From c31cb95da3ba061fc5b8c138af14616a2961f43d Mon Sep 17 00:00:00 2001
From: Luke Kysow <1034429+lkysow@users.noreply.github.com>
Date: Tue, 16 Jul 2019 10:23:49 +0100
Subject: [PATCH 1/2] Document multiple services config in hcl

Also change ttl => timeout since ttl doesn't work anymore.
---
 website/source/docs/agent/services.html.md | 42 ++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/website/source/docs/agent/services.html.md b/website/source/docs/agent/services.html.md
index 1dcbf5e21c..536c0cb12c 100644
--- a/website/source/docs/agent/services.html.md
+++ b/website/source/docs/agent/services.html.md
@@ -235,7 +235,7 @@ Multiple services definitions can be provided at once using the plural
         {
           "args": ["/bin/check_redis", "-p", "6000"],
           "interval": "5s",
-          "ttl": "20s"
+          "timeout": "20s"
         }
       ]
     },
@@ -252,7 +252,7 @@ Multiple services definitions can be provided at once using the plural
         {
           "args": ["/bin/check_redis", "-p", "7000"],
           "interval": "30s",
-          "ttl": "60s"
+          "timeout": "60s"
         }
       ]
     },
@@ -261,6 +261,44 @@ Multiple services definitions can be provided at once using the plural
 }
 ```
 
+In HCL you can specify the plural `services` key (although not `service`) multiple times:
+
+```hcl
+services {
+  id = "red0"
+  name = "redis"
+  tags = [
+    "primary"
+  ]
+  address = ""
+  port = 6000
+  checks = [
+    {
+      args = ["/bin/check_redis", "-p", "6000"]
+      interval = "5s"
+      timeout = "20s"
+    }
+  ]
+}
+services {
+  id = "red1"
+  name = "redis"
+  tags = [
+    "delayed",
+    "secondary"
+  ]
+  address = ""
+  port = 7000
+  checks = [
+    {
+      args = ["/bin/check_redis", "-p", "7000"]
+      interval = "30s"
+      timeout = "60s"
+    }
+  ]
+}
+```
+
 ## Service and Tag Names with DNS
 
 Consul exposes service definitions and tags over the [DNS](/docs/agent/dns.html)

From 2679315177e4372ffdf4780e84f61baac82285f1 Mon Sep 17 00:00:00 2001
From: kaitlincarter-hc <43049322+kaitlincarter-hc@users.noreply.github.com>
Date: Thu, 18 Jul 2019 05:36:36 +0200
Subject: [PATCH 2/2] [docs] Encryption docs update (#6082)

* Bad link in encryption docs

* clarifying the guide link

* Update website/source/docs/agent/encryption.html.md

Co-Authored-By: kaitlincarter-hc <43049322+kaitlincarter-hc@users.noreply.github.com>

* Update website/source/docs/agent/encryption.html.md

Co-Authored-By: kaitlincarter-hc <43049322+kaitlincarter-hc@users.noreply.github.com>
---
 website/source/docs/agent/encryption.html.md | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/website/source/docs/agent/encryption.html.md b/website/source/docs/agent/encryption.html.md
index 6758889ff3..3ddb801b66 100644
--- a/website/source/docs/agent/encryption.html.md
+++ b/website/source/docs/agent/encryption.html.md
@@ -101,7 +101,9 @@ and is secured using a symmetric key. See above for enabling gossip encryption.
 ## Configuring TLS on an existing cluster
 
 As of version 0.8.4, Consul supports migrating to TLS-encrypted traffic on a running cluster
-without downtime. This process assumes a starting point with no TLS settings configured, and involves
-an intermediate step in order to get to full TLS encryption. Review this step-by-step
-[guide](https://learn.hashicorp.com/consul/security-networking/certificates) to learn how. 
+without downtime. This process assumes a starting point with no TLS settings configured and involves
+an intermediate step in order to get to full TLS encryption. Review the
+[Securing RPC Communication with TLS Encryption guide](https://learn.hashicorp.com/consul/security-networking/certificates)
+for the step-by-step process to configure TLS on a new or existing cluster. Note the call outs there
+for existing cluster configuration.