From ff9745bb007a44ab6148c8c6a7284fc23b6be2f2 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <jeffrey.mitchell@gmail.com>
Date: Mon, 14 Dec 2015 21:04:58 -0500
Subject: [PATCH] Update Changelog and documentation with separate-HA-backend
 info.

---
 CHANGELOG.md                             | 9 +++++++++
 website/source/docs/config/index.html.md | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a28f08b65..907a25465 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 ## 0.5.0 (Unreleased)
 
+FEATURES:
+
+ * **Split Data/High Availability Physical Backends**: You can now configure
+   two separate physical backends: one to be used for High Availability
+   coordination and another to be used for encrypted data storage. See the
+   [configuration
+   documentation](https://vaultproject.io/docs/config/index.html) for details.
+   [GH-395]
+
 IMPROVEMENTS:
 
  * cli: Output secrets sorted by key name [GH-830]
diff --git a/website/source/docs/config/index.html.md b/website/source/docs/config/index.html.md
index 8f6195490..580b6a5c0 100644
--- a/website/source/docs/config/index.html.md
+++ b/website/source/docs/config/index.html.md
@@ -38,6 +38,11 @@ to specify where the configuration is.
   is stored. There are multiple options available for storage backends,
   and they're documented below.
 
+* `ha_backend` (optional) - Configures the storage backend where Vault HA
+  coordination will take place. Must be an HA-supporting backend using the
+  configuration options as documented below. If not set, HA will be attempted
+  on the backend given in the `backend` parameter.
+
 * `listener` (required) - Configures how Vault is listening for API requests.
   "tcp" is currently the only option available. A full reference for the
    inner syntax is below.