From 766dac4d793be5cabcfd465e4dd94d6d04190f53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hasan=20Tu=CC=88rken?= Date: Mon, 8 Feb 2016 17:04:13 +0200 Subject: [PATCH] update documentation --- builtin/providers/aws/provider.go | 1 - .../docs/providers/aws/index.html.markdown | 18 ++++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/builtin/providers/aws/provider.go b/builtin/providers/aws/provider.go index 4cc9c5980..ffa5a4d7c 100644 --- a/builtin/providers/aws/provider.go +++ b/builtin/providers/aws/provider.go @@ -270,7 +270,6 @@ func init() { "insecure": "Explicitly allow the provider to perform \"insecure\" SSL requests. If omitted," + "default value is `false`", - "default value is `false`", } } diff --git a/website/source/docs/providers/aws/index.html.markdown b/website/source/docs/providers/aws/index.html.markdown index f89cd9fa4..7bc328dad 100644 --- a/website/source/docs/providers/aws/index.html.markdown +++ b/website/source/docs/providers/aws/index.html.markdown @@ -133,6 +133,9 @@ The following arguments are supported in the `provider` block: to prevent you mistakenly using a wrong one (and end up destroying live environment). Conflicts with `allowed_account_ids`. +* `insecure` - (Optional) Optional) Explicitly allow the provider to + perform "insecure" SSL requests. If omitted, default value is `false` + * `dynamodb_endpoint` - (Optional) Use this to override the default endpoint URL constructed from the `region`. It's typically used to connect to dynamodb-local. @@ -141,17 +144,16 @@ The following arguments are supported in the `provider` block: URL constructed from the `region`. It's typically used to connect to kinesalite. -* `iam_endpoint` - (Optional) Use this to override the default endpoint +Nested `endpoints` block supports the followings: + +* `iam` - (Optional) Use this to override the default endpoint URL constructed from the `region`. It's typically used to connect to custom iam endpoints. -* `ec2_endpoint` - (Optional) Use this to override the default endpoint +* `ec2` - (Optional) Use this to override the default endpoint URL constructed from the `region`. It's typically used to connect to custom ec2 endpoints. - -* `token` - (Optional) Use this to set an MFA token. It can also be - sourced from the `AWS_SECURITY_TOKEN` environment variable. - -* `insecure` - (Optional) Optional) Explicitly allow the provider to - perform "insecure" SSL requests. If omitted, default value is `false` +* `elb` - (Optional) Use this to override the default endpoint + URL constructed from the `region`. It's typically used to connect to + custom elb endpoints. \ No newline at end of file