Merge pull request #3832 from mcinteer/master

Make docs indicate that AWS session token can be explicitly set
hashicorp · Nov 9, 2015 · 003cbc0 · 003cbc0
2 parents 6906dc1 + 64d982a
commit 003cbc0
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/website/source/docs/providers/aws/index.html.markdown b/website/source/docs/providers/aws/index.html.markdown
@@ -59,5 +59,4 @@ The following arguments are supported in the `provider` block:
 
 * `kinesis_endpoint` - (Optional) Use this to override the default endpoint URL constructed from the `region`. It's typically used to connect to kinesalite.
 
-In addition to the above parameters, the `AWS_SESSION_TOKEN` environmental
-variable can be set to set an MFA token.
+* `token` - (Optional) Use this to set an MFA token. It can also be sourced from the `AWS_SECURITY_TOKEN` environment variable.