From 68778accb2c29634fd37e2a66417daaa96a26aab Mon Sep 17 00:00:00 2001
From: Alex Dadgar <alex.dadgar@gmail.com>
Date: Fri, 4 Aug 2017 16:14:41 -0700
Subject: [PATCH] Small improvements to docs

This PR fixes an incorrect placement of the update stanza in the task
and also links from the env stanza into an example of using the template
block to generate dynamic environment variables.
---
 .../source/docs/job-specification/env.html.md |  7 ++++
 .../blue-green-and-canary-deployments.html.md | 32 +++++++++----------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/website/source/docs/job-specification/env.html.md b/website/source/docs/job-specification/env.html.md
index 8079788a8..df0acc938 100644
--- a/website/source/docs/job-specification/env.html.md
+++ b/website/source/docs/job-specification/env.html.md
@@ -74,4 +74,11 @@ env {
 }
 ```
 
+### Dynamic Environment Variables
+
+Nomad also supports populating dynamic environment variables from data stored in
+HashiCorp Consul and Vault. To use this feature please see the documentation on
+the [`template` stanza][template-env].
+
 [interpolation]: /docs/runtime/interpolation.html "Nomad interpolation"
+[template-env]: /docs/job-specification/template.html#environment-variables "Nomad template Stanza"
diff --git a/website/source/docs/operating-a-job/update-strategies/blue-green-and-canary-deployments.html.md b/website/source/docs/operating-a-job/update-strategies/blue-green-and-canary-deployments.html.md
index 351e8416f..e87f211db 100644
--- a/website/source/docs/operating-a-job/update-strategies/blue-green-and-canary-deployments.html.md
+++ b/website/source/docs/operating-a-job/update-strategies/blue-green-and-canary-deployments.html.md
@@ -39,17 +39,17 @@ job "docs" {
   group "api" {
     count = 5
 
+    update {
+      max_parallel     = 1
+      canary           = 5
+      min_healthy_time = "30s"
+      healthy_deadline = "10m"
+      auto_revert      = true
+    }
+
     task "api-server" {
       driver = "docker"
 
-      update {
-        max_parallel     = 1
-        canary           = 5
-        min_healthy_time = "30s"
-        healthy_deadline = "10m"
-        auto_revert      = true
-      }
-
       config {
         image = "api-server:1.3"
       }
@@ -299,17 +299,17 @@ job "docs" {
   group "api" {
     count = 5
 
+    update {
+      max_parallel     = 1
+      canary           = 1
+      min_healthy_time = "30s"
+      healthy_deadline = "10m"
+      auto_revert      = true
+    }
+
     task "api-server" {
       driver = "docker"
 
-      update {
-        max_parallel     = 1
-        canary           = 1
-        min_healthy_time = "30s"
-        healthy_deadline = "10m"
-        auto_revert      = true
-      }
-
       config {
         image = "api-server:1.3"
       }