update master to generate docs like rancher.github.io does

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>

.dockerignore

@@ -15,3 +15,4 @@ tests/integration/.tox
 #.dapper
 vendor/*/*/*/.git
 tmp
+docs/_site

docs/Dockerfile

@@ -0,0 +1,5 @@
+FROM rancher/rancher.github.io:build AS builder
+
+FROM nginx
+COPY --from=builder /build/_site /usr/share/nginx/html/docs
+COPY --from=builder /build/favicon.png /usr/share/nginx/html/favicon.png

docs/Dockerfile.build

@@ -0,0 +1,21 @@
+FROM jekyll/jekyll:3.4 AS builder
+WORKDIR /build
+COPY Gemfile /build
+COPY Gemfile.lock /build
+COPY _config.yml /build
+RUN jekyll build
+COPY . /build
+
+# IMPORTANT: this line moves the development docs to where they would be in rancher/rancher.gihub.io
+RUN mv os os-orig \
+    && mkdir -p os/v1.0/en \
+    && mv os-orig/* os/v1.0/en/
+
+# Set up the latest pages that get converted into redirects
+ENV OS_DOCS_LATEST v1.0
+RUN mkdir -p os/latest/en \
+    && cp -r os/v1.0/en/* os/latest/en/ \
+    && cp -r os/v1.0/en/* os/latest/ \
+    && cp -r os/v1.0/en/* os/
+
+RUN jekyll build

docs/Gemfile.lock

@@ -86,7 +86,7 @@ GEM
       gemoji (~> 2.0)
       html-pipeline (~> 2.2)
       jekyll (>= 2.0)
-    json (1.8.1)
+    json (1.8.2)
     kramdown (1.9.0)
     liquid (3.0.6)
     listen (3.0.4)
@@ -128,4 +128,4 @@ DEPENDENCIES
   json
 
 BUNDLED WITH
-   1.11.2
+   1.15.3

docs/Makefile

@@ -0,0 +1,27 @@
+.PHONY: default build build-nginx run live
+
+default: build build-nginx run
+
+# this target sets up Jekyll, and uses it to build html
+build:
+	docker build -t rancher/rancher.github.io:build -f Dockerfile.build .
+
+# this target uses the Jekyll html image in a multistage Dockerfile to build a small nginx image
+build-nginx:
+	docker build -t rancher/rancher.github.io .
+
+run: build-nginx
+	docker run --rm -p 80:80 rancher/rancher.github.io
+
+# this target will use the jekyll image and bind mount your local repo, when you modify a file, the html will be automatically rebuilt. (the redirects from latest won't work)
+# You can also examine the output html in the _sites dir.
+live:
+	docker run --rm -it -p 80:4000 \
+		-v $(PWD)/os:/build/os/v1.0/en \
+		-v $(PWD)/_site:/build/_site \
+		rancher/rancher.github.io:build jekyll serve -w -P 4000 --incremental
+
+clean:
+	rm -rf _sites
+	docker rmi rancher/rancher.github.io
+	docker rmi rancher/rancher.github.io:build

docs/README.md

@@ -1,20 +1,141 @@
-# Documentation for the `master` version of `rancher/os`
+# Rancher Labs Documentation
 
-This dir is _not_ the documentation for any released version of RancherOS.
+This README file includes information pertaining to the documentation project for both Rancher and Rancher OS.
-You can find that at the [Rancher Labs Documentation site](https://docs.rancher.com) and
-specifically for [RancherOS](https://docs.rancher.com/os/).
 
-When there are Pull Requests to the `rancher/os` repository that affect the user (or developer),
+## Rancher
-then it should include changes to the documenation in this directory.
 
-When we make a new release of RancherOS, the `docs/os` dir will be copied into the `rancher/rancher.github.io`
+Rancher is an open source project that provides a complete platform for operating Docker in production. It provides infrastructure services such as multi-host networking, global and local load balancing, and volume snapshots. It integrates native Docker management capabilities such as Docker Machine and Docker Swarm. It offers a rich user experience that enables devops admins to operate Docker in production at large scale.
-repository to be accessible by users.
 
-## Previewing your changes
+## Rancher OS
 
-You can either build and view your docs locally by running `make docs`, or you can
+Operating system composed entirely of Docker containers. Everything in RancherOS is a container managed by Docker. This includes system services such as udev and syslog. RancherOS includes only the bare minimum amount of software needed to run Docker.
-set your fork of the `rancher/os` repository to render your `master` using `GitHub Pages`.
 
-To set up `GitHub Pages`, browse to your fork, then to the `Settings` - under `GitHub Pages`, set the `Source`
+## Rancher Labs Documentation website
-to `master branch /docs folder` and hit the `Save` button. GitHub will tell you the URL at which the
+
-documenation can be read.
+Rancher documentation is available at <http://rancher.com/docs/rancher/>.
+
+As Rancher has gone GA, we've added in version control. The default Rancher docs site will always be referring to the latest release. We will branch off specific versions of Rancher that are deemed GA, which would also be tagged as `rancher/server:stable`.
+
+Currently, we've added support for Chinese version of the docs site per community request. Currently, Rancher will not be actively translating the docs site, but we welcome PRs.
+
+Rancher OS documentation is available at <http://rancher.com/docs/os/>.
+
+## Contributing to Rancher Labs Documentation Project
+
+### About Rancher Labs Documentation Site
+
+Rancher Labs documentation is hosted on GitHub Pages and published online by using Jekyll, an easy blog-aware static website generator. For more details on how to set up Jekyll, we recommend you to read <https://help.github.com/articles/using-jekyll-with-pages/>. If you are using Windows, we strongly advise you to follow the instruction given at <http://jekyllrb.com/docs/windows/>.
+
+For information on editing `.md` files (Markdown), refer to <https://daringfireball.net/projects/markdown/syntax>.
+
+Or you can use the `make live` Makefile target (or run `docker run --rm -it -p 80:4000 -v $(PWD):/build rancher/rancher.github.io:build jekyll serve -w -P 4000 --incremental` by hand to use the Jekyll build image used for our production pipeline.
+
+### Setting up the Git Environment
+
+In your browser, navigate to <https://github.com/rancher/rancher.github.io>.
+
+Fork this repository by clicking the Fork button on the upper right-hand side. A fork of the repository is generated for you. On the right-hand side of the page of your fork, under 'HTTPS clone URL', copy the URL by clicking the Copy to clipboard icon.
+
+On your computer, follow these steps to setup a local repository to start working on the documentation:
+
+```shell
+git clone https://github.com/YOUR_ACCOUNT/rancher.github.io.git
+cd rancher.github.io
+git remote add upstream https://github.com/rancher/rancher.github.io
+git checkout master
+git fetch upstream
+git merge upstream/master
+```
+
+### Updating the Files
+
+We recommend you to create a new branch to update the documentation files and that you do not disturb the master branch, other than pulling in changes from `upstream/master`.
+For example, you create a branch, `dev`, on your computer to make changes locally to the documentation. This `dev` branch will be your local repository which then be pushed to your forked repository on GitHub where you will create a Pull Request for the changes to be committed into the official documentation.
+
+It is a healthy practice to create a new branch each time you want to contribute to the documentation and only track the changes for that pull request in this branch.
+
+```shell
+git checkout -b dev
+```
+
+The argument `-b dev` creates a new branch named `dev`. Now you can make necessary changes to the documentation.
+
+```shell
+git add .
+git commit -a -m "commit message for your changes"
+```
+
+You can optionally run Jekyll locally on your computer to be able to see the final result of your modifications and you write them. For that, use the command below. You can refer to [Jekyll's official website](https://jekyllrb.com/) for more details.
+
+```shell
+jekyll serve
+```
+
+Additionally, you can use the provided `Makefile` to build and test in a Docker container:
+
+```shell
+make live
+```
+
+### Merging upstream/master into Your Local Branch (`dev`)
+
+Maintain an up-to-date master branch in your local repository. Merge the changes on a daily basis from the `upstream/master` (the official documentation repository) into your local repository.
+
+Ensure that you do complete this activity before you start working on a feature as well as right before you submit your changes as a pull request.
+
+You can also do this process periodically while you work on your changes to make sure that you are working off the most recent version of the documentation.
+
+```shell
+# Checkout your local 'master' branch.
+git checkout master
+
+# Synchronize your local repository with 'upstream/master', so that you have all the latest changes.
+git fetch upstream
+
+# Merge the latest changes from the 'upstream/master' into your local 'master' branch to make it up-to-date.
+git merge upstream/master
+
+# Checkout your local development branch (e.g.: 'dev').
+git checkout dev
+
+# Pull the latest changes into your local development branch.
+git pull master
+```
+
+### Checklist for contributions
+
+Please check the following list before you submit a Pull Request to make sure we can approve it right away!
+
+* Check if your change applies to more than one version, and if so, please make the same change in other versions as well. (Rancher only)
+* If your change only applies to a minor version, make sure it is specified in the text, i.e. `Available as of Rancher v1.6.6` or `Available as of RancherOS v1.1.0`.
+* If your change is regarding an item in the `rancher-catalog`, make sure the change is also applied in the README there.
+
+### Making a Pull Request on GitHub
+
+**Important:** Ensure that you have merged `upstream/master` into your dev branch before you do the following.
+
+After you have made necessary changes to the documentation and are ready to contribute them, create a Pull Request on GitHub. You do it by pushing your changes to your forked repository (usually called `origin`) and then initiating a pull request.
+
+```
+git push origin master
+git push origin dev
+```
+
+Now follow the steps below to initiate a Pull request on GitHub.
+
+1.  Navigate your browser to your forked repository: <https://github.com/YOUR_ACCOUNT/rancher.github.io.git>.
+1.  Click the *Compare & pull request* button on the upper side of the forked repository.
+1.  Enter a clear description for the changes you have made.
+1.  Click *Send Pull Request*.
+
+If you are asked to make modifications to your proposed changes, make the changes locally on your `dev` branch and push the changes. The Pull Request will be automatically updated.
+
+### Cleaning up the Local Repository
+
+You no longer need the `dev` branch after the changes have been committed into `upstream/master`. If you want to make additional documentation changes, restart the process with a new branch.
+
+```
+git checkout master
+git branch -D dev
+git push origin :dev
+```

docs/_config.yml

@@ -1,12 +1,6 @@
 name: Rancher Documentation
 description: Documentation for Rancher
 
-
-URL: http://rancher.github.io
-baseurl: ""
-
-exclude: []
-
 markdown: kramdown
 highlighter: rouge
 kramdown:
@@ -16,3 +10,35 @@ permalink: pretty
 
 gems:
   - jekyll-redirect-from
+
+URL: "http://rancher.com"
+baseurl: "/docs"
+
+# RancherOS defaults
+defaults:
+  -
+    # os/quick-start-guide/ should redirect to os/v1.0/en/quick-start-guide
+    scope:
+      path: "os"
+    values:
+      layout: "os-redirect"
+      version: v1.0
+      lang: en
+  -
+    # os/latest/quick-start-guide/ should redirect to os/v1.0/en/quick-start-guide
+    scope:
+      path: "os/latest"
+    values:
+      layout: "os-latest-redirect"
+  -
+    # os/latest/en/quick-start-guide/ should redirect to os/v1.0/en/quick-start-guide
+    scope:
+      path: "os/latest/en"
+    values:
+      layout: "os-latest-en-redirect"
+  -
+    scope:
+      path: "os/v1.0"
+    values:
+      layout: "os-default-v1.0"
+

docs/_includes/footer.html

@@ -1,32 +1,41 @@
-</div>
+      </div>
 
-<div class="col span-8">
+      <div class="col span-8">
-    <div class="content-container">
+        <div class="content-container">
-      
+          {{ content }}
-        {{ content }}
 
-<footer class="clearfix">
+          <footer class="clearfix">
-    <div class="copyright pull-left" >Copyright &copy; 2017  <a href="http://rancher.com">Rancher Labs</a>. All Rights Reserved.</div>
+            <div class="copyright pull-left">Copyright &copy; 2014-2017 <a href="http://rancher.com">Rancher Labs</a>.  All Rights Reserved.</div>
-        <a class="btn btn-primary pull-right" href="https://github.com/rancher/rancher.github.io/tree/master/{{page.path }}">Edit this page <i class="fa fa-pencil"></i></a>
+            <a class="btn btn-primary pull-right" href="https://github.com/rancher/rancher.github.io/tree/master/{{page.path }}">Edit this page <i class="fa fa-pencil"></i></a>
+          </footer>
+        </div>
+      </div>
     </div>
-</footer>
-</div>
-</div>
-</div>
 
-<!-- Start of Async HubSpot Analytics Code -->
+    <script src="{{site.baseurl}}/vendor/jquery.js?t={{site.time}}"></script>
-<script type="text/javascript">
+    <script src="{{site.baseurl}}/js/jquery.slicknav.min.js?t={{site.time}}"></script>
-(function(d,s,i,r) {
+    <script src="{{site.baseurl}}/js/rancher-docs.js?t={{site.time}}"></script>
-if (d.getElementById(i)){return;}
-var n=d.createElement(s),e=d.getElementsByTagName(s)[0];
-n.id=i;n.src='//js.hs-analytics.net/analytics/'+(Math.ceil(new Date()/r)*r)+'/468859.js';
-e.parentNode.insertBefore(n, e);
-})(document,"script","hs-analytics",300000);
-</script>
-<!-- End of Async HubSpot Analytics Code -->
 
-<script src="{{site.baseurl}}/vendor/jquery.js?t={{site.time}}"></script>
+    <!-- Start of Google Analytics -->
-<script src="{{site.baseurl}}/js/jquery.slicknav.min.js?t={{site.time}}"></script>
+    <script>
-<script src="{{site.baseurl}}/js/rancher-docs.js?t={{site.time}}"></script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-</body>
+          (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+            })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+      ga('create', 'UA-56382716-3', 'auto');
+        ga('send', 'pageview');
+    </script>
+    <!-- End of Google Analytics -->
+
+    <!-- Start of Async HubSpot Analytics Code -->
+    <script type="text/javascript">
+    (function(d,s,i,r) {
+    if (d.getElementById(i)){return;}
+    var n=d.createElement(s),e=d.getElementsByTagName(s)[0];
+    n.id=i;n.src='//js.hs-analytics.net/analytics/'+(Math.ceil(new Date()/r)*r)+'/468859.js';
+    e.parentNode.insertBefore(n, e);
+    })(document,"script","hs-analytics",300000);
+    </script>
+    <!-- End of Async HubSpot Analytics Code -->
+  </body>
 </html>

docs/_includes/os-sidebar-v1.0.html

@@ -0,0 +1,101 @@
+<ul id="menu">
+    <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/">Overview</a></li>
+    <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/quick-start-guide/">Quick Start Guide</a></li>
+    <li>
+        <a href="#">
+            Running RancherOS <i class="pull-right fa fa-angle-down"></i></a>
+        <ul>
+            <li>
+                <a href="#">Workstation <i class="pull-right fa fa-angle-down"></i></a>
+                <ul>
+                    <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/running-rancheros/workstation/docker-machine/">Docker Machine</a></li>
+                    <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/running-rancheros/workstation/boot-from-iso/">Boot from ISO</a></li>
+                </ul>
+            </li>
+            <li>
+                <a href="#">Cloud <i class="pull-right fa fa-angle-down"></i></a>
+                <ul>
+                    <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/running-rancheros/cloud/aws/">AWS</a></li>
+                    <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/running-rancheros/cloud/gce/">GCE</a></li>
+                    <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/running-rancheros/cloud/do/">DigitalOcean</a></li>
+                    <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/running-rancheros/cloud/openstack/">Openstack</a></li>
+                    <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/running-rancheros/server/pxe/">PXE</a></li>
+                </ul>
+            </li>
+            <li>
+                <a href="#">Bare metal and Virtual Server <i class="pull-right fa fa-angle-down"></i></a>
+                <ul>
+                    <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/running-rancheros/server/install-to-disk/">Install to Disk</a></li>
+                    <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/running-rancheros/server/pxe/">PXE</a></li>
+                    <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/running-rancheros/server/raspberry-pi/">Raspberry Pi</a></li>
+                </ul>
+            </li>
+        </ul>
+    </li>
+    <li>
+        <a href="#">Configuration <i class="pull-right fa fa-angle-down"></i></a>
+        <ul>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/configuration/">Configuring RancherOS</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/configuration/ssh-keys/">SSH Keys</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/configuration/write-files/">Writing Files</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/configuration/running-commands/">Running Commands</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/configuration/hostname/">Setting the Hostname</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/configuration/switching-consoles/">Switching Consoles</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/configuration/docker/">Configuring Docker or System Docker</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/configuration/setting-up-docker-tls/">Setting up Docker TLS</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/configuration/private-registries/">Private Registries</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/configuration/switching-docker-versions/">Switching Docker Versions</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/configuration/users/">Users</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/configuration/resizing-device-partition/">Resizing a Device Partition</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/configuration/sysctl/">sysctl Settings</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/configuration/adding-kernel-parameters/">Adding kernel parameters</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/configuration/loading-kernel-modules/">Loading kernel modules</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/configuration/kernel-modules-kernel-headers/">Install kernel modules that require kernel headers</a></li>
+        </ul>
+    </li>
+    <li>
+        <a href="#">System Services<i class="pull-right fa fa-angle-down"></i></a>
+        <ul>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/system-services/adding-system-services/">System Services</a></li>
+	    <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/system-services/custom-system-services/">Custom Services</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/system-services/system-docker-volumes/">System Docker Volumes</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/system-services/environment/">Environment</a></li>
+        </ul>
+    </li>
+    <li>
+        <a href="#">Boot Process<i class="pull-right fa fa-angle-down"></i></a>
+        <ul>
+		<li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/boot-process/built-in-system-services/">Built-in System Services</a></li>
+		<li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/boot-process/cloud-init/">Cloud-init</a></li>
+		<li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/boot-process/image-preloading/">Image Preloading</a></li>
+        </ul>
+    </li>
+    <li>
+        <a href="#">Storage<i class="pull-right fa fa-angle-down"></i></a>
+        <ul>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/storage/state-partition/">State Partition</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/storage/additional-mounts/">Additional Mounts</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/storage/using-zfs/">Using ZFS</a></li>
+        </ul>
+    </li>
+    <li>
+        <a href="#">Networking<i class="pull-right fa fa-angle-down"></i></a>
+        <ul>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/networking/interfaces/">Interfaces</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/networking/dns/">DNS</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/networking/proxy-settings/">Proxy Settings</a></li>
+        </ul>
+    </li>
+    <li>
+        <a href="#">Custom Builds<i class="pull-right fa fa-angle-down"></i></a>
+        <ul>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/configuration/custom-kernels/">Custom Kernels</a></li>
+            <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/configuration/custom-rancheros-iso/">Building custom RancherOS ISO</a></li>
+        </ul>
+    </li>
+    <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/upgrading/">Upgrading</a></li>
+    <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/amazon-ecs/">Amazon ECS</a></li>
+    <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/contributing/">Contributing to RancherOS</a></li>
+    <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/running-rancher-on-rancheros/">Tips on using Rancher with RancherOS</a></li>
+    <li><a href="{{site.baseurl}}/os/{{page.version}}/{{page.lang}}/security/">RancherOS security</a></li>
+</ul>

docs/_includes/os-sidebar.html

@@ -19,7 +19,6 @@
                     <li><a href="{{site.baseurl}}/os/running-rancheros/cloud/gce/">GCE</a></li>
                     <li><a href="{{site.baseurl}}/os/running-rancheros/cloud/do/">DigitalOcean</a></li>
                     <li><a href="{{site.baseurl}}/os/running-rancheros/cloud/openstack/">Openstack</a></li>
-                    <li><a href="{{site.baseurl}}/os/running-rancheros/cloud/vmware-esxi/">VMware ESXi</a></li>
                     <li><a href="{{site.baseurl}}/os/running-rancheros/server/pxe/">PXE</a></li>
                 </ul>
             </li>
@@ -67,14 +66,14 @@
         <a href="#">Boot Process<i class="pull-right fa fa-angle-down"></i></a>
         <ul>
 		<li><a href="{{site.baseurl}}/os/boot-process/built-in-system-services/">Built-in System Services</a></li>
-		<li><a href="{{site.baseurl}}/os/boot-process/cloud-init">Cloud-init</a></li>
+		<li><a href="{{site.baseurl}}/os/boot-process/cloud-init/">Cloud-init</a></li>
-		<li><a href="{{site.baseurl}}/os/boot-process/image-preloading">Image Preloading</a></li>
+		<li><a href="{{site.baseurl}}/os/boot-process/image-preloading/">Image Preloading</a></li>
         </ul>
     </li>
     <li>
         <a href="#">Storage<i class="pull-right fa fa-angle-down"></i></a>
         <ul>
-            <li><a href="{{site.baseurl}}/os/storage/state-partition">State Partition</a></li>
+            <li><a href="{{site.baseurl}}/os/storage/state-partition/">State Partition</a></li>
             <li><a href="{{site.baseurl}}/os/storage/additional-mounts/">Additional Mounts</a></li>
             <li><a href="{{site.baseurl}}/os/storage/using-zfs/">Using ZFS</a></li>
         </ul>

docs/_includes/rancher-header.html

@@ -1,50 +1,47 @@
 <!DOCTYPE html>
 <html lang="en">
-    <head>
+  <head>
-      <meta charset="utf-8">
+    <meta charset="utf-8">
-      <title>{{ page.title }}</title>
+    <title>{{ page.title }}</title>
-      <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
-      <meta name="description" content="{{ site.description }}">
+    <meta name="description" content="{{ site.description }}">
-      <link href="/favicon.png" rel="shortcut icon" type="image/png" sizes="16x16">
+    <link href="{{site.baseurl}}/favicon.png" rel="shortcut icon" type="image/png" sizes="16x16">
-      <link href="{{site.baseurl}}/css/syntax.css?t={{site.time}}" rel="stylesheet">
+    <link href="{{site.baseurl}}/css/syntax.css?t={{site.time}}" rel="stylesheet">
-      <link href="{{site.baseurl}}/vendor/font-awesome/css/font-awesome.min.css?t={{site.time}}" rel="stylesheet">
+    <link href="{{site.baseurl}}/vendor/font-awesome/css/font-awesome.min.css?t={{site.time}}" rel="stylesheet">
-      <link href="{{site.baseurl}}/vendor/lato/lato.css?t={{site.time}}" rel="stylesheet">
+    <link href="{{site.baseurl}}/vendor/lato/lato.css?t={{site.time}}" rel="stylesheet">
-      <link href="{{site.baseurl}}/css/lacsso.css?t={{site.time}}" rel="stylesheet">
+    <link href="{{site.baseurl}}/css/lacsso.css?t={{site.time}}" rel="stylesheet">
-      <link href="{{site.baseurl}}/css/slicknav.css?t={{site.time}}" rel="stylesheet">
+    <link href="{{site.baseurl}}/css/slicknav.css?t={{site.time}}" rel="stylesheet">
-      <link href="{{site.baseurl}}/css/rancher-docs.css?t={{site.time}}" rel="stylesheet">
+    <link href="{{site.baseurl}}/css/rancher-docs.css?t={{site.time}}" rel="stylesheet">
-    </head>
+  </head>
-    <body class="bg-default" class="bg-default">
+  <body class="bg-default">
-        <div class="row body">
+    <div class="row body">
+      <header id="header" class="section">
+        <nav class="row" role="navigation">
+          <div class="col span-3">
+          <a class="navbar-brand" href="/"><img src="{{site.baseurl}}/img/rancher-logo-nopadding.svg" width="200px" style="padding-left: 20px" /></a>
+          </div>
 
+          <div class="col span-5 offset-3">
+            <!--Start Google Search-->
+            <div class="gcse-search" id="google-search"></div>
+            <script>
+              var match = window.location.pathname.match(/\/rancher\/([^\/]+)/);
+              if ( match ) {
+                document.getElementById('google-search').setAttribute('data-defaultToRefinement', match[1]);
+              }
 
-          <header id="header" class="section">
+              (function() {
-            <nav class="row" role="navigation">
+                var cx = '007896692384436596364:60akf3bfmxm';
-              <div class="col span-3">
+                var gcse = document.createElement('script');
-              <a class="navbar-brand" href="/"><img src="{{site.baseurl}}/img/rancher-logo-nopadding.svg" width="200px" style="padding-left: 20px" /></a>
+                gcse.type = 'text/javascript';
-              </div>
+                gcse.async = true;
-
+                gcse.src = 'https://cse.google.com/cse.js?cx=' + cx;
-              <div class="col span-5 offset-3">
+                var s = document.getElementsByTagName('script')[0];
-              <!--Start Google Search-->
+                s.parentNode.insertBefore(gcse, s);
-                <div class="gcse-search" id="google-search"></div>
+              })();
-                <script>
+            </script>
-                  var match = window.location.pathname.match(/\/rancher\/([^\/]+)/);
+            <!--End Google Search-->
-                  if ( match ) {
+          </div>
-                    document.getElementById('google-search').setAttribute('data-defaultToRefinement', match[1]);
+        </nav>
-                  }
+      </header>
-
+      <div class="col span-3 mt-0 mr-0 sidebar">
-                  (function() {
-                    var cx = '007896692384436596364:60akf3bfmxm';
-                    var gcse = document.createElement('script');
-                    gcse.type = 'text/javascript';
-                    gcse.async = true;
-                    gcse.src = 'https://cse.google.com/cse.js?cx=' + cx;
-                    var s = document.getElementsByTagName('script')[0];
-                    s.parentNode.insertBefore(gcse, s);
-                  })();
-                </script>
-                <!--End Google Search-->
-              </div>
-
-            </nav>
-          </header>
-        <div class="col span-3 mt-0 mr-0 sidebar">

docs/_includes/rancher-sidebar-v1.3.html

@@ -11,7 +11,6 @@
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#requirements-for-ha">HA Requirements</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#single-container-external-database">Using an External DB</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#single-container-bind-mount">Bind Mounted MySQL Volume</a></li>
-          <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#alb">Using an ALB in AWS</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#elb">Using an ELB in AWS</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#ldap">Using LDAP/AD with TLS</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#http-proxy">Behind an HTTP Proxy</a></li>
@@ -22,7 +21,7 @@
                  <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#example-nginx-configuration">Example NGINX Configuration</a></li>
                  <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#example-apache-configuration">Example Apache Configuration</a></li>
                  <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#example-haproxy-configuration">Example HAProxy Configuration</a></li>
-                 <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#alb">Using an ALB in AWS with SSL</a></li>
+                 <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#example-f5-big-ip-configuration">Example F5 BIG-IP Configuration</a></li>
                  <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#elb">Using an ELB in AWS with SSL</a></li>
                  <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#using-self-signed-certs-beta">Using Self Signed Certs</a></li>
                </ul>

docs/_includes/rancher-sidebar-v1.4.html

@@ -12,7 +12,6 @@
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#requirements-for-ha">HA Requirements</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#single-container-external-database">Using an External DB</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#single-container-bind-mount">Bind Mounted MySQL Volume</a></li>
-          <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#alb">Using an ALB in AWS</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#elb">Using an ELB in AWS</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#ldap">Using LDAP/AD with TLS</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#http-proxy">Behind an HTTP Proxy</a></li>
@@ -23,7 +22,7 @@
                  <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#example-nginx-configuration">Example NGINX Configuration</a></li>
                  <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#example-apache-configuration">Example Apache Configuration</a></li>
                  <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#example-haproxy-configuration">Example HAProxy Configuration</a></li>
-                 <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#alb">Using an ALB in AWS with SSL</a></li>
+                 <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#example-f5-big-ip-configuration">Example F5 BIG-IP Configuration</a></li>
                  <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#elb">Using an ELB in AWS with SSL</a></li>
                  <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#using-self-signed-certs-beta">Using Self Signed Certs</a></li>
                </ul>
@@ -131,7 +130,7 @@
     <li>
           <a href="#">Cattle<i class="pull-right fa fa-angle-down"></i></a>
           <ul>
-                <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/cattle/stacks">Stacks</a></li>
+                <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/cattle/stacks/">Stacks</a></li>
                 <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/cattle/adding-services/">Services</a></li>
                 <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/cattle/adding-load-balancers/">Load Balancers</a></li>
                 <li>

docs/_includes/rancher-sidebar-v1.5.html

@@ -12,7 +12,6 @@
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#requirements-for-ha">HA Requirements</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#single-container-external-database">Using an External DB</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#single-container-bind-mount">Bind Mounted MySQL Volume</a></li>
-          <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#alb">Using an ALB in AWS</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#elb">Using an ELB in AWS</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#ldap">Using LDAP/AD with TLS</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#http-proxy">Behind an HTTP Proxy</a></li>
@@ -23,7 +22,7 @@
                  <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#example-nginx-configuration">Example NGINX Configuration</a></li>
                  <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#example-apache-configuration">Example Apache Configuration</a></li>
                  <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#example-haproxy-configuration">Example HAProxy Configuration</a></li>
-                 <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#alb">Using an ALB in AWS with SSL</a></li>
+                 <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#example-f5-big-ip-configuration">Example F5 BIG-IP Configuration</a></li>
                  <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#elb">Using an ELB in AWS with SSL</a></li>
                  <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#using-self-signed-certs-beta">Using Self Signed Certs</a></li>
                </ul>
@@ -109,6 +108,8 @@
         <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/environments/registries/">Adding Private Registries</a></li>
         <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/environments/registries/#insecure-registries">Insecure Registries</a></li>
         <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/environments/registries/#self-signed-certificates">Self Signed Certificates</a></li>
+        <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/environments/registries/#using-amazons-ecr-registry">Using Amazon's ECR</a></li>
+        <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/environments/registries/#using-google-container-registry">Using Google Container Registry</a></li>
         <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/environments/registries/#changing-the-default-registry">Changing the Default Registry</a></li>
         <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/environments/registries/#limiting-which-registries-can-be-used">Limiting Registries</a></li>
       </ul>
@@ -140,7 +141,7 @@
     <li>
           <a href="#">Cattle<i class="pull-right fa fa-angle-down"></i></a>
           <ul>
-                <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/cattle/stacks">Stacks</a></li>
+                <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/cattle/stacks/">Stacks</a></li>
                 <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/cattle/adding-services/">Services</a></li>
                 <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/cattle/adding-load-balancers/">Load Balancers</a></li>
                 <li>
@@ -204,6 +205,7 @@
               <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/">Launching Kubernetes</a></li>
               <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/resiliency-planes/">Resiliency Planes</a></li>
               <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/providers/">Cloud Providers</a></li>
+              <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/private-registry/">Private Registry</a></li>
               <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/disaster-recovery/">Disaster Recovery</a></li>
               <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/backups/">Backups</a></li>
               <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/storage/">Persistent Storage</a></li>
@@ -211,7 +213,6 @@
                   <a href="#">Add-ons Support<i class="pull-right fa fa-angle-down"></i></a>
                   <ul>
                       <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/addons/">Add-ons Support</a></li>
-                      <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/addons/#private-registry-for-add-ons/">Private Registry for Installing Add-Ons</a></li>
                       <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/addons/#helm">Helm</a></li>
                       <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/addons/#skydns">SkyDNS</a></li>
                   </ul>

docs/_includes/rancher-sidebar-v1.6.html

@@ -12,10 +12,10 @@
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#requirements-for-ha">HA Requirements</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#single-container-external-database">Using an External DB</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#single-container-bind-mount">Bind Mounted MySQL Volume</a></li>
-          <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#alb">Using an ALB in AWS</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#elb">Using an ELB in AWS</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#ldap">Using LDAP/AD with TLS</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/#http-proxy">Behind an HTTP Proxy</a></li>
+          <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/selinux/">SELinux Requirements for RHEL/CentOS</a></li>
           <li>
                <a href="#">Basic SSL Configuration<i class="pull-right fa fa-angle-down"></i></a>
                <ul>
@@ -23,7 +23,7 @@
                  <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#example-nginx-configuration">Example NGINX Configuration</a></li>
                  <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#example-apache-configuration">Example Apache Configuration</a></li>
                  <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#example-haproxy-configuration">Example HAProxy Configuration</a></li>
-                 <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#alb">Using an ALB in AWS with SSL</a></li>
+                 <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#example-f5-big-ip-configuration">Example F5 BIG-IP Configuration</a></li>
                  <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#elb">Using an ELB in AWS with SSL</a></li>
                  <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/installing-rancher/installing-server/basic-ssl-config/#using-self-signed-certs-beta">Using Self Signed Certs</a></li>
                </ul>
@@ -64,6 +64,7 @@
                 </ul>
           </li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/configuration/access-control/#site-access">Rancher Site Access</a></li>
+          <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/configuration/access-control/#restricting-concurrent-sessions">Restricting Concurrent Sessions</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/configuration/accounts/">Accounts</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/configuration/settings/#host-registration">Host Registration</a></li>
           <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/configuration/settings/#catalog">Enabling Catalogs</a></li>
@@ -109,6 +110,8 @@
         <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/environments/registries/">Adding Private Registries</a></li>
         <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/environments/registries/#insecure-registries">Insecure Registries</a></li>
         <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/environments/registries/#self-signed-certificates">Self Signed Certificates</a></li>
+        <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/environments/registries/#using-amazons-ecr-registry">Using Amazon's ECR</a></li>
+        <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/environments/registries/#using-google-container-registry">Using Google Container Registry</a></li>
         <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/environments/registries/#changing-the-default-registry">Changing the Default Registry</a></li>
         <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/environments/registries/#limiting-which-registries-can-be-used">Limiting Registries</a></li>
       </ul>
@@ -123,7 +126,14 @@
               <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/rancher-services/load-balancer">Load Balancer</a></li>
               <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/rancher-services/dns-service/">DNS Service</a></li>
               <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/rancher-services/metadata-service/">Metadata Service</a></li>
-              <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/rancher-services/storage-service/">Persistent Storage Service</a></li>
+              <li>
+                  <a href="#">Persistent Storage Service<i class="pull-right fa fa-angle-down"></i></a>
+                  <ul>
+                      <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/rancher-services/storage-service/">Persistent Storage Service</a></li>
+                      <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/rancher-services/storage-service/rancher-nfs/">Rancher NFS</a></li>
+                      <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/rancher-services/storage-service/rancher-ebs/">Rancher EBS</a></li>
+                  </ul>
+              </li>
               <li>
                   <a href="#">External Scheduler<i class="pull-right fa fa-angle-down"></i></a>
                   <ul>
@@ -140,8 +150,9 @@
     <li>
           <a href="#">Cattle<i class="pull-right fa fa-angle-down"></i></a>
           <ul>
-                <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/cattle/stacks">Stacks</a></li>
+                <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/cattle/stacks/">Stacks</a></li>
                 <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/cattle/adding-services/">Services</a></li>
+                <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/cattle/volumes/">Volumes</a></li>
                 <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/cattle/adding-load-balancers/">Load Balancers</a></li>
                 <li>
                     <a href="#">Load Balancer Options in the UI<i class="pull-right fa fa-angle-down"></i></a>
@@ -204,6 +215,8 @@
               <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/">Launching Kubernetes</a></li>
               <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/resiliency-planes/">Resiliency Planes</a></li>
               <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/providers/">Cloud Providers</a></li>
+              <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/private-registry/">Private Registry</a></li>
+              <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/rbac/">RBAC</a></li>
               <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/disaster-recovery/">Disaster Recovery</a></li>
               <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/backups/">Backups</a></li>
               <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/storage/">Persistent Storage</a></li>
@@ -211,7 +224,6 @@
                   <a href="#">Add-ons Support<i class="pull-right fa fa-angle-down"></i></a>
                   <ul>
                       <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/addons/">Add-ons Support</a></li>
-                      <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/addons/#private-registry-for-add-ons/">Private Registry for Installing Add-Ons</a></li>
                       <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/addons/#helm">Helm</a></li>
                       <li><a href="{{site.baseurl}}/rancher/{{page.version}}/{{page.lang}}/kubernetes/addons/#skydns">SkyDNS</a></li>
                   </ul>

docs/_layouts/os-default-v1.0.html

@@ -0,0 +1,3 @@
+{% include os-header.html %}
+{% include os-sidebar-v1.0.html %}
+{% include footer.html %}

docs/_layouts/os-default.html

@@ -1,3 +1,3 @@
 {% include os-header.html %}
-{% include os-sidebar.html %}
+{% include os-sidebar-v1.0.html %}
 {% include footer.html %}

docs/_layouts/os-latest-en-redirect.html

@@ -0,0 +1,14 @@
+{% capture version %}/{{page.version}}/{% endcapture %}
+{% capture redirectto %}{{site.baseurl}}/{{ page.path | replace: "/latest/", version | replace: "index.md", "" }}{% endcapture %}
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Redirecting...</title>
+<link rel="canonical" href="{{redirectto}}">
+<meta http-equiv="refresh" content="0; url={{redirectto}}">
+<h1>Redirecting...</h1>
+version: {{version}}
+from (os/latest/en) {{site.baseurl}}/{{page.path}}
+to                  {{redirectto}}
+<a href="{{redirectto}}">Click here if you are not redirected.</a>
+<script>location="{{redirectto}}"</script>
+

docs/_layouts/os-latest-redirect.html

@@ -0,0 +1,14 @@
+{% capture version %}/{{page.version}}/{% endcapture %}
+{% capture redirectto %}{{site.baseurl}}/{{ page.path | replace: "/latest/", "/latest/en/" | replace: "/latest/", version | replace: "index.md", "" }}{% endcapture %}
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Redirecting...</title>
+<link rel="canonical" href="{{redirectto}}">
+<meta http-equiv="refresh" content="0; url={{redirectto}}">
+<h1>Redirecting...</h1>
+version: {{version}}
+from (os/latest) {{site.baseurl}}/{{page.path}}
+to               {{redirectto}}
+<a href="{{redirectto}}">Click here if you are not redirected.</a>
+<script>location="{{redirectto}}"</script>
+

docs/_layouts/os-redirect.html

@@ -0,0 +1,15 @@
+{% capture version %}/{{page.version}}/{% endcapture %}
+{% capture baseto %}os/{{page.version}}/en/{% endcapture %}
+{% capture redirectto %}{{site.baseurl}}/{{ page.path | replace_first: "os/", baseto | replace: "index.md", "" }}{% endcapture %}
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Redirecting...</title>
+<link rel="canonical" href="{{redirectto}}">
+<meta http-equiv="refresh" content="0; url={{redirectto}}">
+<h1>Redirecting...</h1>
+version: {{version}}
+from (os) {{site.baseurl}}/{{page.path}}
+to        {{redirectto}}
+<a href="{{redirectto}}">Click here if you are not redirected.</a>
+<script>location="{{redirectto}}"</script>
+

docs/_layouts/rancher-default-v1.5.html

@@ -1,3 +1,3 @@
 {% include rancher-header.html %}
 {% include rancher-sidebar-v1.5.html %}
-{% include footer.html %}
+{% include footer-archive.html %}

docs/os/amazon-ecs/index.md

@@ -1,6 +1,6 @@
 ---
 title: Amazon ECS on RancherOS
-layout: os-default
+
 
 ---
 

docs/os/boot-process/built-in-system-services/index.md

@@ -1,6 +1,6 @@
 ---
 title: Built-in System Services in RancherOS
-layout: os-default
+
 redirect_from:
   - os/system-services/built-in-system-services/
 ---

docs/os/boot-process/cloud-init/index.md

@@ -1,6 +1,6 @@
 ---
 title: Cloud-init
-layout: os-default
+
 
 ---
 

docs/os/boot-process/image-preloading/index.md

@@ -1,6 +1,6 @@
 ---
 title: Image Preloading
-layout: os-default
+
 redirect_from:
   - os/configuration/prepacking-docker-images/
 

docs/os/configuration/adding-kernel-parameters/index.md

@@ -1,6 +1,6 @@
 ---
 title: Adding kernel parameters
-layout: os-default
+
 
 ---
 

docs/os/configuration/custom-console/index.md

@@ -1,6 +1,6 @@
 ---
 title: Custom Console on RancherOS
-layout: os-default
+
 
 ---
 

docs/os/configuration/custom-kernels/index.md

@@ -1,6 +1,6 @@
 ---
 title: Custom Kernels in RancherOS
-layout: os-default
+
 
 ---
 

docs/os/configuration/custom-rancheros-iso/index.md

@@ -1,6 +1,6 @@
 ---
 title: Custom RancherOS ISO
-layout: os-default
+
 
 ---
 

docs/os/configuration/docker/index.md

@@ -1,6 +1,6 @@
 ---
 title: Configuring Docker in RancherOS
-layout: os-default
+
 
 ---
 

docs/os/configuration/hostname/index.md

@@ -1,6 +1,6 @@
 ---
 title: Setting the Hostname in RancherOS
-layout: os-default
+
 
 ---
 

docs/os/configuration/index.md

@@ -1,6 +1,6 @@
 ---
 title: Configuring RancherOS
-layout: os-default
+
 redirect_from:
   - os/cloud-config/
 ---

docs/os/configuration/kernel-modules-kernel-headers/index.md

@@ -1,6 +1,6 @@
 ---
 title: Installing Kernel Modules with Kernel Headers in RancherOS
-layout: os-default
+
 
 ---
 

docs/os/configuration/loading-kernel-modules/index.md

@@ -1,6 +1,6 @@
 ---
 title: DKMS / Loadable Kernel Modules in RancherOS
-layout: os-default
+
 
 ---
 

docs/os/configuration/private-registries/index.md

@@ -1,6 +1,6 @@
 ---
 title: Private Registries in RancherOS
-layout: os-default
+
 
 ---
 

docs/os/configuration/resizing-device-partition/index.md

@@ -1,6 +1,6 @@
 ---
 title: Resizing a Device Partition in RancherOS
-layout: os-default
+
 
 ---
 

docs/os/configuration/running-commands/index.md

@@ -1,6 +1,6 @@
 ---
 title: Running Commands in RancherOS
-layout: os-default
+
 
 ---
 

docs/os/configuration/setting-up-docker-tls/index.md

@@ -1,6 +1,6 @@
 ---
 title: Configuring TLS in RancherOS
-layout: os-default
+
 
 ---
 

docs/os/configuration/ssh-keys/index.md

@@ -1,6 +1,6 @@
 ---
 title: SSH Keys in RancherOS
-layout: os-default
+
 
 ---
 

docs/os/configuration/switching-consoles/index.md

@@ -1,6 +1,6 @@
 ---
 title: Switching Consoles in RancherOS
-layout: os-default
+
 redirect_from:
   - os/configuration/custom-console/
 

docs/os/configuration/switching-docker-versions/index.md

@@ -1,6 +1,6 @@
 ---
 title: Changing Docker Versions in RancherOS
-layout: os-default
+
 redirect_from:
   - os/configuration/custom-docker/
 

docs/os/configuration/sysctl/index.md

@@ -1,6 +1,6 @@
 ---
 title: sysctl Settings in RancherOS
-layout: os-default
+
 
 ---
 

docs/os/configuration/users/index.md

@@ -1,6 +1,6 @@
 ---
 title: Users in RancherOS
-layout: os-default
+
 
 ---
 

docs/os/configuration/write-files/index.md

@@ -1,6 +1,6 @@
 ---
 title: Writing Files in RancherOS
-layout: os-default
+
 
 ---
 

docs/os/contributing/index.md

@@ -1,6 +1,6 @@
 ---
 title: Contributing to RancherOS
-layout: os-default
+
 
 ---
 

docs/os/custom-builds/custom-kernels/index.md

@@ -1,6 +1,6 @@
 ---
 title: Custom Kernels in RancherOS
-layout: os-default
+
 redirect_from:
   - os/configuration/custom-kernels/
 ---

docs/os/custom-builds/custom-rancheros-iso/index.md

@@ -1,6 +1,6 @@
 ---
 title: Custom RancherOS ISO
-layout: os-default
+
 redirect_from:
   - os/configuration/custom-rancheros-iso/
 ---

docs/os/faqs/amazon/index.md

@@ -1,6 +1,6 @@
 ---
 title: Amazon FAQs
-layout: os-default
+
 
 ---
 

docs/os/faqs/index.md

@@ -1,6 +1,6 @@
 ---
 title: FAQs
-layout: os-default
+
 
 ---
 

docs/os/index.md

@@ -1,7 +1,7 @@
 ---
 title: RancherOS Documentation
 description: RancherOS is a simplified Linux distribution built from containers, for containers. These documents describe how to install and use RancherOS.
-layout: os-default
+
 ---
 
 ## Overview of RancherOS

docs/os/networking/dns/index.md

@@ -1,6 +1,6 @@
 ---
 title: Configuring DNS in RancherOS
-layout: os-default
+
 redirect_from:
   - os/configuration/networking/#dns
 ---

docs/os/networking/interfaces/index.md

@@ -1,6 +1,6 @@
 ---
 title: Configuring Network Interfaces in RancherOS
-layout: os-default
+
 redirect_from:
   - os/configuration/networking/
 ---

docs/os/networking/proxy-settings/index.md

@@ -1,6 +1,6 @@
 ---
 title: Configuring Proxy Settings in RancherOS
-layout: os-default
+
 
 ---
 

docs/os/quick-start-guide/index.md

@@ -1,6 +1,6 @@
 ---
 title: Quick Start Guide for RancherOS
-layout: os-default
+
 
 ---
 

docs/os/running-rancher-on-rancheros/index.md

@@ -1,6 +1,6 @@
 ---
 title: Running Rancher on RancherOS
-layout: os-default
+
 
 ---
 

docs/os/running-rancheros/cloud/aws/index.md

@@ -1,6 +1,6 @@
 ---
 title: Getting Started on Amazon EC2
-layout: os-default
+
 
 ---
 

docs/os/running-rancheros/cloud/azure/index.md

@@ -1,6 +1,6 @@
 ---
 title: Running RancherOS on Azure
-layout: os-default
+
 
 ---
 

docs/os/running-rancheros/cloud/do/index.md

@@ -1,6 +1,6 @@
 ---
 title: Running RancherOS on Digital Ocean
-layout: os-default
+
 
 ---
 

docs/os/running-rancheros/cloud/gce/index.md

@@ -1,6 +1,6 @@
 ---
 title: Running RancherOS on GCE
-layout: os-default
+
 
 ---
 ## Running RancherOS on Google Compute Engine (GCE)

docs/os/running-rancheros/cloud/openstack/index.md

@@ -1,6 +1,6 @@
 ---
 title: Rancher RancherOS in Openstack
-layout: os-default
+
 ---
 
 ## Openstack

docs/os/running-rancheros/cloud/vmware-esxi/index.md

@@ -1,6 +1,6 @@
 ---
 title: Rancher RancherOS in VMware OSXi
-layout: os-default
+
 ---
 
 ## VMware ESXi

docs/os/running-rancheros/index.md

@@ -1,6 +1,6 @@
 ---
 title: Running RancherOS
-layout: os-default
+
 
 ---
 

docs/os/running-rancheros/server/install-to-disk/index.md

@@ -1,6 +1,6 @@
 ---
 title: Installing RancherOS to Disk
-layout: os-default
+
 ---
 
 ## Installing RancherOS to Disk

docs/os/running-rancheros/server/pxe/index.md

@@ -1,6 +1,6 @@
 ---
 title: Booting RancherOS with iPXE
-layout: os-default
+
 
 ---
 ## Booting RancherOS via iPXE

docs/os/running-rancheros/server/raspberry-pi/index.md

@@ -1,6 +1,6 @@
 ---
 title: Running RancherOS on Raspberry Pi
-layout: os-default
+
 ---
 
 ## Raspberry Pi

docs/os/running-rancheros/workstation/boot-from-iso/index.md

@@ -1,6 +1,6 @@
 ---
 title: Booting from ISO
-layout: os-default
+
 ---
 
 ## Boot from ISO

docs/os/running-rancheros/workstation/docker-machine/index.md

@@ -1,6 +1,6 @@
 ---
 title: Using Docker Machine to run RancherOS
-layout: os-default
+
 
 ---
 

docs/os/security/index.md

@@ -1,6 +1,6 @@
 ---
 title: RancherOS security
-layout: os-default
+
 
 ---
 

docs/os/storage/additional-mounts/index.md

@@ -1,6 +1,6 @@
 ---
 title: Additional Mounts in RancherOS
-layout: os-default
+
 redirect_from:
   - os/configuration/additional-mounts/
 ---

docs/os/storage/state-partition/index.md

@@ -1,6 +1,6 @@
 ---
 title: Persistent State Partition in RancherOS
-layout: os-default
+
 ---
 
 ## Persistent State Partition

docs/os/storage/using-zfs/index.md

@@ -1,6 +1,6 @@
 ---
 title: Using ZFS in RancherOS
-layout: os-default
+
 redirect_from:
   - os/configuration/storage/
 ---

docs/os/system-services/adding-system-services/index.md

@@ -1,6 +1,6 @@
 ---
 title: System Services in RancherOS
-layout: os-default
+
 redirect_from:
   - os/system-services/
   - os/configuration/system-services/

docs/os/system-services/custom-system-services/index.md

@@ -1,6 +1,6 @@
 ---
 title: Custom System Services in RancherOS
-layout: os-default
+
 ---
 
 ## Custom System Services

docs/os/system-services/environment/index.md

@@ -1,6 +1,6 @@
 ---
 title: Environment
-layout: os-default
+
 
 ---
 

docs/os/system-services/system-docker-volumes/index.md

@@ -1,6 +1,6 @@
 ---
 title: System Docker Volumes
-layout: os-default
+
 
 ---
 

docs/os/under-the-hood/device-plug-and-unplug/index.md

@@ -1,6 +1,6 @@
 ---
 title: Device Plug and Unplug
-layout: os-default
+
 
 ---
 

docs/os/under-the-hood/directories/index.md

@@ -1,6 +1,6 @@
 ---
 title: Directories
-layout: os-default
+
 ---
 
 ## How directories are mounted, Ram disk, etc.

docs/os/under-the-hood/porting/index.md

@@ -1,6 +1,6 @@
 ---
 title: Porting
-layout: os-default
+
 
 ---
 

docs/os/under-the-hood/startup-sequence/index.md

@@ -1,6 +1,6 @@
 ---
 title: Startup Sequence
-layout: os-default
+
 
 ---
 

docs/os/under-the-hood/zombie-process-management/index.md

@@ -1,6 +1,6 @@
 ---
 title: Zombie process management
-layout: os-default
+
 
 ---
 

docs/os/upgrading/index.md

@@ -1,6 +1,6 @@
 ---
 title: Upgrading RancherOS
-layout: os-default
+
 
 ---