rancher · felipe-colussi · Aug 15, 2023 · Aug 15, 2023 · Aug 17, 2023 · Aug 18, 2023
diff --git a/.github/ISSUE_TEMPLATE/request-a-new-feature.md b/.github/ISSUE_TEMPLATE/request-a-new-feature.md
@@ -4,13 +4,23 @@ about: For requesting new feature(s) to be added to the docs.
 title: ''
 labels: ''
 assignees: ''
-
 ---
 
-**Summary:**
+## Related Issues
+
+<!--
+List any issues or tickets on other platforms that are associated with the request. For example, include a link to the issue tracking that feature in the Rancher repo, or list the Jira ticket number for the request. 
+-->
+
+## Summary
+
+<!--
 Describe the new feature. If QA has not yet tested the new feature/process, please also file a ticket with QA for their review.
+-->
 
+## Details
 
-**Details:**
+<!--
 - Include all pertinent information, e.g., screenshots, resource requirements, workarounds, links, etc.
-- List page link(s) in the current docs where the new feature applies, if applicable.
+- List page link(s) in the current docs where the new feature applies, if applicable.
+-->
diff --git a/.github/ISSUE_TEMPLATE/request-an-update.md b/.github/ISSUE_TEMPLATE/request-an-update.md
@@ -4,8 +4,15 @@ about: For fixing docs errors/typos, adding needed/missing information, updating
 title: ''
 labels: ''
 assignees: ''
-
 ---
 
-**Summary:**
-Describe the requested update giving as much detail as possible. Please also list page link(s) in the current docs where the update applies.
+## Related Issues
+<!--
+List any issues or tickets on other platforms that are associated with the request. For example, include a link to the issue tracking that feature in the Rancher repo, or list the Jira ticket number for the request.
+-->
+
+## Summary
+
+<!--
+Describe the requested update giving as much detail as possible. Please also list page link(s) in the current docs where the update applies.
+-->
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,27 @@
+<!--
+Check the Rancher docs issues to see if there is an existing issue for this pull request. If there is, enter the issue number below.
+-->
+
+Fixes #[issue_number]
+
+## Reminders
+
+- See the [README](../README.md) for more details on how to work with the Rancher docs.
+
+- Verify if changes pertain to other versions of Rancher. If they do, finalize the edits on one version of the page, then apply the edits to the other versions.
+
+- If the pull request is dependent on an upcoming release, make sure to target the release branch instead of `main`.
+
+## Description
+
+<!--
+- What is the goal of this pull request? 
+- What did you change? 
+- Are there any other pull requests, tickets, or issues associated with this pull request?
+-->
+
+## Comments
+
+<!--
+Any additional notes a reviewer should know before we review.
+-->
diff --git a/README.md b/README.md
@@ -1,16 +1,31 @@
-# Edit The Docs
+# Contribute to Rancher Docs
 
-To get started, fork and clone the rancher-docs repository.
+Welcome to the [Rancher docs](https://ranchermanager.docs.rancher.com/) repository. See the [Rancher software](https://github.com/rancher/rancher) repository if you have questions or requests for the Rancher platform.
+
+## Make a Suggestion
+
+You can suggest changes to the Rancher docs in two ways: 
+
+1. [Open an issue](https://github.com/rancher/rancher-docs/issues/new/choose).
+1. Edit the docs in the way you see fit and open a pull request.
+
+## Edit the Docs
+
+To get started, [fork](https://github.com/rancher/rancher-docs/fork) and clone the rancher-docs repository.
 
 Our repository doesn't allow you to make changes directly to the `main` branch. Create a working branch and make pull requests from your fork to [rancher/rancher-docs](https://github.com/rancher/rancher-docs).
 
 For most updates, you'll need to edit a file in `/docs`, and the corresponding file in `/versioned_docs/version-2.7`. If a change affects older versions, you can find files documenting Rancher v2.0 and later in the `/versioned_docs` directory. 
 
-If a file is moved or renamed, you'll also need to edit the `sidebars.js` files for each version, and the list of redirects in `docusaurus.config.js`. 
+If a file is moved or renamed, you'll also need to edit the `sidebars.js` files for each version, and the list of redirects in `docusaurus.config.js`. See [Moving or Renaming Docs](./moving-or-renaming-docs.md).
+
+### Navigate the Repo
+
+The file paths in the repo correspond to the URLs for pages on the docs website. The docs for the latest version of Rancher are located in `/docs`. Most index pages are found within the `/pages-for-subheaders` directory in `/docs`. All images are in `/static/img` in the top level of the repo. Older docs are found within `/versioned_docs` and generally follow the same structure as the files in `/docs`.
 
-## Style & Formatting
+### Style & Formatting
 
-The docs are written in [Markdown](https://www.markdownguide.org/getting-started/). We refer to the Microsoft [style guide](https://learn.microsoft.com/en-us/style-guide/welcome/) and generally use standard American English. Many pages are also available in Simplified Chinese.
+The docs are written in [Markdown](https://www.markdownguide.org/getting-started/). We refer to the Microsoft [style guide](https://learn.microsoft.com/en-us/style-guide/welcome/) and use standard American English. Many pages are also available in Simplified Chinese.
 
 Every docs page contain metadata in the first few lines:
 
@@ -22,7 +37,7 @@ title: Some Title
 
 The `title` is rendered as the page's headline. The site renderer wraps the `title` value in `H1` tags, which are equivalent to `#` in Markdown syntax. This means that all subsequent headers on the page should be second level (`##`) or more.
 
-## Docs Website
+## Run the Docs Website
 
 The Rancher Docs website is built with [Docusaurus 2](https://docusaurus.io/), a modern static website generator.
 

diff --git a/docs/cluster-provisioning/rke-clusters/options/options.md b/docs/cluster-provisioning/rke-clusters/options/options.md
@@ -2,4 +2,8 @@
 title: RKE Cluster Configuration
 ---
 
+<head>
+  <link rel="canonical" href="https://ranchermanager.docs.rancher.com/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration"/>
+</head>
+
 This page has moved [here.](../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
diff --git a/docs/contribute-to-rancher.md b/docs/contribute-to-rancher.md
@@ -2,7 +2,11 @@
 title: Contributing to Rancher
 ---
 
-This section explains the repositories used for Rancher, how to build the repositories, and what information to include when you file an issue.
+<head>
+  <link rel="canonical" href="https://ranchermanager.docs.rancher.com/contribute-to-rancher"/>
+</head>
+
+Learn about the repositories used for Rancher and Rancher docs, how to build Rancher repositories, and what information to include when you file an issue.
 
 For more detailed information on how to contribute to the development of Rancher projects, refer to the [Rancher Developer Wiki](https://github.com/rancher/rancher/wiki). The wiki has resources on many topics, including the following:
 
@@ -14,7 +18,15 @@ For more detailed information on how to contribute to the development of Rancher
 
 On the Rancher Users Slack, the channel for developers is **#developer**.
 
-## Repositories
+## Rancher Docs
+
+If you have suggestions for the documentation on this website, [open](https://github.com/rancher/rancher-docs/issues/new/choose) an issue in the main [Rancher docs](https://github.com/rancher/rancher-docs) repository. This repo contains documentation for Rancher v2.0 and later. 
+
+See the [Rancher docs README](https://github.com/rancher/rancher-docs#readme) for more details on contributing to and building the Rancher v2.x docs repo.
+
+For documentation describing Rancher v1.6 and earlier, see the [Rancher 1.x docs](https://github.com/rancher/rancher.github.io) repo, which contains source files for https://rancher.com/docs/rancher/v1.6/en/. 
+
+## Rancher Repositories
 
 All of repositories are located within our main GitHub organization. There are many repositories used for Rancher, but we'll provide descriptions of some of the main ones used in Rancher.
 
@@ -38,19 +50,19 @@ To see all libraries/projects used in Rancher, see the [`go.mod` file](https://g
 ![Rancher diagram](/img/ranchercomponentsdiagram-2.6.svg)<br/>
 <sup>Rancher components used for provisioning/managing Kubernetes clusters.</sup>
 
-## Building
+### Building Rancher Repositories
 
 Every repository should have a Makefile and can be built using the `make` command. The `make` targets are based on the scripts in the `/scripts` directory in the repository, and each target will use [Dapper](https://github.com/rancher/dapper) to run the target in an isolated environment. The `Dockerfile.dapper` will be used for this process, and includes all the necessary build tooling needed.
 
 The default target is `ci`, and will run `./scripts/validate`, `./scripts/build`, `./scripts/test` and `./scripts/package`. The resulting binaries of the build will be in `./build/bin` and are usually also packaged in a Docker image.
 
-## Bugs, Issues or Questions
+### Rancher Bugs, Issues or Questions
 
 If you find any bugs or are having any trouble, please search the [reported issue](https://github.com/rancher/rancher/issues) as someone may have experienced the same issue or we are actively working on a solution.
 
 If you can't find anything related to your issue, contact us by [filing an issue](https://github.com/rancher/rancher/issues/new). Though we have many repositories related to Rancher, we want the bugs filed in the Rancher repository so we won't miss them! If you want to ask a question or ask fellow users about an use case, we suggest creating a post on the [Rancher Forums](https://forums.rancher.com).
 
-### Checklist for Filing Issues
+#### Checklist for Filing Issues
 
 Please follow this checklist when filing an issue which will helps us investigate and fix the issue. More info means more data we can use to determine what is causing the issue or what might be related to the issue.
 
@@ -126,11 +138,3 @@ Please remove any sensitive data as it will be publicly viewable.
     - Docker daemon logging (these might not all exist, depending on operating system)
         - `/var/log/docker.log`
 - **Metrics:** If you are experiencing performance issues, please provide as much of data (files or screenshots) of metrics which can help determining what is going on. If you have an issue related to a machine, it helps to supply output of `top`, `free -m`, `df` which shows processes/memory/disk usage.
-
-## Docs
-
-If you have any updates to our documentation, please make any pull request to our docs repo.
-
-- [Rancher 2.x Docs repository](https://github.com/rancher/docs): This repo is where all the docs for Rancher 2.x are located. They are located in the `content` folder in the repo.
-
-- [Rancher 1.x Docs repository](https://github.com/rancher/rancher.github.io): This repo is where all the docs for Rancher 1.x are located. They are located in the `rancher` folder in the repo.
diff --git a/docs/faq/container-network-interface-providers.md b/docs/faq/container-network-interface-providers.md
@@ -3,6 +3,10 @@ title: Container Network Interface (CNI) Providers
 description: Learn about Container Network Interface (CNI), the CNI providers Rancher provides, the features they offer, and how to choose a provider for you
 ---
 
+<head>
+  <link rel="canonical" href="https://ranchermanager.docs.rancher.com/faq/container-network-interface-providers"/>
+</head>
+
 ## What is CNI?
 
 CNI (Container Network Interface), a [Cloud Native Computing Foundation project](https://cncf.io/), consists of a specification and libraries for writing plugins to configure network interfaces in Linux containers, along with a number of  plugins. CNI concerns itself only with network connectivity of containers and removing allocated resources when the container is deleted.

diff --git a/docs/faq/deprecated-features-in-v2.5.md b/docs/faq/deprecated-features-in-v2.5.md
@@ -2,6 +2,10 @@
 title: Deprecated Features in Rancher
 ---
 
+<head>
+  <link rel="canonical" href="https://ranchermanager.docs.rancher.com/faq/deprecated-features-in-v2.5"/>
+</head>
+
 ### What is Rancher's Deprecation policy?
 
 We have published our official deprecation policy in the support [terms of service](https://rancher.com/support-maintenance-terms).

diff --git a/docs/faq/dockershim.md b/docs/faq/dockershim.md
@@ -2,6 +2,10 @@
 title: Dockershim
 ---
 
+<head>
+  <link rel="canonical" href="https://ranchermanager.docs.rancher.com/faq/dockershim"/>
+</head>
+
 The Dockershim is the CRI compliant layer between the Kubelet and the Docker daemon. As part of the Kubernetes 1.20 release, the [deprecation of the in-tree Dockershim was announced](https://kubernetes.io/blog/2020/12/02/dont-panic-kubernetes-and-docker/). Removal is currently scheduled for Kubernetes 1.24. For more information on the deprecation and its timelines, see the [Kubernetes Dockershim Deprecation FAQ](https://kubernetes.io/blog/2020/12/02/dockershim-faq/#when-will-dockershim-be-removed).
 
 RKE clusters, starting with Kubernetes 1.21, now support the external Dockershim to continue leveraging Docker as the CRI runtime. We now implement the upstream open source community Dockershim announced by [Mirantis and Docker](https://www.mirantis.com/blog/mirantis-to-take-over-support-of-kubernetes-dockershim-2/) to ensure RKE clusters can continue to leverage Docker.

diff --git a/docs/faq/general-faq.md b/docs/faq/general-faq.md
@@ -2,6 +2,10 @@
 title: General FAQ
 ---
 
+<head>
+  <link rel="canonical" href="https://ranchermanager.docs.rancher.com/faq/general-faq"/>
+</head>
+
 This FAQ is a work in progress designed to answers the questions our users most frequently ask about Rancher v2.x.
 
 See [Technical FAQ](technical-items.md), for frequently asked technical questions.

diff --git a/docs/faq/install-and-configure-kubectl.md b/docs/faq/install-and-configure-kubectl.md
@@ -2,6 +2,10 @@
 title: Installing and Configuring kubectl
 ---
 
+<head>
+  <link rel="canonical" href="https://ranchermanager.docs.rancher.com/faq/install-and-configure-kubectl"/>
+</head>
+
 `kubectl` is a CLI utility for running commands against Kubernetes clusters. It's required for many maintenance and administrative tasks in Rancher 2.x.
 
 ### Installation

diff --git a/docs/faq/rancher-is-no-longer-needed.md b/docs/faq/rancher-is-no-longer-needed.md
@@ -2,6 +2,10 @@
 title: Rancher is No Longer Needed
 ---
 
+<head>
+  <link rel="canonical" href="https://ranchermanager.docs.rancher.com/faq/rancher-is-no-longer-needed"/>
+</head>
+
 This page is intended to answer questions about what happens if you don't want Rancher anymore, if you don't want a cluster to be managed by Rancher anymore, or if the Rancher server is deleted.
 
 

diff --git a/docs/faq/security.md b/docs/faq/security.md
@@ -3,6 +3,10 @@ title: Security
 
 ---
 
+<head>
+  <link rel="canonical" href="https://ranchermanager.docs.rancher.com/faq/security"/>
+</head>
+
 **Is there a Hardening Guide?**
 
 The Hardening Guide is now located in the main [Security](../pages-for-subheaders/rancher-security.md) section.

diff --git a/docs/faq/technical-items.md b/docs/faq/technical-items.md
@@ -2,6 +2,10 @@
 title: Technical
 ---
 
+<head>
+  <link rel="canonical" href="https://ranchermanager.docs.rancher.com/faq/technical-items"/>
+</head>
+
 ### How can I reset the administrator password?
 
 Docker Install:

diff --git a/docs/faq/telemetry.md b/docs/faq/telemetry.md
@@ -2,6 +2,10 @@
 title: Telemetry
 ---
 
+<head>
+  <link rel="canonical" href="https://ranchermanager.docs.rancher.com/faq/telemetry"/>
+</head>
+
 ### What is Telemetry?
 
 Telemetry collects aggregate information about the size of Rancher installations, versions of components used, and which features are used.  This information is used by Rancher Labs to help make the product better and is not shared with third-parties.

diff --git a/...tion-and-upgrade/install-upgrade-on-a-kubernetes-cluster/air-gapped-upgrades.md b/...tion-and-upgrade/install-upgrade-on-a-kubernetes-cluster/air-gapped-upgrades.md
@@ -1,5 +1,5 @@
 ---
-title: Rendering the Helm Template in an Air-Gapped Environment
+title: Upgrading in an Air-Gapped Environment
 ---
 
 <head>
@@ -12,9 +12,9 @@ These instructions assume you have already followed the instructions for a Kuber
 
 :::
 
-### Rancher Helm Template Options
+### Rancher Helm Upgrade Options
 
-Render the Rancher template using the same chosen options that were used when installing Rancher. Use the reference table below to replace each placeholder. Rancher needs to be configured to use the private registry in order to provision any Rancher launched Kubernetes clusters or Rancher tools.
+To upgrade with Helm, apply the same options that you used when installing Rancher. Refer to the reference table below to replace each placeholder. Rancher needs to be configured to use the private registry in order to provision any Rancher launched Kubernetes clusters or Rancher tools.
 
 Based on the choice you made during installation, complete one of the procedures below.
 
@@ -29,8 +29,7 @@ Placeholder | Description
 ### Option A: Default Self-signed Certificate
 
 ```
-helm template rancher ./rancher-<VERSION>.tgz --output-dir . \
-    --no-hooks \ # prevent files for Helm hooks from being generated
+helm upgrade rancher ./rancher-<VERSION>.tgz \
 	--namespace cattle-system \
 	--set hostname=<RANCHER.YOURDOMAIN.COM> \
 	--set certmanager.version=<CERTMANAGER_VERSION> \
@@ -42,8 +41,7 @@ helm template rancher ./rancher-<VERSION>.tgz --output-dir . \
 ### Option B: Certificates from Files using Kubernetes Secrets
 
 ```plain
-helm template rancher ./rancher-<VERSION>.tgz --output-dir . \
-	--no-hooks \ # prevent files for Helm hooks from being generated
+helm upgrade rancher ./rancher-<VERSION>.tgz \
 	--namespace cattle-system \
 	--set hostname=<RANCHER.YOURDOMAIN.COM> \
 	--set rancherImage=<REGISTRY.YOURDOMAIN.COM:PORT>/rancher/rancher \
@@ -55,8 +53,7 @@ helm template rancher ./rancher-<VERSION>.tgz --output-dir . \
 If you are using a Private CA signed cert, add `--set privateCA=true` following `--set ingress.tls.source=secret`:
 
 ```plain
-helm template rancher ./rancher-<VERSION>.tgz --output-dir . \
-	--no-hooks \ # prevent files for Helm hooks from being generated
+helm upgrade rancher ./rancher-<VERSION>.tgz \
 	--namespace cattle-system \
 	--set hostname=<RANCHER.YOURDOMAIN.COM> \
 	--set rancherImage=<REGISTRY.YOURDOMAIN.COM:PORT>/rancher/rancher \
@@ -66,16 +63,6 @@ helm template rancher ./rancher-<VERSION>.tgz --output-dir . \
 	--set useBundledSystemChart=true # Use the packaged Rancher system charts
 ```
 
-### Apply the Rendered Templates
-
-Copy the rendered manifest directories to a system with access to the Rancher server cluster and apply the rendered templates.
-
-Use `kubectl` to apply the rendered manifests.
-
-```plain
-kubectl -n cattle-system apply -R -f ./rancher
-```
-
 ## Verify the Upgrade
 
 Log into Rancher to confirm that the upgrade succeeded.

diff --git a/...d/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rollbacks.md b/...d/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rollbacks.md
@@ -26,7 +26,7 @@ See the [rancher/rancher-cleanup repo](https://github.com/rancher/rancher-cleanu
 ### Rolling back from v2.6.4+ to lower versions of v2.6.x
 
 1. Follow these [instructions](https://github.com/rancher/rancher-cleanup/blob/main/README.md) to run the scripts.
-1. Follow these [instructions](https://rancher.com/docs/rancher/v2.6/en/backups/migrating-rancher/) to install the rancher-backup Helm chart on the existing cluster and restore the previous state.
+1. Follow these [instructions](../../../how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md) to install the rancher-backup Helm chart on the existing cluster and restore the previous state.
     1. Omit Step 3.
     1. When you reach Step 4, install the Rancher v2.6.x version on the local cluster you intend to roll back to.
 

diff --git a/...de/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md b/...de/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md
@@ -122,7 +122,7 @@ Copy the fetched charts to a system that has access to the Rancher server cluste
 
 ##### 1. Install Cert-Manager
 
-Install cert-manager with the options you would like to use to install the chart. Remember to set the `image.repository` option to pull the image from your private registry. This will create a `cert-manager` directory with the Kubernetes manifest files.
+Install cert-manager with the same options you would use to install the chart. Remember to set the `image.repository` option to pull the image from your private registry.
 
 :::note
 
@@ -144,7 +144,7 @@ If you are using self-signed certificates, install cert-manager:
 2. Create the cert-manager CustomResourceDefinitions (CRDs).
 
     ```plain
-    kubectl apply -f cert-manager/cert-manager-crd.yaml
+    kubectl apply -f cert-manager-crd.yaml
     ```
 
 3. Install cert-manager.