iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2307 from mitchellh/b-docs-dashes 

clean up character encodings
This commit is contained in:
Mitchell Hashimoto 2015-06-24 08:29:24 -07:00
parent 8f0e28fae1 def6f8aefc
commit fbf7db0418
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
website/source/docs/builders/amazon-chroot.html.markdown
View File

@ -128,7 +128,7 @@ can be configured for this builder.
* `enhanced_networking` (boolean) - Enable enhanced networking (SriovNetSupport) on * `enhanced_networking` (boolean) - Enable enhanced networking (SriovNetSupport) on
HVM-compatible AMIs. If true, add `ec2:ModifyInstanceAttribute` to your AWS IAM policy. HVM-compatible AMIs. If true, add `ec2:ModifyInstanceAttribute` to your AWS IAM policy.
* `force_deregister` (boolean) – Force Packer to first deregister an existing * `force_deregister` (boolean) - Force Packer to first deregister an existing
AMI if one with the same name already exists. Default `false`. AMI if one with the same name already exists. Default `false`.
* `mount_path` (string) - The path where the volume will be mounted. This is * `mount_path` (string) - The path where the volume will be mounted. This is
@ -137,13 +137,13 @@ AMI if one with the same name already exists. Default `false`.
template where the `.Device` variable is replaced with the name of the template where the `.Device` variable is replaced with the name of the
device where the volume is attached. device where the volume is attached.
* `mount_options` (array of strings) – Options to supply the `mount` command * `mount_options` (array of strings) - Options to supply the `mount` command
when mounting devices. Each option will be prefixed with `-o ` and supplied to when mounting devices. Each option will be prefixed with `-o ` and supplied to
the `mount` command ran by Packer. Because this command is ran in a shell, user the `mount` command ran by Packer. Because this command is ran in a shell, user
discrestion is advised. See [this manual page for the mount command][1] for valid discrestion is advised. See [this manual page for the mount command][1] for valid
file system specific options file system specific options
* `root_volume_size` (integer) – The size of the root volume for the chroot * `root_volume_size` (integer) - The size of the root volume for the chroot
environment, and the resulting AMI environment, and the resulting AMI
* `tags` (object of key/value strings) - Tags applied to the AMI. * `tags` (object of key/value strings) - Tags applied to the AMI.

20
website/source/docs/builders/amazon-ebs.html.markdown
View File

@ -67,22 +67,22 @@ can be configured for this builder.
* `ami_block_device_mappings` (array of block device mappings) - Add the block * `ami_block_device_mappings` (array of block device mappings) - Add the block
device mappings to the AMI. The block device mappings allow for keys: device mappings to the AMI. The block device mappings allow for keys:
- `device_name` (string) – The device name exposed to the instance (for - `device_name` (string) - The device name exposed to the instance (for
example, "/dev/sdh" or "xvdh") example, "/dev/sdh" or "xvdh")
- `virtual_name` (string) – The virtual device name. See the documentation on - `virtual_name` (string) - The virtual device name. See the documentation on
[Block Device Mapping][1] for more information [Block Device Mapping][1] for more information
- `snapshot_id` (string) – The ID of the snapshot - `snapshot_id` (string) - The ID of the snapshot
- `volume_type` (string) – The volume type. gp2 for General Purpose (SSD) - `volume_type` (string) - The volume type. gp2 for General Purpose (SSD)
volumes, io1 for Provisioned IOPS (SSD) volumes, and standard for Magnetic volumes, io1 for Provisioned IOPS (SSD) volumes, and standard for Magnetic
volumes volumes
- `volume_size` (integer) – The size of the volume, in GiB. Required if not - `volume_size` (integer) - The size of the volume, in GiB. Required if not
specifying a `snapshot_id` specifying a `snapshot_id`
- `delete_on_termination` (boolean) – Indicates whether the EBS volume is - `delete_on_termination` (boolean) - Indicates whether the EBS volume is
deleted on instance termination deleted on instance termination
- `encrypted` (boolean) – Indicates whether to encrypt the volume or not - `encrypted` (boolean) - Indicates whether to encrypt the volume or not
- `no_device` (boolean) – Suppresses the specified device included in the - `no_device` (boolean) - Suppresses the specified device included in the
block device mapping of the AMI block device mapping of the AMI
- `iops` (integer) – The number of I/O operations per second (IOPS) that the - `iops` (integer) - The number of I/O operations per second (IOPS) that the
volume supports. See the documentation on [IOPs][2] for more information volume supports. See the documentation on [IOPs][2] for more information
@ -116,7 +116,7 @@ can be configured for this builder.
* `enhanced_networking` (boolean) - Enable enhanced networking (SriovNetSupport) on * `enhanced_networking` (boolean) - Enable enhanced networking (SriovNetSupport) on
HVM-compatible AMIs. If true, add `ec2:ModifyInstanceAttribute` to your AWS IAM policy. HVM-compatible AMIs. If true, add `ec2:ModifyInstanceAttribute` to your AWS IAM policy.
* `force_deregister` (boolean) – Force Packer to first deregister an existing * `force_deregister` (boolean) - Force Packer to first deregister an existing
AMI if one with the same name already exists. Default `false`. AMI if one with the same name already exists. Default `false`.
* `iam_instance_profile` (string) - The name of an * `iam_instance_profile` (string) - The name of an

20
website/source/docs/builders/amazon-instance.html.markdown
View File

@ -87,22 +87,22 @@ can be configured for this builder.
* `ami_block_device_mappings` (array of block device mappings) - Add the block * `ami_block_device_mappings` (array of block device mappings) - Add the block
device mappings to the AMI. The block device mappings allow for keys: device mappings to the AMI. The block device mappings allow for keys:
- `device_name` (string) – The device name exposed to the instance (for - `device_name` (string) - The device name exposed to the instance (for
example, "/dev/sdh" or "xvdh") example, "/dev/sdh" or "xvdh")
- `virtual_name` (string) – The virtual device name. See the documentation on - `virtual_name` (string) - The virtual device name. See the documentation on
[Block Device Mapping][1] for more information [Block Device Mapping][1] for more information
- `snapshot_id` (string) – The ID of the snapshot - `snapshot_id` (string) - The ID of the snapshot
- `volume_type` (string) – The volume type. gp2 for General Purpose (SSD) - `volume_type` (string) - The volume type. gp2 for General Purpose (SSD)
volumes, io1 for Provisioned IOPS (SSD) volumes, and standard for Magnetic volumes, io1 for Provisioned IOPS (SSD) volumes, and standard for Magnetic
volumes volumes
- `volume_size` (integer) – The size of the volume, in GiB. Required if not - `volume_size` (integer) - The size of the volume, in GiB. Required if not
specifying a `snapshot_id` specifying a `snapshot_id`
- `delete_on_termination` (boolean) – Indicates whether the EBS volume is - `delete_on_termination` (boolean) - Indicates whether the EBS volume is
deleted on instance termination deleted on instance termination
- `encrypted` (boolean) – Indicates whether to encrypt the volume or not - `encrypted` (boolean) - Indicates whether to encrypt the volume or not
- `no_device` (boolean) – Suppresses the specified device included in the - `no_device` (boolean) - Suppresses the specified device included in the
block device mapping of the AMI block device mapping of the AMI
- `iops` (integer) – The number of I/O operations per second (IOPS) that the - `iops` (integer) - The number of I/O operations per second (IOPS) that the
volume supports. See the documentation on [IOPs][2] for more information volume supports. See the documentation on [IOPs][2] for more information
* `ami_description` (string) - The description to set for the resulting * `ami_description` (string) - The description to set for the resulting
@ -155,7 +155,7 @@ can be configured for this builder.
* `enhanced_networking` (boolean) - Enable enhanced networking (SriovNetSupport) on * `enhanced_networking` (boolean) - Enable enhanced networking (SriovNetSupport) on
HVM-compatible AMIs. If true, add `ec2:ModifyInstanceAttribute` to your AWS IAM policy. HVM-compatible AMIs. If true, add `ec2:ModifyInstanceAttribute` to your AWS IAM policy.
* `force_deregister` (boolean) – Force Packer to first deregister an existing * `force_deregister` (boolean) - Force Packer to first deregister an existing
AMI if one with the same name already exists. Default `false`. AMI if one with the same name already exists. Default `false`.
* `iam_instance_profile` (string) - The name of an * `iam_instance_profile` (string) - The name of an