Mildwonkey/docs updates (#22623)

* website/formatdate: update example

The given example was showing HOUR:MONTH instead of HOUR:MINUTE

Fixes #22598

* website/import: remove reference to no-longer-working option

Users can no longer supply `-config=""` to tell Terraform not to load
configuration for import.

Fixes #22294

* website/provisioners: `host` is required in connection blocks

Fixes #21877

* website/variables: clarify variable definition precedence

It was not entirely obvious that a variable could not be assigned
multiples times in a single source.

Fixes #21682

* website/backend/local: add `workspace_dir` attribute

Fixes #21391

* website/output: `sensitive` outputs are redacted in output

Fixes #21502

* website/backends: sidebar order tweak

It makes sense for backend 'configuration' to appear before 'init'.

Fixes #13796

* Revert "website/formatdate: update example"

This reverts commit ccd93c86ddd15a21625c0767702ee1cc62e77254.

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.

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`:

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 = <sensitive>
+```
+
 To query for the DNS address of the load balancer:
 
 ```shell

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:

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`.

website/layouts/docs.erb

@@ -381,14 +381,14 @@
       <li<%= sidebar_current("docs-backends") %>>
         <a href="/docs/backends/index.html">Backends</a>
         <ul class="nav">
-          <li<%= sidebar_current("docs-backends-init") %>>
-            <a href="/docs/backends/init.html">Init</a>
-          </li>
-
           <li<%= sidebar_current("docs-backends-config") %>>
             <a href="/docs/backends/config.html">Configuration</a>
           </li>
 
+          <li<%= sidebar_current("docs-backends-init") %>>
+            <a href="/docs/backends/init.html">Init</a>
+          </li>
+
           <li<%= sidebar_current("docs-backends-state") %>>
             <a href="/docs/backends/state.html">State Storage & Locking</a>
           </li>