diff --git a/content/rancher/installation/_index.md b/content/rancher/installation/_index.md
index 5adc97588ae..e8685d62e6b 100644
--- a/content/rancher/installation/_index.md
+++ b/content/rancher/installation/_index.md
@@ -3,3 +3,5 @@ title: Installation
weight: 50
---
# Installation
+
+This section contains instructions for installing Rancher in development and production environments.
diff --git a/content/rancher/installation/installation-scenarios/_index.md b/content/rancher/installation/installation-scenarios/_index.md
deleted file mode 100644
index 590c094b1c9..00000000000
--- a/content/rancher/installation/installation-scenarios/_index.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-title: Installation Scenarios
-weight: 100
----
-
-# Installation Scenarios
-
-## Single Node Scenarios
-
-In these scenarios, you'll install {{< product >}} on a single Linux host. These scenarios assume that you're starting fresh: no previously existing Kubernetes clusters.
-
-### Option 1: Single Container Install
-
-An install using one Linux host and a single Docker container. That's it!
-
-### Option 2: Single Container Install with External etcd
-
-### Option 3: Local Cluster Install
-
-## Multi Node Scenarios
-
-### Option 1 (and only): RKE Install
-
-## Special Scenarios
-
-### No Internet Connection Install
diff --git a/content/rancher/installation/load-balancing-config/_index.md b/content/rancher/installation/load-balancing-config/_index.md
index 73848e841f9..ef57a31c7e8 100644
--- a/content/rancher/installation/load-balancing-config/_index.md
+++ b/content/rancher/installation/load-balancing-config/_index.md
@@ -3,6 +3,8 @@ title: Load Balancer Configuration
weight: 300
---
-# External Load Balancer Configuration
+# Load Balancer Configuration
Following {{< product >}} installation, you have the option of configuring an external load balancer to direct cluster traffic.
+
+Rancher has tested a few load balancer configurations. Choose from the available options below. There is no "best" configuration. Choose the load balancer that best suits your needs.
diff --git a/content/rancher/installation/load-balancing-config/configuring-amazon-alb.md b/content/rancher/installation/load-balancing-config/configuring-amazon-alb.md
index 2e29e1f8d49..2977a890d95 100644
--- a/content/rancher/installation/load-balancing-config/configuring-amazon-alb.md
+++ b/content/rancher/installation/load-balancing-config/configuring-amazon-alb.md
@@ -4,6 +4,8 @@ weight: 305
---
# Option 1-Amazon ALB
+Amazon Elastic Load Balancing offers a couple of different load balancers that we're tested. This procedure provides step-by-step instruction for configuring Amazon Application Load Balancer (ALB) with your Rancher Server.
+
## Objectives
Configuring an Amazon ALB is a multistage process. We've broken it down into multiple tasks so that it's easy to follow.
@@ -25,7 +27,7 @@ Configuring an Amazon ALB is a multistage process. We've broken it down into mul
The Wizard in **3. Create Your ALB** only allows you to add a single target group. Go back into Amazon's console and add the second target group manually.
-## Create Target Groups
+### Create Target Groups
Your first ALB configuration step is to create two target groups: one for HTTP, the other for HTTPS.
@@ -35,7 +37,7 @@ The document below will guide you through this process. Use the data in the tabl
[Amazon Documentation: Create a Target Group](https://docs.aws.amazon.com/elasticloadbalancing/latest/application/create-target-group.html)
-### Target Group 1 (HTTP)
+#### Target Group 1 (HTTP)
Option | Setting
----------------------------|------------------------------------
@@ -47,7 +49,7 @@ VPC | Choose your VPC
Protocol
(Health Check) | `HTTP`
-### Target Group 2 (HTTPS)
+#### Target Group 2 (HTTPS)
Option | Setting
----------------------------|------------------------------------
@@ -58,7 +60,7 @@ Target type | `instance`
VPC | Choose your VPC
Protocol
(Health Check) | `HTTPS`
-## Register Targets
+### Register Targets
Next, add your Kubernetes nodes assigned either the `controlplane` or `worker` role to _both_ of your target groups.
diff --git a/content/rancher/installation/load-balancing-config/configuring-amazon-nlb.md b/content/rancher/installation/load-balancing-config/configuring-amazon-nlb.md
index 7bb85a5ef22..86656787e88 100644
--- a/content/rancher/installation/load-balancing-config/configuring-amazon-nlb.md
+++ b/content/rancher/installation/load-balancing-config/configuring-amazon-nlb.md
@@ -4,6 +4,8 @@ weight: 310
---
# Option 2-Amazon NLB
+Amazon Elastic Load Balancing offers a couple of different load balancers that we're tested. This procedure provides step-by-step instruction for configuring Amazon Network Load Balancer (NLB) with your Rancher Server.
+
## Objectives
Configuring an Amazon NLB is a multistage process. We've broken it down into multiple tasks so that it's easy to follow.
@@ -25,7 +27,7 @@ Configuring an Amazon NLB is a multistage process. We've broken it down into mul
The Wizard in **3. Create Your NLB** only allows you to add a single target group. Go back into Amazon's console and add the second target group manually.
-## Create Target Groups
+### Create Target Groups
Your first NLB configuration step is to create two target groups for the TCP protocol: one on port 80, the other on port 443.
@@ -35,7 +37,7 @@ The document below will guide you through this process. Use the data in the tabl
[Amazon Documentation: Create a Target Group](https://docs.aws.amazon.com/elasticloadbalancing/latest/application/create-target-group.html)
-### Target Group 1 (TCP)
+#### Target Group 1 (TCP)
Option | Setting
----------------------------|------------------------------------
@@ -47,7 +49,7 @@ VPC | Choose your VPC
Protocol
(Health Check) | `TCP`
-### Target Group 2 (TCP)
+#### Target Group 2 (TCP)
Option | Setting
----------------------------|------------------------------------
@@ -58,7 +60,7 @@ Target type | `instance`
VPC | Choose your VPC
Protocol
(Health Check) | `TCP`
-## Register Targets
+### Register Targets
Next, add your Kubernetes nodes assigned either the `controlplane` or `worker` role to _both_ of your target groups.
diff --git a/content/rancher/installation/load-balancing-config/configuring-haproxy.md b/content/rancher/installation/load-balancing-config/configuring-haproxy.md
deleted file mode 100644
index 3a9d16a4978..00000000000
--- a/content/rancher/installation/load-balancing-config/configuring-haproxy.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: Option 4—HAProxy
-weight:
----
-# Option 4-HAProxy
-
-Yeah, you can use HAProxy too.
diff --git a/content/rancher/installation/load-balancing-config/configuring-nginx.md b/content/rancher/installation/load-balancing-config/configuring-nginx.md
index bfe7ad193b2..d1eec663b39 100644
--- a/content/rancher/installation/load-balancing-config/configuring-nginx.md
+++ b/content/rancher/installation/load-balancing-config/configuring-nginx.md
@@ -4,4 +4,65 @@ weight: 315
---
# Option 3-NGINX
-NGINX is a popular application platform that can be used as a load balancer.
+NGINX is a popular application platform that can be used as a load balancer. Rancher supports use of NGINX with ngx_http_v2_module enabled, which isn't enabled by default. Use the following parameter when setting up NGINX to enable the module: `--with-http_v2_module`.
+
+>**Note:**
+>- NGINX is not supported if you are using SSL passthrough.
+>- If you are using self-signed certificates, the certificate and key must be signed by same certificate authority as `cattle-keys-server`.
+
+After the server is running, use the code sample below as a template when setting up your NGINX config file. Replace the variables with host names or IP addresses from your environment.
+
+```
+upstream rancher {
+ server ;
+ server ;
+}
+
+map $http_upgrade $connection_upgrade {
+ default Upgrade;
+ '' close;
+}
+
+server {
+ listen 443 ssl http2 default_server;
+ server_name ;
+
+ if ($host != $server_name) {
+ return 301 https://$server_name$request_uri;
+ }
+
+ ssl_certificate ;
+ ssl_certificate_key ;
+
+ location / {
+ proxy_set_header Host $host;
+ proxy_set_header X-Forwarded-Host $host;
+ proxy_set_header X-Forwarded-Port $server_port;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection $connection_upgrade;
+
+ # mitigate HTTPoxy Vulnerability
+ # https://www.nginx.com/blog/mitigating-the-httpoxy-vulnerability-with-nginx/
+ proxy_set_header Proxy "";
+
+ proxy_http_version 1.1;
+
+ # This allows the ability for the execute shell window to remain open for up to 30 minutes. Without this parameter, the default is 1 minute and will automatically close.
+ proxy_connect_timeout 30s;
+ proxy_send_timeout 1800s;
+ proxy_read_timeout 1800s;
+
+ proxy_pass http://rancher;
+ }
+}
+
+server {
+ listen 80;
+ server_name ;
+ return 301 https://$server_name$request_uri;
+}
+
+```
diff --git a/content/rancher/installation/server-installation/_index.md b/content/rancher/installation/server-installation/_index.md
index a156e65084d..415e7ecc604 100644
--- a/content/rancher/installation/server-installation/_index.md
+++ b/content/rancher/installation/server-installation/_index.md
@@ -1,6 +1,10 @@
---
-title: Deploy Rancher
+title: Server Installation
weight: 225
---
-# {{< product >}} Server Installation
+# Rancher Server Installation
+
+This section contains instructions for setting up Rancher Server in development and production environments. The section also contains supplementary documentation for configuring load balancers and SSL certificates to work with Rancher.
+
+Choose from the options below:
diff --git a/content/rancher/installation/server-installation/container-install.md b/content/rancher/installation/server-installation/container-install.md
index 47459c453b8..4d12e370e63 100644
--- a/content/rancher/installation/server-installation/container-install.md
+++ b/content/rancher/installation/server-installation/container-install.md
@@ -1,13 +1,16 @@
---
-title: Single Node Installation
+title: Option 1—Install by Docker Container
weight: 250
+description: For development environments, we recommend installing Rancher by deploying a single Docker container.
---
-# Installing Rancher Using a Docker Container
+# Install by Docker Container
+
+For development environments, we recommend installing Rancher by deploying a single Docker container. In this installation scenario, you'll install Docker on a single Linux host, and then install Rancher on your host using a single Docker container.
## Provision Linux Host
-Provision a single Linux host to use as a template to launch your {{< product >}}.
+Provision a single Linux host to use as a template to launch your {{< product >}} Server.
### Requirements
diff --git a/content/rancher/installation/server-installation/kubernetes-install.md b/content/rancher/installation/server-installation/kubernetes-install.md
index 91756e91c97..c530d8ffac8 100644
--- a/content/rancher/installation/server-installation/kubernetes-install.md
+++ b/content/rancher/installation/server-installation/kubernetes-install.md
@@ -1,11 +1,11 @@
---
-title: Installing Rancher in a Kubernetes Cluster
+title: Option 2—Install by K8s Cluster Addon
weight: 275
---
-# Installing Rancher in a Kubernetes Cluster
+# Install by Kubernetes Cluster Addon
-In high-availability installations, Rancher is installed on multiple nodes of a Kubernetes cluster. This multi-node configuration ensures that Rancher server is always available, even if your primary Rancher server goes down.
+For environments already running a Kubernettes cluster, you can deploy Rancher using the Rancher Kubernetes Engine (RKE). RKE is our light-weight, lightening-fast installer. During install, you can point RKE toward a config file that installs Rancher as an Addon.
## Provision Linux Hosts
diff --git a/content/rancher/installation/server-tags/_index.md b/content/rancher/installation/server-tags/_index.md
index 33d23b8b978..677c777addd 100644
--- a/content/rancher/installation/server-tags/_index.md
+++ b/content/rancher/installation/server-tags/_index.md
@@ -7,8 +7,8 @@ weight: 200
{{< product >}} Server has two different tags that you can use during installation.
-- `rancher/server:latest`: Our latest development builds. These builds are validated through our CI automation framework. These releases aren't for production environments.
+- `rancher/rancher:latest`: Our latest development builds. These builds are validated through our CI automation framework. These releases aren't for production environments.
-- `rancher/server:stable`: Our latest stable release builds. This tag is recommended for production.
+- `rancher/rancher:stable`: Our latest stable release builds. This tag is recommended for production.
Please don't use any release with a `rc{n}` suffix. These rc builds are meant for the {{< product >}} team to test out builds.