docs

hashicorp · Jun 7, 2016 · baff94f · baff94f
1 parent cc80c24
commit baff94f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/command/meta.go b/command/meta.go
@@ -115,7 +115,7 @@ func generalOptionsUsage() string {
     Default = http://127.0.0.1:4646
 
   -region=<region>
-    The region of the Nomad servers to forward commands too.
+    The region of the Nomad servers to forward commands to.
     Overrides the NOMAD_REGION environment variable if set.
     Defaults to the Agent's local region.
 `

diff --git a/command/plan.go b/command/plan.go
@@ -45,7 +45,7 @@ Usage: nomad plan [options] <file>
   give insight into what the scheduler will attempt to do and why.
 
   If the job has specified the region, the -region flag and NOMAD_REGION
-  environment variable are overridden to the job's region.
+  environment variable are overridden and the the job's region is used.
 
 General Options:
 

diff --git a/command/run.go b/command/run.go
@@ -38,7 +38,7 @@ Usage: nomad run [options] <file>
   issues or internal errors, are indicated by exit code 1.
 
   If the job has specified the region, the -region flag and NOMAD_REGION
-  environment variable are overridden to the job's region.
+  environment variable are overridden and the the job's region is used.
 
 General Options:
 

diff --git a/website/helpers/command_helpers.rb b/website/helpers/command_helpers.rb
@@ -4,6 +4,10 @@ def general_options_usage()
     <<EOF
 * `-address=<addr>`: The address of the Nomad server. Overrides the `NOMAD_ADDR`
   environment variable if set. Defaults to `http://127.0.0.1:4646`.
+
+* `-region=<region>`: The region of the Nomad server to forward commands to.
+  Overrides the `NOMAD_REGION` environment variable if set. Defaults to the
+  Agent's local region.
 EOF
   end
 end
diff --git a/website/source/docs/commands/run.html.md.erb b/website/source/docs/commands/run.html.md.erb
@@ -32,6 +32,9 @@ there are job placement issues encountered (unsatisfiable constraints, resource
 exhaustion, etc), then the exit code will be 2. Any other errors, including
 client connection issues or internal errors, are indicated by exit code 1.
 
+If the job has specified the region, the -region flag and NOMAD_REGION
+environment variable are overridden and the the job's region is used.
+
 ## General Options
 
 <%= general_options_usage %>