diff --git a/website/docs/backends/types/local.html.md b/website/docs/backends/types/local.html.md index a98787634..fb30fdebd 100644 --- a/website/docs/backends/types/local.html.md +++ b/website/docs/backends/types/local.html.md @@ -41,3 +41,4 @@ The following configuration options are supported: * `path` - (Optional) The path to the `tfstate` file. This defaults to "terraform.tfstate" relative to the root module by default. + * `workspace_dir` - (Optional) The path to non-default workspaces. diff --git a/website/docs/commands/import.html.md b/website/docs/commands/import.html.md index e30044509..fa2bdc933 100644 --- a/website/docs/commands/import.html.md +++ b/website/docs/commands/import.html.md @@ -105,11 +105,6 @@ provider "aws" { } ``` -You can force Terraform to explicitly not load your configuration by -specifying `-config=""` (empty string). This is useful in situations where -you want to manually configure the provider because your configuration -may not be valid. - ## Example: Import into Resource This example will import an AWS instance into the `aws_instance` resource named `foo`: diff --git a/website/docs/commands/output.html.markdown b/website/docs/commands/output.html.markdown index 6db0ef3e0..5b072eb16 100644 --- a/website/docs/commands/output.html.markdown +++ b/website/docs/commands/output.html.markdown @@ -40,6 +40,11 @@ output "lb_address" { output "instance_ips" { value = ["${aws_instance.web.*.public_ip}"] } + +output "password" { + sensitive = true + value = ["${var.secret_password}"] +} ``` To list all outputs: @@ -48,6 +53,12 @@ To list all outputs: $ terraform output ``` +Note that outputs with the `sensitive` attribute will be redacted: +```shell +$ terraform output password +password = +``` + To query for the DNS address of the load balancer: ```shell diff --git a/website/docs/configuration/variables.html.md b/website/docs/configuration/variables.html.md index df238144d..781c88b50 100644 --- a/website/docs/configuration/variables.html.md +++ b/website/docs/configuration/variables.html.md @@ -271,7 +271,8 @@ recommend always setting complex variable values via variable definitions files. The above mechanisms for setting variables can be used together in any combination. If the same variable is assigned multiple values, Terraform uses -the _last_ value it finds, overriding any previous values. +the _last_ value it finds, overriding any previous values. Note that the same +variable cannot be assigned multiple values within a single source. Terraform loads variables in the following order, with later sources taking precedence over earlier ones: diff --git a/website/docs/provisioners/connection.html.markdown b/website/docs/provisioners/connection.html.markdown index b9c6fa6cb..56dabe442 100644 --- a/website/docs/provisioners/connection.html.markdown +++ b/website/docs/provisioners/connection.html.markdown @@ -31,6 +31,7 @@ provisioner "file" { type = "ssh" user = "root" password = "${var.root_password}" + host = "${var.host}" } } @@ -43,6 +44,7 @@ provisioner "file" { type = "winrm" user = "Administrator" password = "${var.admin_password}" + host = "${var.host}" } } ``` @@ -60,7 +62,7 @@ provisioner "file" { * `password` - The password we should use for the connection. In some cases this is specified by the provider. -* `host` - The address of the resource to connect to. This is usually specified by the provider. +* `host` - (Required) The address of the resource to connect to. This is usually specified by the provider. * `port` - The port to connect to. Defaults to `22` when using type `ssh` and defaults to `5985` when using type `winrm`. diff --git a/website/layouts/docs.erb b/website/layouts/docs.erb index 9b4cc7202..7b0fb35b8 100644 --- a/website/layouts/docs.erb +++ b/website/layouts/docs.erb @@ -381,14 +381,14 @@ > Backends