Minor doc updates

hashicorp · Aug 15, 2016 · d497de4 · d497de4
1 parent 11df331
commit d497de4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/website/source/docs/concepts/ha.html.markdown b/website/source/docs/concepts/ha.html.markdown
@@ -112,6 +112,10 @@ server, set the value of the key `disable_clustering` to `"false"` (note the
 quotes) in the `backend` block (or `ha_backend` block if using split data/HA
 backends).
 
+If request forwarding is enabled, clients can still force the older/fallback
+redirection behavior if desired by setting the `X-Vault-No-Request-Forwarding`
+header to any non-empty value.
+
 Successful cluster setup requires a few configuration parameters, although some
 can be automatically determined.
 

diff --git a/website/source/docs/config/index.html.md b/website/source/docs/config/index.html.md
@@ -233,6 +233,12 @@ page](https://www.vaultproject.io/docs/concepts/ha.html).
     servers in the cluster for request forwarding. This can also be set via the
     `VAULT_CLUSTER_ADDR` environment variable, which takes precedence.
 
+  * `disable_clustering` (optional) - This controls whether clustering features
+    (currently, request forwarding) are enabled. Setting this on a node will
+    disable these features _when that node is the active node_. In 0.6.1 this
+    is `"true"` (note the quotes) by default, but will become `"false"` by
+    default in the next release.
+
 #### Backend Reference: Consul
 
 For Consul, the following options are supported: