Merge pull request #1094 from hashicorp/d-json-docs

Improved JSON docs
hashicorp · Apr 14, 2016 · fb5fa2c · fb5fa2c
2 parents a1faed4 + 37da266
commit fb5fa2c
Show file tree

Hide file tree

Showing 3 changed files with 190 additions and 162 deletions.
diff --git a/website/Gemfile.lock b/website/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/hashicorp/middleman-hashicorp.git
-  revision: 92b553abc3eb26361328111db2ecb587717666b7
+  revision: 5f29fd16eae65f35034a66184305ea3089b6b0da
   specs:
     middleman-hashicorp (0.2.0)
       bootstrap-sass (~> 3.3)
@@ -27,7 +27,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    autoprefixer-rails (6.3.4)
+    autoprefixer-rails (6.3.6)
       execjs
     bootstrap-sass (3.3.6)
       autoprefixer-rails (>= 5.2.1)
@@ -152,7 +152,7 @@ GEM
     redcarpet (3.3.4)
     ref (2.0.0)
     rouge (1.10.1)
-    sass (3.4.21)
+    sass (3.4.22)
     sprockets (2.12.4)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -189,4 +189,4 @@ DEPENDENCIES
   middleman-hashicorp!
 
 BUNDLED WITH
-   1.10.3
+   1.11.2
diff --git a/website/source/docs/jobspec/index.html.md b/website/source/docs/jobspec/index.html.md
@@ -208,7 +208,7 @@ The `job` object supports the following keys:
 The `group` object supports the following keys:
 
 * `count` - Specifies the number of the task groups that should
-  be running. Must be positive, defaults to one.
+  be running. Must be non-negative, defaults to one.
 
 * `constraint` - This can be provided multiple times to define additional
   constraints. See the constraint reference for more details.
@@ -220,7 +220,7 @@ The `group` object supports the following keys:
 * `task` - This can be specified multiple times, to add a task as
   part of the group.
 
-* `meta` - Annotates the task group with opaque metadata.
+* `meta` - A key/value map that annotates the task group with opaque metadata.
 
 ### Task
 
@@ -432,7 +432,7 @@ Nomad allows downloading `http`, `https`, and `S3` artifacts. If these artifacts
 are archives (zip, tar.gz, bz2, etc.), these will be unarchived before the task
 is started.
 
-The `artifact` object maps supports the following keys:
+The `artifact` object supports the following keys:
 
 * `source` - The path to the artifact to download.
 
@@ -479,5 +479,3 @@ the lack of comments. Otherwise, the two are completely interoperable.
 
 See the [JSON API documentation](/docs/jobspec/json.html) for more details on
 the JSON structure.
-
-