diff --git a/content/rancher/v2.x/en/concepts/load-balancing/_index.md b/content/rancher/v2.x/en/concepts/load-balancing/_index.md
index 8d601790a68..c6f9837225f 100644
--- a/content/rancher/v2.x/en/concepts/load-balancing/_index.md
+++ b/content/rancher/v2.x/en/concepts/load-balancing/_index.md
@@ -2,9 +2,6 @@
title: Load Balancing
weight: 2175
---
-
-# Load Balancing
-
Kubernetes supports load balancing in two ways: Layer-4 Load Balancing and Layer-7 Load Balancing.
## Layer-4 Load Balancer
diff --git a/content/rancher/v2.x/en/concepts/volumes/_index.md b/content/rancher/v2.x/en/concepts/volumes/_index.md
index 7823d3f6740..697a37a4463 100644
--- a/content/rancher/v2.x/en/concepts/volumes/_index.md
+++ b/content/rancher/v2.x/en/concepts/volumes/_index.md
@@ -2,9 +2,6 @@
title: Volumes
weight: 2225
---
-
-# Volumes
-
There are two ways to create volumes on Kubernetes: Persistent Volumes (PVs) and Storage Classes.
## Persistent Volumes
diff --git a/content/rancher/v2.x/en/installation/ha-server-install/_index.md b/content/rancher/v2.x/en/installation/ha-server-install/_index.md
index 1fc075ae958..5c93920b101 100644
--- a/content/rancher/v2.x/en/installation/ha-server-install/_index.md
+++ b/content/rancher/v2.x/en/installation/ha-server-install/_index.md
@@ -2,14 +2,25 @@
title: High Availability Installation
weight: 275
---
-This set of instructions creates a new Kubernetes cluster dedicated to running Rancher in a high-availability (HA) configuration. This procedure walks you through setting up a 3-node cluster using the Rancher Kubernetes Engine (RKE). The cluster's sole purpose is running pods for Rancher. The setup is based on:
+This set of instructions creates a new Kubernetes cluster that's dedicated to running Rancher in a high-availability (HA) configuration. This procedure walks you through setting up a 3-node cluster using the Rancher Kubernetes Engine (RKE). The cluster's sole purpose is running pods for Rancher. The setup is based on:
* Round Robin DNS
* NGINX Ingress controller

-## Provision Linux Hosts
+## Overview
+
+1. Provision Linux Hosts
+2. Configure DNS
+3. Download RKE
+4. Download Config File Template
+5. Configure Nodes
+6. Configure Certificates
+7. Configure FQDN
+8. Run RKE
+
+## Part 1—Provision Linux Hosts
Before you install Rancher, confirm you meet the host requirements. Provision 3 new Linux hosts using the requirements below.
@@ -23,7 +34,7 @@ Before you install Rancher, confirm you meet the host requirements. Provision 3
{{< requirements_ports >}}
-## Configure DNS
+## Part 2—Configure DNS
Choose a fully qualified domain name (FQDN) you want to use to access Rancher (this is usually something like `rancher.yourdomain.com`).
You need to create a DNS A record, pointing to the IP addresses of your [Linux hosts](#provision-linux-hosts). If the DNS A record is created, you can validate if it's setup correctly by running `nslookup rancher.yourdomain.com`. It should return the 3 IP addresses of your [Linux hosts](#provision-linux-hosts) like in the example below.
@@ -44,7 +55,7 @@ Name: rancher.yourdomain.com
Address: ip_of_node3
```
-## Download RKE
+## Part 3—Download RKE
Rancher Kubernetes Engine (RKE) is a fast, versatile Kubernetes installer that you can use to install Kubernetes on your Linux hosts. We will be using RKE to setup our cluster and run Rancher.
@@ -76,14 +87,14 @@ $ ./rke_linux-amd64 -version
rke version v
```
-## Download Config Template based on SSL certificate
+## Part 4—Download Config Template based on SSL certificate
RKE uses a `.yml` config file to install and configure your Kubernetes cluster. There are 2 templates to choose from, depending on the SSL certificate you want to use.
- [Template for using Self Signed Certificate (3-node-certificate.yml)](https://raw.githubusercontent.com/rancher/rancher/e9d29b3f3b9673421961c68adf0516807d1317eb/rke-templates/3-node-certificate.yml)
- [Template for using Certificate Signed By A Recognized Certificate Authority (3-node-certificate-recognizedca.yml)](https://raw.githubusercontent.com/rancher/rancher/e9d29b3f3b9673421961c68adf0516807d1317eb/rke-templates/3-node-certificate-recognizedca.yml)
-## Configure nodes section
+## Part 5—Configure nodes section
Once you have the `.yml` config file template, edit the nodes section to point toward your Linux hosts.
@@ -115,7 +126,7 @@ nodes:
ssh_key_path: ~/.ssh/id_rsa
```
-## Configure certificates
+## Part 6—Configure certificates
Certificates can be configured by using base64 encoded strings in the config file. The base64 encoded string can be generated using the following command:
@@ -123,7 +134,7 @@ Certificates can be configured by using base64 encoded strings in the config fil
- **Linux**: `cat FILENAME | base64 -w0`
- **Windows**: `certutil -encode FILENAME FILENAME.base64`
-### Self Signed Certificate
+### Option A—Self Signed Certificate
>**Note:**
> If you are using Certificate Signed By A Recognized Certificate Authority, [click here](#certificate-signed-by-a-recognized-certificate-authority) to proceed.
@@ -168,7 +179,7 @@ data:
cacerts.pem: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNvRENDQVlnQ0NRRHVVWjZuMEZWeU16QU5CZ2txaGtpRzl3MEJBUXNGQURBU01SQXdEZ1lEVlFRRERBZDAKWlhOMExXTmhNQjRYRFRFNE1EVXdOakl4TURRd09Wb1hEVEU0TURjd05USXhNRFF3T1Zvd0VqRVFNQTRHQTFVRQpBd3dIZEdWemRDMWpZVENDQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFNQmpBS3dQCndhRUhwQTdaRW1iWWczaTNYNlppVmtGZFJGckJlTmFYTHFPL2R0RUdmWktqYUF0Wm45R1VsckQxZUlUS3UzVHgKOWlGVlV4Mmo1Z0tyWmpwWitCUnFiZ1BNbk5hS1hocmRTdDRtUUN0VFFZdGRYMVFZS0pUbWF5NU45N3FoNTZtWQprMllKRkpOWVhHWlJabkdMUXJQNk04VHZramF0ZnZOdmJ0WmtkY2orYlY3aWhXanp2d2theHRUVjZlUGxuM2p5CnJUeXBBTDliYnlVcHlad3E2MWQvb0Q4VUtwZ2lZM1dOWmN1YnNvSjhxWlRsTnN6UjVadEFJV0tjSE5ZbE93d2oKaG41RE1tSFpwZ0ZGNW14TU52akxPRUc0S0ZRU3laYlV2QzlZRUhLZTUxbGVxa1lmQmtBZWpPY002TnlWQUh1dApuay9DMHpXcGdENkIwbkVDQXdFQUFUQU5CZ2txaGtpRzl3MEJBUXNGQUFPQ0FRRUFHTCtaNkRzK2R4WTZsU2VBClZHSkMvdzE1bHJ2ZXdia1YxN3hvcmlyNEMxVURJSXB6YXdCdFJRSGdSWXVtblVqOGo4T0hFWUFDUEthR3BTVUsKRDVuVWdzV0pMUUV0TDA2eTh6M3A0MDBrSlZFZW9xZlVnYjQrK1JLRVJrWmowWXR3NEN0WHhwOVMzVkd4NmNOQQozZVlqRnRQd2hoYWVEQmdma1hXQWtISXFDcEsrN3RYem9pRGpXbi8walI2VDcrSGlaNEZjZ1AzYnd3K3NjUDIyCjlDQVZ1ZFg4TWpEQ1hTcll0Y0ZINllBanlCSTJjbDhoSkJqa2E3aERpVC9DaFlEZlFFVFZDM3crQjBDYjF1NWcKdE03Z2NGcUw4OVdhMnp5UzdNdXk5bEthUDBvTXl1Ty82Tm1wNjNsVnRHeEZKSFh4WTN6M0lycGxlbTNZQThpTwpmbmlYZXc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
```
-### Certificate Signed By A Recognized Certificate Authority
+### Option B—Certificate Signed By A Recognized Certificate Authority
If you are using a Certificate Signed By A Recognized Certificate Authority, you will need to generate a base64 encoded string for the Certificate file and the Certificate Key file.
@@ -193,7 +204,7 @@ data:
```
-## Configure FQDN
+## Part 7—Configure FQDN
There are 2 references to `` in the config file. Both need to be replaced with the FQDN chosen in [Configure DNS](#configure-dns).
@@ -230,7 +241,7 @@ After replacing `` wit the FQDN chosen in [Configure DNS](#configure-dns),
Save the `.yml` file and close it.
-## Run RKE
+## Part 8—Run RKE
All configuration is in place to run RKE. You can do this by running the `rke up` command and using the `--config` parameter to point to your config file.
diff --git a/content/rancher/v2.x/en/home/_index.md b/content/rancher/v2.x/en/overview/_index.md
similarity index 95%
rename from content/rancher/v2.x/en/home/_index.md
rename to content/rancher/v2.x/en/overview/_index.md
index 1202ed219c8..5d3a38dac3b 100644
--- a/content/rancher/v2.x/en/home/_index.md
+++ b/content/rancher/v2.x/en/overview/_index.md
@@ -1,5 +1,10 @@
---
+<<<<<<< Updated upstream
title: Overview
+=======
+linkTitle:
+aliases: [/rancher/v2.x/en/]
+>>>>>>> Stashed changes
weight: 1
---
Rancher is a container management platform built for organizations that deploy containers in production. Rancher makes it easy to run Kubernetes everywhere, meet IT requirements, and empower DevOps teams.
diff --git a/content/rancher/v2.x/en/home/architecture/_index.md b/content/rancher/v2.x/en/overview/architecture/_index.md
similarity index 100%
rename from content/rancher/v2.x/en/home/architecture/_index.md
rename to content/rancher/v2.x/en/overview/architecture/_index.md