Merge pull request #1917 from hashicorp/sethvargo/edisk_groups

Document ephemeral_disk under group
hashicorp · Nov 2, 2016 · 875b8c8 · 875b8c8
2 parents 76c5129 + 09bd533
commit 875b8c8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/website/source/docs/job-specification/ephemeral_disk.html.md b/website/source/docs/job-specification/ephemeral_disk.html.md
@@ -4,7 +4,7 @@ page_title: "ephemeral_disk Stanza - Job Specification"
 sidebar_current: "docs-job-specification-ephemeral_disk"
 description: |-
   The "ephemeral_disk" stanza describes the ephemeral disk requirements of the
-  task group. Ephemeral disks can be marked as sticky and support live data
+  group. Ephemeral disks can be marked as sticky and support live data
   migrations.
 ---
 
@@ -21,8 +21,8 @@ description: |-
 
 
 The `ephemeral_disk` stanza describes the ephemeral disk requirements of the
-task group. Ephemeral disks can be marked as sticky and support live data
-migrations. All tasks in this group will share the same ephemeral disk.
+group. Ephemeral disks can be marked as sticky and support live data migrations.
+All tasks in this group will share the same ephemeral disk.
 
 ```hcl
 job "docs" {

diff --git a/website/source/docs/job-specification/group.html.md b/website/source/docs/job-specification/group.html.md
@@ -38,6 +38,10 @@ job "docs" {
 - `count` `(int: 1)` - Specifies the number of the task groups that should
   be running under this group. This value must be non-negative.
 
+- `ephemeral_disk` <code>([EphemeralDisk][]: nil)</code> - Specifies the
+  ephemeral disk requirements of the group. Ephemeral disks can be marked as
+  sticky and support live data migrations.
+
 - `meta` <code>([Meta][]: nil)</code> - Specifies a key-value map that annotates
   with user-defined metadata.
 
@@ -102,5 +106,6 @@ group "example" {
 [task]: /docs/job-specification/task.html "Nomad task Job Specification"
 [job]: /docs/job-specification/job.html "Nomad job Job Specification"
 [constraint]: /docs/job-specification/constraint.html "Nomad constraint Job Specification"
+[ephemeraldisk]: /docs/job-specification/ephemeral_disk.html "Nomad ephemeral_disk Job Specification"
 [meta]: /docs/job-specification/meta.html "Nomad meta Job Specification"
 [restart]: /docs/job-specification/restart.html "Nomad restart Job Specification"