diff --git a/content/_index.md b/content/_index.md
index 100cbd11156..3b87e52ad8b 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -1,7 +1,4 @@
---
- tag: ["tag1", "tag2", "tag3"]
- category: "category"
- layout: list-docs
title: homepage
weight: 4
---
diff --git a/content/os/_index.md b/content/os/_index.md
index 1ec9dd2853d..676c702fffb 100644
--- a/content/os/_index.md
+++ b/content/os/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: RancherOS Documentation
description: RancherOS is a simplified Linux distribution built from containers, for containers. These documents describe how to install and use RancherOS.
weight: 1
diff --git a/content/os/about/_index.md b/content/os/about/_index.md
index af1779120c9..e8a4c1ab93c 100644
--- a/content/os/about/_index.md
+++ b/content/os/about/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: About
weight: 300
---
diff --git a/content/os/about/faqs/_index.md b/content/os/about/faqs/_index.md
index bf27b460803..464cb407166 100644
--- a/content/os/about/faqs/_index.md
+++ b/content/os/about/faqs/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: FAQs
weight: 301
---
diff --git a/content/os/about/running-rancher-on-rancherOS/_index.md b/content/os/about/running-rancher-on-rancherOS/_index.md
index 46a4e3f64c8..b282bf20401 100644
--- a/content/os/about/running-rancher-on-rancherOS/_index.md
+++ b/content/os/about/running-rancher-on-rancherOS/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Running Rancher on RancherOS
weight: 302
---
diff --git a/content/os/about/security/_index.md b/content/os/about/security/_index.md
index 68d82458802..29715d2f7a2 100644
--- a/content/os/about/security/_index.md
+++ b/content/os/about/security/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: RancherOS Security
weight: 303
---
diff --git a/content/os/installation/amazon-ecs/_index.md b/content/os/installation/amazon-ecs/_index.md
index 11d45ac8add..76380add181 100644
--- a/content/os/installation/amazon-ecs/_index.md
+++ b/content/os/installation/amazon-ecs/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Amazon ECS (EC2 Container Service)
weight: 190
---
diff --git a/content/os/installation/boot-process/built-in-system-services/_index.md b/content/os/installation/boot-process/built-in-system-services/_index.md
index f3243befbd2..b7e21fb03c8 100644
--- a/content/os/installation/boot-process/built-in-system-services/_index.md
+++ b/content/os/installation/boot-process/built-in-system-services/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Built-in System Services
weight: 150
---
diff --git a/content/os/installation/boot-process/cloud-init/_index.md b/content/os/installation/boot-process/cloud-init/_index.md
index 746629e8253..cb2ee66e398 100644
--- a/content/os/installation/boot-process/cloud-init/_index.md
+++ b/content/os/installation/boot-process/cloud-init/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Cloud-Init
weight: 151
---
diff --git a/content/os/installation/boot-process/image-preloading/_index.md b/content/os/installation/boot-process/image-preloading/_index.md
index cb1dd66e879..52196ea0605 100644
--- a/content/os/installation/boot-process/image-preloading/_index.md
+++ b/content/os/installation/boot-process/image-preloading/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Image Preloading
weight: 152
---
diff --git a/content/os/installation/boot-process/logging/_index.md b/content/os/installation/boot-process/logging/_index.md
index d3436c708a0..8ea2ce6214a 100644
--- a/content/os/installation/boot-process/logging/_index.md
+++ b/content/os/installation/boot-process/logging/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: System Logging
weight: 153
---
diff --git a/content/os/installation/configuration/_index.md b/content/os/installation/configuration/_index.md
index 5ccdd82bac2..0961a9bf37a 100644
--- a/content/os/installation/configuration/_index.md
+++ b/content/os/installation/configuration/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Configuration
weight: 120
---
diff --git a/content/os/installation/configuration/adding-kernel-parameters/_index.md b/content/os/installation/configuration/adding-kernel-parameters/_index.md
index 9b8ab289eb6..d6688509040 100644
--- a/content/os/installation/configuration/adding-kernel-parameters/_index.md
+++ b/content/os/installation/configuration/adding-kernel-parameters/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Adding Kernel Parameters
weight: 133
---
diff --git a/content/os/installation/configuration/docker/_index.md b/content/os/installation/configuration/docker/_index.md
index 75443841382..0c87b4c4d53 100644
--- a/content/os/installation/configuration/docker/_index.md
+++ b/content/os/installation/configuration/docker/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Configuring Docker or System Docker
weight: 126
---
diff --git a/content/os/installation/configuration/hostname/_index.md b/content/os/installation/configuration/hostname/_index.md
index 34215b28d5c..8df3bc82abb 100644
--- a/content/os/installation/configuration/hostname/_index.md
+++ b/content/os/installation/configuration/hostname/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Setting the Hostname
weight: 124
---
diff --git a/content/os/installation/configuration/kernel-modules-kernel-headers/_index.md b/content/os/installation/configuration/kernel-modules-kernel-headers/_index.md
index 2b6ad9cba05..9bdb547cc99 100644
--- a/content/os/installation/configuration/kernel-modules-kernel-headers/_index.md
+++ b/content/os/installation/configuration/kernel-modules-kernel-headers/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Installing Kernel Modules with Kernel Headers
weight: 135
---
diff --git a/content/os/installation/configuration/loading-kernel-modules/_index.md b/content/os/installation/configuration/loading-kernel-modules/_index.md
index ca00efd98cd..03934c82a90 100644
--- a/content/os/installation/configuration/loading-kernel-modules/_index.md
+++ b/content/os/installation/configuration/loading-kernel-modules/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Loading Extra Kernel Modules
weight: 134
---
diff --git a/content/os/installation/configuration/private-registries/_index.md b/content/os/installation/configuration/private-registries/_index.md
index 18d8b2b5359..9c3e80635a5 100644
--- a/content/os/installation/configuration/private-registries/_index.md
+++ b/content/os/installation/configuration/private-registries/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Private Registries
weight: 128
---
diff --git a/content/os/installation/configuration/resizing-device-partition/_index.md b/content/os/installation/configuration/resizing-device-partition/_index.md
index d0b0c6dcb8d..f88c2d71a21 100644
--- a/content/os/installation/configuration/resizing-device-partition/_index.md
+++ b/content/os/installation/configuration/resizing-device-partition/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Resizing a Device Partition
weight: 131
---
diff --git a/content/os/installation/configuration/running-commands/_index.md b/content/os/installation/configuration/running-commands/_index.md
index 17875a7167e..5d63462fe77 100644
--- a/content/os/installation/configuration/running-commands/_index.md
+++ b/content/os/installation/configuration/running-commands/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Running Commands
weight: 123
---
diff --git a/content/os/installation/configuration/setting-up-docker-tls/_index.md b/content/os/installation/configuration/setting-up-docker-tls/_index.md
index af2e97584ff..cbde124cb0e 100644
--- a/content/os/installation/configuration/setting-up-docker-tls/_index.md
+++ b/content/os/installation/configuration/setting-up-docker-tls/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Setting up Docker TLS
weight: 127
---
diff --git a/content/os/installation/configuration/ssh-keys/_index.md b/content/os/installation/configuration/ssh-keys/_index.md
index 8086c253fd6..5942e5e5d05 100644
--- a/content/os/installation/configuration/ssh-keys/_index.md
+++ b/content/os/installation/configuration/ssh-keys/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: SSH Keys
weight: 121
---
diff --git a/content/os/installation/configuration/switching-consoles/_index.md b/content/os/installation/configuration/switching-consoles/_index.md
index 37e038acc3e..e149112c0fb 100644
--- a/content/os/installation/configuration/switching-consoles/_index.md
+++ b/content/os/installation/configuration/switching-consoles/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Switching Consoles
weight: 125
---
diff --git a/content/os/installation/configuration/switching-docker-versions/_index.md b/content/os/installation/configuration/switching-docker-versions/_index.md
index 63c8253cc69..8f6713ad42a 100644
--- a/content/os/installation/configuration/switching-docker-versions/_index.md
+++ b/content/os/installation/configuration/switching-docker-versions/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Switching Docker Versions
weight: 129
---
diff --git a/content/os/installation/configuration/sysctl/_index.md b/content/os/installation/configuration/sysctl/_index.md
index 68d60b2eae7..d0b6ac87e42 100644
--- a/content/os/installation/configuration/sysctl/_index.md
+++ b/content/os/installation/configuration/sysctl/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: sysctl Settings
weight: 132
---
diff --git a/content/os/installation/configuration/users/_index.md b/content/os/installation/configuration/users/_index.md
index ea9c75f2320..6986127f488 100644
--- a/content/os/installation/configuration/users/_index.md
+++ b/content/os/installation/configuration/users/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Users
weight: 130
---
diff --git a/content/os/installation/configuration/write-files/_index.md b/content/os/installation/configuration/write-files/_index.md
index 59b28324ae4..949b454369f 100644
--- a/content/os/installation/configuration/write-files/_index.md
+++ b/content/os/installation/configuration/write-files/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Writing Files
weight: 122
---
diff --git a/content/os/installation/custom-builds/custom-console/_index.md b/content/os/installation/custom-builds/custom-console/_index.md
index e89e20ab7bd..bfc2384b953 100644
--- a/content/os/installation/custom-builds/custom-console/_index.md
+++ b/content/os/installation/custom-builds/custom-console/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Custom Console
weight: 180
---
diff --git a/content/os/installation/custom-builds/custom-kernels/_index.md b/content/os/installation/custom-builds/custom-kernels/_index.md
index a3426d55eea..a42f94ce1ad 100644
--- a/content/os/installation/custom-builds/custom-kernels/_index.md
+++ b/content/os/installation/custom-builds/custom-kernels/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Custom Kernels
weight: 181
---
diff --git a/content/os/installation/custom-builds/custom-rancheros-iso/_index.md b/content/os/installation/custom-builds/custom-rancheros-iso/_index.md
index f8007163498..aa57b54a433 100644
--- a/content/os/installation/custom-builds/custom-rancheros-iso/_index.md
+++ b/content/os/installation/custom-builds/custom-rancheros-iso/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Custom RancherOS ISO
weight: 182
---
diff --git a/content/os/installation/networking/dns/_index.md b/content/os/installation/networking/dns/_index.md
index 302a7469d51..69be9e3ae03 100644
--- a/content/os/installation/networking/dns/_index.md
+++ b/content/os/installation/networking/dns/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Configuring DNS
weight: 171
---
diff --git a/content/os/installation/networking/interfaces/_index.md b/content/os/installation/networking/interfaces/_index.md
index 1d6d970e78a..1d677c24685 100644
--- a/content/os/installation/networking/interfaces/_index.md
+++ b/content/os/installation/networking/interfaces/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Configuring Network Interfaces
weight: 170
---
diff --git a/content/os/installation/networking/proxy-settings/_index.md b/content/os/installation/networking/proxy-settings/_index.md
index d7a0c116810..36363515913 100644
--- a/content/os/installation/networking/proxy-settings/_index.md
+++ b/content/os/installation/networking/proxy-settings/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Configuring Proxy Settings
weight: 172
---
diff --git a/content/os/installation/running-rancheros/_index.md b/content/os/installation/running-rancheros/_index.md
index af2e38ca300..1a251346432 100644
--- a/content/os/installation/running-rancheros/_index.md
+++ b/content/os/installation/running-rancheros/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Running RancherOS
weight: 100
---
diff --git a/content/os/installation/running-rancheros/cloud/aws/_index.md b/content/os/installation/running-rancheros/cloud/aws/_index.md
index 97637df70ad..0e962c83046 100644
--- a/content/os/installation/running-rancheros/cloud/aws/_index.md
+++ b/content/os/installation/running-rancheros/cloud/aws/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Amazon EC2
weight: 105
---
diff --git a/content/os/installation/running-rancheros/cloud/azure/_index.md b/content/os/installation/running-rancheros/cloud/azure/_index.md
index b33b8426d7a..f8e02eceb35 100644
--- a/content/os/installation/running-rancheros/cloud/azure/_index.md
+++ b/content/os/installation/running-rancheros/cloud/azure/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Azure
weight: 110
---
diff --git a/content/os/installation/running-rancheros/cloud/do/_index.md b/content/os/installation/running-rancheros/cloud/do/_index.md
index 5ec61b0ce41..8157d41df50 100644
--- a/content/os/installation/running-rancheros/cloud/do/_index.md
+++ b/content/os/installation/running-rancheros/cloud/do/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Digital Ocean
weight: 107
---
diff --git a/content/os/installation/running-rancheros/cloud/openstack/_index.md b/content/os/installation/running-rancheros/cloud/openstack/_index.md
index 0e29efcf753..5dccc2bdca3 100644
--- a/content/os/installation/running-rancheros/cloud/openstack/_index.md
+++ b/content/os/installation/running-rancheros/cloud/openstack/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: OpenStack
weight: 109
diff --git a/content/os/installation/running-rancheros/cloud/vmware-esxi/_index.md b/content/os/installation/running-rancheros/cloud/vmware-esxi/_index.md
index aa02691adf3..3801f08148b 100644
--- a/content/os/installation/running-rancheros/cloud/vmware-esxi/_index.md
+++ b/content/os/installation/running-rancheros/cloud/vmware-esxi/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: VMware ESXi
weight: 108
---
diff --git a/content/os/installation/running-rancheros/server/install-to-disk/_index.md b/content/os/installation/running-rancheros/server/install-to-disk/_index.md
index d2bb0b1b5c7..6e634dd7e5d 100644
--- a/content/os/installation/running-rancheros/server/install-to-disk/_index.md
+++ b/content/os/installation/running-rancheros/server/install-to-disk/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Installing to Disk
weight: 111
---
diff --git a/content/os/installation/running-rancheros/server/pxe/_index.md b/content/os/installation/running-rancheros/server/pxe/_index.md
index 5c8e24dad07..1c705bc8283 100644
--- a/content/os/installation/running-rancheros/server/pxe/_index.md
+++ b/content/os/installation/running-rancheros/server/pxe/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: iPXE
weight: 112
---
diff --git a/content/os/installation/running-rancheros/server/raspberry-pi/_index.md b/content/os/installation/running-rancheros/server/raspberry-pi/_index.md
index 771f8b73496..341d2af3e9b 100644
--- a/content/os/installation/running-rancheros/server/raspberry-pi/_index.md
+++ b/content/os/installation/running-rancheros/server/raspberry-pi/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Raspberry Pi
weight: 113
---
diff --git a/content/os/installation/running-rancheros/workstation/boot-from-iso/_index.md b/content/os/installation/running-rancheros/workstation/boot-from-iso/_index.md
index dc70fdce066..d9f7411ca42 100644
--- a/content/os/installation/running-rancheros/workstation/boot-from-iso/_index.md
+++ b/content/os/installation/running-rancheros/workstation/boot-from-iso/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Booting from ISO
weight: 102
---
diff --git a/content/os/installation/running-rancheros/workstation/docker-machine/_index.md b/content/os/installation/running-rancheros/workstation/docker-machine/_index.md
index 87dc82e6e0b..6c06c72d07a 100644
--- a/content/os/installation/running-rancheros/workstation/docker-machine/_index.md
+++ b/content/os/installation/running-rancheros/workstation/docker-machine/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Using Docker Machine
weight: 101
---
diff --git a/content/os/installation/storage/additional-mounts/_index.md b/content/os/installation/storage/additional-mounts/_index.md
index 1fca2653e20..3cbc3e7e2c3 100644
--- a/content/os/installation/storage/additional-mounts/_index.md
+++ b/content/os/installation/storage/additional-mounts/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Additional Mounts
weight: 161
---
diff --git a/content/os/installation/storage/state-partition/_index.md b/content/os/installation/storage/state-partition/_index.md
index fe60ee301c6..ffa1d3ffb9c 100644
--- a/content/os/installation/storage/state-partition/_index.md
+++ b/content/os/installation/storage/state-partition/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Persistent State Partition
weight: 160
---
diff --git a/content/os/installation/storage/using-zfs/_index.md b/content/os/installation/storage/using-zfs/_index.md
index 432c866691f..56090b7cc0c 100644
--- a/content/os/installation/storage/using-zfs/_index.md
+++ b/content/os/installation/storage/using-zfs/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Using ZFS
weight: 162
---
diff --git a/content/os/installation/system-services/adding-system-services/_index.md b/content/os/installation/system-services/adding-system-services/_index.md
index 5cec1d0c1e3..d4a2dc751c7 100644
--- a/content/os/installation/system-services/adding-system-services/_index.md
+++ b/content/os/installation/system-services/adding-system-services/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: System Services
weight: 140
---
diff --git a/content/os/installation/system-services/custom-system-services/_index.md b/content/os/installation/system-services/custom-system-services/_index.md
index 12a88c2b8ac..ccb68990fc9 100644
--- a/content/os/installation/system-services/custom-system-services/_index.md
+++ b/content/os/installation/system-services/custom-system-services/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Custom System Services
weight: 141
---
diff --git a/content/os/installation/system-services/environment/_index.md b/content/os/installation/system-services/environment/_index.md
index 837b76d3e6a..7d8a40d0edf 100644
--- a/content/os/installation/system-services/environment/_index.md
+++ b/content/os/installation/system-services/environment/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Environment
weight: 143
---
diff --git a/content/os/installation/system-services/system-docker-volumes/_index.md b/content/os/installation/system-services/system-docker-volumes/_index.md
index d6b1759f5e9..a4bf35c47d7 100644
--- a/content/os/installation/system-services/system-docker-volumes/_index.md
+++ b/content/os/installation/system-services/system-docker-volumes/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: System Docker Volumes
weight: 142
---
diff --git a/content/os/quick-start-guide/_index.md b/content/os/quick-start-guide/_index.md
index f0eeb3bf8b2..f9af6c658f8 100644
--- a/content/os/quick-start-guide/_index.md
+++ b/content/os/quick-start-guide/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Quick Start Guide
weight: 2
---
diff --git a/content/os/upgrading/_index.md b/content/os/upgrading/_index.md
index 4591e50542d..0043d3da6dd 100644
--- a/content/os/upgrading/_index.md
+++ b/content/os/upgrading/_index.md
@@ -1,5 +1,4 @@
---
-layout: list-docs
title: Upgrading RancherOS
weight: 200
---
diff --git a/content/rancher-example/r-five/_index.md b/content/rancher-example/r-five/_index.md
deleted file mode 100644
index a7142a335d5..00000000000
--- a/content/rancher-example/r-five/_index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
- tag: ["tag1", "tag2", "tag3"]
- category: "category"
- layout: list-docs
- title: Five
- weight: 5
----
-
-
-hello
diff --git a/content/rancher-example/r-five/five-placeholder.md b/content/rancher-example/r-five/five-placeholder.md
deleted file mode 100644
index 78df709eafb..00000000000
--- a/content/rancher-example/r-five/five-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
- tag: ["tag1", "tag2", "tag3"]
- category: "categories"
- layout: single-docs
- title: placeholder
----
-
-# Five tasks placeholder md
diff --git a/content/rancher-example/r-four/_index.md b/content/rancher-example/r-four/_index.md
deleted file mode 100644
index 12040318cf5..00000000000
--- a/content/rancher-example/r-four/_index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
- tag: ["tag1", "tag2", "tag3"]
- category: "category"
- layout: list-docs
- title: Four
- weight: 4
----
-
-
-hello
diff --git a/content/rancher-example/r-four/four-placeholder.md b/content/rancher-example/r-four/four-placeholder.md
deleted file mode 100644
index dd22142b087..00000000000
--- a/content/rancher-example/r-four/four-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
- tag: ["tag1", "tag2", "tag3"]
- category: "categories"
- layout: single-docs
- title: placeholder
----
-
-# four tasks placeholder md
diff --git a/content/rancher-example/r-one/_index.md b/content/rancher-example/r-one/_index.md
deleted file mode 100644
index 0c0e0671681..00000000000
--- a/content/rancher-example/r-one/_index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
- tag: ["tag1", "tag2", "tag3"]
- category: "category"
- layout: list-docs
- title: One
- weight: 1
----
-
-
-hello
diff --git a/content/rancher-example/r-one/a-placeholder.md b/content/rancher-example/r-one/a-placeholder.md
deleted file mode 100644
index 64245b28a29..00000000000
--- a/content/rancher-example/r-one/a-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
- tag: ["tag1", "tag2", "tag3"]
- category: "categories"
- layout: single-docs
- title: placeholder a
----
-
-# one tasks placeholder md
diff --git a/content/rancher-example/r-one/b-placeholder.md b/content/rancher-example/r-one/b-placeholder.md
deleted file mode 100644
index 4c40643c37e..00000000000
--- a/content/rancher-example/r-one/b-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
- tag: ["tag1", "tag2", "tag3"]
- category: "categories"
- layout: single-docs
- title: placeholder b
----
-
-# two tasks placeholder md
diff --git a/content/rancher-example/r-one/c-placeholder.md b/content/rancher-example/r-one/c-placeholder.md
deleted file mode 100644
index 2b3baed6fac..00000000000
--- a/content/rancher-example/r-one/c-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
- tag: ["tag1", "tag2", "tag3"]
- category: "categories"
- layout: single-docs
- title: placeholder c
----
-
-# three tasks placeholder md
diff --git a/content/rancher-example/r-one/one-nested/_index.md b/content/rancher-example/r-one/one-nested/_index.md
deleted file mode 100644
index 11d50bc7db3..00000000000
--- a/content/rancher-example/r-one/one-nested/_index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
- tag: ["tag1", "tag2", "tag3"]
- category: "category"
- layout: list-docs
- title: one nested
- weight: 2
----
-
-
-hello
diff --git a/content/rancher-example/r-one/one-nested/two-placeholder.md b/content/rancher-example/r-one/one-nested/two-placeholder.md
deleted file mode 100644
index e08de18f3e0..00000000000
--- a/content/rancher-example/r-one/one-nested/two-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
- tag: ["tag1", "tag2", "tag3"]
- category: "categories"
- layout: single-docs
- title: one nested a
----
-
-# two tasks placeholder md
diff --git a/content/rancher-example/r-one/one-placeholder.md b/content/rancher-example/r-one/one-placeholder.md
deleted file mode 100644
index 64245b28a29..00000000000
--- a/content/rancher-example/r-one/one-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
- tag: ["tag1", "tag2", "tag3"]
- category: "categories"
- layout: single-docs
- title: placeholder a
----
-
-# one tasks placeholder md
diff --git a/content/rancher-example/r-one/three-placeholder.md b/content/rancher-example/r-one/three-placeholder.md
deleted file mode 100644
index 2b3baed6fac..00000000000
--- a/content/rancher-example/r-one/three-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
- tag: ["tag1", "tag2", "tag3"]
- category: "categories"
- layout: single-docs
- title: placeholder c
----
-
-# three tasks placeholder md
diff --git a/content/rancher-example/r-one/two-placeholder.md b/content/rancher-example/r-one/two-placeholder.md
deleted file mode 100644
index 4c40643c37e..00000000000
--- a/content/rancher-example/r-one/two-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
- tag: ["tag1", "tag2", "tag3"]
- category: "categories"
- layout: single-docs
- title: placeholder b
----
-
-# two tasks placeholder md
diff --git a/content/rancher-example/r-three/_index.md b/content/rancher-example/r-three/_index.md
deleted file mode 100644
index e0467a8c5e8..00000000000
--- a/content/rancher-example/r-three/_index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
- tag: ["tag1", "tag2", "tag3"]
- category: "category"
- layout: list-docs
- title: Three
- weight: 3
----
-
-
-hello
diff --git a/content/rancher-example/r-three/three-placeholder.md b/content/rancher-example/r-three/three-placeholder.md
deleted file mode 100644
index da4e9c89bce..00000000000
--- a/content/rancher-example/r-three/three-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
- tag: ["tag1", "tag2", "tag3"]
- category: "categories"
- layout: single-docs
- title: placeholder
----
-
-# three tasks placeholder md
diff --git a/content/rancher-example/r-two/_index.md b/content/rancher-example/r-two/_index.md
deleted file mode 100644
index d24a458db7d..00000000000
--- a/content/rancher-example/r-two/_index.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
- tag: ["tag1", "tag2", "tag3"]
- category: "category"
- layout: list-docs
- title: Two
- weight: 2
----
-
-
-hello
diff --git a/content/rancher-example/r-two/two-placeholder.md b/content/rancher-example/r-two/two-placeholder.md
deleted file mode 100644
index 11772ff4e88..00000000000
--- a/content/rancher-example/r-two/two-placeholder.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
- tag: ["tag1", "tag2", "tag3"]
- category: "categories"
- layout: single-docs
- title: two placeholder
----
-
-# two tasks placeholder md
diff --git a/content/rancher/_index.md b/content/rancher/_index.md
index ff26e31f1e9..4e8e7364c22 100644
--- a/content/rancher/_index.md
+++ b/content/rancher/_index.md
@@ -1,5 +1,4 @@
---
- layout: single-docs
title: Rancher 2.0 Documentation
weight: 1
---
diff --git a/content/rancher/concepts/_index.md b/content/rancher/concepts/_index.md
index 51a36094895..f478862230e 100644
--- a/content/rancher/concepts/_index.md
+++ b/content/rancher/concepts/_index.md
@@ -1,5 +1,4 @@
---
- layout: single-docs
title: Rancher Overview
weight: 2000
---
diff --git a/content/rancher/installation/_index.md b/content/rancher/installation/_index.md
new file mode 100644
index 00000000000..550519fdf9b
--- /dev/null
+++ b/content/rancher/installation/_index.md
@@ -0,0 +1,7 @@
+---
+ title: Installation
+ weight: 100
+---
+
+Notes: Installation Scenarios
+A directory of install scenarios. Each scenario offers a synopsis.
diff --git a/content/rancher/quick-start-guide/_index.md b/content/rancher/quick-start-guide/_index.md
index 21f09087df6..4c5e437ea34 100644
--- a/content/rancher/quick-start-guide/_index.md
+++ b/content/rancher/quick-start-guide/_index.md
@@ -1,5 +1,4 @@
---
-layout: single-docs
title: Quick Start Guide
weight: 25
chapter: true
@@ -19,6 +18,7 @@ This Quick Start Guide is divided into different tasks for easier consumption.
1. [Provision a Linux Host](#provision-a-linux-host)
+<<<<<<< HEAD
Begin by provisioning a Linux host.
2. [Install Rancher](#install-rancher)
@@ -52,63 +52,162 @@ Begin creation of a custom cluster by provisioning a Linux host. Your host can b
- A cloud-host virtual machine (VM)
- An on-premise VM
- A bare-metal server
+=======
+1. [Review Requirements](#host-and-node-requirements)
+
+ Before you do anything, review the requirements.
+
+2. [Prepare a Linux Host](#prepare-a-linux-host)
+
+ First, you need to provision a Linux host.
+
+3. [Install Rancher](#install-rancher)
+
+ Run the Docker command for installing Rancher.
+
+4. [Log In](#log-in)
+
+ Browse to your Linux host to access the Rancher UI.
+
+5. [Create a Cluster](#create-a-cluster)
+
+ Use Rancher to create your first cluster.
+
+6. [Deploy a Workload](#deploy-a-workload)
+
+ Create a workload so that Kubernetes can distribute an application and its dependencies among your nodes.
+
+7. [View Your Application](#view-your-application)
+
+ When your workload finishes deployment, browse to your application to make sure it works.
+
+8. [What's Next?](#whats-next)
+
+ Now that you've created a cluster and deployed a workload, find out what else you can do with Rancher v2.0.
+>>>>>>> more menu setup
Provision the host according to the requirements below.
#### Hardware Requirements
-- Memory: 4GB
+- Memory: 4GB
#### Software requirements
-- Operating System: Ubuntu 16.04 (64-bit)
-- Software: Docker
+- Operating System: Ubuntu 16.04 (64-bit)
+- Software: Docker
- **Supported Versions:**
+ **Supported Versions:**
- - `1.12.6`
- - `1.13.1`
- - `17.03.2`
+ - `1.12.6`
+ - `1.13.1`
+ - `17.03.2`
- >**Notes:**
- >
- > * For Docker installation instructions, visit their [documentation](https://docs.docker.com/install/).
- > * Docker requirements apply to both your Linux host and your cluster nodes.
+ >**Notes:**
+ >
+ > * For Docker installation instructions, visit their [documentation](https://docs.docker.com/install/).
+ > * Docker requirements apply to both your Linux host and your cluster nodes.
+<<<<<<< HEAD
+=======
+#### Port Requirements
+
+When provisioning your Linux host, open the ports listed below so that your master and worker nodes can communicate.
+
+##### Master Nodes (etcd and controlplane nodes)
+
+Protocol | Direction | Port Range | Purpose
+--|---|---|--
+TCP | Inbound | 22 | SSH server
+TCP | Inbound | 80 | Canal
+TCP | Inbound | 443 | Canal
+TCP | Inbound | 6443 | Kubernetes API server
+TCP | Inbound | 2379-2380 | etcd server client API
+TCP | Inbound | 10250 | kubelet API
+TCP | Inbound | 10251 | scheduler
+TCP | Inbound | 10252 | controller
+TCP | Inbound | 10256 | kubeproxy
+
+##### Worker Nodes
+
+Protocol | Direction | Port Range | Purpose
+--|---|---|--
+TCP | Inbound | 22 | SSH Server
+TCP | Inbound | 80 | Canal
+TCP | Inbound | 443 | Canal
+TCP | Inbound | 10250 | kubelet API
+TCP | Inbound | 10256 | kubeproxy
+TCP | Inbound | 30000-32767 | NodePort Services
+
+### Prepare a Linux Host
+
+Begin by provisioning a Linux host to be your Rancher server and a template for your cluster nodes. This host can be:
+
+- A virtual machine hosted by a cloud service.
+- An on-premise virtual machine.
+- An on-premise bare-metal server.
+
+Provision the server according to the [requirements above](#host-and-node-requirements).
+
+>>>>>>> more menu setup
### Install Rancher
To install Rancher on your host, connect to it and then use a shell to install.
-1. Log in to your Linux host using your preferred shell, such as PuTTy or a remote Terminal connection.
+1. Log in to your Linux host using your preferred shell, such as PuTTy or a remote Terminal connection.
-2. From your shell, enter the following command:
+2. From your shell, enter the following command:
+<<<<<<< HEAD
```
$ sudo docker run -d --restart=unless-stopped -p 80:80 -p 443:443 rancher/server
```
+=======
+ ```
+ $ sudo docker run -d --restart=unless-stopped -p 80:80 -p 443:443 rancher/server:preview
+ ```
+
+ >**Note:**
+ > Although Rancher v2.0 is in beta, the `preview` tag is still used for installation.
+
+>>>>>>> more menu setup
**Result:** Rancher is installed.
### Log In
Log in to Rancher to begin using the application. After you log in, you'll make some one-time configurations.
-1. Open a web browser and enter the IP address of your host:
+1. Open a web browser and enter the IP address of your host:
- `https://`
+ `https://`
- Replace `` with your host IP address.
+ Replace `` with your host IP address.
+<<<<<<< HEAD
2. When prompted, create a password for the default `admin` account there cowpoke!
+=======
+ > **Note:** Rancher v2.0 beta:
+ >
+ > - Supports only the HTTPS protocol.
+ > - Uses a self-signed certificate. Due to this signature, the browser prompts you to trust the certificate before login. Following GA, you'll be able to use your own certificate.
+
+2. When prompted, create a password for the default `admin` account there cowpoke!
+>>>>>>> more menu setup
3. Set the **Rancher Server URL**. The URL can either be an IP address or a host name. However, each node in your cluster must be able to resolve to the URL.
+<<<<<<< HEAD
## Create the Cluster
+=======
+ 
+>>>>>>> more menu setup
Welcome to {{< product >}}! Use our application to clone your Linux host and configure them as a Kubernetes cluster.
In this task, use the versatile **Custom** option. This option lets you convert _any_ Linux host (cloud-hosted VM, on-premise VM, or bare-metal) into a cluster.
+<<<<<<< HEAD
1. From the **Clusters** page, click **Add Cluster**.
2. Choose **Custom**.
@@ -130,6 +229,87 @@ In this task, use the versatile **Custom** option. This option lets you convert
10. When you finish running the command on your Linux host, click **Done**.
{{< result_create-cluster >}}
+=======
+1. Click **+ Add Cluster**.
+
+ 
+
+ **Step Result:** The **Add Cluster** page opens.
+
+2. From the **Add Cluster** menu, choose a service or source from which to create your first cluster.
+
+ * If you're using a virtual machine hosted on a major cloud service, choose the tile for the service you want to use (e.g. **Digital Ocean**, **Azure Container Service**).
+ * If you're using bare-metal server, an on-premise virtual machine, or a cloud service that isn't explicitly listed, choose **Custom**.
+
+ > **Note:**
+ >
+ > - For Rancher v2.0 beta, Amazon EKS is not supported. This option will be available after GA.
+ > - For this tutorial, the Import option is out of scope. For now, create a cluster using one of the other options. We'll address Import later.
+
+3. Enter a **Cluster Name**. No spaces allowed.
+
+ > **Tip:** Skip adding **Member Roles** for now. This option isn't essential for your first cluster.
+ >
+ > 
+
+4. **For those using Google Container Engine or Azure Container Service:**
+
+ Complete the form asking for account information. The form includes links to instructions detailing how to obtain this info.
+
+ 
+
+ **Did you choose one of the other tiles (like Digital Ocean)?** This step doesn't apply to you. Skip to the next step.
+
+5. Select **Cluster Options**.
+
+ Use these options to choose things like the version of Kubernetes that's installed in your cluster, along with other Kubernetes options such as pod security policies. Some services have more options than others. If you're unsure of what to choose, use the default options.
+
+6. Add at least one **Node Pool**.
+
+ A *Node Pool* is a group of nodes that are configured identically. Your cluster can contain as many node pools as you'd like. Each object in the grid represents a single node configuration. You can use the node pool to choose the number (i.e. **Count**) of nodes running a given configuration (i.e. **Template**).
+
+ > **Note:** The instructions below don't apply to Google Container Engine, Azure Container Service, or the Custom option.
+ >
+ >* For Azure Container Server, no additional steps are needed. Proceed to this task's [final step](#create-cluster).
+ >* For Google Container Engine, complete the Nodes form. The options are pretty self-explanatory. When you're done, proceed to this task's [final step](#create-cluster).
+ >* For Custom, see [Appendix A: Add Custom Cluster](#appendix-a-add-custom-cluster).
+
+ 1. Enter a **Node Prefix**. When the cluster is created, each node in the pool is named after the prefix. An incremented number is appended to each node.
+
+ 2. Enter the node **Count** for the pool.
+
+ 3. Click **Add Node Template**. A node template is just the a virtual machine configuration you're using to create your nodes (i.e. other virtual machines).
+
+ Depending on the cluster option that you choose, the Rancher UI displays instructions on how to create a template. The process is different for each cloud service. You may need to log in to your cloud service to find the data Rancher needs.
+
+ 4. Choose the **Template** that you just added.
+
+ 
+
+ 5. Select roles for the node pool.
+
+ Kubernetes functions using different [components](https://kubernetes.io/docs/concepts/overview/components/), which are divided into *master components* and *node components*. When setting up your node pool, select a pool to fill each component role. You can install all components one a single pool, or you can spread them around.
+
+ The roles are:
+
+ - **etcd**: One of the master components. Etcd is a distributed reliable key-value store that stores all Kubernetes states.
+
+ - **Control**: The remaining master components as well as the node components. These nodes help manage the Kubernetes cluster and where your applications can be launched.
+
+ - **Worker**: On these nodes, only node components are launched. These nodes run only applications.
+
+ 6. **Optional:** Click **+ Add Node Pool** to add more pools.
+
+ 
+
+ 7. Click **Create**.
+
+**Result:**
+
+- Your cluster is created and assigned a state of **Provisioning**. Rancher is standing up your cluster.
+- You can access your cluster after its state is updated to **Active**.
+- **Active** clusters are assigned a **Project** and **Namespace**, both of which are named `Default`.
+>>>>>>> more menu setup
### Deploy a Workload
@@ -153,11 +333,19 @@ For this workload, you'll be deploying the application NGINX.
7. From **Port Mapping**, click **Add Port**.
+<<<<<<< HEAD
8. From the **Publish on** drop-down, make sure that **Every node** is selected.
+=======
+ 
+>>>>>>> more menu setup
8. From the **Source Port** field, leave the **Random** value in place.
+<<<<<<< HEAD
7. From the **Container Port** field, enter port `80`.
+=======
+ >**Note:** During Rancher v2.0 beta, only port 80 is supported. Other ports will be supported at GA.
+>>>>>>> more menu setup
8. Leave the remaining options on their default setting. We'll tell you about them later.
@@ -178,5 +366,121 @@ From the **Workloads** page, click the link underneath your workload. If your de
Congratulations! You have:
+<<<<<<< HEAD
- Created your first cluster.
- Deployed NGINX to your cluster using a workload.
+=======
+- Created your first cluster.
+- Deployed an application to your cluster using a workload.
+
+Now you can use the rest of Rancher v2.0 to orchestrate and manage your pods.
+
+(Moooooo-re coming soon!)
+
+
+
+
+### Appendix A: Add Custom Cluster
+
+When creating a custom cluster, follow these instructions to complete its creation. These instructions will create one or more node that will be used to image your cluster.
+
+>**Note:** When creating a custom cluster, make sure each node meets the [Host Requirements](#host-requirements).
+
+1. From **Node Roles**, choose the Kubernetes component roles that you want the node to fill. You must fill each role.
+
+ A more detailed description of each [role](#roles) is available earlier in this guide.
+
+ >**Note:** If you want to spread the roles among different nodes, provision additional Linux hosts and enter the command on each of your nodes.
+
+3. **Optional:** Add labels to the node template.
+
+4. Copy the command for installing Docker to your clipboard.
+
+ >**Remember:** The version of Docker installed on your nodes must be [supported](#node-requirements).
+
+5. Log in to your Linux host using your preferred shell, such as PuTTy or a remote Terminal connection.
+
+6. Enter the command on your Linux host.
+
+7. From you Rancher session, click **Done**.
+
+8. Resume the Quick Start Guide from [Deploy a Workload](#deploy-a-workload).
+
+
+>>>>>>> more menu setup
diff --git a/content/rancher/tasks/_index.md b/content/rancher/tasks/_index.md
index afa71833e36..5e095132763 100644
--- a/content/rancher/tasks/_index.md
+++ b/content/rancher/tasks/_index.md
@@ -1,5 +1,4 @@
---
- layout: single-docs
title: Tasks
weight: 3000
---
diff --git a/content/rancher/upgrades/_index.md b/content/rancher/upgrades/_index.md
index ca4e22c10f3..4fc085f989b 100644
--- a/content/rancher/upgrades/_index.md
+++ b/content/rancher/upgrades/_index.md
@@ -1,6 +1,5 @@
---
- layout: single-docs
- title: Upgrade Scenarios
+title: Upgrade Scenarios
weight: 1000
---
diff --git a/layouts/_default/backup-sngl.html b/layouts/_default/backup-sngl.html
new file mode 100644
index 00000000000..feb677c4750
--- /dev/null
+++ b/layouts/_default/backup-sngl.html
@@ -0,0 +1,37 @@
+{{ define "hero" }}
+
+