Rolls back `partials` work, but still consolidates

Since the packer website isn't yet ready to use middleman partials,
this commit rolls back the partials in favor of bringing parity to
each amazon docs page

website/Makefile

@@ -13,5 +13,5 @@ format:
 	bundle exec htmlbeautifier -t 2 source/*.erb
 	bundle exec htmlbeautifier -t 2 source/layouts/*.erb
 	@pandoc -v > /dev/null || echo "pandoc must be installed in order to format markdown content"
-	pandoc -v > /dev/null && find . -iname "*.html.md*" | xargs -I{} bash -c "pandoc -r markdown -w markdown --tab-stop=4 --atx-headers -s --columns=80 {} > {}.new"\; || true
-	pandoc -v > /dev/null && find . -iname "*.html.md*" | xargs -I{} bash -c "mv {}.new {}"\; || true
+	pandoc -v > /dev/null && find . -iname "*.html.md" | xargs -I{} bash -c "pandoc -r markdown -w markdown --tab-stop=4 --atx-headers -s --columns=80 {} > {}.new"\; || true
+	pandoc -v > /dev/null && find . -iname "*.html.md" | xargs -I{} bash -c "mv {}.new {}"\; || true

website/source/docs/builders/amazon-chroot.html.md

@@ -130,11 +130,42 @@ each category, the available configuration keys are alphabetized.
     `ami_virtualization_type`, `pre_mount_commands` and `root_volume_size`. The
     below options are also required in this mode only:
 
-    -   `ami_block_device_mappings` (array of block device mappings) - Add the block
-    device mappings to the AMI. A `device_name` entry matching `root_device_name`
-    should be set. The block device mappings allow for keys:
+-   `ami_block_device_mappings` (array of block device mappings) - Add the block
+device mappings to the AMI. A `device_name` entry matching `root_device_name`
+should be set. The block device mappings allow for keys:
 
-        <%= partial "partials/builders/ami-block-device-mappings" %>
+    -   `delete_on_termination` (boolean) - Indicates whether the EBS volume is
+        deleted on instance termination. Default `false`. **NOTE**: If this
+        value is not explicitly set to `true` and volumes are not cleaned up by
+        an alternative method, additional volumes will accumulate after
+        every build.
+
+    -   `device_name` (string) - The device name exposed to the instance (for
+        example, "/dev/sdh" or "xvdh"). Required when specifying `volume_size`.
+
+    -   `encrypted` (boolean) - Indicates whether to encrypt the volume or not
+
+    -   `iops` (integer) - The number of I/O operations per second (IOPS) that the
+        volume supports. See the documentation on
+        [IOPs](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_EbsBlockDevice.html)
+        for more information
+
+    -   `no_device` (boolean) - Suppresses the specified device included in the
+        block device mapping of the AMI
+
+    -   `snapshot_id` (string) - The ID of the snapshot
+
+    -   `virtual_name` (string) - The virtual device name. See the documentation on
+        [Block Device
+        Mapping](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_BlockDeviceMapping.html)
+        for more information
+
+    -   `volume_size` (integer) - The size of the volume, in GiB. Required if not
+        specifying a `snapshot_id`
+
+    -   `volume_type` (string) - The volume type. gp2 for General Purpose (SSD)
+        volumes, io1 for Provisioned IOPS (SSD) volumes, and standard for Magnetic
+        volumes
 
     -   `root_device_name` (string) - The root device name. For example, `xvda`.
 

website/source/docs/builders/amazon-ebs.html.md

@@ -66,27 +66,39 @@ builder.
 -   `ami_block_device_mappings` (array of block device mappings) - Add the block
     device mappings to the AMI. The block device mappings allow for keys:
 
+    -   `delete_on_termination` (boolean) - Indicates whether the EBS volume is
+        deleted on instance termination. Default `false`. **NOTE**: If this
+        value is not explicitly set to `true` and volumes are not cleaned up by
+        an alternative method, additional volumes will accumulate after
+        every build.
+
     -   `device_name` (string) - The device name exposed to the instance (for
          example, "/dev/sdh" or "xvdh"). Required when specifying `volume_size`.
-    -   `delete_on_termination` (boolean) - Indicates whether the EBS volume is
-        deleted on instance termination
+
     -   `encrypted` (boolean) - Indicates whether to encrypt the volume or not
+
     -   `iops` (integer) - The number of I/O operations per second (IOPS) that the
         volume supports. See the documentation on
         [IOPs](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_EbsBlockDevice.html)
         for more information
+
     -   `no_device` (boolean) - Suppresses the specified device included in the
         block device mapping of the AMI
+
     -   `snapshot_id` (string) - The ID of the snapshot
+
     -   `virtual_name` (string) - The virtual device name. See the documentation on
         [Block Device
         Mapping](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_BlockDeviceMapping.html)
         for more information
+
     -   `volume_size` (integer) - The size of the volume, in GiB. Required if not
         specifying a `snapshot_id`
+
     -   `volume_type` (string) - The volume type. gp2 for General Purpose (SSD)
         volumes, io1 for Provisioned IOPS (SSD) volumes, and standard for Magnetic
         volumes
+
 -   `ami_description` (string) - The description to set for the
     resulting AMI(s). By default this description is empty.
 

website/source/docs/builders/amazon-instance.html.md

@@ -87,27 +87,40 @@ builder.
 
 -   `ami_block_device_mappings` (array of block device mappings) - Add the block
     device mappings to the AMI. The block device mappings allow for keys:
+
     -   `delete_on_termination` (boolean) - Indicates whether the EBS volume is
-        deleted on instance termination
+        deleted on instance termination. Default `false`. **NOTE**: If this
+        value is not explicitly set to `true` and volumes are not cleaned up by
+        an alternative method, additional volumes will accumulate after
+        every build.
+
     -   `device_name` (string) - The device name exposed to the instance (for
-        example, "/dev/sdh" or "xvdh"). Required when specifying `volume_size`.
+         example, "/dev/sdh" or "xvdh"). Required when specifying `volume_size`.
+
     -   `encrypted` (boolean) - Indicates whether to encrypt the volume or not
+
     -   `iops` (integer) - The number of I/O operations per second (IOPS) that the
         volume supports. See the documentation on
         [IOPs](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_EbsBlockDevice.html)
         for more information
+
     -   `no_device` (boolean) - Suppresses the specified device included in the
         block device mapping of the AMI
+
     -   `snapshot_id` (string) - The ID of the snapshot
+
     -   `virtual_name` (string) - The virtual device name. See the documentation on
         [Block Device
         Mapping](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_BlockDeviceMapping.html)
         for more information
+
     -   `volume_size` (integer) - The size of the volume, in GiB. Required if not
         specifying a `snapshot_id`
+
     -   `volume_type` (string) - The volume type. gp2 for General Purpose (SSD)
         volumes, io1 for Provisioned IOPS (SSD) volumes, and standard for Magnetic
         volumes
+
 -   `ami_description` (string) - The description to set for the
     resulting AMI(s). By default this description is empty.
 

website/source/partials/builders/_ami-block-device-mappings.html.md

@@ -1,33 +0,0 @@
--   `delete_on_termination` (boolean) - Indicates whether the EBS volume is
-    deleted on instance termination. Default `false`. **NOTE**: If this
-    value is not explicitly set to `true` and volumes are not cleaned up by
-    an alternative method, additional volumes will accumulate after
-    every build.
-
--   `device_name` (string) - The device name exposed to the instance (for
-     example, "/dev/sdh" or "xvdh"). Required when specifying `volume_size`.
-
--   `encrypted` (boolean) - Indicates whether to encrypt the volume or not
-
--   `iops` (integer) - The number of I/O operations per second (IOPS) that the
-    volume supports. See the documentation on
-    [IOPs](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_EbsBlockDevice.html)
-    for more information
-
--   `no_device` (boolean) - Suppresses the specified device included in the
-    block device mapping of the AMI
-
--   `snapshot_id` (string) - The ID of the snapshot
-
--   `virtual_name` (string) - The virtual device name. See the documentation on
-    [Block Device
-    Mapping](https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_BlockDeviceMapping.html)
-    for more information
-
--   `volume_size` (integer) - The size of the volume, in GiB. Required if not
-    specifying a `snapshot_id`
-
--   `volume_type` (string) - The volume type. gp2 for General Purpose (SSD)
-    volumes, io1 for Provisioned IOPS (SSD) volumes, and standard for Magnetic
-    volumes
-