From f5e76a7125302227ab88c357a20945871353c855 Mon Sep 17 00:00:00 2001
From: Brian Shumate <brian@brianshumate.com>
Date: Fri, 6 Jan 2017 09:42:49 -0500
Subject: [PATCH] DOCS: update environment variables page

- Relocate Environment Variables page to Agent section
- Correct front matter newlines issue
---
 .../environment-variables.html.markdown}                   | 7 ++-----
 website/source/layouts/docs.erb                            | 4 ++++
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename website/source/docs/{commands/environment-variables.html.md => agent/environment-variables.html.markdown} (85%)

diff --git a/website/source/docs/commands/environment-variables.html.md b/website/source/docs/agent/environment-variables.html.markdown
similarity index 85%
rename from website/source/docs/commands/environment-variables.html.md
rename to website/source/docs/agent/environment-variables.html.markdown
index 19f1d9be92..64a5c1de6b 100644
--- a/website/source/docs/commands/environment-variables.html.md
+++ b/website/source/docs/agent/environment-variables.html.markdown
@@ -1,12 +1,9 @@
 ---
 layout: "docs"
 page_title: "Environment Variables"
-sidebar_current: "docs-commands-environment-variables"
+sidebar_current: "docs-agent-envvars"
 description: |-
-  In addition to CLI flags, Consul reads environment variables for behavior
-defaults. CLI flags always take precedence over environment variables, but it
-is often helpful to use environment variables to configure the Consul agent,
-particularly with configuration management and init systems.
+  In addition to CLI flags, Consul reads environment variables for behavior defaults. CLI flags always take precedence over environment variables, but it is often helpful to use environment variables to configure the Consul agent, particularly with configuration management and init systems.
 ---
 
 # Environment Variables
diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb
index defdc57c20..f1260cc1ab 100644
--- a/website/source/layouts/docs.erb
+++ b/website/source/layouts/docs.erb
@@ -184,6 +184,10 @@
 					<a href="/docs/agent/dns.html">DNS Interface</a>
 					</li>
 
+					<li<%= sidebar_current("docs-agent-envvars") %>>
+					<a href="/docs/agent/environment-variables.html">Environment Variables</a>
+					</li>
+
 					<li<%= sidebar_current("docs-agent-http") %>>
 					<a href="/docs/agent/http.html">HTTP API</a>
 					<ul class="subnav">