diff --git a/website/source/api/acl/tokens.html.md b/website/source/api/acl/tokens.html.md
index dbc53ba2e2..1d13a34571 100644
--- a/website/source/api/acl/tokens.html.md
+++ b/website/source/api/acl/tokens.html.md
@@ -11,7 +11,7 @@ description: |-
 # ACL Token HTTP API
 
 The `/acl/token` endpoints [create](#create-a-token), [read](#read-a-token),
-[update](#update-a-token), [list](#list-tokens), [clone](#clone-token) and [delete](#delete-a-token)  ACL policies in Consul.
+[update](#update-a-token), [list](#list-tokens), [clone](#clone-a-token) and [delete](#delete-a-token)  ACL policies in Consul.
 
 For more information about ACLs, please see the [ACL Guide](/docs/guides/acl.html).
 
diff --git a/website/source/api/operator/segment.html.md b/website/source/api/operator/segment.html.md
index b205d05f9b..f86792ab00 100644
--- a/website/source/api/operator/segment.html.md
+++ b/website/source/api/operator/segment.html.md
@@ -20,7 +20,7 @@ The network area functionality described here is available only in
 later. Network segments are operator-defined sections of agents on the LAN, typically
 isolated from other segments by network configuration.
 
-Please see the [Network Segments Guide](/docs/guides/segments.html) for more details.
+Please see the [Network Segments Guide](/docs/guides/network-segments.html) for more details.
 
 ## List Network Segments
 
@@ -57,4 +57,4 @@ $ curl \
 
 ```json
 ["","alpha","beta"]
-```
\ No newline at end of file
+```
diff --git a/website/source/docs/acl/acl-legacy.html.md b/website/source/docs/acl/acl-legacy.html.md
index 31925779e3..2b967b33b9 100644
--- a/website/source/docs/acl/acl-legacy.html.md
+++ b/website/source/docs/acl/acl-legacy.html.md
@@ -6,7 +6,7 @@ description: |-
   Consul provides an optional Access Control List (ACL) system which can be used to control access to data and APIs. The ACL system is a Capability-based system that relies on tokens which can have fine grained rules applied to them. It is very similar to AWS IAM in many ways.
 ---
 
--> **1.3.0 and earlier:** This guide only applies in Consul versions 1.3.0 and before. If you are using the 1.4.0 or later please use the updated guide [here](/docs/acl/acl.html)
+-> **1.3.0 and earlier:** This guide only applies in Consul versions 1.3.0 and before. If you are using the 1.4.0 or later please use the updated guide [here](/docs/acl/acl-system.html)
 
 
 ~> **Alert: Deprecation Notice**
diff --git a/website/source/docs/acl/acl-rules.html.md b/website/source/docs/acl/acl-rules.html.md
index 051599d425..c8f44cb0b2 100644
--- a/website/source/docs/acl/acl-rules.html.md
+++ b/website/source/docs/acl/acl-rules.html.md
@@ -158,7 +158,7 @@ ACL rules look like this:
 acl = "write"
 ```
 
-There is only one acl rule allowed per policy and its value is set to one of the [policy dispositions](docs/acl/acl-rules.html#rule-specification). In the example
+There is only one acl rule allowed per policy and its value is set to one of the [policy dispositions](/docs/acl/acl-rules.html#rule-specification). In the example
 above ACLs may be read or written including discovering any token's secret ID. Snapshotting also requires `acl = "write"`
 permissions due to the fact that all the token secrets are contained within the snapshot.
 
diff --git a/website/source/docs/enterprise/network-segments/index.html.md b/website/source/docs/enterprise/network-segments/index.html.md
index b0d61dd521..517885a584 100644
--- a/website/source/docs/enterprise/network-segments/index.html.md
+++ b/website/source/docs/enterprise/network-segments/index.html.md
@@ -16,7 +16,7 @@ clusters that have multiple tenants that should not be able to communicate
 with each other.
 
 To get started with Network Segments,
-[read the guide](/docs/guides/segments.html).
+[read the guide](/docs/guides/network-segments.html).
 
 # Consul Networking Models
 
diff --git a/website/source/docs/guides/forwarding.html.md b/website/source/docs/guides/forwarding.html.md
index 05cce8e42a..c4db9c7834 100644
--- a/website/source/docs/guides/forwarding.html.md
+++ b/website/source/docs/guides/forwarding.html.md
@@ -195,7 +195,7 @@ instance and relay hosts should not be on the same host or the redirects will
 intercept the traffic.
 
 On Linux systems that support it, incoming requests and requests to
-the local host can use [`iptables`]((http://www.netfilter.org/)) to forward ports on the same machine
+the local host can use [`iptables`](http://www.netfilter.org/) to forward ports on the same machine
 without a secondary service. Since Consul, by default, only resolves
 the `.consul` TLD, it is especially important to use the `recursors`
 option if you wish the `iptables` setup to resolve for other domains.
diff --git a/website/source/docs/upgrade-specific.html.md b/website/source/docs/upgrade-specific.html.md
index cb1b011c2e..04abdce2a6 100644
--- a/website/source/docs/upgrade-specific.html.md
+++ b/website/source/docs/upgrade-specific.html.md
@@ -96,7 +96,7 @@ as soon as possible after upgrade, as well as updating any integrations to work
 with the the new ACL [Token](/api/acl/tokens.html) and
 [Policy](/api/acl/policies.html) APIs.
 
-More complete details on how to upgrade "legacy" tokens is available [here](/docs/guides/acl-migrate-tokens.html).
+More complete details on how to upgrade "legacy" tokens is available [here](/docs/acl/acl-migrate-tokens.html).
 
 ### Connect Multi-datacenter