From 67f02e6a547dfbff00954872bf3db255e90ff686 Mon Sep 17 00:00:00 2001 From: Paul Stack Date: Mon, 17 Apr 2017 01:33:30 +0300 Subject: [PATCH] provider/aws: Documentation fixes for aws_ami (#13694) * provider/aws: Documentation fixes for aws_ami Fixes: #13685 * Update ami.html.markdown --- website/source/docs/providers/aws/r/ami.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/source/docs/providers/aws/r/ami.html.markdown b/website/source/docs/providers/aws/r/ami.html.markdown index 505cece26e..b275289d24 100644 --- a/website/source/docs/providers/aws/r/ami.html.markdown +++ b/website/source/docs/providers/aws/r/ami.html.markdown @@ -81,12 +81,12 @@ Nested `ebs_block_device` blocks have the following structure: as the selected snapshot. * `volume_type` - (Optional) The type of EBS volume to create. Can be one of "standard" (the default), "io1" or "gp2". -* `encrypted` - (Optional) Specifies whether the destination snapshots of the copied image should be encrypted. -The default CMK for EBS is used unless a non-default AWS Key Management Service (AWS KMS) CMK is specified with KmsKeyId. * `kms_key_id` - (Optional) The full ARN of the AWS Key Management Service (AWS KMS) CMK to use when encrypting the snapshots of an image during a copy operation. This parameter is only required if you want to use a non-default CMK; if this parameter is not specified, the default CMK for EBS is used +~> **Note:** You can specify `encrypted` or `snapshot_id` but not both. + Nested `ephemeral_block_device` blocks have the following structure: * `device_name` - (Required) The path at which the device is exposed to created instances.