From 92da3d08ff298724180d5767fc78a5eb59ee782c Mon Sep 17 00:00:00 2001
From: Kyle Havlovitz <kylehav@gmail.com>
Date: Fri, 10 Mar 2017 15:19:50 -0800
Subject: [PATCH] Adjust autopilot sections based on feedback

---
 website/source/docs/guides/autopilot.html.markdown | 10 +++++++++-
 website/source/docs/upgrade-specific.html.markdown |  9 ++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/website/source/docs/guides/autopilot.html.markdown b/website/source/docs/guides/autopilot.html.markdown
index ce8b7b2c42..ebcd4b9f80 100644
--- a/website/source/docs/guides/autopilot.html.markdown
+++ b/website/source/docs/guides/autopilot.html.markdown
@@ -15,7 +15,9 @@ servers, monitoring the of the Raft cluster, and stable server introduction.
 To enable Autopilot features (with the exception of dead server cleanup),
 the [`raft_protocol`](/docs/agent/options.html#_raft_protocol) setting in
 the Agent configuration must be set to 3 or higher on all servers. In Consul
-0.8 this setting defaults to 2; in Consul 0.9 it will default to 3.
+0.8 this setting defaults to 2; in Consul 0.9 it will default to 3. For more
+information, see the [Version Upgrade section](/docs/upgrade-specific.html#raft_protocol)
+on Raft Protocol versions.
 
 ## Configuration
 
@@ -51,6 +53,12 @@ set, to prevent them from interfering with the quorum size and leader elections.
 This cleanup will also happen whenever a new server is successfully added to the
 cluster.
 
+Prior to Autopilot, it would take 72 hours for dead servers to be automatically reaped,
+or operators had to script a `consul force-leave`. If another server failure occurred,
+it could jeopardize the quorum, even if the failed Consul server had been automatically
+replaced. Autopilot helps prevent these kinds of outages by quickly removing failed
+servers as soon as a replacement Consul server comes online.
+
 This option can be disabled by running `consul operator autopilot set-config`
 with the `-cleanup-dead-servers=false` option.
 
diff --git a/website/source/docs/upgrade-specific.html.markdown b/website/source/docs/upgrade-specific.html.markdown
index 987cc5aa84..5deeb68842 100644
--- a/website/source/docs/upgrade-specific.html.markdown
+++ b/website/source/docs/upgrade-specific.html.markdown
@@ -33,7 +33,7 @@ and update any scripts that passed a custom `-rpc-addr` to the following command
 * `monitor`
 * `reload`
 
-#### Raft Protocol version compatibility
+#### <a name="raft_protocol"></a><a href="#raft_protocol">Raft Protocol Version Compatibility</a>
 
 When upgrading to Consul 0.8.0 from a version lower than 0.7.0, users will need to
 set the [`-raft-protocol`](/docs/agent/options.html#_raft_protocol) option to 1 in
@@ -42,8 +42,8 @@ After the servers have been migrated to version 0.8.0, `-raft-protocol` can be m
 up to 2 and the servers restarted to match the default.
 
 The Raft protocol must be stepped up in this way; only adjacent version numbers are
-compatible (for example, version 1 cannot talk to version 3). Here is a table of the Raft Protocol
-versions supported by each Consul version:
+compatible (for example, version 1 cannot talk to version 3). Here is a table of the
+Raft Protocol versions supported by each Consul version:
 
 <table class="table table-bordered table-striped">
   <tr>
@@ -64,6 +64,9 @@ versions supported by each Consul version:
   </tr>
 </table>
 
+In order to enable all [Autopilot](/docs/guides/autopilot.html) features, all servers
+in a Consul cluster must be running with Raft protocol version 3 or later.
+
 ## Consul 0.7.1
 
 #### Child Process Reaping