From 5331cb0cebba909fed468a74c53b6e678e4897e0 Mon Sep 17 00:00:00 2001
From: Mauren Berti <mauren.berti@suse.com>
Date: Fri, 14 Oct 2022 17:52:47 -0400
Subject: [PATCH 01/15] Fix rendering images in the Helm charts docs.

---
 .../new-user-guides/helm-charts-in-rancher/create-apps.md      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/how-to-guides/new-user-guides/helm-charts-in-rancher/create-apps.md b/docs/how-to-guides/new-user-guides/helm-charts-in-rancher/create-apps.md
index 5e8c2310bb0..b5f9e5127ed 100644
--- a/docs/how-to-guides/new-user-guides/helm-charts-in-rancher/create-apps.md
+++ b/docs/how-to-guides/new-user-guides/helm-charts-in-rancher/create-apps.md
@@ -58,8 +58,7 @@ Before you create your own custom catalog, you should have a basic understanding
 
 - `questions.yml`
 
-    A file that contains questions for a form. These form questions simplify deployment of a chart. Without it, you must configure the deployment using a values YAML config, which is more difficult. The following image displays the difference between a Rancher chart (which includes `questions.yml`) and a native Helm chart (which does not).
-
+    A file that contains questions for a form. These form questions simplify deployment of a chart. Without it, you must configure the deployment using a values YAML config, which is more difficult. The following images display the difference between a Rancher chart (which includes `questions.yml`) and a native Helm chart (which does not).
 
     <figcaption>Rancher Chart with <code>questions.yml</code> (top) vs. Helm Chart without (bottom)</figcaption>
 

From 8599003e40f4441677015d26aa42fd581014e5d1 Mon Sep 17 00:00:00 2001
From: Billy Tat <btat@suse.com>
Date: Tue, 18 Oct 2022 13:28:43 -0700
Subject: [PATCH 02/15] Update spacing so image displays

---
 .../configure-ms-adfs-for-rancher.md                             | 1 +
 .../configure-ms-adfs-for-rancher.md                             | 1 +
 .../configure-ms-adfs-for-rancher.md                             | 1 +
 .../configure-ms-adfs-for-rancher.md                             | 1 +
 4 files changed, 4 insertions(+)

diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
index c280d653eb9..68efa80ffc3 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
+++ b/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
@@ -69,6 +69,7 @@ Before configuring Rancher to support AD FS users, you must add Rancher as a [re
     | Token-Groups - Qualified by Long Domain Name | Group               |
     | SAM-Account-Name                             | Name                |
     <br/>
+
     ![](/img/adfs/adfs-add-tcr-2.png)
 
 1. Download the `federationmetadata.xml` from your AD server at:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
index de75d837543..1bcf056acd8 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
@@ -68,6 +68,7 @@ title: 1. 在 Microsoft AD FS 中配置 Rancher
    | Token-Groups - Qualified by Long Domain Name | Group |
    | SAM-Account-Name | 名称 |
    <br/>
+
    ![](/img/adfs/adfs-add-tcr-2.png)
 
 1. 从 AD 服务器的以下位置下载 `federationmetadata.xml`：
diff --git a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
index 802245db536..16c6407aa8d 100644
--- a/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
+++ b/versioned_docs/version-2.0-2.4/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
@@ -69,6 +69,7 @@ Before configuring Rancher to support AD FS users, you must add Rancher as a [re
     | Token-Groups - Qualified by Long Domain Name | Group               |
     | SAM-Account-Name                             | Name                |
     <br/>
+
     ![](/img/adfs/adfs-add-tcr-2.png)
 
 1. Download the `federationmetadata.xml` from your AD server at:
diff --git a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
index 802245db536..16c6407aa8d 100644
--- a/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
+++ b/versioned_docs/version-2.5/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
@@ -69,6 +69,7 @@ Before configuring Rancher to support AD FS users, you must add Rancher as a [re
     | Token-Groups - Qualified by Long Domain Name | Group               |
     | SAM-Account-Name                             | Name                |
     <br/>
+
     ![](/img/adfs/adfs-add-tcr-2.png)
 
 1. Download the `federationmetadata.xml` from your AD server at:

From a1ffcfc8c79b1effc36a461730fb6d782e8e158c Mon Sep 17 00:00:00 2001
From: Billy Tat <btat@suse.com>
Date: Mon, 17 Oct 2022 10:53:16 -0700
Subject: [PATCH 03/15] Add redirect plugin

---
 docusaurus.config.js | 14 ++++++++++++++
 package.json         |  1 +
 yarn.lock            | 15 +++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/docusaurus.config.js b/docusaurus.config.js
index 836fb0c5ead..f50d2e3af8c 100644
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@@ -125,4 +125,18 @@ module.exports = {
       },
     ],
   ],
+  plugins: [
+    [
+      '@docusaurus/plugin-client-redirects',
+      {
+        fromExtensions: ['html', 'htm'],
+        redirects: [
+          // {
+          //   to: '/test',
+          //   from: '/testold',
+          // },
+        ],
+      },
+    ],
+  ],
 };
diff --git a/package.json b/package.json
index 4d48c42de22..a3f95f5c540 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
   },
   "dependencies": {
     "@docusaurus/core": "2.0.0-beta.21",
+    "@docusaurus/plugin-client-redirects": "2.0.0-beta.21",
     "@docusaurus/preset-classic": "2.0.0-beta.21",
     "@mdx-js/react": "^1.6.22",
     "clsx": "^1.1.1",
diff --git a/yarn.lock b/yarn.lock
index 4460cdc18c2..3855a6df713 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1312,6 +1312,21 @@
     "@types/react-router-dom" "*"
     react-helmet-async "*"
 
+"@docusaurus/plugin-client-redirects@2.0.0-beta.21":
+  version "2.0.0-beta.21"
+  resolved "https://registry.yarnpkg.com/@docusaurus/plugin-client-redirects/-/plugin-client-redirects-2.0.0-beta.21.tgz#bf0c3e94d89c7bd15933dacdfefc17fec22c5d76"
+  integrity sha512-4xzrti0au7SaQT/cxr+FM9b+R5gfOSFODwQJ2QeTXbkdiz1+9DV3bp8nB/2CmzZ9ApY5lsueXNpa4n7+UAngrA==
+  dependencies:
+    "@docusaurus/core" "2.0.0-beta.21"
+    "@docusaurus/logger" "2.0.0-beta.21"
+    "@docusaurus/utils" "2.0.0-beta.21"
+    "@docusaurus/utils-common" "2.0.0-beta.21"
+    "@docusaurus/utils-validation" "2.0.0-beta.21"
+    eta "^1.12.3"
+    fs-extra "^10.1.0"
+    lodash "^4.17.21"
+    tslib "^2.4.0"
+
 "@docusaurus/plugin-content-blog@2.0.0-beta.21":
   version "2.0.0-beta.21"
   resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.0.0-beta.21.tgz#86211deeea901ddcd77ca387778e121e93ee8d01"

From d51529a63ed696714f21c6ac9b76564d5861575e Mon Sep 17 00:00:00 2001
From: Jennifer Travinski <jennifer.travinski@suse.com>
Date: Fri, 21 Oct 2022 12:06:13 -0400
Subject: [PATCH 04/15] Removed tech preview wording from Harvester

---
 docs/explanations/integrations-in-rancher/harvester.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/explanations/integrations-in-rancher/harvester.md b/docs/explanations/integrations-in-rancher/harvester.md
index 1e261690bed..120b1a51ae7 100644
--- a/docs/explanations/integrations-in-rancher/harvester.md
+++ b/docs/explanations/integrations-in-rancher/harvester.md
@@ -26,7 +26,7 @@ To navigate to the Harvester cluster, click **☰ > Virtualization Management**.
 
 ### Harvester Node Driver
 
-The [Harvester node driver](https://docs.harvesterhci.io/v0.3/rancher/node-driver/) is marked as `tech preview` on RKE and RKE2 options in Rancher. This will be the case both on the Create page and once the driver is already enabled. The node driver is available whether or not the Harvester feature flag is enabled. Note that the node driver is off by default. Users may create RKE or RKE2 clusters on Harvester only from the Cluster Management page.
+As of Rancher v2.6.3, the [Harvester node driver](https://docs.harvesterhci.io/v0.3/rancher/node-driver/) is GA for RKE and RKE2 options in Rancher. The node driver is available whether or not the Harvester feature flag is enabled. Note that the node driver is off by default. Users may create RKE or RKE2 clusters on Harvester only from the Cluster Management page.
 
 Harvester allows `.ISO` images to be uploaded and displayed through the Harvester UI, but this is not supported in the Rancher UI. This is because `.ISO` images usually require additional setup that interferes with a clean deployment (without requiring user intervention), and they are not typically used in cloud environments.
 

From 917419b234f7d2da4deaf31af87500e57b5d0e8b Mon Sep 17 00:00:00 2001
From: Max Sokolovsky <genexpr@protonmail.com>
Date: Mon, 24 Oct 2022 14:15:43 -0400
Subject: [PATCH 05/15] Add a note about re-configuring a previously set up
 auth provider

---
 docs/pages-for-subheaders/about-authentication.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/pages-for-subheaders/about-authentication.md b/docs/pages-for-subheaders/about-authentication.md
index 2e8cb606b15..208f0991b7d 100644
--- a/docs/pages-for-subheaders/about-authentication.md
+++ b/docs/pages-for-subheaders/about-authentication.md
@@ -101,3 +101,11 @@ Configuration of external authentication affects how principal users are managed
     ![Sign In External Principal](/img/users-page.png)
 
 6. The external principal and the local principal share the same access rights.
+
+:::note Reconfiguring a previously set up auth provider
+
+If you need to reconfigure or disable then re-enable a provider that had been previously set up, ensure that the user who attempts to do so
+is logged in to Rancher as an external user, not the local admin.
+
+:::
+

From 0ffe457668db4138a2279b5a8ef0eeaa68f7eec9 Mon Sep 17 00:00:00 2001
From: Jennifer Travinski <jennifer.travinski@suse.com>
Date: Fri, 30 Sep 2022 14:31:29 -0400
Subject: [PATCH 06/15] Updating site structure per feedback

---
 docs/explanations.md                          |    5 -
 docs/{faq.md => faq/general-faq.md}           |    8 +-
 docs/faq/networking/networking.md             |    8 -
 docs/faq/rancher-is-no-longer-needed.md       |    2 +-
 docs/faq/technical-items.md                   |    4 +-
 docs/getting-started.md                       |   10 -
 .../upgrades.md                               |    7 +-
 .../installation-references/feature-flags.md  |   14 +-
 .../helm-chart-options.md                     |   18 +-
 .../installation-references/tls-settings.md   |    0
 .../port-requirements.md                      |    4 +-
 .../docker-install-commands.md                |    6 +-
 .../infrastructure-private-registry.md        |    4 +-
 .../install-rancher-ha.md                     |    6 +-
 .../install-rancher.md                        |    2 +-
 .../set-up-infrastructure.md                  |    2 +-
 .../upgrade-docker-installed-rancher.md       |   18 +-
 .../resources/custom-ca-root-certificates.md  |    2 +-
 .../upgrade-and-roll-back-kubernetes.md       |    2 +-
 ...de-kubernetes-without-upgrading-rancher.md |    4 +-
 .../introduction/what-are-divio-docs.md       |   98 --
 .../{introduction => }/overview.md            |   24 +-
 docs/how-to-guides.md                         |    5 -
 ...reate-a-custom-benchmark-version-to-run.md |    2 +-
 .../configure-layer-7-nginx-load-balancer.md  |   16 +-
 .../enable-api-audit-log.md                   |    6 +-
 .../continuous-delivery.md                    |    4 +-
 .../istio-traffic-management-features.md      |    4 +-
 .../rancher-on-arm64.md                       |    2 +-
 .../unsupported-storage-drivers.md            |    2 +-
 .../enable-istio-in-cluster.md                |   10 +-
 .../generate-and-view-traffic.md              |    2 +-
 .../manage-pod-security-policies.md           |    4 +-
 .../override-default-limit-in-namespaces.md   |    4 +-
 .../create-persistent-grafana-dashboard.md    |    2 +-
 .../customize-grafana-dashboard.md            |    2 +-
 .../enable-monitoring.md                      |    2 +-
 .../migrate-to-rancher-v2.5+-monitoring.md    |    2 +-
 .../advanced-configuration/alertmanager.md    |    2 +-
 .../advanced-configuration/prometheus.md      |    2 +-
 .../advanced-configuration/prometheusrules.md |    4 +-
 .../open-ports-with-firewalld.md              |    2 +-
 .../tune-etcd-for-large-installs.md           |    0
 .../add-users-to-projects.md                  |   12 +-
 .../manage-cluster-drivers.md                 |    0
 .../manage-node-drivers.md                    |    0
 .../access-or-share-templates.md              |    0
 .../about-rke1-templates/apply-templates.md   |    0
 .../creator-permissions.md                    |    0
 .../about-rke1-templates/enforce-templates.md |    0
 .../about-rke1-templates/example-use-cases.md |    0
 .../about-rke1-templates/infrastructure.md    |    0
 .../manage-rke1-templates.md                  |    0
 .../override-template-settings.md             |    0
 .../configure-active-directory.md             |    6 +-
 .../configure-azure-ad.md                     |    6 +-
 .../configure-freeipa.md                      |    2 +-
 .../authentication-config/configure-github.md |    2 +-
 .../configure-google-oauth.md                 |    4 +-
 .../configure-keycloak-oidc.md                |    2 +-
 .../configure-keycloak-saml.md                |    2 +-
 .../configure-okta-saml.md                    |    0
 .../configure-pingidentity.md                 |    0
 .../create-local-users.md                     |    0
 .../manage-users-and-groups.md                |    2 +-
 .../configure-ms-adfs-for-rancher.md          |    0
 .../configure-rancher-for-ms-adfs.md          |    0
 .../openldap-config-reference.md              |    6 +-
 .../about-group-permissions.md                |    0
 .../create-pod-security-policies.md           |    0
 .../custom-branding.md                        |    0
 .../global-default-private-registry.md        |    0
 .../manage-cluster-templates.md               |    0
 .../cluster-and-project-roles.md              |    0
 .../custom-roles.md                           |    4 +-
 .../global-permissions.md                     |    6 +-
 .../locked-roles.md                           |    0
 ...aunched-kubernetes-clusters-from-backup.md |    4 +-
 .../deploy-apps-across-clusters/fleet.md      |    6 +-
 .../multi-cluster-apps.md                     |    8 +-
 .../ha-k3s-kubernetes-cluster.md              |    2 +-
 .../ha-rke1-kubernetes-cluster.md             |    2 +-
 .../ha-rke2-kubernetes-cluster.md             |    2 +-
 .../rke1-for-rancher.md                       |    4 +-
 ...quirements-for-rancher-managed-clusters.md |    2 +-
 .../register-existing-clusters.md             |    8 +-
 .../set-up-cloud-providers/amazon.md          |  154 +++
 .../azure.md                                  |    0
 .../configure-in-tree-vsphere.md              |    0
 .../configure-out-of-tree-vsphere.md          |    0
 .../google-compute-engine.md                  |    0
 .../migrate-from-in-tree-to-out-of-tree.md    |    0
 .../alibaba.md                                |    2 +-
 .../huawei.md                                 |    2 +-
 .../tencent.md                                |    2 +-
 .../azure-storageclass-configuration.md       |    2 +-
 .../network-requirements-for-host-gateway.md  |    0
 .../windows-linux-cluster-feature-parity.md   |    0
 .../workload-migration-guidance.md            |    0
 .../workloads-and-pods/deploy-workloads.md    |    4 +-
 .../about-rancher-agents.md                   |    8 +-
 .../amazon.md                                 |    6 +-
 .../rke1-vs-rke2-differences.md               |    0
 .../create-a-digitalocean-cluster.md          |   18 +-
 .../create-an-amazon-ec2-cluster.md           |   20 +-
 .../create-an-azure-cluster.md                |   18 +-
 .../provision-kubernetes-clusters-in-aos.md   |   16 +-
 .../vsphere/create-a-vm-template.md           |    0
 .../vsphere/create-credentials.md             |    0
 ...rovision-kubernetes-clusters-in-vsphere.md |   20 +-
 .../access-clusters/add-users-to-clusters.md  |   14 +-
 .../authorized-cluster-endpoint.md            |    0
 .../use-kubectl-and-kubeconfig.md             |    0
 .../add-a-pod-security-policy.md              |    0
 .../assign-pod-security-policies.md           |    0
 .../manage-clusters/clean-cluster-nodes.md    |    0
 .../clone-cluster-configuration.md            |    0
 .../about-glusterfs-volumes.md                |    0
 .../about-persistent-storage.md               |    0
 .../dynamically-provision-new-storage.md      |    4 +-
 .../install-iscsi-volumes.md                  |    0
 .../set-up-existing-storage.md                |    4 +-
 .../use-external-ceph-driver.md               |    0
 .../use-aws-ec2-auto-scaling-groups.md        |    2 +-
 .../manage-clusters/nodes-and-node-pools.md   |    0
 .../projects-and-namespaces.md                |    4 +-
 .../nfs-storage.md                            |    2 +-
 .../persistent-storage-in-amazon-ebs.md       |    2 +-
 .../vsphere-storage.md                        |    4 +-
 .../manage-clusters/rotate-certificates.md    |    0
 .../manage-clusters/rotate-encryption-key.md  |    0
 .../manage-namespaces.md                      |   24 +-
 .../cis-scans/configuration-reference.md      |    0
 .../cis-scans/custom-benchmark.md             |    0
 .../cis-scans/rbac-for-cis-scans.md           |    0
 .../skipped-and-not-applicable-tests.md       |    0
 .../adapter-requirements.md                   |    4 +-
 .../aws-cloud-marketplace/common-issues.md    |    0
 .../aws-cloud-marketplace/install-adapter.md  |    2 +-
 .../uninstall-adapter.md                      |    0
 .../cloud-marketplace/supportconfig.md        |    0
 .../fleet-gitops-at-scale/architecture.md     |    0
 .../use-fleet-behind-a-proxy.md               |    0
 .../fleet-gitops-at-scale/windows-support.md  |    0
 .../integrations-in-rancher/harvester.md      |    4 +-
 .../install-istio-on-rke2-cluster.md          |    0
 .../pod-security-policies.md                  |    0
 .../project-network-isolation.md              |    0
 .../selectors-and-scrape-configurations.md    |    0
 .../istio/cpu-and-memory-allocations.md       |    2 +-
 .../istio/disable-istio.md                    |    0
 .../istio/rbac-for-istio.md                   |    0
 .../flows-and-clusterflows.md                 |    0
 .../outputs-and-clusteroutputs.md             |    0
 .../logging/logging-architecture.md           |    0
 .../logging/logging-helm-chart-options.md     |    2 +-
 .../migrate-to-rancher-v2.5+-logging.md       |    2 +-
 .../logging/rbac-for-logging.md               |    0
 .../logging/taints-and-tolerations.md         |    0
 .../integrations-in-rancher/longhorn.md       |    0
 .../built-in-dashboards.md                    |    8 +-
 .../how-monitoring-works.md                   |    2 +-
 .../promql-expressions.md                     |    0
 .../rbac-for-monitoring.md                    |    0
 .../windows-support.md                        |    0
 .../integrations-in-rancher/neuvector.md      |    2 +-
 .../integrations-in-rancher/opa-gatekeeper.md |    0
 .../about-authentication.md                   |  111 --
 .../about-provisioning-drivers.md             |    8 +-
 .../about-rke1-templates.md                   |   38 +-
 docs/pages-for-subheaders/about-the-api.md    |    2 +-
 docs/pages-for-subheaders/access-clusters.md  |    8 +-
 docs/pages-for-subheaders/advanced-options.md |    5 -
 .../authentication-config.md                  |  108 +-
 ...on-permissions-and-global-configuration.md |    6 +-
 .../aws-cloud-marketplace.md                  |    6 +-
 docs/pages-for-subheaders/cis-scans.md        |    4 +-
 .../cluster-configuration.md                  |    2 +-
 .../configuration-options.md                  |    8 +-
 ...re-microsoft-ad-federation-service-saml.md |    6 +-
 .../configure-openldap.md                     |    4 +-
 .../configure-shibboleth-saml.md              |    6 +-
 .../create-kubernetes-persistent-storage.md   |   20 +-
 .../custom-resource-configuration.md          |    4 +-
 .../enable-experimental-features.md           |    4 +-
 .../fleet-gitops-at-scale.md                  |    6 +-
 .../install-cluster-autoscaler.md             |    2 +-
 ...install-upgrade-on-a-kubernetes-cluster.md |   14 +-
 .../installation-and-upgrade.md               |   12 +-
 .../installation-references.md                |    2 +-
 .../installation-requirements.md              |    2 +-
 .../integrations-in-rancher.md                |    7 -
 docs/pages-for-subheaders/introduction.md     |    5 -
 .../pages-for-subheaders/istio-setup-guide.md |    2 +-
 docs/pages-for-subheaders/istio.md            |   10 +-
 .../kubernetes-clusters-in-rancher-setup.md   |    2 +-
 .../kubernetes-components.md                  |    2 +-
 .../launch-kubernetes-with-rancher.md         |    2 +-
 docs/pages-for-subheaders/logging.md          |   22 +-
 docs/pages-for-subheaders/manage-clusters.md  |    2 +-
 .../manage-persistent-storage.md              |   12 -
 .../manage-project-resource-quotas.md         |    2 +-
 docs/pages-for-subheaders/manage-projects.md  |   10 +-
 .../manage-role-based-access-control-rbac.md  |    6 +-
 .../monitoring-and-alerting.md                |   14 +-
 docs/pages-for-subheaders/nutanix.md          |    6 +-
 .../other-cloud-providers.md                  |    9 -
 .../other-troubleshooting-tips.md             |   12 -
 docs/pages-for-subheaders/pipelines.md        |    2 +-
 .../provisioning-storage-examples.md          |    6 +-
 .../rancher-manager-architecture.md           |    2 +-
 .../rancher-on-a-single-node-with-docker.md   |    2 +-
 docs/pages-for-subheaders/rancher-security.md |    2 +-
 docs/pages-for-subheaders/resources.md        |    6 +-
 .../set-up-cloud-providers.md                 |    8 +-
 .../use-existing-nodes.md                     |    8 +-
 .../use-new-nodes-in-an-infra-provider.md     |    4 +-
 .../use-windows-clusters.md                   |   16 +-
 docs/pages-for-subheaders/user-settings.md    |    4 +-
 .../vsphere-cloud-provider.md                 |   13 -
 docs/pages-for-subheaders/vsphere.md          |    8 +-
 docs/rancher-manager.md                       |    3 +-
 docs/reference-guides.md                      |   11 -
 .../storage-configuration.md                  |    4 +-
 .../cli-with-rancher/rancher-cli.md           |    8 +-
 .../node-template-configuration/amazon-ec2.md |    6 +-
 .../rke1-cluster-configuration.md             |    6 +-
 .../rke2-cluster-configuration.md             |    2 +-
 .../helm-chart-options.md                     |    2 +-
 .../monitoring-v2-configuration/receivers.md  |    2 +-
 .../monitoring-v2-configuration/routes.md     |    2 +-
 .../servicemonitors-and-podmonitors.md        |    2 +-
 .../pipelines/configure-persistent-data.md    |    2 +-
 .../reference-guides/rancher-cluster-tools.md |    2 +-
 .../architecture-recommendations.md           |    2 +-
 ...unicating-with-downstream-user-clusters.md |    6 +-
 ...hardening-guide-with-cis-v1.6-benchmark.md |    2 +-
 .../advanced-options.md                       |    4 +-
 .../user-settings/manage-cloud-credentials.md |    2 +-
 .../user-settings/manage-node-templates.md    |    4 +-
 .../_cluster-capabilities-table.md            |   16 +-
 .../general-troubleshooting.md}               |   20 +-
 .../user-id-tracking-in-audit-logs.md         |    2 +-
 sidebars.js                                   | 1198 ++++++++---------
 244 files changed, 1264 insertions(+), 1417 deletions(-)
 delete mode 100644 docs/explanations.md
 rename docs/{faq.md => faq/general-faq.md} (90%)
 delete mode 100644 docs/faq/networking/networking.md
 delete mode 100644 docs/getting-started.md
 rename docs/{reference-guides => getting-started/installation-and-upgrade}/installation-references/feature-flags.md (78%)
 rename docs/{reference-guides => getting-started/installation-and-upgrade}/installation-references/helm-chart-options.md (94%)
 rename docs/{reference-guides => getting-started/installation-and-upgrade}/installation-references/tls-settings.md (100%)
 delete mode 100644 docs/getting-started/introduction/what-are-divio-docs.md
 rename docs/getting-started/{introduction => }/overview.md (65%)
 delete mode 100644 docs/how-to-guides.md
 rename docs/{getting-started/installation-and-upgrade/advanced-options/advanced-use-cases => how-to-guides/advanced-user-guides}/configure-layer-7-nginx-load-balancer.md (87%)
 rename docs/{getting-started/installation-and-upgrade/advanced-options/advanced-use-cases => how-to-guides/advanced-user-guides}/enable-api-audit-log.md (98%)
 rename docs/{getting-started/installation-and-upgrade/advanced-options => how-to-guides/advanced-user-guides}/enable-experimental-features/continuous-delivery.md (58%)
 rename docs/{getting-started/installation-and-upgrade/advanced-options => how-to-guides/advanced-user-guides}/enable-experimental-features/istio-traffic-management-features.md (91%)
 rename docs/{getting-started/installation-and-upgrade/advanced-options => how-to-guides/advanced-user-guides}/enable-experimental-features/rancher-on-arm64.md (94%)
 rename docs/{getting-started/installation-and-upgrade/advanced-options => how-to-guides/advanced-user-guides}/enable-experimental-features/unsupported-storage-drivers.md (92%)
 rename docs/{getting-started/installation-and-upgrade/advanced-options/advanced-use-cases => how-to-guides/advanced-user-guides}/open-ports-with-firewalld.md (96%)
 rename docs/{getting-started/installation-and-upgrade/advanced-options/advanced-use-cases => how-to-guides/advanced-user-guides}/tune-etcd-for-large-installs.md (100%)
 rename docs/how-to-guides/{advanced-user-guides/manage-projects => new-user-guides}/add-users-to-projects.md (77%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md (100%)
 rename docs/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/configure-active-directory.md (97%)
 rename docs/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/configure-azure-ad.md (95%)
 rename docs/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/configure-freeipa.md (95%)
 rename docs/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/configure-github.md (95%)
 rename docs/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/configure-google-oauth.md (95%)
 rename docs/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/configure-keycloak-oidc.md (98%)
 rename docs/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/configure-keycloak-saml.md (98%)
 rename docs/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/configure-okta-saml.md (100%)
 rename docs/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/configure-pingidentity.md (100%)
 rename docs/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/create-local-users.md (100%)
 rename docs/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/manage-users-and-groups.md (98%)
 rename docs/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md (100%)
 rename docs/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md (100%)
 rename docs/{reference-guides => how-to-guides/new-user-guides/authentication-permissions-and-global-configuration}/configure-openldap/openldap-config-reference.md (89%)
 rename docs/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/configure-shibboleth-saml/about-group-permissions.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/create-pod-security-policies.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/custom-branding.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/global-default-private-registry.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/manage-cluster-templates.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md (97%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md (96%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md (100%)
 create mode 100644 docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md
 rename docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/{launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers => set-up-cloud-providers}/azure.md (100%)
 rename docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/{launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere => set-up-cloud-providers}/configure-in-tree-vsphere.md (100%)
 rename docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/{launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere => set-up-cloud-providers}/configure-out-of-tree-vsphere.md (100%)
 rename docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/{launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers => set-up-cloud-providers}/google-compute-engine.md (100%)
 rename docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/{launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere => set-up-cloud-providers}/migrate-from-in-tree-to-out-of-tree.md (100%)
 rename docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/{launch-kubernetes-with-rancher => }/use-windows-clusters/azure-storageclass-configuration.md (91%)
 rename docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/{launch-kubernetes-with-rancher => }/use-windows-clusters/network-requirements-for-host-gateway.md (100%)
 rename docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/{launch-kubernetes-with-rancher => }/use-windows-clusters/windows-linux-cluster-feature-parity.md (100%)
 rename docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/{launch-kubernetes-with-rancher => }/use-windows-clusters/workload-migration-guidance.md (100%)
 rename docs/how-to-guides/new-user-guides/{kubernetes-clusters-in-rancher-setup => }/launch-kubernetes-with-rancher/about-rancher-agents.md (74%)
 rename docs/how-to-guides/new-user-guides/{kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers => launch-kubernetes-with-rancher}/amazon.md (90%)
 rename docs/how-to-guides/new-user-guides/{kubernetes-clusters-in-rancher-setup => }/launch-kubernetes-with-rancher/rke1-vs-rke2-differences.md (100%)
 rename docs/how-to-guides/new-user-guides/{kubernetes-clusters-in-rancher-setup => }/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md (72%)
 rename docs/how-to-guides/new-user-guides/{kubernetes-clusters-in-rancher-setup => }/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md (85%)
 rename docs/how-to-guides/new-user-guides/{kubernetes-clusters-in-rancher-setup => }/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md (79%)
 rename docs/how-to-guides/new-user-guides/{kubernetes-clusters-in-rancher-setup => }/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md (71%)
 rename docs/how-to-guides/new-user-guides/{kubernetes-clusters-in-rancher-setup => }/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template.md (100%)
 rename docs/how-to-guides/new-user-guides/{kubernetes-clusters-in-rancher-setup => }/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md (100%)
 rename docs/how-to-guides/new-user-guides/{kubernetes-clusters-in-rancher-setup => }/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md (74%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/access-clusters/add-users-to-clusters.md (68%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/access-clusters/authorized-cluster-endpoint.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/add-a-pod-security-policy.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/assign-pod-security-policies.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/clean-cluster-nodes.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/clone-cluster-configuration.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md (96%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md (95%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md (99%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/nodes-and-node-pools.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/projects-and-namespaces.md (98%)
 rename docs/how-to-guides/{advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage => new-user-guides/manage-clusters}/provisioning-storage-examples/nfs-storage.md (97%)
 rename docs/how-to-guides/{advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage => new-user-guides/manage-clusters}/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md (75%)
 rename docs/how-to-guides/{advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage => new-user-guides/manage-clusters}/provisioning-storage-examples/vsphere-storage.md (85%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/rotate-certificates.md (100%)
 rename docs/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/rotate-encryption-key.md (100%)
 rename docs/how-to-guides/{advanced-user-guides/manage-projects => new-user-guides}/manage-namespaces.md (71%)
 rename docs/{explanations => }/integrations-in-rancher/cis-scans/configuration-reference.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/cis-scans/custom-benchmark.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md (83%)
 rename docs/{explanations => }/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md (98%)
 rename docs/{explanations => }/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/cloud-marketplace/supportconfig.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/fleet-gitops-at-scale/architecture.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/harvester.md (92%)
 rename docs/{explanations => }/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/istio/configuration-options/pod-security-policies.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/istio/configuration-options/project-network-isolation.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/istio/cpu-and-memory-allocations.md (93%)
 rename docs/{explanations => }/integrations-in-rancher/istio/disable-istio.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/istio/rbac-for-istio.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/logging/logging-architecture.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/logging/logging-helm-chart-options.md (98%)
 rename docs/{explanations => }/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md (99%)
 rename docs/{explanations => }/integrations-in-rancher/logging/rbac-for-logging.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/logging/taints-and-tolerations.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/longhorn.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md (90%)
 rename docs/{explanations => }/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md (99%)
 rename docs/{explanations => }/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/monitoring-and-alerting/windows-support.md (100%)
 rename docs/{explanations => }/integrations-in-rancher/neuvector.md (98%)
 rename docs/{explanations => }/integrations-in-rancher/opa-gatekeeper.md (100%)
 delete mode 100644 docs/pages-for-subheaders/about-authentication.md
 delete mode 100644 docs/pages-for-subheaders/advanced-options.md
 delete mode 100644 docs/pages-for-subheaders/integrations-in-rancher.md
 delete mode 100644 docs/pages-for-subheaders/introduction.md
 delete mode 100644 docs/pages-for-subheaders/manage-persistent-storage.md
 delete mode 100644 docs/pages-for-subheaders/other-cloud-providers.md
 delete mode 100644 docs/pages-for-subheaders/other-troubleshooting-tips.md
 delete mode 100644 docs/pages-for-subheaders/vsphere-cloud-provider.md
 delete mode 100644 docs/reference-guides.md
 rename docs/{troubleshooting.md => troubleshooting/general-troubleshooting.md} (55%)

diff --git a/docs/explanations.md b/docs/explanations.md
deleted file mode 100644
index 838ff422a26..00000000000
--- a/docs/explanations.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Explanations
----
-
-**Explanatory docs** are concerned primarily with providing theoretical knowledge for the "why" behind a task or a topic. Explanations are "understanding-oriented" in nature and will clarify a topic in order to broaden the user's knowledge. In this section, users can find additional context and background, alternatives or even opinions on topics, and often historical reasons, constraints, and insights into why a process works the way that it does.
\ No newline at end of file
diff --git a/docs/faq.md b/docs/faq/general-faq.md
similarity index 90%
rename from docs/faq.md
rename to docs/faq/general-faq.md
index 5221ad9b6af..91b604a45ec 100644
--- a/docs/faq.md
+++ b/docs/faq/general-faq.md
@@ -1,10 +1,10 @@
 ---
-title: FAQ
+title: General FAQ
 ---
 
 This FAQ is a work in progress designed to answers the questions our users most frequently ask about Rancher v2.x.
 
-See [Technical FAQ](faq/technical-items.md), for frequently asked technical questions.
+See [Technical FAQ](technical-items.md), for frequently asked technical questions.
 
 <br/>
 
@@ -22,13 +22,13 @@ Yes.
 
 **Does Rancher support Windows?**
 
-As of Rancher 2.3.0, we support Windows Server 1809 containers. For details on how to set up a cluster with Windows worker nodes, refer to the section on [configuring custom clusters for Windows.](pages-for-subheaders/use-windows-clusters.md)
+As of Rancher 2.3.0, we support Windows Server 1809 containers. For details on how to set up a cluster with Windows worker nodes, refer to the section on [configuring custom clusters for Windows.](../pages-for-subheaders/use-windows-clusters.md)
 
 <br/>
 
 **Does Rancher support Istio?**
 
-As of Rancher 2.3.0, we support [Istio.](pages-for-subheaders/istio.md)
+As of Rancher 2.3.0, we support [Istio.](../pages-for-subheaders/istio.md)
 
 Furthermore, Istio is implemented in our micro-PaaS "Rio", which works on Rancher 2.x along with any CNCF compliant Kubernetes cluster. You can read more about it [here](https://rio.io/)
 
diff --git a/docs/faq/networking/networking.md b/docs/faq/networking/networking.md
deleted file mode 100644
index 1626e70c264..00000000000
--- a/docs/faq/networking/networking.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: Networking
----
-
-Networking FAQ's
-
-- [CNI Providers](../container-network-interface-providers.md)
-
diff --git a/docs/faq/rancher-is-no-longer-needed.md b/docs/faq/rancher-is-no-longer-needed.md
index 0b41b23d694..74a9c5df220 100644
--- a/docs/faq/rancher-is-no-longer-needed.md
+++ b/docs/faq/rancher-is-no-longer-needed.md
@@ -15,7 +15,7 @@ The capability to access a downstream cluster without Rancher depends on the typ
 
 - **Registered clusters:** The cluster will be unaffected and you can access the cluster using the same methods that you did before the cluster was registered into Rancher.
 - **Hosted Kubernetes clusters:** If you created the cluster in a cloud-hosted Kubernetes provider such as EKS, GKE, or AKS, you can continue to manage the cluster using your provider's cloud credentials.
-- **RKE clusters:** To access an [RKE cluster,](../pages-for-subheaders/launch-kubernetes-with-rancher.md) the cluster must have the [authorized cluster endpoint](../pages-for-subheaders/rancher-manager-architecture.md#4-authorized-cluster-endpoint) enabled, and you must have already downloaded the cluster's kubeconfig file from the Rancher UI. (The authorized cluster endpoint is enabled by default for RKE clusters.) With this endpoint, you can access your cluster with kubectl directly instead of communicating through the Rancher server's [authentication proxy.](../pages-for-subheaders/rancher-manager-architecture.md#1-the-authentication-proxy) For instructions on how to configure kubectl to use the authorized cluster endpoint, refer to the section about directly accessing clusters with [kubectl and the kubeconfig file.](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) These clusters will use a snapshot of the authentication as it was configured when Rancher was removed.
+- **RKE clusters:** To access an [RKE cluster,](../pages-with-subheaders/launch-kubernetes-with-rancher.md) the cluster must have the [authorized cluster endpoint](../pages-for-subheaders/rancher-manager-architecture.md#4-authorized-cluster-endpoint) enabled, and you must have already downloaded the cluster's kubeconfig file from the Rancher UI. (The authorized cluster endpoint is enabled by default for RKE clusters.) With this endpoint, you can access your cluster with kubectl directly instead of communicating through the Rancher server's [authentication proxy.](../pages-for-subheaders/rancher-manager-architecture.md#1-the-authentication-proxy) For instructions on how to configure kubectl to use the authorized cluster endpoint, refer to the section about directly accessing clusters with [kubectl and the kubeconfig file.](../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) These clusters will use a snapshot of the authentication as it was configured when Rancher was removed.
 
 ### What if I don't want Rancher anymore?
 
diff --git a/docs/faq/technical-items.md b/docs/faq/technical-items.md
index 56492420f60..5a438ff0fe1 100644
--- a/docs/faq/technical-items.md
+++ b/docs/faq/technical-items.md
@@ -51,7 +51,7 @@ Node Templates can be accessed by opening your account menu (top right) and sele
 
 ### Why is my Layer-4 Load Balancer in `Pending` state?
 
-The Layer-4 Load Balancer is created as `type: LoadBalancer`. In Kubernetes, this needs a cloud provider or controller that can satisfy these requests, otherwise these will be in `Pending` state forever. More information can be found on [Cloud Providers](../pages-for-subheaders/set-up-cloud-providers.md) or [Create External Load Balancer](https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/)
+The Layer-4 Load Balancer is created as `type: LoadBalancer`. In Kubernetes, this needs a cloud provider or controller that can satisfy these requests, otherwise these will be in `Pending` state forever. More information can be found on [Cloud Providers](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers.md) or [Create External Load Balancer](https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/)
 
 ### Where is the state of Rancher stored?
 
@@ -85,7 +85,7 @@ The UI consists of static files, and works based on responses of the API. That m
 
 A node is required to have a static IP configured (or a reserved IP via DHCP). If the IP of a node has changed, you will have to remove it from the cluster and readd it. After it is removed, Rancher will update the cluster to the correct state. If the cluster is no longer in `Provisioning` state, the node is removed from the cluster.
 
-When the IP address of the node changed, Rancher lost connection to the node, so it will be unable to clean the node properly. See [Cleaning cluster nodes](../how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md) to clean the node.
+When the IP address of the node changed, Rancher lost connection to the node, so it will be unable to clean the node properly. See [Cleaning cluster nodes](../how-to-guides/new-user-guides/manage-clusters/clean-cluster-nodes.md) to clean the node.
 
 When the node is removed from the cluster, and the node is cleaned, you can readd the node to the cluster.
 
diff --git a/docs/getting-started.md b/docs/getting-started.md
deleted file mode 100644
index 916baabc663..00000000000
--- a/docs/getting-started.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title: Getting Started
----
-
-To get up and running with Rancher quickly, we have included a **Getting Started** section.
-
-The goal of this section is to be able to assist users in deploying Rancher and workloads and to install or upgrade Rancher quickly and effectively.
-
-Please see the [introduction](./pages-for-subheaders/introduction.md), [quick start guides](./pages-for-subheaders/quick-start-guides.md), and the [installation and upgrade](./pages-for-subheaders/installation-and-upgrade.md) sections for more.
-
diff --git a/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades.md b/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades.md
index 13b5619e59e..071f7d2bcdb 100644
--- a/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades.md
+++ b/docs/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades.md
@@ -22,8 +22,7 @@ The kubeconfig can also be manually targeted for the intended cluster with the `
 
 Review the list of known issues for each Rancher version, which can be found in the release notes on [GitHub](https://github.com/rancher/rancher/releases) and on the [Rancher forums.](https://forums.rancher.com/c/announcements/12)
 
-Note that upgrades _to_ or _from_ any chart in the [rancher-alpha repository](../../../reference-guides/installation-references/helm-chart-options.md#helm-chart-repositories/) aren't supported.
-
+Note that upgrades _to_ or _from_ any chart in the [rancher-alpha repository](../../../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#helm-chart-repositories/) aren't supported.
 ### Helm Version
 
 The upgrade instructions assume you are using Helm 3.
@@ -36,7 +35,7 @@ For [air-gapped installs only,](../../../pages-for-subheaders/air-gapped-helm-cl
 
 ### For upgrades from a Rancher server with a hidden local cluster
 
-If you are upgrading to Rancher v2.5 from a Rancher server that was started with the Helm chart option `--add-local=false`, you will need to drop that flag when upgrading. Otherwise, the Rancher server will not start. The `restricted-admin` role can be used to continue restricting access to the local cluster. For more information, see [this section.](../../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md#upgrading-from-rancher-with-a-hidden-local-cluster)
+If you are upgrading to Rancher v2.5 from a Rancher server that was started with the Helm chart option `--add-local=false`, you will need to drop that flag when upgrading. Otherwise, the Rancher server will not start. The `restricted-admin` role can be used to continue restricting access to the local cluster. For more information, see [this section.](../../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md#upgrading-from-rancher-with-a-hidden-local-cluster)
 
 ### For upgrades with cert-manager older than 0.8.0
 
@@ -63,7 +62,7 @@ You'll use the backup as a restore point if something goes wrong during upgrade.
 
 1. Get the repository name that you used to install Rancher.
 
-    For information about the repos and their differences, see [Helm Chart Repositories](../../../reference-guides/installation-references/helm-chart-options.md#helm-chart-repositories).
+    For information about the repos and their differences, see [Helm Chart Repositories](../installation-references/helm-chart-options.md#helm-chart-repositories).
 
     - Latest: Recommended for trying out the newest features
         ```
diff --git a/docs/reference-guides/installation-references/feature-flags.md b/docs/getting-started/installation-and-upgrade/installation-references/feature-flags.md
similarity index 78%
rename from docs/reference-guides/installation-references/feature-flags.md
rename to docs/getting-started/installation-and-upgrade/installation-references/feature-flags.md
index 2a5b6fa8c02..045ebea21b0 100644
--- a/docs/reference-guides/installation-references/feature-flags.md
+++ b/docs/getting-started/installation-and-upgrade/installation-references/feature-flags.md
@@ -4,7 +4,7 @@ title: Feature Flags
 
 Feature flags were introduced to allow you to try experimental features that are not enabled by default.
 
-To learn about feature values and how to enable features, refer [here](../../pages-for-subheaders/enable-experimental-features.md).
+To learn about feature values and how to enable features, refer [here](../../../pages-for-subheaders/enable-experimental-features.md).
 
 :::note
 
@@ -14,14 +14,14 @@ There are some feature flags that may require a restart of the Rancher server co
 
 The following is a list of the feature flags available in Rancher:
 
-- `harvester`: This feature flag is available starting in v2.6.1. It is used to manage access to the Virtualization Management page where users can navigate directly to Harvester clusters and access the Harvester UI. For more information, see [this page](../../explanations/integrations-in-rancher/harvester.md#feature-flag/).
+- `harvester`: This feature flag is available starting in v2.6.1. It is used to manage access to the Virtualization Management page where users can navigate directly to Harvester clusters and access the Harvester UI. For more information, see [this page](../../../integrations-in-rancher/harvester.md#feature-flag/).
 - `rke2`: Used to enable the ability to provision RKE2 clusters. By default, this feature flag is enabled, which allows users to attempt to provision these type of clusters.
-- `fleet`: The previous `fleet` feature flag is now required to be enabled as the Fleet capabilities are leveraged within the new provisioning framework. If you had this feature flag disabled in earlier versions, upon upgrading to Rancher v2.6, the flag will automatically be enabled. See this [page](../../how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md) for more information.
-- `continuous-delivery`: In Rancher v2.5.x, Fleet came with a GitOps feature that could not be disabled separately from Fleet. In Rancher v2.6, the `continuous-delivery` feature flag was introduced to allow the GitOps feature of Fleet to be disabled. For more information, see [this page.](../../getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/continuous-delivery.md).
+- `fleet`: The previous `fleet` feature flag is now required to be enabled as the Fleet capabilities are leveraged within the new provisioning framework. If you had this feature flag disabled in earlier versions, upon upgrading to Rancher v2.6, the flag will automatically be enabled. See this [page](../../../how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md) for more information.
+- `continuous-delivery`: In Rancher v2.5.x, Fleet came with a GitOps feature that could not be disabled separately from Fleet. In Rancher v2.6, the `continuous-delivery` feature flag was introduced to allow the GitOps feature of Fleet to be disabled. For more information, see [this page.](../../../how-to-guides/advanced-user-guides/enable-experimental-features/continuous-delivery.md).
 - `legacy`: There are a set of features from previous versions that are slowly being phased out of Rancher for newer iterations of the feature. This is a mix of deprecated features as well as features that will eventually be moved to newer variations in Rancher. By default, this feature flag is disabled for new installations. If you are upgrading from a previous version, this feature flag would be enabled.
-- `token-hashing`: Used to enable new token-hashing feature. Once enabled, existing tokens will be hashed and all new tokens will be hashed automatically using the SHA256 algorithm. Once a token is hashed it cannot be undone. Once this feature flag is enabled, it cannot be disabled. See [hashing of tokens](../../reference-guides/about-the-api/api-tokens.md) for more information.
-- `unsupported-storage-drivers`: This feature [allows unsupported storage drivers.](../../getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md). In other words, it enables types for storage providers and provisioners that are not enabled by default.
-- `istio-virtual-service-ui`: This feature enables a [UI to create, read, update, and delete Istio virtual services and destination rules,](../../getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md) which are traffic management features of Istio.
+- `token-hashing`: Used to enable new token-hashing feature. Once enabled, existing tokens will be hashed and all new tokens will be hashed automatically using the SHA256 algorithm. Once a token is hashed it cannot be undone. Once this feature flag is enabled, it cannot be disabled. See [hashing of tokens](../../../reference-guides/about-the-api/api-tokens.md) for more information.
+- `unsupported-storage-drivers`: This feature [allows unsupported storage drivers.](../../../how-to-guides/advanced-user-guides/enable-experimental-features/unsupported-storage-drivers.md). In other words, it enables types for storage providers and provisioners that are not enabled by default.
+- `istio-virtual-service-ui`: This feature enables a [UI to create, read, update, and delete Istio virtual services and destination rules,](../../../how-to-guides/advanced-user-guides/enable-experimental-features/istio-traffic-management-features.md) which are traffic management features of Istio.
 - `multi-cluster-management`: Used for multi-cluster provisioning and management of Kubernetes clusters. This feature flag can only be set at install time and not changed afterwards.
 
 The below table shows the availability and default value for feature flags in Rancher:
diff --git a/docs/reference-guides/installation-references/helm-chart-options.md b/docs/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md
similarity index 94%
rename from docs/reference-guides/installation-references/helm-chart-options.md
rename to docs/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md
index 2b67d1ac034..3dc13ccbf95 100644
--- a/docs/reference-guides/installation-references/helm-chart-options.md
+++ b/docs/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md
@@ -4,9 +4,9 @@ title: Rancher Helm Chart Options
 
 This page is a configuration reference for the Rancher Helm chart.
 
-For help choosing a Helm chart version, refer to [this page.](../../getting-started/installation-and-upgrade/resources/choose-a-rancher-version.md)
+For help choosing a Helm chart version, refer to [this page.](../../../getting-started/installation-and-upgrade/resources/choose-a-rancher-version.md)
 
-For information on enabling experimental features, refer to [this page.](../../pages-for-subheaders/enable-experimental-features.md)
+For information on enabling experimental features, refer to [this page.](../../../pages-for-subheaders/enable-experimental-features.md)
 
 ## Common Options
 
@@ -30,7 +30,7 @@ For information on enabling experimental features, refer to [this page.](../../p
 | `antiAffinity`                 | "preferred"                                           | `string` - AntiAffinity rule for Rancher pods - "preferred, required"                                                                             |
 | `auditLog.destination`         | "sidecar"                                             | `string` - Stream to sidecar container console or hostPath volume - "sidecar, hostPath"                                                           |
 | `auditLog.hostPath`            | "/var/log/rancher/audit"                              | `string` - log file destination on host (only applies when `auditLog.destination` is set to `hostPath`)                                           |
-| `auditLog.level`               | 0                                                     | `int` - set the [API Audit Log](../../getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md) level. 0 is off. [0-3]                                   |
+| `auditLog.level`               | 0                                                     | `int` - set the [API Audit Log](../../../how-to-guides/advanced-user-guides/enable-api-audit-log.md) level. 0 is off. [0-3]                                   |
 | `auditLog.maxAge`              | 1                                                     | `int` - maximum number of days to retain old audit log files (only applies when `auditLog.destination` is set to `hostPath`)                      |
 | `auditLog.maxBackup`           | 1                                                     | `int` - maximum number of audit log files to retain (only applies when `auditLog.destination` is set to `hostPath`)                               |
 | `auditLog.maxSize`             | 100                                                   | `int` - maximum size in megabytes of the audit log file before it gets rotated (only applies when `auditLog.destination` is set to `hostPath`)    |
@@ -50,8 +50,8 @@ For information on enabling experimental features, refer to [this page.](../../p
 | `rancherImageTag`              | same as chart version                                 | `string` - rancher/rancher image tag                                                                                                              |
 | `replicas`                     | 3                                                     | `int` - Number of Rancher server replicas. Setting to -1 will dynamically choose 1, 2, or 3 based on the number of available nodes in the cluster.                                                                                                        |
 | `resources`                    | {}                                                    | `map` - rancher pod resource requests & limits                                                                                                    |
-| `restrictedAdmin` | `false` | `bool` - When this option is set to true, the initial Rancher user has restricted access to the local Kubernetes cluster to prevent privilege escalation. For more information, see the section about the [restricted-admin role.](../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md#restricted-admin) |
-| `systemDefaultRegistry`        | ""                                                    | `string` - private registry to be used for all system container images, e.g., registry.example.com                   |
+| `restrictedAdmin` | `false` | `bool` - When this option is set to true, the initial Rancher user has restricted access to the local Kubernetes cluster to prevent privilege escalation. For more information, see the section about the [restricted-admin role.](../../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md#restricted-admin) |
+| `systemDefaultRegistry`        | ""                                                    | `string` - private registry to be used for all system container images, e.g., http://registry.example.com/                   |
 | `tls`                          | "ingress"                                             | `string` - See [External TLS Termination](#external-tls-termination) for details. - "ingress, external"                                           |
 | `useBundledSystemChart`        | `false`                                               | `bool` - select to use the system-charts packaged with Rancher server. This option is used for air gapped installations.  |
 
@@ -75,9 +75,9 @@ kubectl get secret --namespace cattle-system bootstrap-secret -o go-template='{{
 
 ### API Audit Log
 
-Enabling the [API Audit Log](../../getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md)
+Enabling the [API Audit Log](../../how-to-guides/advanced-user-guides/advanced-options/advanced-use-cases/enable-api-audit-log.md)
 
-You can collect this log as you would any container log. Enable [logging](../../pages-for-subheaders/logging.md) for the `System` Project on the Rancher server cluster.
+You can collect this log as you would any container log. Enable [logging](../../../pages-for-subheaders/logging.md) for the `System` Project on the Rancher server cluster.
 
 ```plain
 --set auditLog.level=1
@@ -163,7 +163,7 @@ kubectl -n cattle-system create secret generic tls-ca-additional --from-file=ca-
 
 ### Private Registry and Air Gap Installs
 
-For details on installing Rancher with a private registry, see the [air gap installation docs.](../../pages-for-subheaders/air-gapped-helm-cli-install.md)
+For details on installing Rancher with a private registry, see the [air gap installation docs.](../../../pages-for-subheaders/air-gapped-helm-cli-install.md)
 
 # External TLS Termination
 
@@ -173,7 +173,7 @@ You may terminate the SSL/TLS on a L7 load balancer external to the Rancher clus
 
 :::note
 
-If you are using a Private CA signed certificate, add `--set privateCA=true` and see [Adding TLS Secrets - Using a Private CA Signed Certificate](../../getting-started/installation-and-upgrade/resources/add-tls-secrets.md) to add the CA cert for Rancher.
+If you are using a Private CA signed certificate, add `--set privateCA=true` and see [Adding TLS Secrets - Using a Private CA Signed Certificate](../../../getting-started/installation-and-upgrade/resources/add-tls-secrets.md) to add the CA cert for Rancher.
 
 :::
 
diff --git a/docs/reference-guides/installation-references/tls-settings.md b/docs/getting-started/installation-and-upgrade/installation-references/tls-settings.md
similarity index 100%
rename from docs/reference-guides/installation-references/tls-settings.md
rename to docs/getting-started/installation-and-upgrade/installation-references/tls-settings.md
diff --git a/docs/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md b/docs/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md
index 6fbd61e71c3..3a65daa6dc5 100644
--- a/docs/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md
+++ b/docs/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md
@@ -214,7 +214,7 @@ The required ports are automatically opened by Rancher during creation of cluste
 <details>
   <summary>Click to expand</summary>
 
-The following table depicts the port requirements for [Rancher Launched Kubernetes](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) with [Custom Nodes](../../../pages-for-subheaders/use-existing-nodes.md).
+The following table depicts the port requirements for [Rancher Launched Kubernetes](../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher.md) with [Custom Nodes](../../../pages-for-subheaders/use-existing-nodes.md).
 
 <PortsCustomNodes/>
 
@@ -275,7 +275,7 @@ In these cases, you have to explicitly allow this traffic in your host firewall,
 
 ### Rancher AWS EC2 Security Group
 
-When using the [AWS EC2 node driver](../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md) to provision cluster nodes in Rancher, you can choose to let Rancher create a security group called `rancher-nodes`. The following rules are automatically added to this security group.
+When using the [AWS EC2 node driver](../../../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.mdcreate-an-amazon-ec2-cluster.md) to provision cluster nodes in Rancher, you can choose to let Rancher create a security group called `rancher-nodes`. The following rules are automatically added to this security group.
 
 |       Type      | Protocol |  Port Range | Source/Destination     | Rule Type |
 |-----------------|:--------:|:-----------:|------------------------|:---------:|
diff --git a/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/docker-install-commands.md b/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/docker-install-commands.md
index f6b401ffe23..4d9aad48f16 100644
--- a/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/docker-install-commands.md
+++ b/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/docker-install-commands.md
@@ -36,7 +36,7 @@ Log into your Linux host, and then run the installation command below. When ente
 | Placeholder                      | Description                                                                                                                   |
 | -------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
 | `<REGISTRY.YOURDOMAIN.COM:PORT>` | Your private registry URL and port.                                                                                           |
-| `<RANCHER_VERSION_TAG>`          | The release tag of the [Rancher version](../../../../reference-guides/installation-references/helm-chart-options.md) that you want to install. |
+| `<RANCHER_VERSION_TAG>`          | The release tag of the [Rancher version](../../installation-references/helm-chart-options.md) that you want to install. |
 
 Privileged access is [required.](#privileged-access-for-rancher)
 
@@ -76,7 +76,7 @@ After creating your certificate, log into your Linux host, and then run the inst
 | `<PRIVATE_KEY.pem>`              | The path to the private key for your certificate.                                                                             |
 | `<CA_CERTS.pem>`                     | The path to the certificate authority's certificate.                                                                          |
 | `<REGISTRY.YOURDOMAIN.COM:PORT>` | Your private registry URL and port.                                                                                           |
-| `<RANCHER_VERSION_TAG>`          | The release tag of the [Rancher version](../../../../reference-guides/installation-references/helm-chart-options.md) that you want to install. |
+| `<RANCHER_VERSION_TAG>`          | The release tag of the [Rancher version](../../installation-references/helm-chart-options.md) that you want to install. |
 
 Privileged access is [required.](#privileged-access-for-rancher)
 
@@ -115,7 +115,7 @@ After obtaining your certificate, log into your Linux host, and then run the ins
 | `<FULL_CHAIN.pem>`               | The path to your full certificate chain.                                                                                      |
 | `<PRIVATE_KEY.pem>`              | The path to the private key for your certificate.                                                                             |
 | `<REGISTRY.YOURDOMAIN.COM:PORT>` | Your private registry URL and port.                                                                                           |
-| `<RANCHER_VERSION_TAG>`          | The release tag of the [Rancher version](../../../../reference-guides/installation-references/helm-chart-options.md) that you want to install. |
+| `<RANCHER_VERSION_TAG>`          | The release tag of the [Rancher version](../../installation-references/helm-chart-options.md) that you want to install. |
 
 :::note
 
diff --git a/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md b/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md
index 44fd2c5e337..fb943cce288 100644
--- a/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md
+++ b/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md
@@ -59,7 +59,7 @@ When Rancher is installed (also in a later step), the Rancher system creates an
 For your implementation, consider if you want or need to use a Layer-4 or Layer-7 load balancer:
 
 - **A layer-4 load balancer** is the simpler of the two choices, in which you are forwarding TCP traffic to your nodes. We recommend configuring your load balancer as a Layer 4 balancer, forwarding traffic to ports TCP/80 and TCP/443 to the Rancher management cluster nodes. The Ingress controller on the cluster will redirect HTTP traffic to HTTPS and terminate SSL/TLS on port TCP/443. The Ingress controller will forward traffic to port TCP/80 to the Ingress pod in the Rancher deployment.
-- **A layer-7 load balancer** is a bit more complicated but can offer features that you may want. For instance, a layer-7 load balancer is capable of handling TLS termination at the load balancer, as opposed to Rancher doing TLS termination itself. This can be beneficial if you want to centralize your TLS termination in your infrastructure. Layer-7 load balancing also offers the capability for your load balancer to make decisions based on HTTP attributes such as cookies, etc. that a layer-4 load balancer is not able to concern itself with. If you decide to terminate the SSL/TLS traffic on a layer-7 load balancer, you will need to use the `--set tls=external` option when installing Rancher in a later step. For more information, refer to the [Rancher Helm chart options.](../../../../reference-guides/installation-references/helm-chart-options.md#external-tls-termination)
+- **A layer-7 load balancer** is a bit more complicated but can offer features that you may want. For instance, a layer-7 load balancer is capable of handling TLS termination at the load balancer, as opposed to Rancher doing TLS termination itself. This can be beneficial if you want to centralize your TLS termination in your infrastructure. Layer-7 load balancing also offers the capability for your load balancer to make decisions based on HTTP attributes such as cookies, etc. that a layer-4 load balancer is not able to concern itself with. If you decide to terminate the SSL/TLS traffic on a layer-7 load balancer, you will need to use the `--set tls=external` option when installing Rancher in a later step. For more information, refer to the [Rancher Helm chart options.](../../installation-references/helm-chart-options.md#external-tls-termination)
 
 For an example showing how to set up an NGINX load balancer, refer to [this page.](../../../../how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md)
 
@@ -126,7 +126,7 @@ When Rancher is installed (also in a later step), the Rancher system creates an
 For your implementation, consider if you want or need to use a Layer-4 or Layer-7 load balancer:
 
 - **A layer-4 load balancer** is the simpler of the two choices, in which you are forwarding TCP traffic to your nodes. We recommend configuring your load balancer as a Layer 4 balancer, forwarding traffic to ports TCP/80 and TCP/443 to the Rancher management cluster nodes. The Ingress controller on the cluster will redirect HTTP traffic to HTTPS and terminate SSL/TLS on port TCP/443. The Ingress controller will forward traffic to port TCP/80 to the Ingress pod in the Rancher deployment.
-- **A layer-7 load balancer** is a bit more complicated but can offer features that you may want. For instance, a layer-7 load balancer is capable of handling TLS termination at the load balancer, as opposed to Rancher doing TLS termination itself. This can be beneficial if you want to centralize your TLS termination in your infrastructure. Layer-7 load balancing also offers the capability for your load balancer to make decisions based on HTTP attributes such as cookies, etc. that a layer-4 load balancer is not able to concern itself with. If you decide to terminate the SSL/TLS traffic on a layer-7 load balancer, you will need to use the `--set tls=external` option when installing Rancher in a later step. For more information, refer to the [Rancher Helm chart options.](../../../../reference-guides/installation-references/helm-chart-options.md#external-tls-termination)
+- **A layer-7 load balancer** is a bit more complicated but can offer features that you may want. For instance, a layer-7 load balancer is capable of handling TLS termination at the load balancer, as opposed to Rancher doing TLS termination itself. This can be beneficial if you want to centralize your TLS termination in your infrastructure. Layer-7 load balancing also offers the capability for your load balancer to make decisions based on HTTP attributes such as cookies, etc. that a layer-4 load balancer is not able to concern itself with. If you decide to terminate the SSL/TLS traffic on a layer-7 load balancer, you will need to use the `--set tls=external` option when installing Rancher in a later step. For more information, refer to the [Rancher Helm chart options.](../../installation-references/helm-chart-options.md#external-tls-termination)
 
 For an example showing how to set up an NGINX load balancer, refer to [this page.](../../../../how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md)
 
diff --git a/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md b/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md
index 85ebbf1324a..f3fb0cfd85b 100644
--- a/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md
+++ b/docs/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md
@@ -22,7 +22,7 @@ From a system that has access to the internet, fetch the latest Helm chart and c
 
 1. If you haven't already, install `helm` locally on a workstation that has internet access. Note: Refer to the [Helm version requirements](../../resources/helm-version-requirements.md) to choose a version of Helm to install Rancher.
 
-2. Use `helm repo add` command to add the Helm chart repository that contains charts to install Rancher. For more information about the repository choices and which is best for your use case, see [Choosing a Version of Rancher](../../../../reference-guides/installation-references/helm-chart-options.md#helm-chart-repositories).
+2. Use `helm repo add` command to add the Helm chart repository that contains charts to install Rancher. For more information about the repository choices and which is best for your use case, see [Choosing a Version of Rancher](../../installation-references/helm-chart-options.md#helm-chart-repositories).
     - Latest: Recommended for trying out the newest features
         ```
         helm repo add rancher-latest https://releases.rancher.com/server-charts/latest
@@ -55,7 +55,7 @@ When Rancher is installed on an air gapped Kubernetes cluster, there are two rec
 
 :::note
 
-If you want terminate SSL/TLS externally, see [TLS termination on an External Load Balancer](../../../../reference-guides/installation-references/helm-chart-options.md#external-tls-termination).
+If you want terminate SSL/TLS externally, see [TLS termination on an External Load Balancer](../../installation-references/helm-chart-options.md#external-tls-termination).
 
 :::
 
@@ -258,6 +258,6 @@ If you don't intend to send telemetry data, opt out [telemetry](../../../../faq/
 
 These resources could be helpful when installing Rancher:
 
-- [Rancher Helm chart options](../../../../reference-guides/installation-references/helm-chart-options.md)
+- [Rancher Helm chart options](../../installation-references/helm-chart-options.md)
 - [Adding TLS secrets](../../resources/add-tls-secrets.md)
 - [Troubleshooting Rancher Kubernetes Installations](../../install-upgrade-on-a-kubernetes-cluster/troubleshooting.md)
diff --git a/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md b/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md
index 52c59805f35..a4b901e0794 100644
--- a/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md
+++ b/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md
@@ -95,6 +95,6 @@ If you don't intend to send telemetry data, opt out [telemetry](../../../../faq/
 
 These resources could be helpful when installing Rancher:
 
-- [Rancher Helm chart options](../../../../reference-guides/installation-references/helm-chart-options.md)
+- [Rancher Helm chart options](../../installation-references/helm-chart-options.md)
 - [Adding TLS secrets](../../resources/add-tls-secrets.md)
 - [Troubleshooting Rancher Kubernetes Installations](../../install-upgrade-on-a-kubernetes-cluster/troubleshooting.md)
diff --git a/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md b/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md
index bf4c69b69f9..81e6da13c61 100644
--- a/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md
+++ b/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md
@@ -37,7 +37,7 @@ When Rancher is installed (also in a later step), the Rancher system creates an
 For your implementation, consider if you want or need to use a Layer-4 or Layer-7 load balancer:
 
 - **A layer-4 load balancer** is the simpler of the two choices, in which you are forwarding TCP traffic to your nodes. We recommend configuring your load balancer as a Layer 4 balancer, forwarding traffic to ports TCP/80 and TCP/443 to the Rancher management cluster nodes. The Ingress controller on the cluster will redirect HTTP traffic to HTTPS and terminate SSL/TLS on port TCP/443. The Ingress controller will forward traffic to port TCP/80 to the Ingress pod in the Rancher deployment.
-- **A layer-7 load balancer** is a bit more complicated but can offer features that you may want. For instance, a layer-7 load balancer is capable of handling TLS termination at the load balancer, as opposed to Rancher doing TLS termination itself. This can be beneficial if you want to centralize your TLS termination in your infrastructure. Layer-7 load balancing also offers the capability for your load balancer to make decisions based on HTTP attributes such as cookies, etc. that a layer-4 load balancer is not able to concern itself with. If you decide to terminate the SSL/TLS traffic on a layer-7 load balancer, you will need to use the `--set tls=external` option when installing Rancher in a later step. For more information, refer to the [Rancher Helm chart options.](../../../../reference-guides/installation-references/helm-chart-options.md#external-tls-termination)
+- **A layer-7 load balancer** is a bit more complicated but can offer features that you may want. For instance, a layer-7 load balancer is capable of handling TLS termination at the load balancer, as opposed to Rancher doing TLS termination itself. This can be beneficial if you want to centralize your TLS termination in your infrastructure. Layer-7 load balancing also offers the capability for your load balancer to make decisions based on HTTP attributes such as cookies, etc. that a layer-4 load balancer is not able to concern itself with. If you decide to terminate the SSL/TLS traffic on a layer-7 load balancer, you will need to use the `--set tls=external` option when installing Rancher in a later step. For more information, refer to the [Rancher Helm chart options.](../../installation-references/helm-chart-options.md#external-tls-termination)
 
 For an example showing how to set up an NGINX load balancer, refer to [this page.](../../../../how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md)
 
diff --git a/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md b/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md
index 751866de062..50307440b61 100644
--- a/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md
+++ b/docs/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md
@@ -15,7 +15,7 @@ The following instructions will guide you through upgrading a Rancher server tha
 
 ## Prerequisites
 
-- **Review the [known upgrade issues](../../install-upgrade-on-a-kubernetes-cluster/upgrades.md#known-upgrade-issues)** section in the Rancher documentation for the most noteworthy issues to consider when upgrading Rancher. A more complete list of known issues for each Rancher version can be found in the release notes on [GitHub](https://github.com/rancher/rancher/releases) and on the [Rancher forums](https://forums.rancher.com/c/announcements/12). Note that upgrades to or from any chart in the [rancher-alpha repository](../../../../reference-guides/installation-references/helm-chart-options.md#helm-chart-repositories/) aren’t supported.
+- **Review the [known upgrade issues](../../install-upgrade-on-a-kubernetes-cluster/upgrades.md#known-upgrade-issues)** section in the Rancher documentation for the most noteworthy issues to consider when upgrading Rancher. A more complete list of known issues for each Rancher version can be found in the release notes on [GitHub](https://github.com/rancher/rancher/releases) and on the [Rancher forums](https://forums.rancher.com/c/announcements/12). Note that upgrades to or from any chart in the [rancher-alpha repository](../../../../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#helm-chart-repositories/) aren’t supported.
 - **For [air gap installs only,](../../../../pages-for-subheaders/air-gapped-helm-cli-install.md) collect and populate images for the new Rancher server version**. Follow the guide to [populate your private registry](../air-gapped-helm-cli-install/publish-images.md) with the images for the Rancher version that you want to upgrade to.
 
 ## Placeholder Review
@@ -99,7 +99,7 @@ Pull the image of the Rancher version that you want to upgrade to.
 
 Placeholder | Description
 ------------|-------------
-`<RANCHER_VERSION_TAG>` | The release tag of the [Rancher version](../../../../reference-guides/installation-references/helm-chart-options.md) that you want to upgrade to.
+`<RANCHER_VERSION_TAG>` | The release tag of the [Rancher version](../../installation-references/helm-chart-options.md) that you want to upgrade to.
 
 ```
 docker pull rancher/rancher:<RANCHER_VERSION_TAG>
@@ -140,7 +140,7 @@ If you have selected to use the Rancher generated self-signed certificate, you a
 
 Placeholder | Description
 ------------|-------------
-`<RANCHER_VERSION_TAG>` | The release tag of the [Rancher version](../../../../reference-guides/installation-references/helm-chart-options.md) that you want to upgrade to.
+`<RANCHER_VERSION_TAG>` | The release tag of the [Rancher version](../../installation-references/helm-chart-options.md) that you want to upgrade to.
 
 ```
 docker run -d --volumes-from rancher-data \
@@ -173,7 +173,7 @@ Placeholder | Description
 `<FULL_CHAIN.pem>` | The path to your full certificate chain.
 `<PRIVATE_KEY.pem>` | The path to the private key for your certificate.
 `<CA_CERTS.pem>` | The path to the certificate authority's certificate.
-`<RANCHER_VERSION_TAG>` | The release tag of the [Rancher version](../../../../reference-guides/installation-references/helm-chart-options.md) that you want to upgrade to.
+`<RANCHER_VERSION_TAG>` | The release tag of the [Rancher version](../../installation-references/helm-chart-options.md) that you want to upgrade to.
 
 ```
 docker run -d --volumes-from rancher-data \
@@ -208,7 +208,7 @@ Placeholder | Description
 `<CERT_DIRECTORY>` | The path to the directory containing your certificate files.
 `<FULL_CHAIN.pem>` | The path to your full certificate chain.
 `<PRIVATE_KEY.pem>` | The path to the private key for your certificate.
-`<RANCHER_VERSION_TAG>` | The release tag of the [Rancher version](../../../../reference-guides/installation-references/helm-chart-options.md) that you want to upgrade to.
+`<RANCHER_VERSION_TAG>` | The release tag of the [Rancher version](../../installation-references/helm-chart-options.md) that you want to upgrade to.
 
 ```
 docker run -d --volumes-from rancher-data \
@@ -246,7 +246,7 @@ If you have selected to use [Let's Encrypt](https://letsencrypt.org/) certificat
 
 Placeholder | Description
 ------------|-------------
-`<RANCHER_VERSION_TAG>` | The release tag of the [Rancher version](../../../../reference-guides/installation-references/helm-chart-options.md) that you want to upgrade to.
+`<RANCHER_VERSION_TAG>` | The release tag of the [Rancher version](../../installation-references/helm-chart-options.md) that you want to upgrade to.
 `<YOUR.DNS.NAME>` | The domain address that you had originally started with
 
 ```
@@ -279,7 +279,7 @@ If you have selected to use the Rancher generated self-signed certificate, you a
 Placeholder | Description
 ------------|-------------
 `<REGISTRY.YOURDOMAIN.COM:PORT>` |  Your private registry URL and port.
-`<RANCHER_VERSION_TAG>` | The release tag of the [Rancher version](../../../../reference-guides/installation-references/helm-chart-options.md) that you want to to upgrade to.
+`<RANCHER_VERSION_TAG>` | The release tag of the [Rancher version](../../installation-references/helm-chart-options.md) that you want to to upgrade to.
 
 ```
   docker run -d --volumes-from rancher-data \
@@ -314,7 +314,7 @@ Placeholder | Description
 `<PRIVATE_KEY.pem>` | The path to the private key for your certificate.
 `<CA_CERTS.pem>` | The path to the certificate authority's certificate.
 `<REGISTRY.YOURDOMAIN.COM:PORT>` | Your private registry URL and port.
-`<RANCHER_VERSION_TAG>` | The release tag of the [Rancher version](../../../../reference-guides/installation-references/helm-chart-options.md) that you want to upgrade to.
+`<RANCHER_VERSION_TAG>` | The release tag of the [Rancher version](../../installation-references/helm-chart-options.md) that you want to upgrade to.
 
 ```
 docker run -d --restart=unless-stopped \
@@ -349,7 +349,7 @@ Placeholder | Description
 `<FULL_CHAIN.pem>` | The path to your full certificate chain.
 `<PRIVATE_KEY.pem>` | The path to the private key for your certificate.
 `<REGISTRY.YOURDOMAIN.COM:PORT>` | Your private registry URL and port.
-`<RANCHER_VERSION_TAG>` | The release tag of the [Rancher version](../../../../reference-guides/installation-references/helm-chart-options.md) that you want to upgrade to.
+`<RANCHER_VERSION_TAG>` | The release tag of the [Rancher version](../../installation-references/helm-chart-options.md) that you want to upgrade to.
 
 :::note
 
diff --git a/docs/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md b/docs/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md
index 5d5dee35d7c..8b90b9dc93d 100644
--- a/docs/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md
+++ b/docs/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md
@@ -20,5 +20,5 @@ For details on starting a Rancher container with your private CA certificates mo
 
 - [Docker install Custom CA certificate options](../../../reference-guides/single-node-rancher-in-docker/advanced-options.md#custom-ca-certificate)
 
-- [Kubernetes install options for Additional Trusted CAs](../../../reference-guides/installation-references/helm-chart-options.md#additional-trusted-cas)
+- [Kubernetes install options for Additional Trusted CAs](../installation-references/helm-chart-options.md#additional-trusted-cas)
 
diff --git a/docs/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md b/docs/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md
index f42e13ac575..825c1af2d68 100644
--- a/docs/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md
+++ b/docs/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md
@@ -82,7 +82,7 @@ To enable draining each node during a cluster upgrade,
 1. On the **Clusters** page, go to the cluster you want to enable node draining and click **⋮ > Edit Config**.
 1. Click **⋮ > Edit**.
 1. In the **Upgrade Strategy** tab, go to the **Drain nodes** field and click **Yes**. Node draining is configured separately for control plane and worker nodes.
-1. Configure the options for how pods are deleted. For more information about each option, refer to [this section.](../../how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md#aggressive-and-safe-draining-options)
+1. Configure the options for how pods are deleted. For more information about each option, refer to [this section.](../../how-to-guides/new-user-guides/manage-clusters/nodes-and-node-pools.md#aggressive-and-safe-draining-options)
 1. Optionally, configure a grace period. The grace period is the timeout given to each pod for cleaning things up, so they will have chance to exit gracefully. Pods might need to finish any outstanding requests, roll back transactions or save state to some external storage. If this value is negative, the default value specified in the pod will be used.
 1. Optionally, configure a timeout, which is the amount of time the drain should continue to wait before giving up.
 1. Click **Save**.
diff --git a/docs/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md b/docs/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md
index 3c945df1359..75b07f0ee3f 100644
--- a/docs/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md
+++ b/docs/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md
@@ -10,7 +10,7 @@ The Kubernetes API can change between minor versions. Therefore, we don't suppor
 
 :::
 
-Rancher's Kubernetes metadata contains information specific to the Kubernetes version that Rancher uses to provision [RKE clusters](../../pages-for-subheaders/launch-kubernetes-with-rancher.md). Rancher syncs the data periodically and creates custom resource definitions (CRDs) for **system images,** **service options** and **addon templates**. Consequently, when a new Kubernetes version is compatible with the Rancher server version, the Kubernetes metadata makes the new version available to Rancher for provisioning clusters. The metadata gives you an overview of the information that the [Rancher Kubernetes Engine](https://rancher.com/docs/rke/latest/en/) (RKE) uses for deploying various Kubernetes versions.
+Rancher's Kubernetes metadata contains information specific to the Kubernetes version that Rancher uses to provision [RKE clusters](../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher.md). Rancher syncs the data periodically and creates custom resource definitions (CRDs) for **system images,** **service options** and **addon templates**. Consequently, when a new Kubernetes version is compatible with the Rancher server version, the Kubernetes metadata makes the new version available to Rancher for provisioning clusters. The metadata gives you an overview of the information that the [Rancher Kubernetes Engine](https://rancher.com/docs/rke/latest/en/) (RKE) uses for deploying various Kubernetes versions.
 
 This table below describes the CRDs that are affected by the periodic data sync.
 
@@ -34,7 +34,7 @@ Administrators might configure the RKE metadata settings to do the following:
 
 ### Refresh Kubernetes Metadata
 
-The option to refresh the Kubernetes metadata is available for administrators by default, or for any user who has the **Manage Cluster Drivers** [global role.](../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)
+The option to refresh the Kubernetes metadata is available for administrators by default, or for any user who has the **Manage Cluster Drivers** [global role.](../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)
 
 To force Rancher to refresh the Kubernetes metadata, a manual refresh action is available:
 
diff --git a/docs/getting-started/introduction/what-are-divio-docs.md b/docs/getting-started/introduction/what-are-divio-docs.md
deleted file mode 100644
index 1d478a54c6d..00000000000
--- a/docs/getting-started/introduction/what-are-divio-docs.md
+++ /dev/null
@@ -1,98 +0,0 @@
----
-title: What Are Divio Docs?
----
-
-The [Divio documentation system](https://documentation.divio.com/) is a software documentation paradigm that is based on functionality and the premise that the best documentation is specific, concise, and purposeful. Divio traditionally consists of four main categories: tutorials, how-to guides, reference guides, and explanations. 
-
-In our docs, we have used this guideline to craft a unique set of docs which include [getting started](../../getting-started.md), [how-to guides](../../how-to-guides.md) (including [new](../../pages-for-subheaders/new-user-guides.md) and [advanced user guides](../../pages-for-subheaders/advanced-user-guides.md)), [reference guides](../../reference-guides.md), [explanations](../../explanations.md), an [FAQ section](../../faq.md), [troubleshooting tips](../../troubleshooting.md), and the ability to [contribute to Rancher](../../contribute-to-rancher.md). 
-
-
-## Getting Started
-
-To get up and running with Rancher quickly, we have included a **Getting Started** section.
-
-The goal of this section is to be able to assist users in deploying Rancher and workloads and to install or upgrade Rancher quickly and effectively.
-
-Please see the [introduction](../../pages-for-subheaders/introduction.md), [quick start guides](../../pages-for-subheaders/quick-start-guides.md), and the [installation and upgrade](../../pages-for-subheaders/installation-and-upgrade.md) sections for more.
-
-## How-to Guides
-
-How-to guides serve to describe practical steps for users to accomplish some task. In Rancher, we break down how-to guides further into [new user guides](#new-user-guides) and [advanced user guides](#advanced-user-guides).
-
-### New User Guides 
-
-New user guides, also known as tutorials, describe practical steps for users to follow in order to complete some concrete action. These docs are known as "learning-oriented" docs in which users learn by "doing".
-
-The new user guides are designed to guide beginners, or the everyday users of Rancher, through a series of steps to learn how to do something. The goal is that the user will be able to learn how to complete tasks by using easy-to-follow, meaningful, and repeatable directions. These guides will assist users to do work to then get the promised results immediately.
-
-The average Rancher user has a level of technical skill that is above the level of "beginner"; however, the new user guides are designed to help new, or beginner, users as well as the seasoned Rancher customer equally. This is accomplished by using a combination of high-level and technical language to introduce topics and guide the user through general tasks that are essential for every Rancher user to know.
-
-A good example of a new user guide can be found [here](../../how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md).
-
-### Advanced User Guides
-
-Advanced user guides are "problem-oriented" docs in which users learn how to answer questions or solve problems. The major difference between these and the new user guides is that these guides are geared toward more experienced or advanced users who have more technical needs from their documentation. These users already have an understanding of Rancher and its functions. They know what they need to accomplish; they just need additional guidance to complete some more complex task they have encountered while working.
-
-It should be noted that neither new user guides nor advanced user guides provide detailed explanations or discussions (these kinds of docs belong elsewhere). How-to guides focus on the action of guiding users through repeatable, effective steps to learn new skills, master some task, or overcome some problem.
-
-A good example of an advanced user guide can be found [here](../../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md).
-
-## Reference Guides
-
-Reference guides are technical descriptions of processes or products that users can study. Reference guides are designed to be "information-oriented" and their primary function is to describe.
-
-These docs may also include some usage steps in the course of description; however, their purpose is not to explain concepts nor to outline steps to achieve tasks. 
-
-The users who utilize reference guides are knowledgeable with the Rancher product as well as how to use it. They will benefit from detailed descriptions of something to be used when needing to refer to specifics of usage.
-
-Good examples of Rancher reference guides would be the [Rancher Manager architecture](../../pages-for-subheaders/rancher-manager-architecture.md) and [cluster configuration guides](../../pages-for-subheaders/cluster-configuration.md).
-
-## Explanations
-
-Explanation docs are concerned primarily with providing theoretical knowledge for the "why" behind a task or a topic. Explanations are "understanding-oriented" in nature and will clarify a topic in order to broaden the user's knowledge. In this section, users can find additional context and background, alternatives or even opinions on topics, and often historical reasons, constraints, and insights into why a process works the way that it does.
-
-Explanatory docs do not instruct the user how to do something, as in tutorials and how-to guides, nor do they give detailed descriptions as references do. Explanations serve to give substance and background on both simple and complex topics.
-
-For our new docs, we are working to build up this section as most of our previous documentation was process-oriented rather than discussion-oriented. Currently, we feature [Integrations in Rancher](../../pages-for-subheaders/integrations-in-rancher.md) to discuss our integrated products.
-
-### Integrations in Rancher
-
-Over time, Rancher has accrued several products and projects that have been integrated into the Rancher UI. To assist users in learning more about these integrations, this subsection has been added under **Explanations**. 
-
-Examples of some of these integrations are [Harvester](../../explanations/integrations-in-rancher/harvester.md) and [NeuVector](../../explanations/integrations-in-rancher/neuvector.md). 
-
-## Other Docs Categories
-
-### FAQ
-
-Our [FAQ](../../faq.md) section is designed to answer the questions our users have been most often asking about Rancher v2.x. The nature of these questions may be technical or non-technical.
-
-We work to continually add to and enhance this section; check back frequently for updates.
-
-### Troubleshooting
-
-The [troubleshooting section](../../troubleshooting.md) is designed to help both new and existing Rancher users to troubleshoot known issues that they may encounter when using Rancher.
-
-We work to continually add to and enhance this section; check back frequently for updates.
-
-### Contribute to Rancher
-
-The Rancher Manager documentation is always a work-in-progress; the docs work best when being constantly examined, updated, and improved upon. To do this more effectively, we call upon the community to assist us.
-
-This [contributing to Rancher section](../../contribute-to-rancher.md) will instruct users on the repositories used for Rancher, how to build the repositories, and what information is needed when filing an issue or creating a pull request. 
-
-We review all contributions frequently and will provide feedback to contributors promptly.
-
-## Overlapping of Categories
-
-You may have noticed that within the confines of each category - new user guides, advanced user guides, references - there is some overlap. This is true because the flow of information is fluid, and so often docs will include data that could logically fall under more than one category. Although there is the tendency for our docs to overlap somewhat, if we keep in mind the primary functions of each category and work to make those distinct, then the documentation will be much clearer and useful for users.
-
-## New Structure Goals
-
-Our previous Rancher documentation focused on individual features and topics; the new Divio paradigm prioritizes function and cohesion. 
-
-Because the previous docs structure was not based on the Divio paradigm, not every doc as it is written currently will fall neatly into a user guide or a reference, for example. Some docs may include elements of several kind of documentation functions.
-
-As such, we have worked to move our existing documentation into the new paradigm based on each doc's function. Moving forward, we will be creating, rewriting, and reshaping our docs as needed to more closely align with the Divio structure, purpose, and its design concepts. 
-
-Ultimately, the finished product will much more cohesively and effectively assist our users by emphasizing functionality over individual topic or feature-based docs.
diff --git a/docs/getting-started/introduction/overview.md b/docs/getting-started/overview.md
similarity index 65%
rename from docs/getting-started/introduction/overview.md
rename to docs/getting-started/overview.md
index 247598c0a0a..8b3888e2150 100644
--- a/docs/getting-started/introduction/overview.md
+++ b/docs/getting-started/overview.md
@@ -30,21 +30,21 @@ The Rancher API server is built on top of an embedded Kubernetes API server and
 
 ### Authorization and Role-Based Access Control
 
-- **User management:** The Rancher API server [manages user identities](../../pages-for-subheaders/about-authentication.md) that correspond to external authentication providers like Active Directory or GitHub, in addition to local users.
-- **Authorization:** The Rancher API server manages [access control](../../pages-for-subheaders/manage-role-based-access-control-rbac.md) and [security](../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md) policies.
+- **User management:** The Rancher API server [manages user identities](../pages-for-subheaders/authentication-config.md) that correspond to external authentication providers like Active Directory or GitHub, in addition to local users.
+- **Authorization:** The Rancher API server manages [access control](../pages-for-subheaders/manage-role-based-access-control-rbac.md) and [security](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md) policies.
 
 ### Working with Kubernetes
 
-- **Provisioning Kubernetes clusters:** The Rancher API server can [provision Kubernetes](../../pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md) on existing nodes, or perform [Kubernetes upgrades.](../installation-and-upgrade/upgrade-and-roll-back-kubernetes.md)
-- **Catalog management:** Rancher provides the ability to use a [catalog of Helm charts](../../pages-for-subheaders/helm-charts-in-rancher.md) that make it easy to repeatedly deploy applications.
-- **Managing projects:** A project is a group of multiple namespaces and access control policies within a cluster. A project is a Rancher concept, not a Kubernetes concept, which allows you to manage multiple namespaces as a group and perform Kubernetes operations in them. The Rancher UI provides features for [project administration](../../pages-for-subheaders/manage-projects.md) and for [managing applications within projects.](../../pages-for-subheaders/kubernetes-resources-setup.md)
-- **Fleet Continuous Delivery:** Within Rancher, you can leverage [Fleet Continuous Delivery](../../pages-for-subheaders/fleet-gitops-at-scale.md) to deploy applications from git repositories, without any manual operation, to targeted downstream Kubernetes clusters.
-- **Istio:** Our [integration with Istio](../../pages-for-subheaders/istio.md) is designed so that a Rancher operator, such as an administrator or cluster owner, can deliver Istio to developers. Then developers can use Istio to enforce security policies, troubleshoot problems, or manage traffic for green/blue deployments, canary deployments, or A/B testing.
+- **Provisioning Kubernetes clusters:** The Rancher API server can [provision Kubernetes](../pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md) on existing nodes, or perform [Kubernetes upgrades.](installation-and-upgrade/upgrade-and-roll-back-kubernetes.md)
+- **Catalog management:** Rancher provides the ability to use a [catalog of Helm charts](../pages-for-subheaders/helm-charts-in-rancher.md) that make it easy to repeatedly deploy applications.
+- **Managing projects:** A project is a group of multiple namespaces and access control policies within a cluster. A project is a Rancher concept, not a Kubernetes concept, which allows you to manage multiple namespaces as a group and perform Kubernetes operations in them. The Rancher UI provides features for [project administration](../pages-for-subheaders/manage-projects.md) and for [managing applications within projects.](../pages-for-subheaders/kubernetes-resources-setup.md)
+- **Fleet Continuous Delivery:** Within Rancher, you can leverage [Fleet Continuous Delivery](../pages-for-subheaders/fleet-gitops-at-scale.md) to deploy applications from git repositories, without any manual operation, to targeted downstream Kubernetes clusters.
+- **Istio:** Our [integration with Istio](../pages-for-subheaders/istio.md) is designed so that a Rancher operator, such as an administrator or cluster owner, can deliver Istio to developers. Then developers can use Istio to enforce security policies, troubleshoot problems, or manage traffic for green/blue deployments, canary deployments, or A/B testing.
 
 ### Working with Cloud Infrastructure
 
-- **Tracking nodes:** The Rancher API server tracks identities of all the [nodes](../../how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md) in all clusters.
-- **Setting up infrastructure:**  When configured to use a cloud provider, Rancher can dynamically provision [new nodes](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md) and [persistent storage](../../pages-for-subheaders/create-kubernetes-persistent-storage.md) in the cloud.
+- **Tracking nodes:** The Rancher API server tracks identities of all the [nodes](../how-to-guides/new-user-guides/manage-clusters/nodes-and-node-pools.md) in all clusters.
+- **Setting up infrastructure:**  When configured to use a cloud provider, Rancher can dynamically provision [new nodes](../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md) and [persistent storage](../pages-for-subheaders/create-kubernetes-persistent-storage.md) in the cloud.
 
 ### Cluster Visibility
 
@@ -54,12 +54,12 @@ The Rancher API server is built on top of an embedded Kubernetes API server and
 
 # Editing Downstream Clusters with Rancher
 
-The options and settings available for an existing cluster change based on the method that you used to provision it. For example, only clusters [provisioned by RKE](../../pages-for-subheaders/launch-kubernetes-with-rancher.md) have **Cluster Options** available for editing.
+The options and settings available for an existing cluster change based on the method that you used to provision it. For example, only clusters [provisioned by RKE](../pages-for-subheaders/launch-kubernetes-with-rancher.md) have **Cluster Options** available for editing.
 
-After a cluster is created with Rancher, a cluster administrator can manage cluster membership, enable pod security policies, and manage node pools, among [other options.](../../pages-for-subheaders/cluster-configuration.md)
+After a cluster is created with Rancher, a cluster administrator can manage cluster membership, enable pod security policies, and manage node pools, among [other options.](../pages-for-subheaders/cluster-configuration.md)
 
 The following table summarizes the options and settings available for each cluster type:
 
-import ClusterCapabilitiesTable from '../../shared-files/_cluster-capabilities-table.md';
+import ClusterCapabilitiesTable from '../shared-files/_cluster-capabilities-table.md';
 
 <ClusterCapabilitiesTable />
diff --git a/docs/how-to-guides.md b/docs/how-to-guides.md
deleted file mode 100644
index 87165f2a758..00000000000
--- a/docs/how-to-guides.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: How-to Guides
----
-
-**How-to guides** serve to describe practical steps for users to accomplish some task. In Rancher, we break down how-to guides further into [new user guides](./pages-for-subheaders/new-user-guides.md) and [advanced user guides](./pages-for-subheaders/advanced-user-guides.md).
diff --git a/docs/how-to-guides/advanced-user-guides/cis-scan-guides/create-a-custom-benchmark-version-to-run.md b/docs/how-to-guides/advanced-user-guides/cis-scan-guides/create-a-custom-benchmark-version-to-run.md
index f79edaee991..a0f1d181ec8 100644
--- a/docs/how-to-guides/advanced-user-guides/cis-scan-guides/create-a-custom-benchmark-version-to-run.md
+++ b/docs/how-to-guides/advanced-user-guides/cis-scan-guides/create-a-custom-benchmark-version-to-run.md
@@ -6,4 +6,4 @@ There could be some Kubernetes cluster setups that require custom configurations
 
 It is now possible to create a custom Benchmark Version for running a cluster scan using the `rancher-cis-benchmark` application.
 
-For details, see [this page.](../../../explanations/integrations-in-rancher/cis-scans/custom-benchmark.md)
\ No newline at end of file
+For details, see [this page.](../../../integrations-in-rancher/cis-scans/custom-benchmark.md)
\ No newline at end of file
diff --git a/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md b/docs/how-to-guides/advanced-user-guides/configure-layer-7-nginx-load-balancer.md
similarity index 87%
rename from docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md
rename to docs/how-to-guides/advanced-user-guides/configure-layer-7-nginx-load-balancer.md
index 07e5320f516..041d7978b66 100644
--- a/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md
+++ b/docs/how-to-guides/advanced-user-guides/configure-layer-7-nginx-load-balancer.md
@@ -10,14 +10,14 @@ This install procedure walks you through deployment of Rancher using a single co
 
 ## Requirements for OS, Docker, Hardware, and Networking
 
-Make sure that your node fulfills the general [installation requirements.](../../../../pages-for-subheaders/installation-requirements.md)
+Make sure that your node fulfills the general [installation requirements.](../../pages-for-subheaders/installation-requirements.md)
 
 ## Installation Outline
 
 
 ## 1. Provision Linux Host
 
-Provision a single Linux host according to our [Requirements](../../../../pages-for-subheaders/installation-requirements.md) to launch your Rancher Server.
+Provision a single Linux host according to our [Requirements](../../pages-for-subheaders/installation-requirements.md) to launch your Rancher Server.
 
 ## 2. Choose an SSL Option and Install Rancher
 
@@ -165,15 +165,15 @@ http {
 
 ## What's Next?
 
-- **Recommended:** Review Single Node [Backup](../../../../how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md) and [Restore](../../../../how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher.md). Although you don't have any data you need to back up right now, we recommend creating backups after regular Rancher use.
-- Create a Kubernetes cluster: [Provisioning Kubernetes Clusters](../../../../pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md).
+- **Recommended:** Review Single Node [Backup](../../how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md) and [Restore](../../how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher.md). Although you don't have any data you need to back up right now, we recommend creating backups after regular Rancher use.
+- Create a Kubernetes cluster: [Provisioning Kubernetes Clusters](../../pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md).
 
 <br/>
 
 ## FAQ and Troubleshooting
 
-For help troubleshooting certificates, see [this section.](../../other-installation-methods/rancher-on-a-single-node-with-docker/certificate-troubleshooting.md)
-
+For help troubleshooting certificates, see [this section.](../../getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/certificate-troubleshooting.md)
+[](../)
 ## Advanced Options
 
 ### API Auditing
@@ -188,7 +188,7 @@ If you want to record all transactions with the Rancher API, enable the [API Aud
 
 ### Air Gap
 
-If you are visiting this page to complete an [Air Gap Installation](../../../../pages-for-subheaders/air-gapped-helm-cli-install.md), you must pre-pend your private registry URL to the server tag when running the installation command in the option that you choose. Add `<REGISTRY.DOMAIN.COM:PORT>` with your private registry URL in front of `rancher/rancher:latest`.
+If you are visiting this page to complete an [Air Gap Installation](../../pages-for-subheaders/air-gapped-helm-cli-install.md), you must pre-pend your private registry URL to the server tag when running the installation command in the option that you choose. Add `<REGISTRY.DOMAIN.COM:PORT>` with your private registry URL in front of `rancher/rancher:latest`.
 
 **Example:**
 
@@ -208,7 +208,7 @@ docker run -d --restart=unless-stopped \
   rancher/rancher:latest
 ```
 
-As of Rancher v2.5, privileged access is [required.](../../../../pages-for-subheaders/rancher-on-a-single-node-with-docker.md#privileged-access-for-rancher-v2-5)
+As of Rancher v2.5, privileged access is [required.](../../pages-for-subheaders/rancher-on-a-single-node-with-docker.md#privileged-access-for-rancher-v2-5)
 
 This layer 7 NGINX configuration is tested on NGINX version 1.13 (mainline) and 1.14 (stable).
 
diff --git a/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md b/docs/how-to-guides/advanced-user-guides/enable-api-audit-log.md
similarity index 98%
rename from docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md
rename to docs/how-to-guides/advanced-user-guides/enable-api-audit-log.md
index 1500401eeb4..0e46c8a486c 100644
--- a/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md
+++ b/docs/how-to-guides/advanced-user-guides/enable-api-audit-log.md
@@ -10,9 +10,9 @@ You can enable API Auditing during Rancher installation or upgrade.
 
 The Audit Log is enabled and configured by passing environment variables to the Rancher server container. See the following to enable on your installation.
 
-- [Docker Install](../../../../reference-guides/single-node-rancher-in-docker/advanced-options.md#api-audit-log)
+- [Docker Install](../../reference-guides/single-node-rancher-in-docker/advanced-options.md#api-audit-log)
 
-- [Kubernetes Install](../../../../reference-guides/installation-references/helm-chart-options.md#api-audit-log)
+- [Kubernetes Install](../../reference-guides/installation-references/helm-chart-options.md#api-audit-log)
 
 ## API Audit Log Options
 
@@ -59,7 +59,7 @@ kubectl -n cattle-system logs -f rancher-84d886bdbb-s4s69 rancher-audit-log
 
 #### Shipping the Audit Log
 
-You can enable Rancher's built in log collection and shipping for the cluster to ship the audit and other services logs to a supported collection endpoint. See [Rancher Tools - Logging](../../../../pages-for-subheaders/logging.md) for details.
+You can enable Rancher's built in log collection and shipping for the cluster to ship the audit and other services logs to a supported collection endpoint. See [Rancher Tools - Logging](../../pages-for-subheaders/logging.md) for details.
 
 ## Audit Log Samples
 
diff --git a/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/continuous-delivery.md b/docs/how-to-guides/advanced-user-guides/enable-experimental-features/continuous-delivery.md
similarity index 58%
rename from docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/continuous-delivery.md
rename to docs/how-to-guides/advanced-user-guides/enable-experimental-features/continuous-delivery.md
index f95d0f737fc..b9c7a1383ee 100644
--- a/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/continuous-delivery.md
+++ b/docs/how-to-guides/advanced-user-guides/enable-experimental-features/continuous-delivery.md
@@ -2,9 +2,9 @@
 title: Continuous Delivery
 ---
 
-As of Rancher v2.5, [Fleet](../../../../how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md) comes preinstalled in Rancher, and as of Rancher v2.6, Fleet can no longer be fully disabled. However, the Fleet feature for GitOps continuous delivery may be disabled using the `continuous-delivery` feature flag.
+As of Rancher v2.5, [Fleet](../../../how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md) comes preinstalled in Rancher, and as of Rancher v2.6, Fleet can no longer be fully disabled. However, the Fleet feature for GitOps continuous delivery may be disabled using the `continuous-delivery` feature flag.
 
-To enable or disable this feature, refer to the instructions on [the main page about enabling experimental features.](../../../../pages-for-subheaders/enable-experimental-features.md)
+To enable or disable this feature, refer to the instructions on [the main page about enabling experimental features.](../../../pages-for-subheaders/enable-experimental-features.md)
 
 Environment Variable Key | Default Value | Description
 ---|---|---
diff --git a/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md b/docs/how-to-guides/advanced-user-guides/enable-experimental-features/istio-traffic-management-features.md
similarity index 91%
rename from docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md
rename to docs/how-to-guides/advanced-user-guides/enable-experimental-features/istio-traffic-management-features.md
index 7347b5b5ba6..aba1c8c49b3 100644
--- a/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md
+++ b/docs/how-to-guides/advanced-user-guides/enable-experimental-features/istio-traffic-management-features.md
@@ -4,9 +4,9 @@ title: UI for Istio Virtual Services and Destination Rules
 
 This feature enables a UI that lets you create, read, update and delete virtual services and destination rules, which are traffic management features of Istio.
 
-> **Prerequisite:** Turning on this feature does not enable Istio. A cluster administrator needs to [enable Istio for the cluster](../../../../pages-for-subheaders/istio-setup-guide.md) in order to use the feature.
+> **Prerequisite:** Turning on this feature does not enable Istio. A cluster administrator needs to [enable Istio for the cluster](../../../pages-for-subheaders/istio-setup-guide.md) in order to use the feature.
 
-To enable or disable this feature, refer to the instructions on [the main page about enabling experimental features.](../../../../pages-for-subheaders/enable-experimental-features.md)
+To enable or disable this feature, refer to the instructions on [the main page about enabling experimental features.](../../../pages-for-subheaders/enable-experimental-features.md)
 
 Environment Variable Key | Default Value | Status | Available as of
 ---|---|---|---
diff --git a/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md b/docs/how-to-guides/advanced-user-guides/enable-experimental-features/rancher-on-arm64.md
similarity index 94%
rename from docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md
rename to docs/how-to-guides/advanced-user-guides/enable-experimental-features/rancher-on-arm64.md
index 6c73c8fe79f..7b3b12df707 100644
--- a/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md
+++ b/docs/how-to-guides/advanced-user-guides/enable-experimental-features/rancher-on-arm64.md
@@ -33,7 +33,7 @@ version's release notes in the following two ways:
 
 - Create custom cluster and adding ARM64 based node(s)
   - Kubernetes cluster version must be 1.12 or higher
-  - CNI Network Provider must be [Flannel](../../../../faq/container-network-interface-providers.md#flannel)
+  - CNI Network Provider must be [Flannel](../../../faq/container-network-interface-providers.md#flannel)
 - Importing clusters that contain ARM64 based nodes
   - Kubernetes cluster version must be 1.12 or higher
 
diff --git a/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md b/docs/how-to-guides/advanced-user-guides/enable-experimental-features/unsupported-storage-drivers.md
similarity index 92%
rename from docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md
rename to docs/how-to-guides/advanced-user-guides/enable-experimental-features/unsupported-storage-drivers.md
index cb580ec5614..a5d5578df8d 100644
--- a/docs/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md
+++ b/docs/how-to-guides/advanced-user-guides/enable-experimental-features/unsupported-storage-drivers.md
@@ -4,7 +4,7 @@ title: Allow Unsupported Storage Drivers
 
 This feature allows you to use types for storage providers and provisioners that are not enabled by default.
 
-To enable or disable this feature, refer to the instructions on [the main page about enabling experimental features.](../../../../pages-for-subheaders/enable-experimental-features.md)
+To enable or disable this feature, refer to the instructions on [the main page about enabling experimental features.](../../../pages-for-subheaders/enable-experimental-features.md)
 
 Environment Variable Key | Default Value | Description
 ---|---|---
diff --git a/docs/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md b/docs/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md
index 11661ec90c3..7e2d904749a 100644
--- a/docs/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md
+++ b/docs/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md
@@ -5,9 +5,9 @@ title: 1. Enable Istio in the Cluster
 :::note Prerequisites:
 
 - Only a user with the `cluster-admin` [Kubernetes default role](https://kubernetes.io/docs/reference/access-authn-authz/rbac/#user-facing-roles) assigned can configure and install Istio in a Kubernetes cluster.
-- If you have pod security policies, you will need to install Istio with the CNI enabled. For details, see [this section.](../../../explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies.md)
-- To install Istio on an RKE2 cluster, additional steps are required. For details, see [this section.](../../../explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md)
-- To install Istio in a cluster where project network isolation is enabled, additional steps are required. For details, see [this section.](../../../explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation.md)
+- If you have pod security policies, you will need to install Istio with the CNI enabled. For details, see [this section.](../../../integrations-in-rancher/istio/configuration-options/pod-security-policies.md)
+- To install Istio on an RKE2 cluster, additional steps are required. For details, see [this section.](../../../integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md)
+- To install Istio in a cluster where project network isolation is enabled, additional steps are required. For details, see [this section.](../../../integrations-in-rancher/istio/configuration-options/project-network-isolation.md)
 
 :::
 
@@ -16,8 +16,8 @@ title: 1. Enable Istio in the Cluster
 1. Click **Apps & Marketplace**.
 1. Click **Charts**.
 1. Click **Istio**.
-1. If you have not already installed your own monitoring app, you will be prompted to install the rancher-monitoring app. Optional: Set your Selector or Scrape config options on rancher-monitoring app install.
-1. Optional: Configure member access and [resource limits](../../../explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md) for the Istio components. Ensure you have enough resources on your worker nodes to enable Istio.
+1. If you have not already installed your own monitoring app, you will be prompted to install the rancher-monitoring app. Optional: Set your Selector or Scrape config options on rancher-monitoring app install. 
+1. Optional: Configure member access and [resource limits](../../../integrations-in-rancher/istio/cpu-and-memory-allocations.md) for the Istio components. Ensure you have enough resources on your worker nodes to enable Istio.
 1. Optional: Make additional configuration changes to values.yaml if needed.
 1. Optional: Add additional resources or configuration via the [overlay file.](../../../pages-for-subheaders/configuration-options.md#overlay-file)
 1. Click **Install**.
diff --git a/docs/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md b/docs/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md
index 741130d49a7..c79bef9c06a 100644
--- a/docs/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md
+++ b/docs/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md
@@ -10,7 +10,7 @@ The Istio overview page provides a link to the Kiali dashboard. From the Kiali d
 
 :::note Prerequisites:
 
-To enable traffic to show up in the graph, ensure you have prometheus installed in the cluster. Rancher-istio installs Kiali configured by default to work with the rancher-monitoring chart. You can use rancher-monitoring or install your own monitoring solution. Optional: you can change configuration on how data scraping occurs by setting the [Selectors & Scrape Configs](../../../explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md) options.
+To enable traffic to show up in the graph, ensure you have prometheus installed in the cluster. Rancher-istio installs Kiali configured by default to work with the rancher-monitoring chart. You can use rancher-monitoring or install your own monitoring solution. Optional: you can change configuration on how data scraping occurs by setting the [Selectors & Scrape Configs](../../../integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md) options.
 
 :::
 
diff --git a/docs/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md b/docs/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md
index 78b9f078e86..32f4dffd780 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md
@@ -12,8 +12,8 @@ You can always assign a pod security policy (PSP) to an existing project if you
 
 ### Prerequisites
 
-- Create a Pod Security Policy within Rancher. Before you can assign a default PSP to an existing project, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies](../authentication-permissions-and-global-configuration/create-pod-security-policies.md).
-- Assign a default Pod Security Policy to the project's cluster. You can't assign a PSP to a project until one is already applied to the cluster. For more information, see [the documentation about adding a pod security policy to a cluster](../manage-clusters/add-a-pod-security-policy.md).
+- Create a Pod Security Policy within Rancher. Before you can assign a default PSP to an existing project, you must have a PSP available for assignment. For instruction, see [Creating Pod Security Policies](../../new-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md).
+- Assign a default Pod Security Policy to the project's cluster. You can't assign a PSP to a project until one is already applied to the cluster. For more information, see [the documentation about adding a pod security policy to a cluster](../../new-user-guides/manage-clusters/add-a-pod-security-policy.md). 
 
 ### Applying a Pod Security Policy
 
diff --git a/docs/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md b/docs/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md
index be183865a78..626c9ecef38 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md
+++ b/docs/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md
@@ -4,13 +4,13 @@ title: Overriding the Default Limit for a Namespace
 
 Although the **Namespace Default Limit** propagates from the project to each namespace when created, in some cases, you may need to increase (or decrease) the quotas for a specific namespace. In this situation, you can override the default limits by editing the namespace.
 
-In the diagram below, the Rancher administrator has a resource quota in effect for their project. However, the administrator wants to override the namespace limits for `Namespace 3` so that it has more resources available. Therefore, the administrator [raises the namespace limits](../../manage-clusters/projects-and-namespaces.md) for `Namespace 3` so that the namespace can access more resources.
+In the diagram below, the Rancher administrator has a resource quota in effect for their project. However, the administrator wants to override the namespace limits for `Namespace 3` so that it has more resources available. Therefore, the administrator [raises the namespace limits](../../../new-user-guides/manage-clusters/projects-and-namespaces.md) for `Namespace 3` so that the namespace can access more resources.
 
 <sup>Namespace Default Limit Override</sup>
 
 ![Namespace Default Limit Override](/img/rancher-resource-quota-override.svg)
 
-How to: [Editing Namespace Resource Quotas](../../manage-clusters/projects-and-namespaces.md)
+How to: [Editing Namespace Resource Quotas](../../../new-user-guides/manage-clusters/projects-and-namespaces.md)
 
 ### Editing Namespace Resource Quotas
 
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md
index bf38a406fe8..7456187a062 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md
@@ -19,7 +19,7 @@ To allow the Grafana dashboard to persist after the Grafana instance restarts, a
 
 - The monitoring application needs to be installed.
 - To create the persistent dashboard, you must have at least the **Manage Config Maps** Rancher RBAC permissions assigned to you in the project or namespace that contains the Grafana Dashboards. This correlates to the `monitoring-dashboard-edit` or `monitoring-dashboard-admin` Kubernetes native RBAC Roles exposed by the Monitoring chart.
-- To see the links to the external monitoring UIs, including Grafana dashboards, you will need at least a [project-member role.](../../../explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md#users-with-rancher-cluster-manager-based-permissions)
+- To see the links to the external monitoring UIs, including Grafana dashboards, you will need at least a [project-member role.](../../../integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md#users-with-rancher-cluster-manager-based-permissions)
 
 :::
 
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md
index 20c1a7296fb..51652c396b1 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md
@@ -8,7 +8,7 @@ In this section, you'll learn how to customize the Grafana dashboard to show met
 
 Before you can customize a Grafana dashboard, the `rancher-monitoring` application must be installed.
 
-To see the links to the external monitoring UIs, including Grafana dashboards, you will need at least a [project-member role.](../../../explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md#users-with-rancher-cluster-manager-based-permissions)
+To see the links to the external monitoring UIs, including Grafana dashboards, you will need at least a [project-member role.](../../../integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md#users-with-rancher-cluster-manager-based-permissions)
 
 ### Signing in to Grafana
 
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md
index 977efdac6ab..9c954304b8d 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md
@@ -2,7 +2,7 @@
 title: Enable Monitoring
 ---
 
-As an [administrator](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md) or [cluster owner](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#cluster-roles), you can configure Rancher to deploy Prometheus to monitor your Kubernetes cluster.
+As an [administrator](../../new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md) or [cluster owner](../../new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#cluster-roles), you can configure Rancher to deploy Prometheus to monitor your Kubernetes cluster.
 
 This page describes how to enable monitoring and alerting within a cluster using the new monitoring application.
 
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/migrate-to-rancher-v2.5+-monitoring.md b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/migrate-to-rancher-v2.5+-monitoring.md
index 4aced111bbc..42fafe7dc95 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/migrate-to-rancher-v2.5+-monitoring.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-alerting-guides/migrate-to-rancher-v2.5+-monitoring.md
@@ -29,7 +29,7 @@ For more information on how to configure Monitoring & Alerting V2, see [this pag
 
 Project owners and members no longer get access to Grafana or Prometheus by default. If view-only users had access to Grafana, they would be able to see data from any namespace. For Kiali, any user can edit things they don’t own in any namespace.
 
-For more information about role-based access control in `rancher-monitoring`, refer to [this page.](../../../explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md)
+For more information about role-based access control in `rancher-monitoring`, refer to [this page.](../../../integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md)
 
 ## Migrating from Monitoring V1 to Monitoring V2
 
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md b/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md
index 51e9bec5bdb..2c2f5e14454 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md
@@ -8,7 +8,7 @@ When Receivers and Routes are updated, the monitoring application will automatic
 
 :::note
 
-This section assumes familiarity with how monitoring components work together. For more information about Alertmanager, see [this section.](../../../../explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md#3-how-alertmanager-works)
+This section assumes familiarity with how monitoring components work together. For more information about Alertmanager, see [this section.](../../../../integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md#3-how-alertmanager-works)
 
 :::
 
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheus.md b/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheus.md
index 09072a8ba15..13bf81613e5 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheus.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheus.md
@@ -6,7 +6,7 @@ It is usually not necessary to directly edit the Prometheus custom resource beca
 
 :::note
 
-This section assumes familiarity with how monitoring components work together. For more information, see [this section.](../../../../explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)
+This section assumes familiarity with how monitoring components work together. For more information, see [this section.](../../../../integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)
 
 :::
 
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md b/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md
index bf4b1b749db..9dea3a0ff7c 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md
@@ -6,7 +6,7 @@ A PrometheusRule defines a group of Prometheus alerting and/or recording rules.
 
 :::note
 
-This section assumes familiarity with how monitoring components work together. For more information, see [this section.](../../../../explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)
+This section assumes familiarity with how monitoring components work together. For more information, see [this section.](../../../../integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)
 
 :::
 
@@ -63,7 +63,7 @@ For examples, refer to the Prometheus documentation on [recording rules](https:/
 |-------|----------------|
 | Alert Name |  The name of the alert. Must be a valid label value.   |
 | Wait To Fire For |   Duration in seconds. Alerts are considered firing once they have been returned for this long. Alerts which have not yet fired for long enough are considered pending. |
-| PromQL Expression |   The PromQL expression to evaluate. Prometheus will evaluate the current value of this PromQL expression on every evaluation cycle and all resultant time series will become pending/firing alerts. For more information, refer to the [Prometheus documentation](https://prometheus.io/docs/prometheus/latest/querying/basics/) or our [example PromQL expressions.](../../../../explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md) |
+| PromQL Expression |   The PromQL expression to evaluate. Prometheus will evaluate the current value of this PromQL expression on every evaluation cycle and all resultant time series will become pending/firing alerts. For more information, refer to the [Prometheus documentation](https://prometheus.io/docs/prometheus/latest/querying/basics/) or our [example PromQL expressions.](../../../../integrations-in-rancher/monitoring-and-alerting/promql-expressions.md) |
 | Labels |  Labels to add or overwrite for each alert.      |
 | Severity |   When enabled, labels are attached to the alert or record that identify it by the severity level.  |
 | Severity Label Value | Critical, warning, or none |
diff --git a/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md b/docs/how-to-guides/advanced-user-guides/open-ports-with-firewalld.md
similarity index 96%
rename from docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md
rename to docs/how-to-guides/advanced-user-guides/open-ports-with-firewalld.md
index a3ffcb2a1a5..bb888b13ca5 100644
--- a/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md
+++ b/docs/how-to-guides/advanced-user-guides/open-ports-with-firewalld.md
@@ -31,7 +31,7 @@ You can check the default firewall rules with this command:
 sudo iptables --list
 ```
 
-This section describes how to use `firewalld` to apply the [firewall port rules](../../installation-requirements/port-requirements.md) for nodes in a high-availability Rancher server cluster.
+This section describes how to use `firewalld` to apply the [firewall port rules](../../pages-for-subheaders/installation-requirements#port-requirements.md) for nodes in a high-availability Rancher server cluster.
 
 ## Prerequisite
 
diff --git a/docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md b/docs/how-to-guides/advanced-user-guides/tune-etcd-for-large-installs.md
similarity index 100%
rename from docs/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md
rename to docs/how-to-guides/advanced-user-guides/tune-etcd-for-large-installs.md
diff --git a/docs/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md b/docs/how-to-guides/new-user-guides/add-users-to-projects.md
similarity index 77%
rename from docs/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md
rename to docs/how-to-guides/new-user-guides/add-users-to-projects.md
index 6b73c3c5ce9..4a4e9d03e18 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md
+++ b/docs/how-to-guides/new-user-guides/add-users-to-projects.md
@@ -8,13 +8,13 @@ You can add members to a project as it is created, or add them to an existing pr
 
 :::tip
 
-Want to provide a user with access to _all_ projects within a cluster? See [Adding Cluster Members](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md) instead.
+Want to provide a user with access to _all_ projects within a cluster? See [Adding Cluster Members](../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md) instead.
 
 :::
 
 ### Adding Members to a New Project
 
-You can add members to a project as you create it (recommended if possible). For details on creating a new project, refer to the [cluster administration section.](../manage-clusters/projects-and-namespaces.md)
+You can add members to a project as you create it (recommended if possible). For details on creating a new project, refer to the [cluster administration section.](../../how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces.md)
 
 ### Adding Members to an Existing Project
 
@@ -41,7 +41,7 @@ Following project creation, you can add users as project members so that they ca
 
 1. Assign the user or group **Project** roles.
 
-    [What are Project Roles?](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md)
+    [What are Project Roles?](../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md)
 
     :::note Notes:
 
@@ -50,9 +50,9 @@ Following project creation, you can add users as project members so that they ca
     - By default, the Rancher role of `project-member` inherits from the `Kubernetes-edit` role, and the `project-owner` role inherits from the `Kubernetes-admin` role. As such, both `project-member` and `project-owner` roles will allow for namespace management, including the ability to create and delete namespaces.
 
     - For `Custom` roles, you can modify the list of individual roles available for assignment.
-
-        - To add roles to the list, [Add a Custom Role](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md).
-        - To remove roles from the list, [Lock/Unlock Roles](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md).
+    
+        - To add roles to the list, [Add a Custom Role](../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md).
+        - To remove roles from the list, [Lock/Unlock Roles](../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md).
 
     :::
 
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-active-directory.md
similarity index 97%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-active-directory.md
index 3ea150abea4..5bffb8876f8 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md
+++ b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-active-directory.md
@@ -4,11 +4,11 @@ title: Configure Active Directory (AD)
 
 If your organization uses Microsoft Active Directory as central user repository, you can configure Rancher to communicate with an Active Directory server to authenticate users. This allows Rancher admins to control access to clusters and projects based on users and groups managed externally in the Active Directory, while allowing end-users to authenticate with their AD credentials when logging in to the Rancher UI.
 
-Rancher uses LDAP to communicate with the Active Directory server. The authentication flow for Active Directory is therefore the same as for the [OpenLDAP authentication](../../../../../pages-for-subheaders/configure-openldap.md) integration.
+Rancher uses LDAP to communicate with the Active Directory server. The authentication flow for Active Directory is therefore the same as for the [OpenLDAP authentication](../../../../pages-for-subheaders/configure-openldap.md) integration.
 
 :::note
 
-Before you start, please familiarise yourself with the concepts of [External Authentication Configuration and Principal Users](../../../../../pages-for-subheaders/about-authentication.md#external-authentication-configuration-and-principal-users).
+Before you start, please familiarise yourself with the concepts of [External Authentication Configuration and Principal Users](../../../../pages-for-subheaders/authentication-config.md#external-authentication-configuration-and-principal-users).
 
 :::
 
@@ -216,4 +216,4 @@ In the same way, we can observe that the value in the **memberOf** attribute in
 
 ## Annex: Troubleshooting
 
-If you are experiencing issues while testing the connection to the Active Directory server, first double-check the credentials entered for the service account as well as the search base configuration. You may also inspect the Rancher logs to help pinpointing the problem cause. Debug logs may contain more detailed information about the error. Please refer to [How can I enable debug logging](../../../../../faq/technical-items.md#how-can-i-enable-debug-logging) in this documentation.
+If you are experiencing issues while testing the connection to the Active Directory server, first double-check the credentials entered for the service account as well as the search base configuration. You may also inspect the Rancher logs to help pinpointing the problem cause. Debug logs may contain more detailed information about the error. Please refer to [How can I enable debug logging](../../../../faq/technical-items.md#how-can-i-enable-debug-logging) in this documentation.
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md
similarity index 95%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md
index a9c609f9f58..bdcfa3b79ca 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md
+++ b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md
@@ -222,7 +222,7 @@ Since [Azure AD Graph API](https://docs.microsoft.com/en-us/graph/migrate-azure-
 
 #### Updating Endpoints in the Rancher UI
 
->**Important:** Admins should create a [backup](../../../../new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher.md) right before they commit to the endpoint migration in Step 4 below.
+>**Important:** Admins should create a [backup](../../../new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher.md) right before they commit to the endpoint migration in Step 4 below.
 
 1. Update the permissions of your Azure AD app registration as described [here](#3-set-required-permissions-for-rancher).
 **This is critical.**
@@ -253,7 +253,7 @@ In air-gapped environments, admins should ensure that their endpoints are [white
 
 If you need to roll back your migration, please note the following:
 
-1. Admins are encouraged to use the proper restore process if they want to go back. Please see [backup docs](../../../../new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher.md), [restore docs](../../../../new-user-guides/backup-restore-and-disaster-recovery/restore-rancher.md), and [examples](../../../../../reference-guides/backup-restore-configuration/examples.md) for reference.
+1. Admins are encouraged to use the proper restore process if they want to go back. Please see [backup docs](../../../new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher.md), [restore docs](../../../new-user-guides/backup-restore-and-disaster-recovery/restore-rancher.md), and [examples](../../../../reference-guides/backup-restore-configuration/examples.md) for reference.
 
 1. Azure app owners who want to rotate the Application Secret will need to also rotate it in Rancher as Rancher does not automatically update the Application Secret when it is changed in Azure. In Rancher, note that it is stored in a Kubernetes secret called `azureadconfig-applicationsecret` which is in the `cattle-global-data` namespace.
 
@@ -309,7 +309,7 @@ Token Endpoint   | https://login.partner.microsoftonline.cn/{tenantID}/oauth2/v2
 >
 >- For existing users who do not wish to upgrade to v2.6.7 after the Azure AD Graph API is retired, they will need to either:
     - Use the built-in Rancher auth or
-    - Use another third-party auth system and set that up in Rancher. Please see the [authentication docs](../../../../../pages-for-subheaders/about-authentication.md) to learn how to configure other open authentication providers.
+    - Use another third-party auth system and set that up in Rancher. Please see the [authentication docs](../../../../pages-for-subheaders/about-authentication.md) to learn how to configure other open authentication providers.
 
 </TabItem>
 </Tabs>
\ No newline at end of file
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-freeipa.md
similarity index 95%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-freeipa.md
index 697c5399905..3f240fcb913 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md
+++ b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-freeipa.md
@@ -8,7 +8,7 @@ If your organization uses FreeIPA for user authentication, you can configure Ran
 
 - You must have a [FreeIPA Server](https://www.freeipa.org/) configured.
 - Create a service account in FreeIPA with `read-only` access. Rancher uses this account to verify group membership when a user makes a request using an API key.
-- Read [External Authentication Configuration and Principal Users](../../../../../pages-for-subheaders/about-authentication.md#external-authentication-configuration-and-principal-users).
+- Read [External Authentication Configuration and Principal Users](../../../../pages-for-subheaders/about-authentication.md#external-authentication-configuration-and-principal-users).
 
 :::
 
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-github.md
similarity index 95%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-github.md
index 9fdc0985220..f2af93fdf43 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md
+++ b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-github.md
@@ -6,7 +6,7 @@ In environments using GitHub, you can configure Rancher to allow sign on using G
 
 :::note Prerequisites:
 
-Read [External Authentication Configuration and Principal Users](../../../../../pages-for-subheaders/about-authentication.md#external-authentication-configuration-and-principal-users).
+Read [External Authentication Configuration and Principal Users](../../../../pages-for-subheaders/about-authentication.md#external-authentication-configuration-and-principal-users).
 
 :::
 
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-google-oauth.md
similarity index 95%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-google-oauth.md
index d0d6f11ed08..47ddaf89f92 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md
+++ b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-google-oauth.md
@@ -6,7 +6,7 @@ If your organization uses G Suite for user authentication, you can configure Ran
 
 Only admins of the G Suite domain have access to the Admin SDK. Therefore, only G Suite admins can configure Google OAuth for Rancher.
 
-Within Rancher, only administrators or users with the **Manage Authentication** [global role](../../manage-role-based-access-control-rbac/global-permissions.md) can configure authentication.
+Within Rancher, only administrators or users with the **Manage Authentication** [global role](../../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md) can configure authentication.
 
 # Prerequisites
 
@@ -95,7 +95,7 @@ Using the Unique ID of the service account key, register it as an Oauth Client u
 
 # Configuring Google OAuth in Rancher
 
-1. Sign into Rancher using a local user assigned the [administrator](../../manage-role-based-access-control-rbac/global-permissions.md) role. This user is also called the local principal.
+1. Sign into Rancher using a local user assigned the [administrator](../../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md) role. This user is also called the local principal.
 1.	In the top left corner, click **☰ > Users & Authentication**.
 1. In the left navigation menu, click **Auth Provider**.
 1. Click **Google**. The instructions in the UI cover the steps to set up authentication with Google OAuth.
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-oidc.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-keycloak-oidc.md
similarity index 98%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-oidc.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-keycloak-oidc.md
index 0e6d09963de..b7e2f444c83 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-oidc.md
+++ b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-keycloak-oidc.md
@@ -125,7 +125,7 @@ After configuration is completed, Rancher user permissions will need to be reapp
 
 ## Annex: Troubleshooting
 
-If you are experiencing issues while testing the connection to the Keycloak server, first double-check the configuration options of your OIDC client. You may also inspect the Rancher logs to help pinpoint what's causing issues. Debug logs may contain more detailed information about the error. Please refer to [How can I enable debug logging](../../../../../faq/technical-items.md#how-can-i-enable-debug-logging) in this documentation.
+If you are experiencing issues while testing the connection to the Keycloak server, first double-check the configuration options of your OIDC client. You may also inspect the Rancher logs to help pinpoint what's causing issues. Debug logs may contain more detailed information about the error. Please refer to [How can I enable debug logging](../../../../faq/technical-items.md#how-can-i-enable-debug-logging) in this documentation.
 
 All Keycloak related log entries will be prepended with either `[generic oidc]` or `[keycloak oidc]`.
 
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-saml.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-keycloak-saml.md
similarity index 98%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-saml.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-keycloak-saml.md
index e13be347a2c..b94908dfcea 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-saml.md
+++ b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-keycloak-saml.md
@@ -160,7 +160,7 @@ openssl req -x509 -sha256 -nodes -days 365 -newkey rsa:2048 -keyout myservice.ke
 
 ## Annex: Troubleshooting
 
-If you are experiencing issues while testing the connection to the Keycloak server, first double-check the configuration option of your SAML client. You may also inspect the Rancher logs to help pinpointing the problem cause. Debug logs may contain more detailed information about the error. Please refer to [How can I enable debug logging](../../../../../faq/technical-items.md#how-can-i-enable-debug-logging) in this documentation.
+If you are experiencing issues while testing the connection to the Keycloak server, first double-check the configuration option of your SAML client. You may also inspect the Rancher logs to help pinpointing the problem cause. Debug logs may contain more detailed information about the error. Please refer to [How can I enable debug logging](../../../../faq/technical-items.md#how-can-i-enable-debug-logging) in this documentation.
 
 ### You are not redirected to Keycloak
 
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-okta-saml.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-okta-saml.md
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-pingidentity.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-pingidentity.md
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/create-local-users.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/create-local-users.md
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/manage-users-and-groups.md
similarity index 98%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/manage-users-and-groups.md
index 7affc79bf1e..184f3517ce4 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md
+++ b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/manage-users-and-groups.md
@@ -4,7 +4,7 @@ title: Users and Groups
 
 Rancher relies on users and groups to determine who is allowed to log in to Rancher and which resources they can access. When you configure an external authentication provider, users from that provider will be able to log in to your Rancher server. When a user logs in, the authentication provider will supply your Rancher server with a list of groups to which the user belongs.
 
-Access to clusters, projects, multi-cluster apps, and global DNS providers and entries can be controlled by adding either individual users or groups to these resources. When you add a group to a resource, all users who are members of that group in the authentication provider, will be able to access the resource with the permissions that you've specified for the group. For more information on roles and permissions, see [Role Based Access Control](../../../../../pages-for-subheaders/manage-role-based-access-control-rbac.md).
+Access to clusters, projects, multi-cluster apps, and global DNS providers and entries can be controlled by adding either individual users or groups to these resources. When you add a group to a resource, all users who are members of that group in the authentication provider, will be able to access the resource with the permissions that you've specified for the group. For more information on roles and permissions, see [Role Based Access Control](../../../../pages-for-subheaders/manage-role-based-access-control-rbac.md).
 
 ## Managing Members
 
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md
diff --git a/docs/reference-guides/configure-openldap/openldap-config-reference.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-openldap/openldap-config-reference.md
similarity index 89%
rename from docs/reference-guides/configure-openldap/openldap-config-reference.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-openldap/openldap-config-reference.md
index 6ce2977d6c9..c13f0d1d37c 100644
--- a/docs/reference-guides/configure-openldap/openldap-config-reference.md
+++ b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-openldap/openldap-config-reference.md
@@ -6,7 +6,7 @@ This section is intended to be used as a reference when setting up an OpenLDAP a
 
 For further details on configuring OpenLDAP, refer to the [official documentation.](https://www.openldap.org/doc/)
 
-> Before you proceed with the configuration, please familiarize yourself with the concepts of [External Authentication Configuration and Principal Users](../../pages-for-subheaders/about-authentication.md#external-authentication-configuration-and-principal-users).
+> Before you proceed with the configuration, please familiarize yourself with the concepts of [External Authentication Configuration and Principal Users](../../../../pages-for-subheaders/about-authentication.md#external-authentication-configuration-and-principal-users).
 
 
 ## Background: OpenLDAP Authentication Flow
@@ -24,7 +24,7 @@ You will need to enter the address, port, and protocol to connect to your OpenLD
 >
 > If the certificate used by the OpenLDAP server is self-signed or not from a recognized certificate authority, make sure have at hand the CA certificate (concatenated with any intermediate certificates) in PEM format. You will have to paste in this certificate during the configuration so that Rancher is able to validate the certificate chain.
 
-If you are in doubt about the correct values to enter in the user/group Search Base configuration fields, consult your LDAP administrator or refer to the section [Identify Search Base and Schema using ldapsearch](../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md#annex-identify-search-base-and-schema-using-ldapsearch) in the Active Directory authentication documentation.
+If you are in doubt about the correct values to enter in the user/group Search Base configuration fields, consult your LDAP administrator or refer to the section [Identify Search Base and Schema using ldapsearch](../../../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md#annex-identify-search-base-and-schema-using-ldapsearch) in the Active Directory authentication documentation.
 
 <figcaption>OpenLDAP Server Parameters</figcaption>
 
@@ -45,7 +45,7 @@ If your OpenLDAP directory deviates from the standard OpenLDAP schema, you must
 
 Note that the attribute mappings configured in this section are used by Rancher to construct search filters and resolve group membership. It is therefore always recommended to verify that the configuration here matches the schema used in your OpenLDAP.
 
-If you are unfamiliar with the user/group schema used in the OpenLDAP server, consult your LDAP administrator or refer to the section [Identify Search Base and Schema using ldapsearch](../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md#annex-identify-search-base-and-schema-using-ldapsearch) in the Active Directory authentication documentation.
+If you are unfamiliar with the user/group schema used in the OpenLDAP server, consult your LDAP administrator or refer to the section [Identify Search Base and Schema using ldapsearch](../../../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md#annex-identify-search-base-and-schema-using-ldapsearch) in the Active Directory authentication documentation.
 
 ### User Schema Configuration
 
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-shibboleth-saml/about-group-permissions.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-shibboleth-saml/about-group-permissions.md
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/custom-branding.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/custom-branding.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/custom-branding.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/custom-branding.md
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
similarity index 97%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
index aa9c4a9a90a..c4ead0d0c2b 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
+++ b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
@@ -98,8 +98,8 @@ If a user is removed from the external authentication provider group, they would
 
 You can only assign a global role to a group if:
 
-* You have set up an [external authentication provider](../../../../pages-for-subheaders/about-authentication.md#external-vs-local-authentication)
-* The external authentication provider supports [user groups](../about-authentication/authentication-config/manage-users-and-groups.md)
+* You have set up an [external authentication provider](../../../../pages-for-subheaders/authentication-config.md#external-vs-local-authentication)
+* The external authentication provider supports [user groups](../../authentication-permissions-and-global-configuration/authentication-config/manage-users-and-groups.md)
 * You have already set up at least one user group with the authentication provider
 
 :::
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
similarity index 96%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
index 2351eb2b072..d32ad3f462d 100644
--- a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
+++ b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
@@ -126,7 +126,7 @@ You can [assign a role to everyone in the group at the same time](#configuring-g
 
 Using custom permissions is convenient for providing users with narrow or specialized access to Rancher.
 
-When a user from an [external authentication source](../../../../pages-for-subheaders/about-authentication.md) signs into Rancher for the first time, they're automatically assigned a set of global permissions (hereafter, permissions). By default, after a user logs in for the first time, they are created as a user and assigned the default `user` permission. The standard `user` permission allows users to login and create clusters.
+When a user from an [external authentication source](../../../../pages-for-subheaders/authentication-config.md) signs into Rancher for the first time, they're automatically assigned a set of global permissions (hereafter, permissions). By default, after a user logs in for the first time, they are created as a user and assigned the default `user` permission. The standard `user` permission allows users to login and create clusters.
 
 However, in some organizations, these permissions may extend too much access. Rather than assigning users the default global permissions of `Administrator` or `Standard User`, you can assign them a more restrictive set of custom global permissions.
 
@@ -217,8 +217,8 @@ If a user is removed from the external authentication provider group, they would
 
 You can only assign a global role to a group if:
 
-* You have set up an [external authentication provider](../../../../pages-for-subheaders/about-authentication.md#external-vs-local-authentication)
-* The external authentication provider supports [user groups](../about-authentication/authentication-config/manage-users-and-groups.md)
+* You have set up an [external authentication provider](../../../../pages-for-subheaders/authentication-config.md#external-vs-local-authentication)
+* The external authentication provider supports [user groups](../authentication-config/manage-users-and-groups.md)
 * You have already set up at least one user group with the authentication provider
 
 :::
diff --git a/docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md
rename to docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md
diff --git a/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md b/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md
index 28eb4aeb882..459a74a33e1 100644
--- a/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md
+++ b/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md
@@ -2,7 +2,7 @@
 title: Restoring a Cluster from Backup
 ---
 
-etcd backup and recovery for [Rancher launched Kubernetes clusters](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) can be easily performed. Snapshots of the etcd database are taken and saved either locally onto the etcd nodes or to a S3 compatible target. The advantages of configuring S3 is that if all etcd nodes are lost, your snapshot is saved remotely and can be used to restore the cluster.
+etcd backup and recovery for [Rancher launched Kubernetes clusters](../kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher.md) can be easily performed. Snapshots of the etcd database are taken and saved either locally onto the etcd nodes or to a S3 compatible target. The advantages of configuring S3 is that if all etcd nodes are lost, your snapshot is saved remotely and can be used to restore the cluster.
 
 Rancher recommends enabling the [ability to set up recurring snapshots of etcd](back-up-rancher-launched-kubernetes-clusters.md#configuring-recurring-snapshots), but [one-time snapshots](back-up-rancher-launched-kubernetes-clusters.md#one-time-snapshots) can easily be taken as well. Rancher allows restore from [saved snapshots](#restoring-a-cluster-from-a-snapshot) or if you don't have any snapshots, you can still [restore etcd](#recovering-etcd-without-a-snapshot).
 
@@ -70,7 +70,7 @@ If the group of etcd nodes loses quorum, the Kubernetes cluster will report a fa
 
 5. Run the revised command.
 
-6. After the single nodes is up and running, Rancher recommends adding additional etcd nodes to your cluster. If you have a [custom cluster](../../../pages-for-subheaders/use-existing-nodes.md) and you want to reuse an old node, you are required to [clean up the nodes](../../advanced-user-guides/manage-clusters/clean-cluster-nodes.md) before attempting to add them back into a cluster.
+6. After the single nodes is up and running, Rancher recommends adding additional etcd nodes to your cluster. If you have a [custom cluster](../../../pages-for-subheaders/use-existing-nodes.md) and you want to reuse an old node, you are required to [clean up the nodes](../manage-clusters/clean-cluster-nodes.md) before attempting to add them back into a cluster.  
 
 # Enabling Snapshot Features for Clusters Created Before Rancher v2.2.0
 
diff --git a/docs/how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md b/docs/how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md
index 5eb118609c6..43f6ca1b1fe 100644
--- a/docs/how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md
+++ b/docs/how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md
@@ -9,7 +9,7 @@ Fleet is a separate project from Rancher, and can be installed on any Kubernetes
 
 ## Architecture
 
-For information about how Fleet works, see [this page.](../../../explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture.md)
+For information about how Fleet works, see [this page.](../../../integrations-in-rancher/fleet-gitops-at-scale/architecture.md)
 
 ## Accessing Fleet in the Rancher UI
 
@@ -34,7 +34,7 @@ Follow the steps below to access Continuous Delivery in the Rancher UI:
 
 ## Windows Support
 
-For details on support for clusters with Windows nodes, see [this page.](../../../explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md)
+For details on support for clusters with Windows nodes, see [this page.](../../../integrations-in-rancher/fleet-gitops-at-scale/windows-support.md)
 
 
 ## GitHub Repository
@@ -44,7 +44,7 @@ The Fleet Helm charts are available [here.](https://github.com/rancher/fleet/rel
 
 ## Using Fleet Behind a Proxy
 
-For details on using Fleet behind a proxy, see [this page.](../../../explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md)
+For details on using Fleet behind a proxy, see [this page.](../../../integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md)
 
 ## Helm Chart Dependencies
 
diff --git a/docs/how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps.md b/docs/how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps.md
index 3ea3d93724d..bebcb796257 100644
--- a/docs/how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps.md
+++ b/docs/how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps.md
@@ -16,8 +16,8 @@ After creating a multi-cluster application, you can program a global DNS entry t
 
 To create a multi-cluster app in Rancher, you must have at least one of the following permissions:
 
-- A [project-member role](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#project-roles) in the target cluster(s), which gives you the ability to create, read, update, and delete the workloads
-- A [cluster owner role](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#cluster-roles) for the clusters(s) that include the target project(s)
+- A [project-member role](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#project-roles) in the target cluster(s), which gives you the ability to create, read, update, and delete the workloads
+- A [cluster owner role](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#cluster-roles) for the clusters(s) that include the target project(s)
 
 ### Enable Legacy Features
 
@@ -66,9 +66,9 @@ For multi-cluster applications, the application is deployed by a _system user_ a
 
 Rancher will let you select from two options for Roles, **Project** and **Cluster**. Rancher will allow creation using any of these roles based on the user's permissions.
 
-- **Project** - This is the equivalent of a [project member](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#project-roles). If you select this role, Rancher will check that in all the target projects, the user has minimally the [project member](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#project-roles) role. While the user might not be explicitly granted the _project member_ role, if the user is an [administrator](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md), a [cluster owner](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#cluster-roles), or a [project owner](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#project-roles), then the user is considered to have the appropriate level of permissions.
+- **Project** - This is the equivalent of a [project member](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#project-roles). If you select this role, Rancher will check that in all the target projects, the user has minimally the [project member](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#project-roles) role. While the user might not be explicitly granted the _project member_ role, if the user is an [administrator](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md), a [cluster owner](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#cluster-roles), or a [project owner](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#project-roles), then the user is considered to have the appropriate level of permissions.
 
-- **Cluster** - This is the equivalent of a [cluster owner](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#cluster-roles). If you select this role, Rancher will check that in all the target projects, the user has minimally the [cluster owner](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#project-roles) role. While the user might not be explicitly granted the _cluster owner_ role, if the user is an [administrator](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md), then the user is considered to have the appropriate level of permissions.
+- **Cluster** - This is the equivalent of a [cluster owner](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#cluster-roles). If you select this role, Rancher will check that in all the target projects, the user has minimally the [cluster owner](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#project-roles) role. While the user might not be explicitly granted the _cluster owner_ role, if the user is an [administrator](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md), then the user is considered to have the appropriate level of permissions.
 
 When launching the application, Rancher will confirm if you have these permissions in the target projects before launching the application.
 
diff --git a/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md b/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md
index ba1b871d740..e9d24c25a91 100644
--- a/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md
+++ b/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md
@@ -50,7 +50,7 @@ When Rancher is installed (also in a later step), the Rancher system creates an
 For your implementation, consider if you want or need to use a Layer-4 or Layer-7 load balancer:
 
 - **A layer-4 load balancer** is the simpler of the two choices, in which you are forwarding TCP traffic to your nodes. We recommend configuring your load balancer as a Layer 4 balancer, forwarding traffic to ports TCP/80 and TCP/443 to the Rancher management cluster nodes. The Ingress controller on the cluster will redirect HTTP traffic to HTTPS and terminate SSL/TLS on port TCP/443. The Ingress controller will forward traffic to port TCP/80 to the Ingress pod in the Rancher deployment.
-- **A layer-7 load balancer** is a bit more complicated but can offer features that you may want. For instance, a layer-7 load balancer is capable of handling TLS termination at the load balancer, as opposed to Rancher doing TLS termination itself. This can be beneficial if you want to centralize your TLS termination in your infrastructure. Layer-7 load balancing also offers the capability for your load balancer to make decisions based on HTTP attributes such as cookies, etc. that a layer-4 load balancer is not able to concern itself with. If you decide to terminate the SSL/TLS traffic on a layer-7 load balancer, you will need to use the `--set tls=external` option when installing Rancher in a later step. For more information, refer to the [Rancher Helm chart options.](../../../reference-guides/installation-references/helm-chart-options.md#external-tls-termination)
+- **A layer-7 load balancer** is a bit more complicated but can offer features that you may want. For instance, a layer-7 load balancer is capable of handling TLS termination at the load balancer, as opposed to Rancher doing TLS termination itself. This can be beneficial if you want to centralize your TLS termination in your infrastructure. Layer-7 load balancing also offers the capability for your load balancer to make decisions based on HTTP attributes such as cookies, etc. that a layer-4 load balancer is not able to concern itself with. If you decide to terminate the SSL/TLS traffic on a layer-7 load balancer, you will need to use the `--set tls=external` option when installing Rancher in a later step. For more information, refer to the [Rancher Helm chart options.](../../../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#external-tls-termination)
 
 For an example showing how to set up an NGINX load balancer, refer to [this page.](nginx-load-balancer.md)
 
diff --git a/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md b/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md
index ac5406a1a8b..c18d1cac87e 100644
--- a/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md
+++ b/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md
@@ -41,7 +41,7 @@ When Rancher is installed (also in a later step), the Rancher system creates an
 For your implementation, consider if you want or need to use a Layer-4 or Layer-7 load balancer:
 
 - **A layer-4 load balancer** is the simpler of the two choices, in which you are forwarding TCP traffic to your nodes. We recommend configuring your load balancer as a Layer 4 balancer, forwarding traffic to ports TCP/80 and TCP/443 to the Rancher management cluster nodes. The Ingress controller on the cluster will redirect HTTP traffic to HTTPS and terminate SSL/TLS on port TCP/443. The Ingress controller will forward traffic to port TCP/80 to the Ingress pod in the Rancher deployment.
-- **A layer-7 load balancer** is a bit more complicated but can offer features that you may want. For instance, a layer-7 load balancer is capable of handling TLS termination at the load balancer, as opposed to Rancher doing TLS termination itself. This can be beneficial if you want to centralize your TLS termination in your infrastructure. Layer-7 load balancing also offers the capability for your load balancer to make decisions based on HTTP attributes such as cookies, etc. that a layer-4 load balancer is not able to concern itself with. If you decide to terminate the SSL/TLS traffic on a layer-7 load balancer, you will need to use the `--set tls=external` option when installing Rancher in a later step. For more information, refer to the [Rancher Helm chart options.](../../../reference-guides/installation-references/helm-chart-options.md#external-tls-termination)
+- **A layer-7 load balancer** is a bit more complicated but can offer features that you may want. For instance, a layer-7 load balancer is capable of handling TLS termination at the load balancer, as opposed to Rancher doing TLS termination itself. This can be beneficial if you want to centralize your TLS termination in your infrastructure. Layer-7 load balancing also offers the capability for your load balancer to make decisions based on HTTP attributes such as cookies, etc. that a layer-4 load balancer is not able to concern itself with. If you decide to terminate the SSL/TLS traffic on a layer-7 load balancer, you will need to use the `--set tls=external` option when installing Rancher in a later step. For more information, refer to the [Rancher Helm chart options.](../../../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#external-tls-termination)
 
 For an example showing how to set up an NGINX load balancer, refer to [this page.](nginx-load-balancer.md)
 
diff --git a/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster.md b/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster.md
index 473b92b5ba9..76610e58092 100644
--- a/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster.md
+++ b/docs/how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster.md
@@ -35,7 +35,7 @@ When Rancher is installed (also in a later step), the Rancher system creates an
 For your implementation, consider if you want or need to use a Layer-4 or Layer-7 load balancer:
 
 - **A layer-4 load balancer** is the simpler of the two choices, in which you are forwarding TCP traffic to your nodes. We recommend configuring your load balancer as a Layer 4 balancer, forwarding traffic to ports TCP/80 and TCP/443 to the Rancher management cluster nodes. The Ingress controller on the cluster will redirect HTTP traffic to HTTPS and terminate SSL/TLS on port TCP/443. The Ingress controller will forward traffic to port TCP/80 to the Ingress pod in the Rancher deployment.
-- **A layer-7 load balancer** is a bit more complicated but can offer features that you may want. For instance, a layer-7 load balancer is capable of handling TLS termination at the load balancer, as opposed to Rancher doing TLS termination itself. This can be beneficial if you want to centralize your TLS termination in your infrastructure. Layer-7 load balancing also offers the capability for your load balancer to make decisions based on HTTP attributes such as cookies, etc. that a layer-4 load balancer is not able to concern itself with. If you decide to terminate the SSL/TLS traffic on a layer-7 load balancer, you will need to use the `--set tls=external` option when installing Rancher in a later step. For more information, refer to the [Rancher Helm chart options.](../../../reference-guides/installation-references/helm-chart-options.md#external-tls-termination)
+- **A layer-7 load balancer** is a bit more complicated but can offer features that you may want. For instance, a layer-7 load balancer is capable of handling TLS termination at the load balancer, as opposed to Rancher doing TLS termination itself. This can be beneficial if you want to centralize your TLS termination in your infrastructure. Layer-7 load balancing also offers the capability for your load balancer to make decisions based on HTTP attributes such as cookies, etc. that a layer-4 load balancer is not able to concern itself with. If you decide to terminate the SSL/TLS traffic on a layer-7 load balancer, you will need to use the `--set tls=external` option when installing Rancher in a later step. For more information, refer to the [Rancher Helm chart options.](../../../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#external-tls-termination)
 
 For an example showing how to set up an NGINX load balancer, refer to [this page.](nginx-load-balancer.md)
 
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md b/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md
index c07f4b6e91a..e4225251ce9 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md
@@ -85,8 +85,8 @@ ingress:
 RKE has many configuration options for customizing the install to suit your specific environment.
 
 Please see the [RKE Documentation](https://rancher.com/docs/rke/latest/en/config-options/) for the full list of options and capabilities.
-
-For tuning your etcd cluster for larger Rancher installations, see the [etcd settings guide](../../../getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md).
+ 
+For tuning your etcd cluster for larger Rancher installations, see the [etcd settings guide](../../advanced-user-guides/tune-etcd-for-large-installs.md).
 
 For more information regarding Dockershim support, refer to [this page](../../../getting-started/installation-and-upgrade/installation-requirements/dockershim.md)
 
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md
index 7385c9656f5..635f6c8b320 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md
@@ -21,7 +21,7 @@ For details on which OS and Docker versions were tested with each Rancher versio
 
 All supported operating systems are 64-bit x86.
 
-If you plan to use ARM64, see [Running on ARM64 (Experimental).](../../../getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md)
+If you plan to use ARM64, see [Running on ARM64 (Experimental).](../../advanced-user-guides/enable-experimental-features/rancher-on-arm64.md)
 
 For information on how to install Docker, refer to the official [Docker documentation.](https://docs.docker.com/)
 
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md
index 0df3e508024..fda6b8ed61d 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md
@@ -44,7 +44,7 @@ EKS clusters must have at least one managed node group to be imported into Ranch
 1. Choose the type of cluster.
 1. Use **Member Roles** to configure user authorization for the cluster. Click **Add Member** to add users that can access the cluster. Use the **Role** drop-down to set permissions for each user.
 1. If you are importing a generic Kubernetes cluster in Rancher, perform the following steps for setup:<br/>
-  a. Click **Agent Environment Variables** under **Cluster Options** to set environment variables for [rancher cluster agent](launch-kubernetes-with-rancher/about-rancher-agents.md). The environment variables can be set using key value pairs. If rancher agent requires use of proxy to communicate with Rancher server, `HTTP_PROXY`, `HTTPS_PROXY` and `NO_PROXY` environment variables can be set using agent environment variables.<br/>
+  a. Click **Agent Environment Variables** under **Cluster Options** to set environment variables for [rancher cluster agent](../launch-kubernetes-with-rancher/about-rancher-agents.md). The environment variables can be set using key value pairs. If rancher agent requires use of proxy to communicate with Rancher server, `HTTP_PROXY`, `HTTPS_PROXY` and `NO_PROXY` environment variables can be set using agent environment variables.<br/>
   b. Enable Project Network Isolation to ensure the cluster supports Kubernetes `NetworkPolicy` resources. Users can select the **Project Network Isolation** option under the **Advanced Options** dropdown to do so.
 1. Click **Create**.
 1. The prerequisite for `cluster-admin` privileges is shown (see **Prerequisites** above), including an example command to fulfil the prerequisite.
@@ -125,7 +125,7 @@ The control that Rancher has to manage a registered cluster depends on the type
 
 After registering a cluster, the cluster owner can:
 
-- [Manage cluster access](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md) through role-based access control
+- [Manage cluster access](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md) through role-based access control
 - Enable [monitoring, alerts and notifiers](../../../pages-for-subheaders/monitoring-and-alerting.md)
 - Enable [logging](../../../pages-for-subheaders/logging.md)
 - Enable [Istio](../../../pages-for-subheaders/istio.md)
@@ -195,7 +195,7 @@ To prevent issues when upgrading, the [Kubernetes upgrade best practices](https:
 
 _Available as of v2.6.3_
 
-Authorized Cluster Endpoint (ACE) support has been added for registered RKE2 and K3s clusters. This support includes manual steps you will perform on the downstream cluster to enable the ACE. For additional information on the authorized cluster endpoint, click [here](../../advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md).
+Authorized Cluster Endpoint (ACE) support has been added for registered RKE2 and K3s clusters. This support includes manual steps you will perform on the downstream cluster to enable the ACE. For additional information on the authorized cluster endpoint, click [here](../manage-clusters/access-clusters/authorized-cluster-endpoint.md).
 
 :::note Notes:
 
@@ -203,7 +203,7 @@ Authorized Cluster Endpoint (ACE) support has been added for registered RKE2 and
 
 - The following steps will work on both RKE2 and K3s clusters registered in v2.6.x as well as those registered (or imported) from a previous version of Rancher with an upgrade to v2.6.x.
 
-- These steps will alter the configuration of the downstream RKE2 and K3s clusters and deploy the `kube-api-authn-webhook`. If a future implementation of the ACE requires an update to the `kube-api-authn-webhook`, then this would also have to be done manually. For more information on this webhook, click [here](../../advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md#about-the-kube-api-auth-authentication-webhook).
+- These steps will alter the configuration of the downstream RKE2 and K3s clusters and deploy the `kube-api-authn-webhook`. If a future implementation of the ACE requires an update to the `kube-api-authn-webhook`, then this would also have to be done manually. For more information on this webhook, click [here](../manage-clusters/access-clusters/authorized-cluster-endpoint.md#about-the-kube-api-auth-authentication-webhook).
 
 :::
 
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md
new file mode 100644
index 00000000000..3e6a8f767ea
--- /dev/null
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md
@@ -0,0 +1,154 @@
+---
+title: Setting up the Amazon Cloud Provider
+weight: 1
+---
+
+When using the `Amazon` cloud provider, you can leverage the following capabilities:
+
+- **Load Balancers:** Launches an AWS Elastic Load Balancer (ELB) when choosing `Layer-4 Load Balancer` in **Port Mapping** or when launching a `Service` with `type: LoadBalancer`.
+- **Persistent Volumes**: Allows you to use AWS Elastic Block Stores (EBS) for persistent volumes.
+
+See [cloud-provider-aws README](https://kubernetes.github.io/cloud-provider-aws/) for all information regarding the Amazon cloud provider.
+
+To set up the Amazon cloud provider,
+
+1. [Create an IAM role and attach to the instances](#1-create-an-iam-role-and-attach-to-the-instances)
+2. [Configure the ClusterID](#2-configure-the-clusterid)
+
+### 1. Create an IAM Role and attach to the instances
+
+All nodes added to the cluster must be able to interact with EC2 so that they can create and remove resources. You can enable this interaction by using an IAM role attached to the instance. See [Amazon documentation: Creating an IAM Role](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html#create-iam-role) how to create an IAM role. There are two example policies:
+
+* The first policy is for the nodes with the `controlplane` role. These nodes have to be able to create/remove EC2 resources. The following IAM policy is an example, please remove any unneeded permissions for your use case.
+* The second policy is for the nodes with the `etcd` or `worker` role. These nodes only have to be able to retrieve information from EC2.
+
+While creating an [Amazon EC2 cluster](../../launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md), you must fill in the **IAM Instance Profile Name** (not ARN) of the created IAM role when creating the **Node Template**.
+
+While creating a [Custom cluster](../../../../pages-for-subheaders/use-existing-nodes.md), you must manually attach the IAM role to the instance(s).
+
+IAM Policy for nodes with the `controlplane` role:
+
+```json
+{
+"Version": "2012-10-17",
+"Statement": [
+  {
+    "Effect": "Allow",
+    "Action": [
+      "autoscaling:DescribeAutoScalingGroups",
+      "autoscaling:DescribeLaunchConfigurations",
+      "autoscaling:DescribeTags",
+      "ec2:DescribeInstances",
+      "ec2:DescribeRegions",
+      "ec2:DescribeRouteTables",
+      "ec2:DescribeSecurityGroups",
+      "ec2:DescribeSubnets",
+      "ec2:DescribeVolumes",
+      "ec2:CreateSecurityGroup",
+      "ec2:CreateTags",
+      "ec2:CreateVolume",
+      "ec2:ModifyInstanceAttribute",
+      "ec2:ModifyVolume",
+      "ec2:AttachVolume",
+      "ec2:AuthorizeSecurityGroupIngress",
+      "ec2:CreateRoute",
+      "ec2:DeleteRoute",
+      "ec2:DeleteSecurityGroup",
+      "ec2:DeleteVolume",
+      "ec2:DetachVolume",
+      "ec2:RevokeSecurityGroupIngress",
+      "ec2:DescribeVpcs",
+      "elasticloadbalancing:AddTags",
+      "elasticloadbalancing:AttachLoadBalancerToSubnets",
+      "elasticloadbalancing:ApplySecurityGroupsToLoadBalancer",
+      "elasticloadbalancing:CreateLoadBalancer",
+      "elasticloadbalancing:CreateLoadBalancerPolicy",
+      "elasticloadbalancing:CreateLoadBalancerListeners",
+      "elasticloadbalancing:ConfigureHealthCheck",
+      "elasticloadbalancing:DeleteLoadBalancer",
+      "elasticloadbalancing:DeleteLoadBalancerListeners",
+      "elasticloadbalancing:DescribeLoadBalancers",
+      "elasticloadbalancing:DescribeLoadBalancerAttributes",
+      "elasticloadbalancing:DetachLoadBalancerFromSubnets",
+      "elasticloadbalancing:DeregisterInstancesFromLoadBalancer",
+      "elasticloadbalancing:ModifyLoadBalancerAttributes",
+      "elasticloadbalancing:RegisterInstancesWithLoadBalancer",
+      "elasticloadbalancing:SetLoadBalancerPoliciesForBackendServer",
+      "elasticloadbalancing:AddTags",
+      "elasticloadbalancing:CreateListener",
+      "elasticloadbalancing:CreateTargetGroup",
+      "elasticloadbalancing:DeleteListener",
+      "elasticloadbalancing:DeleteTargetGroup",
+      "elasticloadbalancing:DescribeListeners",
+      "elasticloadbalancing:DescribeLoadBalancerPolicies",
+      "elasticloadbalancing:DescribeTargetGroups",
+      "elasticloadbalancing:DescribeTargetHealth",
+      "elasticloadbalancing:ModifyListener",
+      "elasticloadbalancing:ModifyTargetGroup",
+      "elasticloadbalancing:RegisterTargets",
+      "elasticloadbalancing:SetLoadBalancerPoliciesOfListener",
+      "iam:CreateServiceLinkedRole",
+      "kms:DescribeKey"
+    ],
+    "Resource": [
+      "*"
+    ]
+  }
+]
+}
+```
+
+IAM policy for nodes with the `etcd` or `worker` role:
+
+```json
+{
+"Version": "2012-10-17",
+"Statement": [
+    {
+        "Effect": "Allow",
+        "Action": [
+            "ec2:DescribeInstances",
+            "ec2:DescribeRegions",
+            "ecr:GetAuthorizationToken",
+            "ecr:BatchCheckLayerAvailability",
+            "ecr:GetDownloadUrlForLayer",
+            "ecr:GetRepositoryPolicy",
+            "ecr:DescribeRepositories",
+            "ecr:ListImages",
+            "ecr:BatchGetImage"
+        ],
+        "Resource": "*"
+    }
+]
+}
+```
+
+### 2. Configure the ClusterID
+
+The following resources need to tagged with a `ClusterID`:
+
+- **Nodes**: All hosts added in Rancher.
+- **Subnet**: The subnet used for your cluster.
+- **Security Group**: The security group used for your cluster.
+
+:::note
+
+Do not tag multiple security groups. Tagging multiple groups generates an error when creating an Elastic Load Balancer (ELB).
+
+:::
+
+When you create an [Amazon EC2 Cluster](../../launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md), the `ClusterID` is automatically configured for the created nodes. Other resources still need to be tagged manually.
+
+Use the following tag:
+
+**Key** = `kubernetes.io/cluster/CLUSTERID` **Value** = `owned`
+
+`CLUSTERID` can be any string you like, as long as it is equal across all tags set.
+
+Setting the value of the tag to `owned` tells the cluster that all resources with this tag are owned and managed by this cluster. If you share resources between clusters, you can change the tag to:
+
+**Key** = `kubernetes.io/cluster/CLUSTERID` **Value** = `shared`.
+
+### Using Amazon Elastic Container Registry (ECR)
+
+The kubelet component has the ability to automatically obtain ECR credentials, when the IAM profile mentioned in [Create an IAM Role and attach to the instances](#1-create-an-iam-role-and-attach-to-the-instances) is attached to the instance(s). When using a Kubernetes version older than v1.15.0, the Amazon cloud provider needs be configured in the cluster. Starting with Kubernetes version v1.15.0, the kubelet can obtain ECR credentials without having the Amazon cloud provider configured in the cluster.
\ No newline at end of file
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/azure.md
similarity index 100%
rename from docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md
rename to docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/azure.md
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-in-tree-vsphere.md
similarity index 100%
rename from docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere.md
rename to docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-in-tree-vsphere.md
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-out-of-tree-vsphere.md
similarity index 100%
rename from docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere.md
rename to docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-out-of-tree-vsphere.md
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/google-compute-engine.md
similarity index 100%
rename from docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md
rename to docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/google-compute-engine.md
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/migrate-from-in-tree-to-out-of-tree.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/migrate-from-in-tree-to-out-of-tree.md
similarity index 100%
rename from docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/migrate-from-in-tree-to-out-of-tree.md
rename to docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/migrate-from-in-tree-to-out-of-tree.md
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md
index 408d708e940..523eeccedbe 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md
@@ -2,7 +2,7 @@
 title: Creating an Aliyun ACK Cluster
 ---
 
-You can use Rancher to create a cluster hosted in Alibaba Cloud Kubernetes (ACK). Rancher has already implemented and packaged the [cluster driver](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md) for ACK, but by default, this cluster driver is `inactive`. In order to launch ACK clusters, you will need to [enable the ACK cluster driver](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md#activating-deactivating-cluster-drivers). After enabling the cluster driver, you can start provisioning ACK clusters.
+You can use Rancher to create a cluster hosted in Alibaba Cloud Kubernetes (ACK). Rancher has already implemented and packaged the [cluster driver](../../authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md) for ACK, but by default, this cluster driver is `inactive`. In order to launch ACK clusters, you will need to [enable the ACK cluster driver](../../authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md#activating-deactivating-cluster-drivers). After enabling the cluster driver, you can start provisioning ACK clusters.
 
 ## Prerequisites Outside of Rancher
 
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md
index f25473f60eb..84dbac4841f 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md
@@ -2,7 +2,7 @@
 title: Creating a Huawei CCE Cluster
 ---
 
-You can use Rancher to create a cluster hosted in Huawei Cloud Container Engine (CCE). Rancher has already implemented and packaged the [cluster driver](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md) for CCE, but by default, this cluster driver is `inactive`. In order to launch CCE clusters, you will need to [enable the CCE cluster driver](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md#activating-deactivating-cluster-drivers). After enabling the cluster driver, you can start provisioning CCE clusters.
+You can use Rancher to create a cluster hosted in Huawei Cloud Container Engine (CCE). Rancher has already implemented and packaged the [cluster driver](../../authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md) for CCE, but by default, this cluster driver is `inactive`. In order to launch CCE clusters, you will need to [enable the CCE cluster driver](../../authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md#activating-deactivating-cluster-drivers). After enabling the cluster driver, you can start provisioning CCE clusters.
 
 ## Prerequisites in Huawei
 
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md
index d1bb42c6676..6b14ed1eda4 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md
@@ -2,7 +2,7 @@
 title: Creating a Tencent TKE Cluster
 ---
 
-You can use Rancher to create a cluster hosted in Tencent Kubernetes Engine (TKE). Rancher has already implemented and packaged the [cluster driver](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md) for TKE, but by default, this cluster driver is `inactive`. In order to launch TKE clusters, you will need to [enable the TKE cluster driver](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md#activating-deactivating-cluster-drivers). After enabling the cluster driver, you can start provisioning TKE clusters.
+You can use Rancher to create a cluster hosted in Tencent Kubernetes Engine (TKE). Rancher has already implemented and packaged the [cluster driver](../../authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md) for TKE, but by default, this cluster driver is `inactive`. In order to launch TKE clusters, you will need to [enable the TKE cluster driver](../../authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md#activating-deactivating-cluster-drivers). After enabling the cluster driver, you can start provisioning TKE clusters.
 
 ## Prerequisites in Tencent
 
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/azure-storageclass-configuration.md
similarity index 91%
rename from docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md
rename to docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/azure-storageclass-configuration.md
index 0d554d6c9b4..640fc18c0ce 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/azure-storageclass-configuration.md
@@ -6,7 +6,7 @@ If you are using Azure VMs for your nodes, you can use [Azure files](https://doc
 
 In order to have the Azure platform create the required storage resources, follow these steps:
 
-1.  [Configure the Azure cloud provider.](../set-up-cloud-providers/other-cloud-providers/azure.md)
+1.  [Configure the Azure cloud provider.](../../kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/azure.md)
 1.  Configure `kubectl` to connect to your cluster.
 1.  Copy the `ClusterRole` and `ClusterRoleBinding` manifest for the service account:
       ```yml
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/network-requirements-for-host-gateway.md
similarity index 100%
rename from docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md
rename to docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/network-requirements-for-host-gateway.md
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/windows-linux-cluster-feature-parity.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/windows-linux-cluster-feature-parity.md
similarity index 100%
rename from docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/windows-linux-cluster-feature-parity.md
rename to docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/windows-linux-cluster-feature-parity.md
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/workload-migration-guidance.md b/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/workload-migration-guidance.md
similarity index 100%
rename from docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/workload-migration-guidance.md
rename to docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/workload-migration-guidance.md
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md
index dafc744636d..3cc75846602 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md
+++ b/docs/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md
@@ -40,8 +40,8 @@ Deploy a workload to run an application in one or more containers.
     To mount an Amazon EBS volume:
 
     - In [Amazon AWS](https://aws.amazon.com/), the nodes must be in the same Availability Zone and possess IAM permissions to attach/unattach volumes.
-
-    - The cluster must be using the [AWS cloud provider](https://kubernetes.io/docs/concepts/cluster-administration/cloud-providers/#aws) option. For more information on enabling this option see [Creating an Amazon EC2 Cluster](../../kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md) or [Creating a Custom Cluster](../../../../pages-for-subheaders/use-existing-nodes.md).
+    
+    - The cluster must be using the [AWS cloud provider](https://kubernetes.io/docs/concepts/cluster-administration/cloud-providers/#aws) option. For more information on enabling this option see [Creating an Amazon EC2 Cluster](../../launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md) or [Creating a Custom Cluster](../../../../pages-for-subheaders/use-existing-nodes.md).
 
     :::
 
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/about-rancher-agents.md
similarity index 74%
rename from docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md
rename to docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/about-rancher-agents.md
index dffe5407d8d..6eaea3617da 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md
+++ b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/about-rancher-agents.md
@@ -7,15 +7,15 @@ There are two different agent resources deployed on Rancher managed clusters:
 - [cattle-cluster-agent](#cattle-cluster-agent)
 - [cattle-node-agent](#cattle-node-agent)
 
-For a conceptual overview of how the Rancher server provisions clusters and communicates with them, refer to the [architecture](../../../../pages-for-subheaders/rancher-manager-architecture.md)
+For a conceptual overview of how the Rancher server provisions clusters and communicates with them, refer to the [architecture](../../../pages-for-subheaders/rancher-manager-architecture.md)
 
 ### cattle-cluster-agent
 
-The `cattle-cluster-agent` is used to connect to the Kubernetes API of [Rancher Launched Kubernetes](../../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) clusters. The `cattle-cluster-agent` is deployed using a Deployment resource.
+The `cattle-cluster-agent` is used to connect to the Kubernetes API of [Rancher Launched Kubernetes](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) clusters. The `cattle-cluster-agent` is deployed using a Deployment resource.
 
 ### cattle-node-agent
 
-The `cattle-node-agent` is used to interact with nodes in a [Rancher Launched Kubernetes](../../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) cluster when performing cluster operations. Examples of cluster operations are upgrading Kubernetes version and creating/restoring etcd snapshots. The `cattle-node-agent` is deployed using a DaemonSet resource to make sure it runs on every node. The `cattle-node-agent` is used as fallback option to connect to the Kubernetes API of [Rancher Launched Kubernetes](../../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) clusters when `cattle-cluster-agent` is unavailable.
+The `cattle-node-agent` is used to interact with nodes in a [Rancher Launched Kubernetes](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) cluster when performing cluster operations. Examples of cluster operations are upgrading Kubernetes version and creating/restoring etcd snapshots. The `cattle-node-agent` is deployed using a DaemonSet resource to make sure it runs on every node. The `cattle-node-agent` is used as fallback option to connect to the Kubernetes API of [Rancher Launched Kubernetes](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) clusters when `cattle-cluster-agent` is unavailable.
 
 ### Scheduling rules
 
@@ -26,7 +26,7 @@ The `cattle-cluster-agent` uses a fixed fixed set of tolerations (listed below,
 | `cattle-cluster-agent` | `beta.kubernetes.io/os:NotIn:windows`      | none         | **Note:** These are the default tolerations, and will be replaced by tolerations matching taints applied to controlplane nodes.<br/><br/>`effect:NoSchedule`<br/>`key:node-role.kubernetes.io/controlplane`<br/>`value:true`<br/><br/>`effect:NoSchedule`<br/>`key:node-role.kubernetes.io/control-plane`<br/>`operator:Exists`<br/><br/>`effect:NoSchedule`<br/>`key:node-role.kubernetes.io/master`<br/>`operator:Exists` |
 | `cattle-node-agent`    | `beta.kubernetes.io/os:NotIn:windows`      | none         | `operator:Exists`                                                              |
 
-The `cattle-cluster-agent` Deployment has preferred scheduling rules using `preferredDuringSchedulingIgnoredDuringExecution`, favoring to be scheduled on nodes with the `controlplane` node. When there are no controlplane nodes visible in the cluster (this is usually the case when using [Clusters from Hosted Kubernetes Providers](../../../../pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md)), you can add the label `cattle.io/cluster-agent=true` on a node to prefer scheduling the `cattle-cluster-agent` pod to that node.
+The `cattle-cluster-agent` Deployment has preferred scheduling rules using `preferredDuringSchedulingIgnoredDuringExecution`, favoring to be scheduled on nodes with the `controlplane` node. When there are no controlplane nodes visible in the cluster (this is usually the case when using [Clusters from Hosted Kubernetes Providers](../../../pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md)), you can add the label `cattle.io/cluster-agent=true` on a node to prefer scheduling the `cattle-cluster-agent` pod to that node.
 
 See [Kubernetes: Assigning Pods to Nodes](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/) to find more information about scheduling rules.
 
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/amazon.md
similarity index 90%
rename from docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md
rename to docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/amazon.md
index cc45f985a02..e079ba2bf36 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md
+++ b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/amazon.md
@@ -21,9 +21,9 @@ All nodes added to the cluster must be able to interact with EC2 so that they ca
 * The first policy is for the nodes with the `controlplane` role. These nodes have to be able to create/remove EC2 resources. The following IAM policy is an example, please remove any unneeded permissions for your use case.
 * The second policy is for the nodes with the `etcd` or `worker` role. These nodes only have to be able to retrieve information from EC2.
 
-While creating an [Amazon EC2 cluster](../../use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md), you must fill in the **IAM Instance Profile Name** (not ARN) of the created IAM role when creating the **Node Template**.
+While creating an [Amazon EC2 cluster](../launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md), you must fill in the **IAM Instance Profile Name** (not ARN) of the created IAM role when creating the **Node Template**.
 
-While creating a [Custom cluster](../../../../../../pages-for-subheaders/use-existing-nodes.md), you must manually attach the IAM role to the instance(s).
+While creating a [Custom cluster](../../../pages-for-subheaders/use-existing-nodes.md), you must manually attach the IAM role to the instance(s).
 
 IAM Policy for nodes with the `controlplane` role:
 
@@ -136,7 +136,7 @@ Do not tag multiple security groups. Tagging multiple groups generates an error
 
 :::
 
-When you create an [Amazon EC2 Cluster](../../use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md), the `ClusterID` is automatically configured for the created nodes. Other resources still need to be tagged manually.
+When you create an [Amazon EC2 Cluster](../launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md), the `ClusterID` is automatically configured for the created nodes. Other resources still need to be tagged manually.
 
 Use the following tag:
 
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/rke1-vs-rke2-differences.md b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/rke1-vs-rke2-differences.md
similarity index 100%
rename from docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/rke1-vs-rke2-differences.md
rename to docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/rke1-vs-rke2-differences.md
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
similarity index 72%
rename from docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
rename to docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
index 6a2805f9b4f..c0e25e9f62c 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
+++ b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
@@ -31,13 +31,13 @@ Then you will create a DigitalOcean cluster in Rancher, and when configuring the
 
 ### 2. Create a node template with your cloud credentials
 
-Creating a [node template](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-templates) for DigitalOcean will allow Rancher to provision new nodes in DigitalOcean. Node templates can be reused for other clusters.
+Creating a [node template](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-templates) for DigitalOcean will allow Rancher to provision new nodes in DigitalOcean. Node templates can be reused for other clusters.
 
 1. Click **☰ > Cluster Management**.
 1. Click **RKE1 Configuration > Node Templates**.
 1. Click **Add Template**.
 1. Click **DigitalOcean**.
-1. Fill out a node template for DigitalOcean. For help filling out the form, refer to [DigitalOcean Node Template Configuration.](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/digitalocean.md)
+1. Fill out a node template for DigitalOcean. For help filling out the form, refer to [DigitalOcean Node Template Configuration.](../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/digitalocean.md)
 
 ### 3. Create a cluster with node pools using the node template
 
@@ -45,8 +45,8 @@ Creating a [node template](../../../../../pages-for-subheaders/use-new-nodes-in-
 1. On the **Clusters** page, click **Create**.
 1. Click **DigitalOcean**.
 1. Enter a **Cluster Name**.
-1. Add one or more node pools to your cluster. Add one or more node pools to your cluster. Each node pool uses a node template to provision new nodes. For more information about node pools, including best practices for assigning Kubernetes roles to them, see [this section.](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)
-1. **In the Cluster Configuration** section, choose the version of Kubernetes that will be installed, what network provider will be used and if you want to enable project network isolation. To see more cluster options, click on **Show advanced options**. For help configuring the cluster, refer to the [RKE cluster configuration reference.](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
+1. Add one or more node pools to your cluster. Add one or more node pools to your cluster. Each node pool uses a node template to provision new nodes. For more information about node pools, including best practices for assigning Kubernetes roles to them, see [this section.](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)
+1. **In the Cluster Configuration** section, choose the version of Kubernetes that will be installed, what network provider will be used and if you want to enable project network isolation. To see more cluster options, click on **Show advanced options**. For help configuring the cluster, refer to the [RKE cluster configuration reference.](../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
 1. Use **Member Roles** to configure user authorization for the cluster. Click **Add Member** to add users that can access the cluster. Use the **Role** drop-down to set permissions for each user.
 1. Click **Create**.
 
@@ -74,9 +74,9 @@ Use Rancher to create a Kubernetes cluster in DigitalOcean.
 1. Click **DigitalOcean**.
 1. Select a **Cloud Credential**, if more than one exists. Otherwise, it's preselected.
 1. Enter a **Cluster Name**.
-1. Create a machine pool for each Kubernetes role. Refer to the [best practices](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-roles-in-rke2) for recommendations on role assignments and counts.
-    1. For each machine pool, define the machine configuration. Refer to the [DigitalOcean machine configuration reference](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/digitalocean.md) for information on configuration options.
-1. Use the **Cluster Configuration** to choose the version of Kubernetes that will be installed, what network provider will be used and if you want to enable project network isolation. For help configuring the cluster, refer to the [RKE2 cluster configuration reference.](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md)
+1. Create a machine pool for each Kubernetes role. Refer to the [best practices](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-roles-in-rke2) for recommendations on role assignments and counts.
+    1. For each machine pool, define the machine configuration. Refer to the [DigitalOcean machine configuration reference](../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/digitalocean.md) for information on configuration options.
+1. Use the **Cluster Configuration** to choose the version of Kubernetes that will be installed, what network provider will be used and if you want to enable project network isolation. For help configuring the cluster, refer to the [RKE2 cluster configuration reference.](../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md)
 1. Use **Member Roles** to configure user authorization for the cluster. Click **Add Member** to add users that can access the cluster. Use the **Role** drop-down to set permissions for each user.
 1. Click **Create**.
 
@@ -97,5 +97,5 @@ You can access your cluster after its state is updated to **Active**.
 
 After creating your cluster, you can access it through the Rancher UI. As a best practice, we recommend setting up these alternate ways of accessing your cluster:
 
-- **Access your cluster with the kubectl CLI:** Follow [these steps](../../../../advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#accessing-clusters-with-kubectl-on-your-workstation) to access clusters with kubectl on your workstation. In this case, you will be authenticated through the Rancher server’s authentication proxy, then Rancher will connect you to the downstream cluster. This method lets you manage the cluster without the Rancher UI.
-- **Access your cluster with the kubectl CLI, using the authorized cluster endpoint:** Follow [these steps](../../../../advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) to access your cluster with kubectl directly, without authenticating through Rancher. We recommend setting up this alternative method to access your cluster so that in case you can’t connect to Rancher, you can still access the cluster.
+- **Access your cluster with the kubectl CLI:** Follow [these steps](../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#accessing-clusters-with-kubectl-on-your-workstation) to access clusters with kubectl on your workstation. In this case, you will be authenticated through the Rancher server’s authentication proxy, then Rancher will connect you to the downstream cluster. This method lets you manage the cluster without the Rancher UI.
+- **Access your cluster with the kubectl CLI, using the authorized cluster endpoint:** Follow [these steps](../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) to access your cluster with kubectl directly, without authenticating through Rancher. We recommend setting up this alternative method to access your cluster so that in case you can’t connect to Rancher, you can still access the cluster.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
similarity index 85%
rename from docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
rename to docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
index 73efb447f91..9ecf6058ccb 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
+++ b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
@@ -17,7 +17,7 @@ Then you will create an EC2 cluster in Rancher, and when configuring the new clu
 - **AWS EC2 Access Key and Secret Key** that will be used to create the instances. See [Amazon Documentation: Creating Access Keys](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html#Using_CreateAccessKey) how to create an Access Key and Secret Key.
 - **IAM Policy created** to add to the user of the Access Key And Secret Key. See [Amazon Documentation: Creating IAM Policies (Console)](https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_create.html#access_policies_create-start) how to create an IAM policy. See our three example JSON policies below:
   - [Example IAM Policy](#example-iam-policy)
-  - [Example IAM Policy with PassRole](#example-iam-policy-with-passrole) (needed if you want to use [Kubernetes Cloud Provider](../../../../../pages-for-subheaders/set-up-cloud-providers.md) or want to pass an IAM Profile to an instance)
+  - [Example IAM Policy with PassRole](#example-iam-policy-with-passrole) (needed if you want to use [Kubernetes Cloud Provider](../../../../pages-for-subheaders/set-up-cloud-providers.md) or want to pass an IAM Profile to an instance)
   - [Example IAM Policy to allow encrypted EBS volumes](#example-iam-policy-to-allow-encrypted-ebs-volumes)
 - **IAM Policy added as Permission** to the user. See [Amazon Documentation: Adding Permissions to a User (Console)](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_users_change-permissions.html#users_change_permissions-add-console) how to attach it to an user.
 
@@ -47,12 +47,12 @@ The steps to create a cluster differ based on your Rancher version.
 
 ### 2. Create a node template with your cloud credentials and information from EC2
 
-Creating a [node template](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-templates) for EC2 will allow Rancher to provision new nodes in EC2. Node templates can be reused for other clusters.
+Creating a [node template](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-templates) for EC2 will allow Rancher to provision new nodes in EC2. Node templates can be reused for other clusters.
 
 1. Click **☰ > Cluster Management**.
 1. Click **RKE1 Configuration > Node Templates**
 1. Click **Add Template**.
-1. Fill out a node template for EC2. For help filling out the form, refer to [EC2 Node Template Configuration.](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md)
+1. Fill out a node template for EC2. For help filling out the form, refer to [EC2 Node Template Configuration.](../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md)
 1. Click **Create**.
 
     :::note
@@ -68,9 +68,9 @@ Add one or more node pools to your cluster. For more information about node pool
 1. Click **☰ > Cluster Management**.
 1. On the **Clusters** page, click **Create**.
 1. Click **Amazon EC2**.
-1. Create a node pool for each Kubernetes role. For each node pool, choose a node template that you created. For more information about node pools, including best practices for assigning Kubernetes roles to them, see [this section.](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)
+1. Create a node pool for each Kubernetes role. For each node pool, choose a node template that you created. For more information about node pools, including best practices for assigning Kubernetes roles to them, see [this section.](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)
 1. Click **Add Member** to add users that can access the cluster. Use the **Role** drop-down to set permissions for each user.
-1. Use **Cluster Options** to choose the version of Kubernetes that will be installed, what network provider will be used and if you want to enable project network isolation. Refer to [Selecting Cloud Providers](../../../../../pages-for-subheaders/set-up-cloud-providers.md) to configure the Kubernetes Cloud Provider. For help configuring the cluster, refer to the [RKE cluster configuration reference.](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
+1. Use **Cluster Options** to choose the version of Kubernetes that will be installed, what network provider will be used and if you want to enable project network isolation. Refer to [Selecting Cloud Providers](../../../../../pages-for-subheaders/set-up-cloud-providers.md) to configure the Kubernetes Cloud Provider. For help configuring the cluster, refer to the [RKE cluster configuration reference.](../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
 
     :::note
 
@@ -106,9 +106,9 @@ If you already have a set of cloud credentials to use, skip this section.
 1. Click **Amazon EC2**.
 1. Select a **Cloud Credential**, if more than one exists. Otherwise, it's preselected.
 1. Enter a **Cluster Name**.
-1. Create a machine pool for each Kubernetes role. Refer to the [best practices](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-roles-in-rke2) for recommendations on role assignments and counts.
-    1. For each machine pool, define the machine configuration. Refer to [the EC2 machine configuration reference](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/amazon-ec2.md) for information on configuration options.
-1. Use the **Cluster Configuration** to choose the version of Kubernetes that will be installed, what network provider will be used and if you want to enable project network isolation. For help configuring the cluster, refer to the [RKE2 cluster configuration reference.](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md)
+1. Create a machine pool for each Kubernetes role. Refer to the [best practices](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-roles-in-rke2) for recommendations on role assignments and counts.
+    1. For each machine pool, define the machine configuration. Refer to [the EC2 machine configuration reference](../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/amazon-ec2.md) for information on configuration options.
+1. Use the **Cluster Configuration** to choose the version of Kubernetes that will be installed, what network provider will be used and if you want to enable project network isolation. For help configuring the cluster, refer to the [RKE2 cluster configuration reference.](../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md)
 1. Use **Member Roles** to configure user authorization for the cluster. Click **Add Member** to add users that can access the cluster. Use the **Role** drop-down to set permissions for each user.
 1. Click **Create**.
 
@@ -130,8 +130,8 @@ You can access your cluster after its state is updated to **Active**.
 
 After creating your cluster, you can access it through the Rancher UI. As a best practice, we recommend setting up these alternate ways of accessing your cluster:
 
-- **Access your cluster with the kubectl CLI:** Follow [these steps](../../../../advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#accessing-clusters-with-kubectl-on-your-workstation) to access clusters with kubectl on your workstation. In this case, you will be authenticated through the Rancher server’s authentication proxy, then Rancher will connect you to the downstream cluster. This method lets you manage the cluster without the Rancher UI.
-- **Access your cluster with the kubectl CLI, using the authorized cluster endpoint:** Follow [these steps](../../../../advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) to access your cluster with kubectl directly, without authenticating through Rancher. We recommend setting up this alternative method to access your cluster so that in case you can’t connect to Rancher, you can still access the cluster.
+- **Access your cluster with the kubectl CLI:** Follow [these steps](../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#accessing-clusters-with-kubectl-on-your-workstation) to access clusters with kubectl on your workstation. In this case, you will be authenticated through the Rancher server’s authentication proxy, then Rancher will connect you to the downstream cluster. This method lets you manage the cluster without the Rancher UI.
+- **Access your cluster with the kubectl CLI, using the authorized cluster endpoint:** Follow [these steps](../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) to access your cluster with kubectl directly, without authenticating through Rancher. We recommend setting up this alternative method to access your cluster so that in case you can’t connect to Rancher, you can still access the cluster.
 
 # IAM Policies
 
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
similarity index 79%
rename from docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
rename to docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
index 9988d4967ce..e98a26855ca 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
+++ b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
@@ -22,9 +22,9 @@ For more information, refer to the documentation on [Azure load balancer limitat
 
 :::
 
-For more information on configuring the Kubernetes cluster that Rancher will install on the Azure nodes, refer to the [RKE cluster configuration reference.](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
+For more information on configuring the Kubernetes cluster that Rancher will install on the Azure nodes, refer to the [RKE cluster configuration reference.](../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
 
-For more information on configuring Azure node templates, refer to the [Azure node template configuration reference.](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md)
+For more information on configuring Azure node templates, refer to the [Azure node template configuration reference.](../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md)
 
 - [Preparation in Azure](#preparation-in-azure)
 - [Creating an Azure Cluster](#creating-an-azure-cluster)
@@ -68,7 +68,7 @@ The creation of this service principal returns three pieces of identification in
 
 ### 2. Create a node template with your cloud credentials
 
-Creating a [node template](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-templates) for Azure will allow Rancher to provision new nodes in Azure. Node templates can be reused for other clusters.
+Creating a [node template](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-templates) for Azure will allow Rancher to provision new nodes in Azure. Node templates can be reused for other clusters.
 
 1. Click **☰ > Cluster Management**.
 1. Click **RKE1 Configuration > Node Templates**.
@@ -84,7 +84,7 @@ Use Rancher to create a Kubernetes cluster in Azure.
 1. On the **Clusters** page, click **Create**.
 1. Click **Azure**.
 1. Enter a **Cluster Name**.
-1. Add one or more node pools to your cluster. Each node pool uses a node template to provision new nodes. For more information about node pools, including best practices, see [this section.](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)
+1. Add one or more node pools to your cluster. Each node pool uses a node template to provision new nodes. For more information about node pools, including best practices, see [this section.](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)
 1. In the **Cluster Configuration** to choose the version of Kubernetes that will be installed, what network provider will be used and if you want to enable project network isolation. To see more cluster options, click on **Show advanced options**. For help configuring the cluster, refer to the [RKE cluster configuration reference.](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
 1. Use **Member Roles** to configure user authorization for the cluster. Click **Add Member** to add users that can access the cluster. Use the **Role** drop-down to set permissions for each user.
 1. Click **Create**.
@@ -115,9 +115,9 @@ Use Rancher to create a Kubernetes cluster in Azure.
 1. Click **Azure**.
 1. Select a **Cloud Credential**, if more than one exists. Otherwise, it's preselected.
 1. Enter a **Cluster Name**.
-1. Create a machine pool for each Kubernetes role. Refer to the [best practices](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-roles-in-rke2) for recommendations on role assignments and counts.
-    1. For each machine pool, define the machine configuration. Refer to the [Azure machine configuration reference](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/azure.md) for information on configuration options.
-1. Use the **Cluster Configuration** to choose the version of Kubernetes that will be installed, what network provider will be used and if you want to enable project network isolation.  For help configuring the cluster, refer to the [RKE2 cluster configuration reference.](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md)
+1. Create a machine pool for each Kubernetes role. Refer to the [best practices](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-roles-in-rke2) for recommendations on role assignments and counts.
+    1. For each machine pool, define the machine configuration. Refer to the [Azure machine configuration reference](../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/azure.md) for information on configuration options.
+1. Use the **Cluster Configuration** to choose the version of Kubernetes that will be installed, what network provider will be used and if you want to enable project network isolation.  For help configuring the cluster, refer to the [RKE2 cluster configuration reference.](../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md)
 1. Use **Member Roles** to configure user authorization for the cluster. Click **Add Member** to add users that can access the cluster. Use the **Role** drop-down to set permissions for each user.
 1. Click **Create**.
 
@@ -140,5 +140,5 @@ You can access your cluster after its state is updated to **Active**.
 
 After creating your cluster, you can access it through the Rancher UI. As a best practice, we recommend setting up these alternate ways of accessing your cluster:
 
-- **Access your cluster with the kubectl CLI:** Follow [these steps](../../../../advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#accessing-clusters-with-kubectl-on-your-workstation) to access clusters with kubectl on your workstation. In this case, you will be authenticated through the Rancher server’s authentication proxy, then Rancher will connect you to the downstream cluster. This method lets you manage the cluster without the Rancher UI.
-- **Access your cluster with the kubectl CLI, using the authorized cluster endpoint:** Follow [these steps](../../../../advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) to access your cluster with kubectl directly, without authenticating through Rancher. We recommend setting up this alternative method to access your cluster so that in case you can’t connect to Rancher, you can still access the cluster.
+- **Access your cluster with the kubectl CLI:** Follow [these steps](../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#accessing-clusters-with-kubectl-on-your-workstation) to access clusters with kubectl on your workstation. In this case, you will be authenticated through the Rancher server’s authentication proxy, then Rancher will connect you to the downstream cluster. This method lets you manage the cluster without the Rancher UI.
+- **Access your cluster with the kubectl CLI, using the authorized cluster endpoint:** Follow [these steps](../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) to access your cluster with kubectl directly, without authenticating through Rancher. We recommend setting up this alternative method to access your cluster so that in case you can’t connect to Rancher, you can still access the cluster.
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
similarity index 71%
rename from docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
rename to docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
index eb248889193..6f27f903f5b 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
+++ b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
@@ -4,15 +4,15 @@ title: Provisioning Kubernetes Clusters in Nutanix AOS
 
 To use Rancher to install an [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes cluster in Nutanix AOS (AHV):
 
-1. Locate Rancher's built-in Nutanix [node driver and activate it](../../../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md#activating-deactivating-node-drivers).
+1. Locate Rancher's built-in Nutanix [node driver and activate it](../../../authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md#activating-deactivating-node-drivers).
 
 1. Create a node template, which Rancher will use to provision nodes in Nutanix AOS.
 
 1. Create a Nutanix AOS cluster in Rancher. When configuring the new cluster, you will define node pools for it. Each node pool will have a Kubernetes role of etcd, controlplane, or worker. Rancher will install RKE Kubernetes on the new nodes, and it will set up each node with the Kubernetes role defined by the node pool.
 
-For details on configuring the Nutanix AOS node template, refer to the [Nutanix AOS node template configuration reference.](../../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/nutanix.md)
+For details on configuring the Nutanix AOS node template, refer to the [Nutanix AOS node template configuration reference.](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/nutanix.md)
 
-For details on configuring RKE Kubernetes clusters in Rancher, refer to the [cluster configuration reference.](../../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
+For details on configuring RKE Kubernetes clusters in Rancher, refer to the [cluster configuration reference.](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
 
 - [Preparation in Nutanix AOS](#preparation-in-nutanix-aos)
 - [Creating a Nutanix AOS Cluster](#creating-a-nutanix-aos-cluster)
@@ -37,7 +37,7 @@ You must ensure that the hosts running the Rancher server are able to establish
 - To the Nutanix Prism Central API (usually port 9440/TCP).
 - To port 22/TCP and 2376/TCP on the created VMs
 
-See [Node Networking Requirements](../../../node-requirements-for-rancher-managed-clusters.md#networking-requirements) for a detailed list of port requirements applicable for creating nodes on an infrastructure provider.
+See [Node Networking Requirements](../../../kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md#networking-requirements) for a detailed list of port requirements applicable for creating nodes on an infrastructure provider.
 
 ### VM-VM Anti-Affinity Policies
 
@@ -50,7 +50,7 @@ Setting up [VM-VM Anti-Affinity Policies](https://portal.nutanix.com/page/docume
 
 ### 1. Create a node template
 
-Creating a [node template](../../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-templates) for Nutanix AOS will allow Rancher to provision new nodes in Nutanix AOS. Node templates can be reused for other clusters.
+Creating a [node template](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-templates) for Nutanix AOS will allow Rancher to provision new nodes in Nutanix AOS. Node templates can be reused for other clusters.
 
 1. Click **☰ > Cluster Management**.
 1. Click **RKE1 Configuration > Node Templates**.
@@ -70,7 +70,7 @@ Use Rancher to create a Kubernetes cluster in Nutanix AOS.
 1. Enter a **Cluster Name**, then click **Continue**.
 1. Use **Member Roles** to configure user authorization for the cluster. Click **Add Member** to add users who can access the cluster. Use the **Role** drop-down to set permissions for each user.
 1. Use **Cluster Options** to choose the version of Kubernetes that will be installed, what network provider will be used, and whether you want to enable project network isolation. To see more cluster options, click on **Show advanced options**. For help configuring the cluster, refer to the [RKE cluster configuration reference.](../../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
-1. Add one or more node pools to your cluster. Each node pool uses a node template to provision new nodes. For more information about node pools, including best practices for assigning Kubernetes roles to the nodes, see [this section.](../../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-pools)
+1. Add one or more node pools to your cluster. Each node pool uses a node template to provision new nodes. For more information about node pools, including best practices for assigning Kubernetes roles to the nodes, see [this section.](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-pools)
 1. Review your options to confirm they're correct. Then click **Create**.
 
 **Result:** Your cluster is created and assigned a state of **Provisioning**. Rancher is standing up your cluster.
@@ -87,6 +87,6 @@ You can access your cluster after its state is updated to **Active**.
 
 After creating your cluster, you can access it through the Rancher UI. As a best practice, we recommend setting up these alternate ways of accessing your cluster:
 
-- **Access your cluster with the kubectl CLI:** Follow [these steps](../../../../../advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#accessing-clusters-with-kubectl-on-your-workstation) to access clusters with kubectl on your workstation. In this case, you will be authenticated through the Rancher server’s authentication proxy, then Rancher will connect you to the downstream cluster. This method lets you manage the cluster without the Rancher UI.
+- **Access your cluster with the kubectl CLI:** Follow [these steps](../../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#accessing-clusters-with-kubectl-on-your-workstation) to access clusters with kubectl on your workstation. In this case, you will be authenticated through the Rancher server’s authentication proxy, then Rancher will connect you to the downstream cluster. This method lets you manage the cluster without the Rancher UI.
 
-- **Access your cluster with the kubectl CLI, using the authorized cluster endpoint:** Follow [these steps](../../../../../advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) to access your cluster with kubectl directly, without authenticating through Rancher. We recommend setting up this alternative method to access your cluster so that in case you can’t connect to Rancher, you can still access the cluster.
\ No newline at end of file
+- **Access your cluster with the kubectl CLI, using the authorized cluster endpoint:** Follow [these steps](../../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) to access your cluster with kubectl directly, without authenticating through Rancher. We recommend setting up this alternative method to access your cluster so that in case you can’t connect to Rancher, you can still access the cluster.
\ No newline at end of file
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template.md b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template.md
similarity index 100%
rename from docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template.md
rename to docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template.md
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md
similarity index 100%
rename from docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md
rename to docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md
diff --git a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
similarity index 74%
rename from docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
rename to docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
index 28474a19ba3..a59648bf5d2 100644
--- a/docs/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
+++ b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
@@ -8,9 +8,9 @@ First, you will set up your vSphere cloud credentials in Rancher. Then you will
 
 Then you will create a vSphere cluster in Rancher, and when configuring the new cluster, you will define node pools for it. Each node pool will have a Kubernetes role of etcd, controlplane, or worker. Rancher will install RKE Kubernetes on the new nodes, and it will set up each node with the Kubernetes role defined by the node pool.
 
-For details on configuring the vSphere node template, refer to the [vSphere node template configuration reference.](../../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere.md)
+For details on configuring the vSphere node template, refer to the [vSphere node template configuration reference.](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere.md)
 
-For details on configuring RKE Kubernetes clusters in Rancher, refer to the [cluster configuration reference.](../../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md#rke-cluster-config-file-reference)
+For details on configuring RKE Kubernetes clusters in Rancher, refer to the [cluster configuration reference.](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md#rke-cluster-config-file-reference)
 
 
 - [Preparation in vSphere](#preparation-in-vsphere)
@@ -36,7 +36,7 @@ It must be ensured that the hosts running the Rancher server are able to establi
 - To the Host API (port 443/TCP) on all ESXi hosts used to instantiate virtual machines for the clusters (*only required when using the ISO creation method*).
 - To port 22/TCP and 2376/TCP on the created VMs
 
-See [Node Networking Requirements](../../../node-requirements-for-rancher-managed-clusters.md#networking-requirements) for a detailed list of port requirements applicable for creating nodes on an infrastructure provider.
+See [Node Networking Requirements](../../../kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md#networking-requirements) for a detailed list of port requirements applicable for creating nodes on an infrastructure provider.
 
 ### Valid ESXi License for vSphere API Access
 
@@ -67,14 +67,14 @@ The a vSphere cluster is created in Rancher depends on the Rancher version.
 
 ### 2. Create a node template with your cloud credentials
 
-Creating a [node template](../../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-templates) for vSphere will allow Rancher to provision new nodes in vSphere. Node templates can be reused for other clusters.
+Creating a [node template](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-templates) for vSphere will allow Rancher to provision new nodes in vSphere. Node templates can be reused for other clusters.
 
 1. Click **☰ > Cluster Management**.
 1. Click **RKE1 Configuration > Node Templates**.
 1. Click **Create**.
 1. Click **Add Template**.
 1. Click **vSphere**.
-1. Fill out a node template for vSphere. For help filling out the form, refer to the vSphere node template [configuration reference.](../../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere.md).
+1. Fill out a node template for vSphere. For help filling out the form, refer to the vSphere node template [configuration reference.](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere.md).
 1. Click **Create**.
 
 ### 3. Create a cluster with node pools using the node template
@@ -87,8 +87,8 @@ Use Rancher to create a Kubernetes cluster in vSphere.
 1. Enter a **Cluster Name** and use your vSphere cloud credentials. Click **Continue**.
 1. Use **Member Roles** to configure user authorization for the cluster. Click **Add Member** to add users that can access the cluster. Use the **Role** drop-down to set permissions for each user.
 1. Use **Cluster Options** to choose the version of Kubernetes that will be installed, what network provider will be used and if you want to enable project network isolation. To see more cluster options, click on **Show advanced options**. For help configuring the cluster, refer to the [RKE cluster configuration reference.](../../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
-1. If you want to dynamically provision persistent storage or other infrastructure later, you will need to enable the vSphere cloud provider by modifying the cluster YAML file. For details, refer to [this section.](../../../../../../pages-for-subheaders/vsphere-cloud-provider.md)
-1. Add one or more node pools to your cluster. Each node pool uses a node template to provision new nodes. For more information about node pools, including best practices for assigning Kubernetes roles to the nodes, see [this section.](../../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-pools)
+1. If you want to dynamically provision persistent storage or other infrastructure later, you will need to enable the vSphere cloud provider by modifying the cluster YAML file. For details, refer to [this section.](../../../../../pages-for-subheaders/vsphere-cloud-provider.md)
+1. Add one or more node pools to your cluster. Each node pool uses a node template to provision new nodes. For more information about node pools, including best practices for assigning Kubernetes roles to the nodes, see [this section.](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-pools)
 1. Review your options to confirm they're correct. Then click **Create**.
 
 **Result:**
@@ -107,6 +107,6 @@ You can access your cluster after its state is updated to **Active**.
 
 After creating your cluster, you can access it through the Rancher UI. As a best practice, we recommend setting up these alternate ways of accessing your cluster:
 
-- **Access your cluster with the kubectl CLI:** Follow [these steps](../../../../../advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#accessing-clusters-with-kubectl-on-your-workstation) to access clusters with kubectl on your workstation. In this case, you will be authenticated through the Rancher server’s authentication proxy, then Rancher will connect you to the downstream cluster. This method lets you manage the cluster without the Rancher UI.
-- **Access your cluster with the kubectl CLI, using the authorized cluster endpoint:** Follow [these steps](../../../../../advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) to access your cluster with kubectl directly, without authenticating through Rancher. We recommend setting up this alternative method to access your cluster so that in case you can’t connect to Rancher, you can still access the cluster.
-- **Provision Storage:** For an example of how to provision storage in vSphere using Rancher, refer to [this section.](../../../../../advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md) In order to dynamically provision storage in vSphere, the vSphere provider must be [enabled.](../../../../../../pages-for-subheaders/vsphere-cloud-provider.md)
\ No newline at end of file
+- **Access your cluster with the kubectl CLI:** Follow [these steps](../../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#accessing-clusters-with-kubectl-on-your-workstation) to access clusters with kubectl on your workstation. In this case, you will be authenticated through the Rancher server’s authentication proxy, then Rancher will connect you to the downstream cluster. This method lets you manage the cluster without the Rancher UI.
+- **Access your cluster with the kubectl CLI, using the authorized cluster endpoint:** Follow [these steps](../../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) to access your cluster with kubectl directly, without authenticating through Rancher. We recommend setting up this alternative method to access your cluster so that in case you can’t connect to Rancher, you can still access the cluster.
+- **Provision Storage:** For an example of how to provision storage in vSphere using Rancher, refer to [this section.](../../../../new-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md) In order to dynamically provision storage in vSphere, the vSphere provider must be [enabled.](../../../../../../pages-for-subheaders/vsphere-cloud-provider.md)
\ No newline at end of file
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md b/docs/how-to-guides/new-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
similarity index 68%
rename from docs/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
rename to docs/how-to-guides/new-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
index 15f63656164..adca3bea9b8 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
+++ b/docs/how-to-guides/new-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
@@ -6,7 +6,7 @@ If you want to provide a user with access and permissions to _all_ projects, nod
 
 :::tip
 
-Want to provide a user with access to a _specific_ project within a cluster? See [Adding Project Members](../../manage-projects/add-users-to-projects.md) instead.
+Want to provide a user with access to a _specific_ project within a cluster? See [Adding Project Members](../../../new-user-guides/add-users-to-projects.md) instead.
 
 :::
 
@@ -31,11 +31,11 @@ Cluster administrators can edit the membership for a cluster, controlling which
 
     If external authentication is configured:
 
-    - Rancher returns users from your [external authentication](../../../../pages-for-subheaders/about-authentication.md) source as you type.
+    - Rancher returns users from your [external authentication](../../../../pages-for-subheaders/authentication-config.md) source as you type.
 
 		:::note Using AD but can't find your users?
 
-		There may be an issue with your search attribute configuration. See [Configuring Active Directory Authentication: Step 5](../../authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md).
+		There may be an issue with your search attribute configuration. See [Configuring Active Directory Authentication: Step 5](../../../new-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md).
 
 		:::
 
@@ -43,20 +43,20 @@ Cluster administrators can edit the membership for a cluster, controlling which
 
 		:::note
 
-		If you are logged in as a local user, external users do not display in your search results. For more information, see [External Authentication Configuration and Principal Users](../../../../pages-for-subheaders/about-authentication.md#external-authentication-configuration-and-principal-users).
+		If you are logged in as a local user, external users do not display in your search results. For more information, see [External Authentication Configuration and Principal Users](../../../../pages-for-subheaders/authentication-config.md#external-authentication-configuration-and-principal-users).
 
 		:::
 
 1. Assign the user or group **Cluster** roles.
 
-    [What are Cluster Roles?](../../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md)
+    [What are Cluster Roles?](../../../new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md)
 
     :::tip
 
     For Custom Roles, you can modify the list of individual roles available for assignment.
 
-    - To add roles to the list, [Add a Custom Role](../../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md).
-    - To remove roles from the list, [Lock/Unlock Roles](../../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md).
+    - To add roles to the list, [Add a Custom Role](../../../new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md).
+    - To remove roles from the list, [Lock/Unlock Roles](../../../new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md).
 
     :::
 
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md b/docs/how-to-guides/new-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md
rename to docs/how-to-guides/new-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md b/docs/how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md
rename to docs/how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md b/docs/how-to-guides/new-user-guides/manage-clusters/add-a-pod-security-policy.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md
rename to docs/how-to-guides/new-user-guides/manage-clusters/add-a-pod-security-policy.md
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies.md b/docs/how-to-guides/new-user-guides/manage-clusters/assign-pod-security-policies.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies.md
rename to docs/how-to-guides/new-user-guides/manage-clusters/assign-pod-security-policies.md
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md b/docs/how-to-guides/new-user-guides/manage-clusters/clean-cluster-nodes.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md
rename to docs/how-to-guides/new-user-guides/manage-clusters/clean-cluster-nodes.md
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md b/docs/how-to-guides/new-user-guides/manage-clusters/clone-cluster-configuration.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md
rename to docs/how-to-guides/new-user-guides/manage-clusters/clone-cluster-configuration.md
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md b/docs/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md
rename to docs/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md b/docs/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md
rename to docs/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md b/docs/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
similarity index 96%
rename from docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
rename to docs/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
index 23487786daf..9415d6f4b08 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
+++ b/docs/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
@@ -8,7 +8,7 @@ This section assumes that you understand the Kubernetes concepts of storage clas
 
 New storage is often provisioned by a cloud provider such as Amazon EBS. However, new storage doesn't have to be in the cloud.
 
-If you have a pool of block storage, and you don't want to use a cloud provider, Longhorn could help you provide persistent storage to your Kubernetes cluster. For more information, see [this page.](../../../../../explanations/integrations-in-rancher/longhorn.md)
+If you have a pool of block storage, and you don't want to use a cloud provider, Longhorn could help you provide persistent storage to your Kubernetes cluster. For more information, see [this page.](../../../../../integrations-in-rancher/longhorn.md)
 
 To provision new storage for your workloads, follow these steps:
 
@@ -36,7 +36,7 @@ Local | `local`
 Network File System | `nfs`
 hostPath | `host-path`
 
-To use a storage provisioner that is not on the above list, you will need to use a [feature flag to enable unsupported storage drivers.](../../../../../getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md)
+To use a storage provisioner that is not on the above list, you will need to use a [feature flag to enable unsupported storage drivers.](../../../../advanced-user-guides/enable-experimental-features/unsupported-storage-drivers.md)
 
 ### 1. Add a storage class and configure it to use your storage
 
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md b/docs/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md
rename to docs/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md b/docs/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
similarity index 95%
rename from docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
rename to docs/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
index 7e1365e9963..c19a5094a3c 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
+++ b/docs/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
@@ -25,9 +25,9 @@ To set up storage, follow these steps:
 
 Creating a persistent volume in Rancher will not create a storage volume. It only creates a Kubernetes resource that maps to an existing volume. Therefore, before you can create a persistent volume as a Kubernetes resource, you must have storage provisioned.
 
-The steps to set up a persistent storage device will differ based on your infrastructure. We provide examples of how to set up storage using [vSphere,](../provisioning-storage-examples/vsphere-storage.md) [NFS,](../provisioning-storage-examples/nfs-storage.md) or Amazon's [EBS.](../provisioning-storage-examples/persistent-storage-in-amazon-ebs.md)
+The steps to set up a persistent storage device will differ based on your infrastructure. We provide examples of how to set up storage using [vSphere,](../../provisioning-storage-examples/vsphere-storage.md) [NFS,](../../provisioning-storage-examples/nfs-storage.md) or Amazon's [EBS.](../../provisioning-storage-examples/persistent-storage-in-amazon-ebs.md) 
 
-If you have a pool of block storage, and you don't want to use a cloud provider, Longhorn could help you provide persistent storage to your Kubernetes cluster. For more information, see [this page.](../../../../../explanations/integrations-in-rancher/longhorn.md)
+If you have a pool of block storage, and you don't want to use a cloud provider, Longhorn could help you provide persistent storage to your Kubernetes cluster. For more information, see [this page.](../../../../../integrations-in-rancher/longhorn.md)
 
 ### 2. Add a PersistentVolume that refers to the persistent storage
 
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md b/docs/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md
rename to docs/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md b/docs/how-to-guides/new-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
similarity index 99%
rename from docs/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
rename to docs/how-to-guides/new-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
index 67954e9c237..f59df583114 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
+++ b/docs/how-to-guides/new-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
@@ -228,7 +228,7 @@ On AWS EC2, we should create a few objects to configure our system. We've define
       sudo docker run -d --privileged --restart=unless-stopped --net=host -v /etc/kubernetes:/etc/kubernetes -v /var/run:/var/run rancher/rancher-agent:<RANCHER_VERSION> --server https://<RANCHER_URL> --token <RANCHER_TOKEN> --ca-checksum <RANCHER_CA_CHECKCSUM> --address ${PUBLIC_IP} --internal-address ${PRIVATE_IP} ${K8S_ROLES}
       ```
 
-More info is at [RKE clusters on AWS](../../../new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md) and [Cluster Autoscaler on AWS.](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/aws/README.md)
+More info is at [RKE clusters on AWS](../../../new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md) and [Cluster Autoscaler on AWS.](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/aws/README.md)
 
 ### 3. Deploy Nodes
 
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md b/docs/how-to-guides/new-user-guides/manage-clusters/nodes-and-node-pools.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md
rename to docs/how-to-guides/new-user-guides/manage-clusters/nodes-and-node-pools.md
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md b/docs/how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces.md
similarity index 98%
rename from docs/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md
rename to docs/how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces.md
index f8a1eb535dd..1f538d18de0 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md
+++ b/docs/how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces.md
@@ -45,7 +45,7 @@ You can assign the following resources directly to namespaces:
 
 To manage permissions in a vanilla Kubernetes cluster, cluster admins configure role-based access policies for each namespace. With Rancher, user permissions are assigned on the project level instead, and permissions are automatically inherited by any namespace owned by the particular project.
 
-For more information on creating and moving namespaces, see [Namespaces](../manage-projects/manage-namespaces.md).
+For more information on creating and moving namespaces, see [Namespaces](../../new-user-guides/manage-namespaces.md).
 
 ### Role-based access control issues with namespaces and kubectl
 
@@ -53,7 +53,7 @@ Because projects are a concept introduced by Rancher, kubectl does not have the
 
 This means that when standard users with project-scoped permissions create a namespaces with `kubectl`, it may be unusable because `kubectl` doesn't require the new namespace to be scoped within a certain project.
 
-If your permissions are restricted to the project level, it is better to [create a namespace through Rancher](../manage-projects/manage-namespaces.md) to ensure that you will have permission to access the namespace.
+If your permissions are restricted to the project level, it is better to [create a namespace through Rancher](../../new-user-guides/manage-namespaces.md) to ensure that you will have permission to access the namespace.
 
 If a standard user is a project owner, the user will be able to create namespaces within that project. The Rancher UI will prevent that user from creating namespaces outside the scope of the projects they have access to.
 
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md b/docs/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/nfs-storage.md
similarity index 97%
rename from docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md
rename to docs/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/nfs-storage.md
index 28c7b820aa2..0842950abdd 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md
+++ b/docs/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/nfs-storage.md
@@ -6,7 +6,7 @@ Before you can use the NFS storage volume plug-in with Rancher deployments, you
 
 :::note
 
-- If you already have an NFS share, you don't need to provision a new NFS server to use the NFS volume plugin within Rancher. Instead, skip the rest of this procedure and complete [adding storage](../../../../../pages-for-subheaders/create-kubernetes-persistent-storage.md).
+- If you already have an NFS share, you don't need to provision a new NFS server to use the NFS volume plugin within Rancher. Instead, skip the rest of this procedure and complete [adding storage](../../../../pages-for-subheaders/create-kubernetes-persistent-storage.md).
 
 - This procedure demonstrates how to set up an NFS server using Ubuntu, although you should be able to use these instructions for other Linux distros (e.g. Debian, RHEL, Arch Linux, etc.). For official instruction on how to create an NFS server using another Linux distro, consult the distro's documentation.
 
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md b/docs/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
similarity index 75%
rename from docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
rename to docs/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
index 3361af6b930..66d27c953da 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
+++ b/docs/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
@@ -12,4 +12,4 @@ This section describes how to set up Amazon's Elastic Block Store in EC2.
 
 **Result:** Persistent storage has been created.
 
-For details on how to set up the newly created storage in Rancher, refer to the section on [setting up existing storage.](../manage-persistent-storage/set-up-existing-storage.md)
\ No newline at end of file
+For details on how to set up the newly created storage in Rancher, refer to the section on [setting up existing storage.](../../../new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md)
\ No newline at end of file
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md b/docs/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md
similarity index 85%
rename from docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md
rename to docs/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md
index d2246589701..4214af2eac5 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md
+++ b/docs/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md
@@ -4,12 +4,12 @@ title: vSphere Storage
 
 To provide stateful workloads with vSphere storage, we recommend creating a vSphereVolume StorageClass. This practice dynamically provisions vSphere storage when workloads request volumes through a PersistentVolumeClaim.
 
-In order to dynamically provision storage in vSphere, the vSphere provider must be [enabled.](../../../../../pages-for-subheaders/vsphere-cloud-provider.md)
+In order to dynamically provision storage in vSphere, the vSphere provider must be enabled. See the following pages for more: [Out-of-tree vSphere](../../../new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-out-of-tree-vsphere) and [in-tree vSphere](../../../new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-in-tree-vsphere).
 
 
 ### Prerequisites
 
-In order to provision vSphere volumes in a cluster created with the [Rancher Kubernetes Engine (RKE)](../../../../../pages-for-subheaders/launch-kubernetes-with-rancher.md), the [vSphere cloud provider](https://rancher.com/docs/rke/latest/en/config-options/cloud-providers/vsphere) must be explicitly enabled in the [cluster options](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md).
+In order to provision vSphere volumes in a cluster created with the [Rancher Kubernetes Engine (RKE)](../../../../pages-for-subheaders/launch-kubernetes-with-rancher.md), the [vSphere cloud provider](https://rancher.com/docs/rke/latest/en/config-options/cloud-providers/vsphere) must be explicitly enabled in the [cluster options](../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md).
 
 ### Creating a StorageClass
 
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md b/docs/how-to-guides/new-user-guides/manage-clusters/rotate-certificates.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md
rename to docs/how-to-guides/new-user-guides/manage-clusters/rotate-certificates.md
diff --git a/docs/how-to-guides/advanced-user-guides/manage-clusters/rotate-encryption-key.md b/docs/how-to-guides/new-user-guides/manage-clusters/rotate-encryption-key.md
similarity index 100%
rename from docs/how-to-guides/advanced-user-guides/manage-clusters/rotate-encryption-key.md
rename to docs/how-to-guides/new-user-guides/manage-clusters/rotate-encryption-key.md
diff --git a/docs/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md b/docs/how-to-guides/new-user-guides/manage-namespaces.md
similarity index 71%
rename from docs/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md
rename to docs/how-to-guides/new-user-guides/manage-namespaces.md
index ef429f0509c..3a4a21d9ae4 100644
--- a/docs/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md
+++ b/docs/how-to-guides/new-user-guides/manage-namespaces.md
@@ -8,14 +8,14 @@ Although you assign resources at the project level so that each namespace in the
 
 Resources that you can assign directly to namespaces include:
 
-- [Workloads](../../../pages-for-subheaders/workloads-and-pods.md)
-- [Load Balancers/Ingress](../../../pages-for-subheaders/load-balancer-and-ingress-controller.md)
-- [Service Discovery Records](../../new-user-guides/kubernetes-resources-setup/create-services.md)
-- [Persistent Volume Claims](../../../pages-for-subheaders/create-kubernetes-persistent-storage.md)
-- [Certificates](../../new-user-guides/kubernetes-resources-setup/encrypt-http-communication.md)
-- [ConfigMaps](../../new-user-guides/kubernetes-resources-setup/configmaps.md)
-- [Registries](../../new-user-guides/kubernetes-resources-setup/kubernetes-and-docker-registries.md)
-- [Secrets](../../new-user-guides/kubernetes-resources-setup/secrets.md)
+- [Workloads](../../pages-for-subheaders/workloads-and-pods.md)
+- [Load Balancers/Ingress](../../pages-for-subheaders/load-balancer-and-ingress-controller.md)
+- [Service Discovery Records](kubernetes-resources-setup/create-services.md)
+- [Persistent Volume Claims](../../pages-for-subheaders/create-kubernetes-persistent-storage.md)
+- [Certificates](kubernetes-resources-setup/encrypt-http-communication.md)
+- [ConfigMaps](kubernetes-resources-setup/configmaps.md)
+- [Registries](kubernetes-resources-setup/kubernetes-and-docker-registries.md)
+- [Secrets](kubernetes-resources-setup/secrets.md)
 
 To manage permissions in a vanilla Kubernetes cluster, cluster admins configure role-based access policies for each namespace. With Rancher, user permissions are assigned on the project level instead, and permissions are automatically inherited by any namespace owned by the particular project.
 
@@ -31,7 +31,7 @@ Create a new namespace to isolate apps and resources in a project.
 
 :::tip
 
-When working with project resources that you can assign to a namespace (i.e., [workloads](../../new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md), [certificates](../../new-user-guides/kubernetes-resources-setup/encrypt-http-communication.md), [ConfigMaps](../../new-user-guides/kubernetes-resources-setup/configmaps.md), etc.) you can create a namespace on the fly.
+When working with project resources that you can assign to a namespace (i.e., [workloads](kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md), [certificates](kubernetes-resources-setup/encrypt-http-communication.md), [ConfigMaps](kubernetes-resources-setup/configmaps.md), etc.) you can create a namespace on the fly.
 
 :::
 
@@ -40,7 +40,7 @@ When working with project resources that you can assign to a namespace (i.e., [w
 1. Click **Cluster > Projects/Namespaces**.
 1. Go to the project where you want to add a namespace and click **Create Namespace**. Alternately, go to **Not in a Project** to create a namespace not associated with a project.
 
-1. **Optional:** If your project has [Resource Quotas](../../../pages-for-subheaders/manage-project-resource-quotas.md) in effect, you can override the default resource **Limits** (which places a cap on the resources that the namespace can consume).
+1. **Optional:** If your project has [Resource Quotas](../../pages-for-subheaders/manage-project-resource-quotas.md) in effect, you can override the default resource **Limits** (which places a cap on the resources that the namespace can consume).
 
 1. Enter a **Name** and then click **Create**.
 
@@ -60,7 +60,7 @@ Cluster admins and members may occasionally need to move a namespace to another
     :::note Notes:
 
     - Don't move the namespaces in the `System` project. Moving these namespaces can adversely affect cluster networking.
-    - You cannot move a namespace into a project that already has a [resource quota](../../../pages-for-subheaders/manage-project-resource-quotas.md)configured.
+    - You cannot move a namespace into a project that already has a [resource quota](../../pages-for-subheaders/manage-project-resource-quotas.md)configured.
     - If you move a namespace from a project that has a quota set to a project with no quota set, the quota is removed from the namespace.
 
 1. Choose a new project for the new namespace and then click **Move**. Alternatively, you can remove the namespace from all projects by selecting **None**.
@@ -71,4 +71,4 @@ Cluster admins and members may occasionally need to move a namespace to another
 
 You can always override the namespace default limit to provide a specific namespace with access to more (or less) project resources.
 
-For more information, see how to [edit namespace resource quotas](./manage-project-resource-quotas/override-default-limit-in-namespaces.md).
\ No newline at end of file
+For more information, see how to [edit namespace resource quotas](../advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md).
\ No newline at end of file
diff --git a/docs/explanations/integrations-in-rancher/cis-scans/configuration-reference.md b/docs/integrations-in-rancher/cis-scans/configuration-reference.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/cis-scans/configuration-reference.md
rename to docs/integrations-in-rancher/cis-scans/configuration-reference.md
diff --git a/docs/explanations/integrations-in-rancher/cis-scans/custom-benchmark.md b/docs/integrations-in-rancher/cis-scans/custom-benchmark.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/cis-scans/custom-benchmark.md
rename to docs/integrations-in-rancher/cis-scans/custom-benchmark.md
diff --git a/docs/explanations/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md b/docs/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md
rename to docs/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md
diff --git a/docs/explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md b/docs/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md
rename to docs/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md
diff --git a/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md b/docs/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md
similarity index 83%
rename from docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md
rename to docs/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md
index d0dbcde86df..42937ea2262 100644
--- a/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md
+++ b/docs/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md
@@ -12,7 +12,7 @@ If you have installed Rancher using the "Rancher Setup" AWS Marketplace offering
 > **Note:** Each entitlement grants access to support for a certain amount of nodes. You can purchase more licenses as necessary later on.
 
 ### 2. Create an EKS Cluster
-Follow the [Rancher docs](../../../../getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md) to create an EKS cluster. When you get to the [final step to install Rancher](../../../../getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md#8-install-the-rancher-helm-chart), **stop and return to this page**. This cluster will need to meet the following requirements:
+Follow the [Rancher docs](../../../getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md) to create an EKS cluster. When you get to the [final step to install Rancher](../../../getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md#8-install-the-rancher-helm-chart), **stop and return to this page**. This cluster will need to meet the following requirements:
 
 - EKS version 1.22.
 - Each node in the cluster has access to the registry containing Rancher and its related images.
@@ -22,7 +22,7 @@ Follow the [Rancher docs](../../../../getting-started/installation-and-upgrade/i
 
 ### 3. Install Rancher
 
-In addition to the options specified to install Rancher in the [Rancher docs](../../../../getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md#8-install-the-rancher-helm-chart), you will also need to enable extra metrics.
+In addition to the options specified to install Rancher in the [Rancher docs](../../../getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md#8-install-the-rancher-helm-chart), you will also need to enable extra metrics.
 This can be done through the Helm CLI through the following options:
 
 ```bash
diff --git a/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues.md b/docs/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues.md
rename to docs/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues.md
diff --git a/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md b/docs/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
similarity index 98%
rename from docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
rename to docs/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
index 54898c13e36..c997e394517 100644
--- a/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
+++ b/docs/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
@@ -41,7 +41,7 @@ kubectl create ns cattle-csp-adapter-system
 
 ### 3. Create Certificate Secrets
 
-The adapter requires access to the root CA that Rancher is using to communicate with the Rancher server. You can read more about which certificate options Rancher supports in the [chart options page](../../../../reference-guides/installation-references/helm-chart-options.md).
+The adapter requires access to the root CA that Rancher is using to communicate with the Rancher server. You can read more about which certificate options Rancher supports in the [chart options page](../../../reference-guides/installation-references/helm-chart-options.md).
 
 If your Rancher install uses a certificate signed by a recognized Certificate Authority such as Let's Encrypt, then you can safely skip to [Step 4](#4-install-the-chart).
 
diff --git a/docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter.md b/docs/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter.md
rename to docs/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter.md
diff --git a/docs/explanations/integrations-in-rancher/cloud-marketplace/supportconfig.md b/docs/integrations-in-rancher/cloud-marketplace/supportconfig.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/cloud-marketplace/supportconfig.md
rename to docs/integrations-in-rancher/cloud-marketplace/supportconfig.md
diff --git a/docs/explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture.md b/docs/integrations-in-rancher/fleet-gitops-at-scale/architecture.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture.md
rename to docs/integrations-in-rancher/fleet-gitops-at-scale/architecture.md
diff --git a/docs/explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md b/docs/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md
rename to docs/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md
diff --git a/docs/explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md b/docs/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md
rename to docs/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md
diff --git a/docs/explanations/integrations-in-rancher/harvester.md b/docs/integrations-in-rancher/harvester.md
similarity index 92%
rename from docs/explanations/integrations-in-rancher/harvester.md
rename to docs/integrations-in-rancher/harvester.md
index 120b1a51ae7..9f7585cfa3f 100644
--- a/docs/explanations/integrations-in-rancher/harvester.md
+++ b/docs/integrations-in-rancher/harvester.md
@@ -12,7 +12,7 @@ Harvester is GA. Please refer to the [Harvester release notes](https://github.co
 ---
 ### Feature Flag
 
-The Harvester feature flag is used to manage access to the Virtualization Management (VM) page in Rancher where users can navigate directly to Harvester clusters and access the Harvester UI. The Harvester feature flag is enabled by default. Click [here](../../pages-for-subheaders/enable-experimental-features.md) for more information on feature flags in Rancher.
+The Harvester feature flag is used to manage access to the Virtualization Management (VM) page in Rancher where users can navigate directly to Harvester clusters and access the Harvester UI. The Harvester feature flag is enabled by default. Click [here](../pages-for-subheaders/enable-experimental-features.md) for more information on feature flags in Rancher.
 
 To navigate to the Harvester cluster, click **☰ > Virtualization Management**. From Harvester Clusters page, click one of the clusters listed to go to the single Harvester cluster view.
 
@@ -30,7 +30,7 @@ As of Rancher v2.6.3, the [Harvester node driver](https://docs.harvesterhci.io/v
 
 Harvester allows `.ISO` images to be uploaded and displayed through the Harvester UI, but this is not supported in the Rancher UI. This is because `.ISO` images usually require additional setup that interferes with a clean deployment (without requiring user intervention), and they are not typically used in cloud environments.
 
-Click [here](../../pages-for-subheaders/about-provisioning-drivers.md#node-drivers) for more information on node drivers in Rancher.
+Click [here](../pages-for-subheaders/about-provisioning-drivers.md#node-drivers) for more information on node drivers in Rancher.
 
 ### Limitations
 
diff --git a/docs/explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md b/docs/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md
rename to docs/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md
diff --git a/docs/explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies.md b/docs/integrations-in-rancher/istio/configuration-options/pod-security-policies.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies.md
rename to docs/integrations-in-rancher/istio/configuration-options/pod-security-policies.md
diff --git a/docs/explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation.md b/docs/integrations-in-rancher/istio/configuration-options/project-network-isolation.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation.md
rename to docs/integrations-in-rancher/istio/configuration-options/project-network-isolation.md
diff --git a/docs/explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md b/docs/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md
rename to docs/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md
diff --git a/docs/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md b/docs/integrations-in-rancher/istio/cpu-and-memory-allocations.md
similarity index 93%
rename from docs/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md
rename to docs/integrations-in-rancher/istio/cpu-and-memory-allocations.md
index cf493771d19..1d02315f727 100644
--- a/docs/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md
+++ b/docs/integrations-in-rancher/istio/cpu-and-memory-allocations.md
@@ -41,7 +41,7 @@ To configure the resources allocated to an Istio component,
 1. In the left navigation bar, click **Apps & Marketplace**.
 1. Click **Installed Apps**.
 1. Go to the `istio-system` namespace. In one of the Istio workloads, such as `rancher-istio`, click **⋮ > Edit/Upgrade**.
-1. Click **Upgrade** to edit the base components via changes to the values.yaml or add an [overlay file](../../../pages-for-subheaders/configuration-options.md#overlay-file). For more information about editing the overlay file, see [this section.](cpu-and-memory-allocations.md#editing-the-overlay-file)
+1. Click **Upgrade** to edit the base components via changes to the values.yaml or add an [overlay file](../../pages-for-subheaders/configuration-options.md#overlay-file). For more information about editing the overlay file, see [this section.](cpu-and-memory-allocations.md#editing-the-overlay-file)
 1. Change the CPU or memory allocations, the nodes where each component will be scheduled to, or the node tolerations.
 1. Click **Upgrade**. to rollout changes
 
diff --git a/docs/explanations/integrations-in-rancher/istio/disable-istio.md b/docs/integrations-in-rancher/istio/disable-istio.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/istio/disable-istio.md
rename to docs/integrations-in-rancher/istio/disable-istio.md
diff --git a/docs/explanations/integrations-in-rancher/istio/rbac-for-istio.md b/docs/integrations-in-rancher/istio/rbac-for-istio.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/istio/rbac-for-istio.md
rename to docs/integrations-in-rancher/istio/rbac-for-istio.md
diff --git a/docs/explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md b/docs/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md
rename to docs/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md
diff --git a/docs/explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md b/docs/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md
rename to docs/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md
diff --git a/docs/explanations/integrations-in-rancher/logging/logging-architecture.md b/docs/integrations-in-rancher/logging/logging-architecture.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/logging/logging-architecture.md
rename to docs/integrations-in-rancher/logging/logging-architecture.md
diff --git a/docs/explanations/integrations-in-rancher/logging/logging-helm-chart-options.md b/docs/integrations-in-rancher/logging/logging-helm-chart-options.md
similarity index 98%
rename from docs/explanations/integrations-in-rancher/logging/logging-helm-chart-options.md
rename to docs/integrations-in-rancher/logging/logging-helm-chart-options.md
index 2d97864a09c..30c0672a4aa 100644
--- a/docs/explanations/integrations-in-rancher/logging/logging-helm-chart-options.md
+++ b/docs/integrations-in-rancher/logging/logging-helm-chart-options.md
@@ -42,7 +42,7 @@ Logging v2 was tested with SELinux on RHEL/CentOS 7 and 8.
 
 [Security-Enhanced Linux (SELinux)](https://en.wikipedia.org/wiki/Security-Enhanced_Linux) is a security enhancement to Linux. After being historically used by government agencies, SELinux is now industry standard and is enabled by default on CentOS 7 and 8.
 
-To use Logging v2 with SELinux, we recommend installing the `rancher-selinux` RPM according to the instructions on [this page.](../../../pages-for-subheaders/selinux-rpm.md#installing-the-rancher-selinux-rpm)
+To use Logging v2 with SELinux, we recommend installing the `rancher-selinux` RPM according to the instructions on [this page.](../../pages-for-subheaders/selinux-rpm.md#installing-the-rancher-selinux-rpm)
 
 Then, when installing the logging application, configure the chart to be SELinux aware by changing `global.seLinux.enabled` to `true` in the `values.yaml`.
 
diff --git a/docs/explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md b/docs/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md
similarity index 99%
rename from docs/explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md
rename to docs/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md
index 80e7b753c38..416065c7bb3 100644
--- a/docs/explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md
+++ b/docs/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md
@@ -7,7 +7,7 @@ Among the many features and changes in the new logging functionality is the remo
 
 ## Installation
 
-To install logging in Rancher v2.5+, refer to the [installation instructions](../../../pages-for-subheaders/logging.md#enabling-logging).
+To install logging in Rancher v2.5+, refer to the [installation instructions](../../pages-for-subheaders/logging.md#enabling-logging).
 
 ### Terminology
 
diff --git a/docs/explanations/integrations-in-rancher/logging/rbac-for-logging.md b/docs/integrations-in-rancher/logging/rbac-for-logging.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/logging/rbac-for-logging.md
rename to docs/integrations-in-rancher/logging/rbac-for-logging.md
diff --git a/docs/explanations/integrations-in-rancher/logging/taints-and-tolerations.md b/docs/integrations-in-rancher/logging/taints-and-tolerations.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/logging/taints-and-tolerations.md
rename to docs/integrations-in-rancher/logging/taints-and-tolerations.md
diff --git a/docs/explanations/integrations-in-rancher/longhorn.md b/docs/integrations-in-rancher/longhorn.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/longhorn.md
rename to docs/integrations-in-rancher/longhorn.md
diff --git a/docs/explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md b/docs/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md
similarity index 90%
rename from docs/explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md
rename to docs/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md
index 5f3a1e75b12..dfa24877702 100644
--- a/docs/explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md
+++ b/docs/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md
@@ -11,11 +11,11 @@ To see the default dashboards for time series data visualization, go to the Graf
 
 ### Customizing Grafana
 
-To view and customize the PromQL queries powering the Grafana dashboard, see [this page.](../../../how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md)
+To view and customize the PromQL queries powering the Grafana dashboard, see [this page.](../../how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md)
 
 ### Persistent Grafana Dashboards
 
-To create a persistent Grafana dashboard, see [this page.](../../../how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md)
+To create a persistent Grafana dashboard, see [this page.](../../how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md)
 
 ### Access to Grafana
 
@@ -51,7 +51,7 @@ To see the Alertmanager UI,
 
 **Result:** The Alertmanager UI opens in a new tab. For help with configuration, refer to the [official Alertmanager documentation.](https://prometheus.io/docs/alerting/latest/alertmanager/)
 
-For more information on configuring Alertmanager in Rancher, see [this page.](../../../how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md)
+For more information on configuring Alertmanager in Rancher, see [this page.](../../how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md)
 
 <figcaption>The Alertmanager UI</figcaption>
 
@@ -111,4 +111,4 @@ You can also see the rules in the Prometheus UI:
 
 ![PrometheusRules UI](/img/prometheus-rules-ui.png)
 
-For more information on configuring PrometheusRules in Rancher, see [this page.](../../../how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md)
\ No newline at end of file
+For more information on configuring PrometheusRules in Rancher, see [this page.](../../how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md)
\ No newline at end of file
diff --git a/docs/explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md b/docs/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md
similarity index 99%
rename from docs/explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md
rename to docs/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md
index 7cee8c0f35e..0d44326cecc 100644
--- a/docs/explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md
+++ b/docs/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md
@@ -131,7 +131,7 @@ While the Rancher UI forms only allow editing a routing tree that is two levels
 
 By editing the forms in the Rancher UI, you can set up a Receiver resource with all the information Alertmanager needs to send alerts to your notification system.
 
-By editing custom YAML in the Alertmanager or Receiver configuration, you can also send alerts to multiple notification systems. For more information, see the section on configuring [Receivers.](../../../reference-guides/monitoring-v2-configuration/receivers.md#configuring-multiple-receivers)
+By editing custom YAML in the Alertmanager or Receiver configuration, you can also send alerts to multiple notification systems. For more information, see the section on configuring [Receivers.](../../reference-guides/monitoring-v2-configuration/receivers.md#configuring-multiple-receivers)
 
 ## 4. Monitoring V2 Specific Components
 
diff --git a/docs/explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md b/docs/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md
rename to docs/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md
diff --git a/docs/explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md b/docs/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md
rename to docs/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md
diff --git a/docs/explanations/integrations-in-rancher/monitoring-and-alerting/windows-support.md b/docs/integrations-in-rancher/monitoring-and-alerting/windows-support.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/monitoring-and-alerting/windows-support.md
rename to docs/integrations-in-rancher/monitoring-and-alerting/windows-support.md
diff --git a/docs/explanations/integrations-in-rancher/neuvector.md b/docs/integrations-in-rancher/neuvector.md
similarity index 98%
rename from docs/explanations/integrations-in-rancher/neuvector.md
rename to docs/integrations-in-rancher/neuvector.md
index 328179e063d..cbb82de00db 100644
--- a/docs/explanations/integrations-in-rancher/neuvector.md
+++ b/docs/integrations-in-rancher/neuvector.md
@@ -7,7 +7,7 @@ import TabItem from '@theme/TabItem';
 
 ### NeuVector Integration in Rancher
 
-New in Rancher v2.6.5, [NeuVector 5.x](https://open-docs.neuvector.com/) is an open-source container-centric security platform that is now integrated into Rancher. NeuVector offers real-time compliance, visibility, and protection for critical applications and data during runtime. NeuVector provides a firewall, container process/file system monitoring, security auditing with CIS benchmarks, and vulnerability scanning. For more information on Rancher security, please see the [security documentation](../../pages-for-subheaders/rancher-security.md).
+New in Rancher v2.6.5, [NeuVector 5.x](https://open-docs.neuvector.com/) is an open-source container-centric security platform that is now integrated into Rancher. NeuVector offers real-time compliance, visibility, and protection for critical applications and data during runtime. NeuVector provides a firewall, container process/file system monitoring, security auditing with CIS benchmarks, and vulnerability scanning. For more information on Rancher security, please see the [security documentation](../pages-for-subheaders/rancher-security.md).
 
 NeuVector can be enabled through a Helm chart that may be installed either through **Apps & Marketplace** or through the **Cluster Tools** button in the Rancher UI. Once the Helm chart is installed, users can easily [deploy and manage NeuVector clusters within Rancher](https://open-docs.neuvector.com/deploying/rancher#deploy-and-manage-neuvector-through-rancher-apps-marketplace).
 
diff --git a/docs/explanations/integrations-in-rancher/opa-gatekeeper.md b/docs/integrations-in-rancher/opa-gatekeeper.md
similarity index 100%
rename from docs/explanations/integrations-in-rancher/opa-gatekeeper.md
rename to docs/integrations-in-rancher/opa-gatekeeper.md
diff --git a/docs/pages-for-subheaders/about-authentication.md b/docs/pages-for-subheaders/about-authentication.md
deleted file mode 100644
index 208f0991b7d..00000000000
--- a/docs/pages-for-subheaders/about-authentication.md
+++ /dev/null
@@ -1,111 +0,0 @@
----
-title: Authentication
----
-
-One of the key features that Rancher adds to Kubernetes is centralized user authentication. This feature allows your users to use one set of credentials to authenticate with any of your Kubernetes clusters.
-
-This centralized user authentication is accomplished using the Rancher authentication proxy, which is installed along with the rest of Rancher. This proxy authenticates your users and forwards their requests to your Kubernetes clusters using a service account.
-
-## External vs. Local Authentication
-
-The Rancher authentication proxy integrates with the following external authentication services.
-
-| Auth Service                                                                                     |
-| ------------------------------------------------------------------------------------------------ |
-| [Microsoft Active Directory](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md)  |
-| [GitHub](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md)                  |
-| [Microsoft Azure AD](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md)    |
-| [FreeIPA](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md)                |
-| [OpenLDAP](configure-openldap.md)              |
-| [Microsoft AD FS](configure-microsoft-ad-federation-service-saml.md) |
-| [PingIdentity](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md)     |
-| [Keycloak (OIDC)](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-oidc.md)  |
-| [Keycloak (SAML)](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-saml.md)  |
-| [Okta](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md)                      |
-| [Google OAuth](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md)            |
-| [Shibboleth](configure-shibboleth-saml.md)           |
-
-<br/>
-However, Rancher also provides [local authentication](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md).
-
-In most cases, you should use an external authentication service over local authentication, as external authentication allows user management from a central location. However, you may want a few local authentication users for managing Rancher under rare circumstances, such as if your external authentication provider is unavailable or undergoing maintenance.
-
-## Users and Groups
-
-Rancher relies on users and groups to determine who is allowed to log in to Rancher and which resources they can access. When authenticating with an external provider, groups are provided from the external provider based on the user. These users and groups are given specific roles to resources like clusters, projects, multi-cluster apps, and global DNS providers and entries. When you give access to a group, all users who are a member of that group in the authentication provider will be able to access the resource with the permissions that you've specified. For more information on roles and permissions, see [Role Based Access Control](manage-role-based-access-control-rbac.md).
-
-:::note
-
-Local authentication does not support creating or managing groups.
-
-:::
-
-For more information, see [Users and Groups](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md)
-
-## Scope of Rancher Authorization
-
-After you configure Rancher to allow sign on using an external authentication service, you should configure who should be allowed to log in and use Rancher. The following options are available:
-
-| Access Level | Description |
-|----------------------------------------------|-------------|
-| Allow any valid Users                   | _Any_ user in the authorization service can access Rancher. We generally discourage use of this setting! |
-| Allow members of Clusters, Projects, plus Authorized Users and Organizations | Any user in the authorization service and any group added as a **Cluster Member** or **Project Member** can log in to Rancher. Additionally, any user in the authentication service or group you add to the **Authorized Users and Organizations** list may log in to Rancher. |
-| Restrict access to only Authorized Users and Organizations | Only users in the authentication service or groups added to the Authorized Users and Organizations can log in to Rancher. |
-
-To set the Rancher access level for users in the authorization service, follow these steps:
-
-1. In the upper left corner, click **☰ > Users & Authentication**.
-1. In the left navigation bar, click **Auth Provider**.
-1. After setting up the configuration details for an auth provider, use the **Site Access** options to configure the scope of user authorization. The table above explains the access level for each option.
-1. Optional: If you choose an option other than **Allow any valid Users,** you can add users to the list of authorized users and organizations by searching for them in the text field that appears.
-1. Click **Save**.
-
-**Result:** The Rancher access configuration settings are applied.
-
-:::note SAML Provider Caveats:
-
-- SAML Protocol does not support search or lookup for users or groups. Therefore, there is no validation on users or groups when adding them to Rancher.
-- When adding users, the exact user IDs (i.e. `UID Field`) must be entered correctly. As you type the user ID, there will be no search for other  user IDs that may match.
-- When adding groups, you must select the group from the drop-down that is next to the text box. Rancher assumes that any input from the text box is a user.
-- The group drop-down shows only the groups that you are a member of. You will not be able to add groups that you are not a member of.
-
-:::
-
-## External Authentication Configuration and Principal Users
-
-Configuration of external authentication requires:
-
-- A local user assigned the administrator role, called hereafter the _local principal_.
-- An external user that can authenticate with your external authentication service, called hereafter the _external principal_.
-
-Configuration of external authentication affects how principal users are managed within Rancher. Follow the list below to better understand these effects.
-
-1. Sign into Rancher as the local principal and complete configuration of external authentication.
-
-    ![Sign In](/img/sign-in.png)
-
-2. Rancher associates the external principal with the local principal. These two users share the local principal's user ID.
-
-    ![Principal ID Sharing](/img/principal-ID.png)
-
-3. After you complete configuration, Rancher automatically signs out the local principal.
-
-    ![Sign Out Local Principal](/img/sign-out-local.png)
-
-4. Then, Rancher automatically signs you back in as the external principal.
-
-    ![Sign In External Principal](/img/sign-in-external.png)
-
-5. Because the external principal and the local principal share an ID, no unique object for the external principal displays on the Users page.
-
-    ![Sign In External Principal](/img/users-page.png)
-
-6. The external principal and the local principal share the same access rights.
-
-:::note Reconfiguring a previously set up auth provider
-
-If you need to reconfigure or disable then re-enable a provider that had been previously set up, ensure that the user who attempts to do so
-is logged in to Rancher as an external user, not the local admin.
-
-:::
-
diff --git a/docs/pages-for-subheaders/about-provisioning-drivers.md b/docs/pages-for-subheaders/about-provisioning-drivers.md
index a281dec85fd..1202cfedb10 100644
--- a/docs/pages-for-subheaders/about-provisioning-drivers.md
+++ b/docs/pages-for-subheaders/about-provisioning-drivers.md
@@ -37,11 +37,11 @@ If there are specific node drivers that you don't want to show to your users, yo
 
 Rancher supports several major cloud providers, but by default, these node drivers are active and available for deployment:
 
-*   [Amazon EC2](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md)
-*   [Azure](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md)
-*   [Digital Ocean](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md)
+*   [Amazon EC2](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.mdcreate-an-amazon-ec2-cluster.md)
+*   [Azure](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.mdider/create-an-azure-cluster.md)
+*   [Digital Ocean](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.mdreate-a-digitalocean-cluster.md)
 *   [vSphere](vsphere.md)
 
 There are several other node drivers that are disabled by default, but are packaged in Rancher:
 
-*   [Harvester](../explanations/integrations-in-rancher/harvester.md#harvester-node-driver/), available in Rancher v2.6.1
+*   [Harvester](../integrations-in-rancher/harvester.md#harvester-node-driver/), available in Rancher v2.6.1
diff --git a/docs/pages-for-subheaders/about-rke1-templates.md b/docs/pages-for-subheaders/about-rke1-templates.md
index d9235bed7e3..15cdbb24543 100644
--- a/docs/pages-for-subheaders/about-rke1-templates.md
+++ b/docs/pages-for-subheaders/about-rke1-templates.md
@@ -14,7 +14,7 @@ Admins control which cluster options can be changed by end users. RKE templates
 
 If a cluster was created with an RKE template, you can't change it to a different RKE template. You can only update the cluster to a new revision of the same template.
 
-You can [save the configuration of an existing cluster as an RKE template.](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md#converting-an-existing-cluster-to-use-an-rke-template) Then the cluster's settings can only be changed if the template is updated. The new template can also be used to launch new clusters.
+You can [save the configuration of an existing cluster as an RKE template.](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md#converting-an-existing-cluster-to-use-an-rke-template) Then the cluster's settings can only be changed if the template is updated. The new template can also be used to launch new clusters.
 
 The core features of RKE templates allow DevOps and security teams to:
 
@@ -45,24 +45,24 @@ The [add-on section](#add-ons) of an RKE template is especially powerful because
 
 RKE templates are supported for Rancher-provisioned clusters. The templates can be used to provision custom clusters or clusters that are launched by an infrastructure provider.
 
-RKE templates are for defining Kubernetes and Rancher settings. Node templates are responsible for configuring nodes. For tips on how to use RKE templates in conjunction with hardware, refer to [RKE Templates and Hardware](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md).
+RKE templates are for defining Kubernetes and Rancher settings. Node templates are responsible for configuring nodes. For tips on how to use RKE templates in conjunction with hardware, refer to [RKE Templates and Hardware](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md).
 
 RKE templates can be created from scratch to pre-define cluster configuration. They can be applied to launch new clusters, or templates can also be exported from existing running clusters.
 
-The settings of an existing cluster can be [saved as an RKE template.](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md#converting-an-existing-cluster-to-use-an-rke-template) This creates a new template and binds the cluster settings to the template, so that the cluster can only be upgraded if the [template is updated](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md#updating-a-template), and the cluster is upgraded to [use a newer version of the template.](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md#upgrading-a-cluster-to-use-a-new-template-revision) The new template can also be used to create new clusters.
+The settings of an existing cluster can be [saved as an RKE template.](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md#converting-an-existing-cluster-to-use-an-rke-template) This creates a new template and binds the cluster settings to the template, so that the cluster can only be upgraded if the [template is updated](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md#updating-a-template), and the cluster is upgraded to [use a newer version of the template.](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md#upgrading-a-cluster-to-use-a-new-template-revision) The new template can also be used to create new clusters.
 
 
 ## Example Scenarios
 When an organization has both basic and advanced Rancher users, administrators might want to give the advanced users more options for cluster creation, while restricting the options for basic users.
 
-These [example scenarios](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md) describe how an organization could use templates to standardize cluster creation.
+These [example scenarios](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md) describe how an organization could use templates to standardize cluster creation.
 
 Some of the example scenarios include the following:
 
-- **Enforcing templates:** Administrators might want to [enforce one or more template settings for everyone](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md#enforcing-a-template-setting-for-everyone) if they want all new Rancher-provisioned clusters to have those settings.
-- **Sharing different templates with different users:** Administrators might give [different templates to basic and advanced users,](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md#templates-for-basic-and-advanced-users) so that basic users can have more restricted options and advanced users can use more discretion when creating clusters.
-- **Updating template settings:** If an organization's security and DevOps teams decide to embed best practices into the required settings for new clusters, those best practices could change over time. If the best practices change, [a template can be updated to a new revision](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md#updating-templates-and-clusters-created-with-them) and clusters created from the template can [upgrade to the new version](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md#upgrading-a-cluster-to-use-a-new-template-revision) of the template.
-- **Sharing ownership of a template:** When a template owner no longer wants to maintain a template, or wants to share ownership of the template, this scenario describes how [template ownership can be shared.](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md#allowing-other-users-to-control-and-share-a-template)
+- **Enforcing templates:** Administrators might want to [enforce one or more template settings for everyone](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md#enforcing-a-template-setting-for-everyone) if they want all new Rancher-provisioned clusters to have those settings.
+- **Sharing different templates with different users:** Administrators might give [different templates to basic and advanced users,](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md#templates-for-basic-and-advanced-users) so that basic users can have more restricted options and advanced users can use more discretion when creating clusters.
+- **Updating template settings:** If an organization's security and DevOps teams decide to embed best practices into the required settings for new clusters, those best practices could change over time. If the best practices change, [a template can be updated to a new revision](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md#updating-templates-and-clusters-created-with-them) and clusters created from the template can [upgrade to the new version](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md#upgrading-a-cluster-to-use-a-new-template-revision) of the template.
+- **Sharing ownership of a template:** When a template owner no longer wants to maintain a template, or wants to share ownership of the template, this scenario describes how [template ownership can be shared.](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md#allowing-other-users-to-control-and-share-a-template)
 
 ## Template Management
 
@@ -78,30 +78,30 @@ For the settings that cannot be overridden, the end user will not be able to dir
 
 The documents in this section explain the details of RKE template management:
 
-- [Getting permission to create templates](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md)
-- [Creating and revising templates](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md)
-- [Enforcing template settings](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md#requiring-new-clusters-to-use-an-rke-template)
-- [Overriding template settings](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md)
-- [Sharing templates with cluster creators](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md#sharing-templates-with-specific-users-or-groups)
-- [Sharing ownership of a template](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md#sharing-ownership-of-templates)
+- [Getting permission to create templates](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md)
+- [Creating and revising templates](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md)
+- [Enforcing template settings](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md#requiring-new-clusters-to-use-an-rke-template) 
+- [Overriding template settings](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md)
+- [Sharing templates with cluster creators](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md#sharing-templates-with-specific-users-or-groups)
+- [Sharing ownership of a template](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md#sharing-ownership-of-templates)
 
 An [example YAML configuration file for a template](../reference-guides/rke1-template-example-yaml.md) is provided for reference.
 
 ## Applying Templates
 
-You can [create a cluster from a template](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md#creating-a-cluster-from-an-rke-template) that you created, or from a template that has been [shared with you.](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md)
+You can [create a cluster from a template](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md#creating-a-cluster-from-an-rke-template) that you created, or from a template that has been [shared with you.](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md)
 
-If the RKE template owner creates a new revision of the template, you can [upgrade your cluster to that revision.](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md#updating-a-cluster-created-with-an-rke-template)
+If the RKE template owner creates a new revision of the template, you can [upgrade your cluster to that revision.](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md#updating-a-cluster-created-with-an-rke-template)
 
 RKE templates can be created from scratch to pre-define cluster configuration. They can be applied to launch new clusters, or templates can also be exported from existing running clusters.
 
-You can [save the configuration of an existing cluster as an RKE template.](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md#converting-an-existing-cluster-to-use-an-rke-template) Then the cluster's settings can only be changed if the template is updated.
+You can [save the configuration of an existing cluster as an RKE template.](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md#converting-an-existing-cluster-to-use-an-rke-template) Then the cluster's settings can only be changed if the template is updated.
 
 ## Standardizing Hardware
 
-RKE templates are designed to standardize Kubernetes and Rancher settings. If you want to standardize your infrastructure as well, one option is to use RKE templates [in conjunction with other tools](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md).
+RKE templates are designed to standardize Kubernetes and Rancher settings. If you want to standardize your infrastructure as well, one option is to use RKE templates [in conjunction with other tools](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md).
 
-Another option is to use [cluster templates,](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md) which include node pool configuration options, but don't provide configuration enforcement.
+Another option is to use [cluster templates,](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md) which include node pool configuration options, but don't provide configuration enforcement.
 
 ## YAML Customization
 
diff --git a/docs/pages-for-subheaders/about-the-api.md b/docs/pages-for-subheaders/about-the-api.md
index b5d38bb0f95..ca541fd4875 100644
--- a/docs/pages-for-subheaders/about-the-api.md
+++ b/docs/pages-for-subheaders/about-the-api.md
@@ -26,7 +26,7 @@ Go to the URL endpoint at `https://<RANCHER_FQDN>/v3`, where `<RANCHER_FQDN>` is
 
 ## Authentication
 
-API requests must include authentication information.  Authentication is done with HTTP basic authentication using [API Keys](../reference-guides/user-settings/api-keys.md). API keys can create new clusters and have access to multiple clusters via `/v3/clusters/`. [Cluster and project roles](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md) apply to these keys and restrict what clusters and projects the account can see and what actions they can take.
+API requests must include authentication information.  Authentication is done with HTTP basic authentication using [API Keys](../reference-guides/user-settings/api-keys.md). API keys can create new clusters and have access to multiple clusters via `/v3/clusters/`. [Cluster and project roles](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md) apply to these keys and restrict what clusters and projects the account can see and what actions they can take.
 
 By default, some cluster-level API tokens are generated with infinite time-to-live (`ttl=0`). In other words, API tokens with `ttl=0` never expire unless you invalidate them. For details on how to invalidate them, refer to the [API tokens page](../reference-guides/about-the-api/api-tokens.md).
 
diff --git a/docs/pages-for-subheaders/access-clusters.md b/docs/pages-for-subheaders/access-clusters.md
index 2eba1efac1c..2dd82ffcb8a 100644
--- a/docs/pages-for-subheaders/access-clusters.md
+++ b/docs/pages-for-subheaders/access-clusters.md
@@ -4,11 +4,11 @@ title: Cluster Access
 
 This section is about what tools can be used to access clusters managed by Rancher.
 
-For information on how to give users permission to access a cluster, see the section on [adding users to clusters.](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md)
+For information on how to give users permission to access a cluster, see the section on [adding users to clusters.](../how-to-guides/new-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md)
 
 For more information on roles-based access control, see [this section.](manage-role-based-access-control-rbac.md)
 
-For information on how to set up an authentication system, see [this section.](about-authentication.md)
+For information on how to set up an authentication system, see [this section.](authentication-config.md)
 
 
 ### Rancher UI
@@ -19,8 +19,8 @@ Rancher provides an intuitive user interface for interacting with your clusters.
 
 You can use the Kubernetes command-line tool, [kubectl](https://kubernetes.io/docs/reference/kubectl/overview/), to manage   your clusters. You have two options for using kubectl:
 
-- **Rancher kubectl shell:** Interact with your clusters by launching a kubectl shell available in the Rancher UI. This option requires no configuration actions on your part. For more information, see [Accessing Clusters with kubectl Shell](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md).
-- **Terminal remote connection:** You can also interact with your clusters by installing [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) on your local desktop and then copying the cluster's kubeconfig file to your local `~/.kube/config` directory. For more information, see [Accessing Clusters with kubectl and a kubeconfig File](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md).
+- **Rancher kubectl shell:** Interact with your clusters by launching a kubectl shell available in the Rancher UI. This option requires no configuration actions on your part. For more information, see [Accessing Clusters with kubectl Shell](../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md).
+- **Terminal remote connection:** You can also interact with your clusters by installing [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) on your local desktop and then copying the cluster's kubeconfig file to your local `~/.kube/config` directory. For more information, see [Accessing Clusters with kubectl and a kubeconfig File](../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md).
 
 ### Rancher CLI
 
diff --git a/docs/pages-for-subheaders/advanced-options.md b/docs/pages-for-subheaders/advanced-options.md
deleted file mode 100644
index 4e9027dee15..00000000000
--- a/docs/pages-for-subheaders/advanced-options.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Advanced
----
-
-The documents in this section contain resources for less common use cases.
\ No newline at end of file
diff --git a/docs/pages-for-subheaders/authentication-config.md b/docs/pages-for-subheaders/authentication-config.md
index a84556c0eb3..42389ef3328 100644
--- a/docs/pages-for-subheaders/authentication-config.md
+++ b/docs/pages-for-subheaders/authentication-config.md
@@ -1,5 +1,111 @@
 ---
 title: Authentication Config
+weight: 10
 ---
 
-In the following tutorials, you will learn how to [manage users and group](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md), [create local users](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md), [configure Google OAuth](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md), [configure Active Directory (AD)](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md), [configure FreeIPA](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md), [configure Azure AD](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md), [configure GitHub](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md), [configure Keycloak (OIDC)](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-oidc.md), [configure Keycloak (SAML)](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-saml.md), [configure PingIdentity (SAML)](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md), [configure Okta (SAML)](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md), [configure Shibboleth (SAML)](../pages-for-subheaders/configure-shibboleth-saml.md), and how to [configure Microsoft AD Federation Service (SAML)](../pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md).
\ No newline at end of file
+One of the key features that Rancher adds to Kubernetes is centralized user authentication. This feature allows your users to use one set of credentials to authenticate with any of your Kubernetes clusters.
+
+This centralized user authentication is accomplished using the Rancher authentication proxy, which is installed along with the rest of Rancher. This proxy authenticates your users and forwards their requests to your Kubernetes clusters using a service account.
+
+## External vs. Local Authentication
+
+The Rancher authentication proxy integrates with the following external authentication services.
+
+| Auth Service                                                                                     |
+| ------------------------------------------------------------------------------------------------ |
+| [Microsoft Active Directory](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-active-directory.md)  |
+| [GitHub](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-github.md)                  |
+| [Microsoft Azure AD](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md)    |
+| [FreeIPA](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-freeipa.md)                |
+| [OpenLDAP](configure-openldap.md)              |
+| [Microsoft AD FS](configure-microsoft-ad-federation-service-saml.md) |
+| [PingIdentity](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-pingidentity.md)     |
+| [Keycloak (OIDC)](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-keycloak-oidc.md)  |
+| [Keycloak (SAML)](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-keycloak-saml.md)  |
+| [Okta](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-okta-saml.md)                      |
+| [Google OAuth](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-google-oauth.md)            |
+| [Shibboleth](configure-shibboleth-saml.md)           |
+
+<br/>
+However, Rancher also provides [local authentication](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md).
+
+In most cases, you should use an external authentication service over local authentication, as external authentication allows user management from a central location. However, you may want a few local authentication users for managing Rancher under rare circumstances, such as if your external authentication provider is unavailable or undergoing maintenance.
+
+## Users and Groups
+
+Rancher relies on users and groups to determine who is allowed to log in to Rancher and which resources they can access. When authenticating with an external provider, groups are provided from the external provider based on the user. These users and groups are given specific roles to resources like clusters, projects, multi-cluster apps, and global DNS providers and entries. When you give access to a group, all users who are a member of that group in the authentication provider will be able to access the resource with the permissions that you've specified. For more information on roles and permissions, see [Role Based Access Control](manage-role-based-access-control-rbac.md).
+
+:::note
+
+Local authentication does not support creating or managing groups.
+
+:::
+
+For more information, see [Users and Groups](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md)
+
+## Scope of Rancher Authorization
+
+After you configure Rancher to allow sign on using an external authentication service, you should configure who should be allowed to log in and use Rancher. The following options are available:
+
+| Access Level | Description |
+|----------------------------------------------|-------------|
+| Allow any valid Users                   | _Any_ user in the authorization service can access Rancher. We generally discourage use of this setting! |
+| Allow members of Clusters, Projects, plus Authorized Users and Organizations | Any user in the authorization service and any group added as a **Cluster Member** or **Project Member** can log in to Rancher. Additionally, any user in the authentication service or group you add to the **Authorized Users and Organizations** list may log in to Rancher. |
+| Restrict access to only Authorized Users and Organizations | Only users in the authentication service or groups added to the Authorized Users and Organizations can log in to Rancher. |
+
+To set the Rancher access level for users in the authorization service, follow these steps:
+
+1. In the upper left corner, click **☰ > Users & Authentication**.
+1. In the left navigation bar, click **Auth Provider**.
+1. After setting up the configuration details for an auth provider, use the **Site Access** options to configure the scope of user authorization. The table above explains the access level for each option.
+1. Optional: If you choose an option other than **Allow any valid Users,** you can add users to the list of authorized users and organizations by searching for them in the text field that appears.
+1. Click **Save**.
+
+**Result:** The Rancher access configuration settings are applied.
+
+:::note SAML Provider Caveats:
+
+- SAML Protocol does not support search or lookup for users or groups. Therefore, there is no validation on users or groups when adding them to Rancher.
+- When adding users, the exact user IDs (i.e. `UID Field`) must be entered correctly. As you type the user ID, there will be no search for other  user IDs that may match.
+- When adding groups, you must select the group from the drop-down that is next to the text box. Rancher assumes that any input from the text box is a user.
+- The group drop-down shows only the groups that you are a member of. You will not be able to add groups that you are not a member of.
+
+:::
+
+## External Authentication Configuration and Principal Users
+
+Configuration of external authentication requires:
+
+- A local user assigned the administrator role, called hereafter the _local principal_.
+- An external user that can authenticate with your external authentication service, called hereafter the _external principal_.
+
+Configuration of external authentication affects how principal users are managed within Rancher. Follow the list below to better understand these effects.
+
+1. Sign into Rancher as the local principal and complete configuration of external authentication.
+
+    ![Sign In](/img/sign-in.png)
+
+2. Rancher associates the external principal with the local principal. These two users share the local principal's user ID.
+
+    ![Principal ID Sharing](/img/principal-ID.png)
+
+3. After you complete configuration, Rancher automatically signs out the local principal.
+
+    ![Sign Out Local Principal](/img/sign-out-local.png)
+
+4. Then, Rancher automatically signs you back in as the external principal.
+
+    ![Sign In External Principal](/img/sign-in-external.png)
+
+5. Because the external principal and the local principal share an ID, no unique object for the external principal displays on the Users page.
+
+    ![Sign In External Principal](/img/users-page.png)
+
+6. The external principal and the local principal share the same access rights.
+
+:::note Reconfiguring a previously set up auth provider
+
+If you need to reconfigure or disable then re-enable a provider that had been previously set up, ensure that the user who attempts to do so
+is logged in to Rancher as an external user, not the local admin.
+
+:::
diff --git a/docs/pages-for-subheaders/authentication-permissions-and-global-configuration.md b/docs/pages-for-subheaders/authentication-permissions-and-global-configuration.md
index 229b0abd15b..b32d8068a91 100644
--- a/docs/pages-for-subheaders/authentication-permissions-and-global-configuration.md
+++ b/docs/pages-for-subheaders/authentication-permissions-and-global-configuration.md
@@ -2,7 +2,7 @@
 title: Authentication, Permissions and Global Configuration
 ---
 
-After installation, the [system administrator](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md) should configure Rancher to configure authentication, authorization, security, default settings, security policies, drivers and global DNS entries.
+After installation, the [system administrator](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md) should configure Rancher to configure authentication, authorization, security, default settings, security policies, drivers and global DNS entries.
 
 ## First Log In
 
@@ -18,7 +18,7 @@ After you set the Rancher Server URL, we do not support updating it. Set the URL
 
 One of the key features that Rancher adds to Kubernetes is centralized user authentication. This feature allows to set up local users and/or connect to an external authentication provider. By connecting to an external authentication provider, you can leverage that provider's user and groups.
 
-For more information how authentication works and how to configure each provider, see [Authentication](about-authentication.md).
+For more information how authentication works and how to configure each provider, see [Authentication](authentication-config.md).
 
 ## Authorization
 
@@ -30,7 +30,7 @@ For more information how authorization works and how to customize roles, see [Ro
 
 _Pod Security Policies_ (or PSPs) are objects that control security-sensitive aspects of pod specification, e.g. root privileges. If a pod does not meet the conditions specified in the PSP, Kubernetes will not allow it to start, and Rancher will display an error message.
 
-For more information how to create and use PSPs, see [Pod Security Policies](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md).
+For more information how to create and use PSPs, see [Pod Security Policies](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md).
 
 ## Provisioning Drivers
 
diff --git a/docs/pages-for-subheaders/aws-cloud-marketplace.md b/docs/pages-for-subheaders/aws-cloud-marketplace.md
index f81804c1c6b..5be068ab186 100644
--- a/docs/pages-for-subheaders/aws-cloud-marketplace.md
+++ b/docs/pages-for-subheaders/aws-cloud-marketplace.md
@@ -12,11 +12,11 @@ Rancher offers an integration with the AWS Marketplace which allows users to pur
 - Rancher must be deployed with additional metrics enabled.
 - Rancher must be installed on an EKS cluster.
 - You must purchase at least one entitlement to Rancher support through AWS Marketplace.
-- You may need additional setup to support proxy/airgap use cases. See the [prerequisites](../explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md) for more information.
+- You may need additional setup to support proxy/airgap use cases. See the [prerequisites](../integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md) for more information.
 
 # How to Use
-1. Complete the [prerequisite steps](../explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md).
-2. [Install the CSP Adapter](../explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md).
+1. Complete the [prerequisite steps](../integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md).
+2. [Install the CSP Adapter](../integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md).
 
 # FAQ
 
diff --git a/docs/pages-for-subheaders/cis-scans.md b/docs/pages-for-subheaders/cis-scans.md
index 4422e137847..9b29c4b542f 100644
--- a/docs/pages-for-subheaders/cis-scans.md
+++ b/docs/pages-for-subheaders/cis-scans.md
@@ -97,11 +97,11 @@ Any skipped tests that are defined as being skipped by one of the default profil
 
 ## Roles-based Access Control
 
-For information about permissions, refer to [this page](../explanations/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md)
+For information about permissions, refer to [this page](../integrations-in-rancher/cis-scans/rbac-for-cis-scans.md)
 
 ## Configuration
 
-For more information about configuring the custom resources for the scans, profiles, and benchmark versions, refer to [this page](../explanations/integrations-in-rancher/cis-scans/configuration-reference.md)
+For more information about configuring the custom resources for the scans, profiles, and benchmark versions, refer to [this page](../integrations-in-rancher/cis-scans/configuration-reference.md)
 
 ## How-to Guides
 
diff --git a/docs/pages-for-subheaders/cluster-configuration.md b/docs/pages-for-subheaders/cluster-configuration.md
index e2e9544fdca..50f96d11258 100644
--- a/docs/pages-for-subheaders/cluster-configuration.md
+++ b/docs/pages-for-subheaders/cluster-configuration.md
@@ -4,7 +4,7 @@ title: Cluster Configuration
 
 After you provision a Kubernetes cluster using Rancher, you can still edit options and settings for the cluster.
 
-For information on editing cluster membership, go to [this page.](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md)
+For information on editing cluster membership, go to [this page.](../how-to-guides/new-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md)
 
 ### Cluster Configuration References
 
diff --git a/docs/pages-for-subheaders/configuration-options.md b/docs/pages-for-subheaders/configuration-options.md
index 9e7ad6f0ccb..15a0599ab00 100644
--- a/docs/pages-for-subheaders/configuration-options.md
+++ b/docs/pages-for-subheaders/configuration-options.md
@@ -24,16 +24,16 @@ The Monitoring app sets `prometheus.prometheusSpec.ignoreNamespaceSelectors=fals
 
 If you would like to limit Prometheus to specific namespaces, set `prometheus.prometheusSpec.ignoreNamespaceSelectors=true`. Once you do this, you will need to add additional configuration to continue to monitor your resources.
 
-For details, refer to [this section.](../explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md)
+For details, refer to [this section.](../integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md)
 
 ### Enable Istio with Pod Security Policies
 
-Refer to [this section.](../explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies.md)
+Refer to [this section.](../integrations-in-rancher/istio/configuration-options/pod-security-policies.md)
 
 ### Additional Steps for Installing Istio on an RKE2 Cluster
 
-Refer to [this section.](../explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md)
+Refer to [this section.](../integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md)
 
 ### Additional Steps for Project Network Isolation
 
-Refer to [this section.](../explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation.md)
\ No newline at end of file
+Refer to [this section.](../integrations-in-rancher/istio/configuration-options/project-network-isolation.md)
\ No newline at end of file
diff --git a/docs/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md b/docs/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md
index 549f70444ef..73c2c651cd6 100644
--- a/docs/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md
+++ b/docs/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md
@@ -20,8 +20,8 @@ You must have a [Microsoft AD FS Server](https://docs.microsoft.com/en-us/window
 
 Setting up Microsoft AD FS with Rancher Server requires configuring AD FS on your Active Directory server, and configuring Rancher to utilize your AD FS server. The following pages serve as guides for setting up Microsoft AD FS authentication on your Rancher installation.
 
-- [1. Configuring Microsoft AD FS for Rancher](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md)
-- [2. Configuring Rancher for Microsoft AD FS](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md)
+- [1. Configuring Microsoft AD FS for Rancher](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md)
+- [2. Configuring Rancher for Microsoft AD FS](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md)
 
 :::note SAML Provider Caveats:
 
@@ -33,4 +33,4 @@ Setting up Microsoft AD FS with Rancher Server requires configuring AD FS on you
 :::
 
 
-### [Next: Configuring Microsoft AD FS for Rancher](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md)
+### [Next: Configuring Microsoft AD FS for Rancher](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md)
diff --git a/docs/pages-for-subheaders/configure-openldap.md b/docs/pages-for-subheaders/configure-openldap.md
index d814b391b3d..be2aa86df69 100644
--- a/docs/pages-for-subheaders/configure-openldap.md
+++ b/docs/pages-for-subheaders/configure-openldap.md
@@ -14,9 +14,9 @@ Rancher must be configured with a LDAP bind account (aka service account) to sea
 
 ## Configure OpenLDAP in Rancher
 
-Configure the settings for the OpenLDAP server, groups and users. For help filling out each field, refer to the [configuration reference.](../reference-guides/configure-openldap/openldap-config-reference.md)
+Configure the settings for the OpenLDAP server, groups and users. For help filling out each field, refer to the [configuration reference.](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-openldap/openldap-config-reference.md)
 
-> Before you proceed with the configuration, please familiarise yourself with the concepts of [External Authentication Configuration and Principal Users](about-authentication.md#external-authentication-configuration-and-principal-users).
+> Before you proceed with the configuration, please familiarise yourself with the concepts of [External Authentication Configuration and Principal Users](authentication-config.md#external-authentication-configuration-and-principal-users).
 
 1.	In the top left corner, click **☰ > Users & Authentication**.
 1. In the left navigation menu, click **Auth Provider**.
diff --git a/docs/pages-for-subheaders/configure-shibboleth-saml.md b/docs/pages-for-subheaders/configure-shibboleth-saml.md
index 048b7900813..9ea4d2ae640 100644
--- a/docs/pages-for-subheaders/configure-shibboleth-saml.md
+++ b/docs/pages-for-subheaders/configure-shibboleth-saml.md
@@ -8,7 +8,7 @@ In this configuration, when Rancher users log in, they will be redirected to the
 
 If you also configure OpenLDAP as the back end to Shibboleth, it will return a SAML assertion to Rancher with user attributes that include groups. Then the authenticated user will be able to access resources in Rancher that their groups have permissions for.
 
-> The instructions in this section assume that you understand how Rancher, Shibboleth, and OpenLDAP work together. For a more detailed explanation of how it works, refer to [this page.](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md)
+> The instructions in this section assume that you understand how Rancher, Shibboleth, and OpenLDAP work together. For a more detailed explanation of how it works, refer to [this page.](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-shibboleth-saml/about-group-permissions.md)
 
 
 # Setting up Shibboleth in Rancher
@@ -87,9 +87,9 @@ Rancher must be configured with a LDAP bind account (aka service account) to sea
 
 ### Configure OpenLDAP in Rancher
 
-Configure the settings for the OpenLDAP server, groups and users. For help filling out each field, refer to the [configuration reference.](../reference-guides/configure-openldap/openldap-config-reference.md) Note that nested group membership is not available for Shibboleth.
+Configure the settings for the OpenLDAP server, groups and users. For help filling out each field, refer to the [configuration reference.](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-openldap/openldap-config-reference.md) Note that nested group membership is not available for Shibboleth.
 
-> Before you proceed with the configuration, please familiarise yourself with the concepts of [External Authentication Configuration and Principal Users](about-authentication.md#external-authentication-configuration-and-principal-users).
+> Before you proceed with the configuration, please familiarise yourself with the concepts of [External Authentication Configuration and Principal Users](authentication-config.md#external-authentication-configuration-and-principal-users).
 
 1. Log into the Rancher UI using the initial local `admin` account.
 1.	In the top left corner, click **☰ > Users & Authentication**.
diff --git a/docs/pages-for-subheaders/create-kubernetes-persistent-storage.md b/docs/pages-for-subheaders/create-kubernetes-persistent-storage.md
index 8980ac5ccf3..8952d8abafa 100644
--- a/docs/pages-for-subheaders/create-kubernetes-persistent-storage.md
+++ b/docs/pages-for-subheaders/create-kubernetes-persistent-storage.md
@@ -4,15 +4,15 @@ description: "Learn about the two ways with which you can create persistent stor
 ---
 When deploying an application that needs to retain data, you'll need to create persistent storage. Persistent storage allows you to store application data external from the pod running your application. This storage practice allows you to maintain application data, even if the application's pod fails.
 
-The documents in this section assume that you understand the Kubernetes concepts of persistent volumes, persistent volume claims, and storage classes. For more information, refer to the section on [how storage works.](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md)
+The documents in this section assume that you understand the Kubernetes concepts of persistent volumes, persistent volume claims, and storage classes. For more information, refer to the section on [how storage works.](../how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md)
 
 ### Prerequisites
 
-To set up persistent storage, the `Manage Volumes` [role](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#project-role-reference) is required.
+To set up persistent storage, the `Manage Volumes` [role](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#project-role-reference) is required.
 
 If you are provisioning storage for a cluster hosted in the cloud, the storage and cluster hosts must have the same cloud provider.
 
-For provisioning new storage with Rancher, the cloud provider must be enabled. For details on enabling cloud providers, refer to [this page.](set-up-cloud-providers.md)
+For provisioning new storage with Rancher, the cloud provider must be enabled. For details on enabling cloud providers, refer to [this page.](../pages-for-subheaders/set-up-cloud-providers.md)
 
 For attaching existing persistent storage to a cluster, the cloud provider does not need to be enabled.
 
@@ -25,7 +25,7 @@ The overall workflow for setting up existing storage is as follows:
 3. Add a persistent volume claim (PVC) that refers to the PV.
 4. Mount the PVC as a volume in your workload.
 
-For details and prerequisites, refer to [this page.](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md)
+For details and prerequisites, refer to [this page.](../how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md)
 
 ### Dynamically Provisioning New Storage in Rancher
 
@@ -35,7 +35,7 @@ The overall workflow for provisioning new storage is as follows:
 2. Add a persistent volume claim (PVC) that refers to the storage class.
 3. Mount the PVC as a volume for your workload.
 
-For details and prerequisites, refer to [this page.](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md)
+For details and prerequisites, refer to [this page.](../how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md)
 
 ### Longhorn Storage
 
@@ -45,19 +45,19 @@ Longhorn is free, open source software. Originally developed by Rancher Labs, it
 
 If you have a pool of block storage, Longhorn can help you provide persistent storage to your Kubernetes cluster without relying on cloud providers. For more information about Longhorn features, refer to the [documentation.](https://longhorn.io/docs/latest/what-is-longhorn/)
 
-Rancher v2.5 simplified the process of installing Longhorn on a Rancher-managed cluster. For more information, see [this page.](../explanations/integrations-in-rancher/longhorn.md)
+Rancher v2.5 simplified the process of installing Longhorn on a Rancher-managed cluster. For more information, see [this page.](../integrations-in-rancher/longhorn.md)
 
 ### Provisioning Storage Examples
 
-We provide examples of how to provision storage with [NFS,](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md) [vSphere,](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md) and [Amazon's EBS.](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md)
+We provide examples of how to provision storage with [NFS,](../how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/nfs-storage.md) [vSphere,](../how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md) and [Amazon's EBS.](../how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md)
 
 ### GlusterFS Volumes
 
-In clusters that store data on GlusterFS volumes, you may experience an issue where pods fail to mount volumes after restarting the `kubelet`. For details on preventing this from happening, refer to [this page.](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md)
+In clusters that store data on GlusterFS volumes, you may experience an issue where pods fail to mount volumes after restarting the `kubelet`. For details on preventing this from happening, refer to [this page.](../how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md)
 
 ### iSCSI Volumes
 
-In [Rancher Launched Kubernetes clusters](launch-kubernetes-with-rancher.md) that store data on iSCSI volumes, you may experience an issue where kubelets fail to automatically connect with iSCSI volumes. For details on resolving this issue, refer to [this page.](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md)
+In [Rancher Launched Kubernetes clusters](../pages-for-subheaders/launch-kubernetes-with-rancher.md) that store data on iSCSI volumes, you may experience an issue where kubelets fail to automatically connect with iSCSI volumes. For details on resolving this issue, refer to [this page.](../how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md)
 
 ### hostPath Volumes
 Before you create a hostPath volume, you need to set up an [extra_bind](https://rancher.com/docs/rke/latest/en/config-options/services/services-extras/#extra-binds/) in your cluster configuration. This will mount the path as a volume in your kubelets, which can then be used for hostPath volumes in your workloads.
@@ -66,7 +66,7 @@ Before you create a hostPath volume, you need to set up an [extra_bind](https://
 
 Kubernetes is moving away from maintaining cloud providers in-tree. vSphere has an out-of-tree cloud provider that can be used by installing the vSphere cloud provider and cloud storage plugins.
 
-For instructions on how to migrate from the in-tree vSphere cloud provider to out-of-tree, and manage the existing VMs post migration, refer to [this page.](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere.md)
+For instructions on how to migrate from the in-tree vSphere cloud provider to out-of-tree, and manage the existing VMs post migration, refer to [this page.](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-out-of-tree-vsphere.md)
 
 ### Related Links
 
diff --git a/docs/pages-for-subheaders/custom-resource-configuration.md b/docs/pages-for-subheaders/custom-resource-configuration.md
index 3358ebb8019..cf43951e5b3 100644
--- a/docs/pages-for-subheaders/custom-resource-configuration.md
+++ b/docs/pages-for-subheaders/custom-resource-configuration.md
@@ -4,5 +4,5 @@ title: Custom Resource Configuration
 
 The following Custom Resource Definitions are used to configure logging:
 
-- [Flow and ClusterFlow](../explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md)
-- [Output and ClusterOutput](../explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md)
\ No newline at end of file
+- [Flow and ClusterFlow](../integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md)
+- [Output and ClusterOutput](../integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md)
\ No newline at end of file
diff --git a/docs/pages-for-subheaders/enable-experimental-features.md b/docs/pages-for-subheaders/enable-experimental-features.md
index 1e64feee609..d6bbff9633c 100644
--- a/docs/pages-for-subheaders/enable-experimental-features.md
+++ b/docs/pages-for-subheaders/enable-experimental-features.md
@@ -1,7 +1,7 @@
 ---
 title: Enabling Experimental Features
 ---
-Rancher includes some features that are experimental and disabled by default. You might want to enable these features, for example, if you decide that the benefits of using an [unsupported storage type](../getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md) outweighs the risk of using an untested feature. Feature flags were introduced to allow you to try these features that are not enabled by default.
+Rancher includes some features that are experimental and disabled by default. You might want to enable these features, for example, if you decide that the benefits of using an [unsupported storage type](../how-to-guides/advanced-user-guides/enable-experimental-features/unsupported-storage-drivers.md) outweighs the risk of using an untested feature. Feature flags were introduced to allow you to try these features that are not enabled by default.
 
 The features can be enabled in three ways:
 
@@ -18,7 +18,7 @@ If no value has been set, Rancher uses the default value.
 
 Because the API sets the actual value and the command line sets the default value, that means that if you enable or disable a feature with the API or UI, it will override any value set with the command line.
 
-For example, if you install Rancher, then set a feature flag to true with the Rancher API, then upgrade Rancher with a command that sets the feature flag to false, the default value will still be false, but the feature will still be enabled because it was set with the Rancher API. If you then deleted the set value (true) with the Rancher API, setting it to NULL, the default value (false) would take effect. See the [feature flags page](../reference-guides/installation-references/feature-flags.md) for more information.
+For example, if you install Rancher, then set a feature flag to true with the Rancher API, then upgrade Rancher with a command that sets the feature flag to false, the default value will still be false, but the feature will still be enabled because it was set with the Rancher API. If you then deleted the set value (true) with the Rancher API, setting it to NULL, the default value (false) would take effect. See the [feature flags page](../getting-started/installation-and-upgrade/installation-references/feature-flags.md) for more information.
 
 # Enabling Features when Starting Rancher
 
diff --git a/docs/pages-for-subheaders/fleet-gitops-at-scale.md b/docs/pages-for-subheaders/fleet-gitops-at-scale.md
index 0a84674278c..a521e1b2a18 100644
--- a/docs/pages-for-subheaders/fleet-gitops-at-scale.md
+++ b/docs/pages-for-subheaders/fleet-gitops-at-scale.md
@@ -9,7 +9,7 @@ Fleet is a separate project from Rancher, and can be installed on any Kubernetes
 
 ## Architecture
 
-For information about how Fleet works, see [this page](../explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture.md).
+For information about how Fleet works, see [this page](../integrations-in-rancher/fleet-gitops-at-scale/architecture.md).
 
 ## Accessing Fleet in the Rancher UI
 
@@ -37,7 +37,7 @@ Follow the steps below to access Continuous Delivery in the Rancher UI:
 
 ## Windows Support
 
-For details on support for clusters with Windows nodes, see [this page](../explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md).
+For details on support for clusters with Windows nodes, see [this page](../integrations-in-rancher/fleet-gitops-at-scale/windows-support.md).
 
 ## GitHub Repository
 
@@ -45,7 +45,7 @@ The Fleet Helm charts are available [here](https://github.com/rancher/fleet/rele
 
 ## Using Fleet Behind a Proxy
 
-For details on using Fleet behind a proxy, see [this page](../explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md).
+For details on using Fleet behind a proxy, see [this page](../integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md).
 
 ## Helm Chart Dependencies
 
diff --git a/docs/pages-for-subheaders/install-cluster-autoscaler.md b/docs/pages-for-subheaders/install-cluster-autoscaler.md
index 0dcca143dd7..7ad4de0d618 100644
--- a/docs/pages-for-subheaders/install-cluster-autoscaler.md
+++ b/docs/pages-for-subheaders/install-cluster-autoscaler.md
@@ -21,4 +21,4 @@ Cluster Autoscaler provides support to distinct cloud providers. For more inform
 
 ### Setting up Cluster Autoscaler on Amazon Cloud Provider
 
-For details on running the cluster autoscaler  on Amazon cloud provider, refer to [this page.](../how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md)
+For details on running the cluster autoscaler  on Amazon cloud provider, refer to [this page.](../how-to-guides/new-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md)
diff --git a/docs/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md b/docs/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md
index 37623f5f601..e9f0f97e373 100644
--- a/docs/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md
+++ b/docs/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md
@@ -75,7 +75,7 @@ To set up Rancher,
 
 ### 1. Add the Helm Chart Repository
 
-Use `helm repo add` command to add the Helm chart repository that contains charts to install Rancher. For more information about the repository choices and which is best for your use case, see [Choosing a Version of Rancher](../reference-guides/installation-references/helm-chart-options.md#helm-chart-repositories).
+Use `helm repo add` command to add the Helm chart repository that contains charts to install Rancher. For more information about the repository choices and which is best for your use case, see [Choosing a Version of Rancher](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#helm-chart-repositories).
 
 - Latest: Recommended for trying out the newest features
     ```
@@ -105,7 +105,7 @@ The Rancher management server is designed to be secure by default and requires S
 
 :::note
 
-If you want terminate SSL/TLS externally, see [TLS termination on an External Load Balancer](../reference-guides/installation-references/helm-chart-options.md#external-tls-termination).
+If you want terminate SSL/TLS externally, see [TLS termination on an External Load Balancer](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#external-tls-termination).
 
 :::
 
@@ -130,7 +130,7 @@ New in v2.6.4, cert-manager versions 1.6.2 and 1.7.1 are compatible. We recommen
 
 :::
 
-> You should skip this step if you are bringing your own certificate files (option `ingress.tls.source=secret`), or if you use [TLS termination on an external load balancer](../reference-guides/installation-references/helm-chart-options.md#external-tls-termination).
+> You should skip this step if you are bringing your own certificate files (option `ingress.tls.source=secret`), or if you use [TLS termination on an external load balancer](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#external-tls-termination).
 
 This step is only required to use certificates issued by Rancher's generated CA (`ingress.tls.source=rancher`) or to request Let's Encrypt issued certificates (`ingress.tls.source=letsEncrypt`).
 
@@ -311,11 +311,11 @@ Now that Rancher is deployed, see [Adding TLS Secrets](../getting-started/instal
 
 The Rancher chart configuration has many options for customizing the installation to suit your specific environment. Here are some common advanced scenarios.
 
-- [HTTP Proxy](../reference-guides/installation-references/helm-chart-options.md#http-proxy)
-- [Private container image Registry](../reference-guides/installation-references/helm-chart-options.md#private-registry-and-air-gap-installs)
-- [TLS Termination on an External Load Balancer](../reference-guides/installation-references/helm-chart-options.md#external-tls-termination)
+- [HTTP Proxy](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#http-proxy)
+- [Private container image Registry](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#private-registry-and-air-gap-installs)
+- [TLS Termination on an External Load Balancer](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#external-tls-termination)
 
-See the [Chart Options](../reference-guides/installation-references/helm-chart-options.md) for the full list of options.
+See the [Chart Options](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md) for the full list of options.
 
 
 ### 6. Verify that the Rancher Server is Successfully Deployed
diff --git a/docs/pages-for-subheaders/installation-and-upgrade.md b/docs/pages-for-subheaders/installation-and-upgrade.md
index da4d01ad100..5718232bd95 100644
--- a/docs/pages-for-subheaders/installation-and-upgrade.md
+++ b/docs/pages-for-subheaders/installation-and-upgrade.md
@@ -14,7 +14,7 @@ In this section,
 - **K3s (Lightweight Kubernetes)** is also a fully compliant Kubernetes distribution. It is newer than RKE, easier to use, and more lightweight, with a binary size of less than 100 MB.
 - **RKE2** is a fully conformant Kubernetes distribution that focuses on security and compliance within the U.S. Federal Government sector.
 
-Note the `restrictedAdmin` Helm chart option available for **the Rancher Server**. When this option is set to true, the initial Rancher user has restricted access to the local Kubernetes cluster to prevent privilege escalation. For more information, see the section about the [restricted-admin role.](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md#restricted-admin)
+Note the `restrictedAdmin` Helm chart option available for **the Rancher Server**. When this option is set to true, the initial Rancher user has restricted access to the local Kubernetes cluster to prevent privilege escalation. For more information, see the section about the [restricted-admin role.](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md#restricted-admin)
 
 # Overview of Installation Options
 
@@ -73,11 +73,11 @@ For more architecture recommendations, refer to [this page.](../reference-guides
 
 ### More Options for Installations on a Kubernetes Cluster
 
-Refer to the [Helm chart options](../reference-guides/installation-references/helm-chart-options.md) for details on installing Rancher on a Kubernetes cluster with other configurations, including:
+Refer to the [Helm chart options](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md) for details on installing Rancher on a Kubernetes cluster with other configurations, including:
 
-- With [API auditing to record all transactions](../reference-guides/installation-references/helm-chart-options.md#api-audit-log)
-- With [TLS termination on a load balancer](../reference-guides/installation-references/helm-chart-options.md#external-tls-termination)
-- With a [custom Ingress](../reference-guides/installation-references/helm-chart-options.md#customizing-your-ingress)
+- With [API auditing to record all transactions](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#api-audit-log)
+- With [TLS termination on a load balancer](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#external-tls-termination)
+- With a [custom Ingress](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#customizing-your-ingress)
 
 In the Rancher installation instructions, we recommend using K3s or RKE to set up a Kubernetes cluster before installing Rancher on the cluster. Both K3s and RKE have many configuration options for customizing the Kubernetes cluster to suit your specific environment. For the full list of their capabilities, refer to their documentation:
 
@@ -89,5 +89,5 @@ In the Rancher installation instructions, we recommend using K3s or RKE to set u
 Refer to the [docs about options for Docker installs](rancher-on-a-single-node-with-docker.md) for details about other configurations including:
 
 - With [API auditing to record all transactions](../reference-guides/single-node-rancher-in-docker/advanced-options.md#api-audit-log)
-- With an [external load balancer](../getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md)
+- With an [external load balancer](../how-to-guides/advanced-user-guides/configure-layer-7-nginx-load-balancer.md)
 - With a [persistent data store](../reference-guides/single-node-rancher-in-docker/advanced-options.md#persistent-data)
diff --git a/docs/pages-for-subheaders/installation-references.md b/docs/pages-for-subheaders/installation-references.md
index 0eeae0f6c4e..e2048279af0 100644
--- a/docs/pages-for-subheaders/installation-references.md
+++ b/docs/pages-for-subheaders/installation-references.md
@@ -2,4 +2,4 @@
 title: Installation References
 ---
 
-Please see the following reference guides for other installation resources: [Rancher Helm chart options](../reference-guides/installation-references/helm-chart-options.md), [TLS settings](../reference-guides/installation-references/tls-settings.md), and [feature flags](../reference-guides/installation-references/feature-flags.md).
\ No newline at end of file
+Please see the following reference guides for other installation resources: [Rancher Helm chart options](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md), [TLS settings](../getting-started/installation-and-upgrade/installation-references/tls-settings.md), and [feature flags](../getting-started/installation-and-upgrade/installation-references/feature-flags.md).
\ No newline at end of file
diff --git a/docs/pages-for-subheaders/installation-requirements.md b/docs/pages-for-subheaders/installation-requirements.md
index 7c2919a2dee..1092d203c62 100644
--- a/docs/pages-for-subheaders/installation-requirements.md
+++ b/docs/pages-for-subheaders/installation-requirements.md
@@ -53,7 +53,7 @@ Some distributions of Linux may have default firewall rules that block communica
 
 If you don't feel comfortable doing so, you might check suggestions in the [respective issue](https://github.com/rancher/rancher/issues/28840). Some users were successful [creating a separate firewalld zone with a policy of ACCEPT for the Pod CIDR](https://github.com/rancher/rancher/issues/28840#issuecomment-787404822).
 
-If you plan to run Rancher on ARM64, see [Running on ARM64 (Experimental).](../getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md)
+If you plan to run Rancher on ARM64, see [Running on ARM64 (Experimental).](../how-to-guides/advanced-user-guides/enable-experimental-features/rancher-on-arm64.md)
 
 ### RKE Specific Requirements
 
diff --git a/docs/pages-for-subheaders/integrations-in-rancher.md b/docs/pages-for-subheaders/integrations-in-rancher.md
deleted file mode 100644
index f687fe90e4a..00000000000
--- a/docs/pages-for-subheaders/integrations-in-rancher.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: Integrations in Rancher
----
-
-Over time, Rancher has accrued several products and projects that have been integrated into the Rancher UI.
-
-Examples of some of these integrations are [Harvester](../explanations/integrations-in-rancher/harvester.md) and [NeuVector](../explanations/integrations-in-rancher/neuvector.md).
\ No newline at end of file
diff --git a/docs/pages-for-subheaders/introduction.md b/docs/pages-for-subheaders/introduction.md
deleted file mode 100644
index 8fcb5797ed1..00000000000
--- a/docs/pages-for-subheaders/introduction.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Introduction
----
-
-The [overview](../getting-started/introduction/overview.md) will discuss Rancher's features, capabilities, and how it makes running Kubernetes easy. The guide to the [new Rancher Manager docs structure, Divio,](../getting-started/introduction/what-are-divio-docs.md) will explain more about the updated look and function of our docs.
\ No newline at end of file
diff --git a/docs/pages-for-subheaders/istio-setup-guide.md b/docs/pages-for-subheaders/istio-setup-guide.md
index 1361d4501a4..705e8b673c9 100644
--- a/docs/pages-for-subheaders/istio-setup-guide.md
+++ b/docs/pages-for-subheaders/istio-setup-guide.md
@@ -10,7 +10,7 @@ If you use Istio for traffic management, you will need to allow external traffic
 
 This guide assumes you have already [installed Rancher,](installation-and-upgrade.md) and you have already [provisioned a separate Kubernetes cluster](kubernetes-clusters-in-rancher-setup.md) on which you will install Istio.
 
-The nodes in your cluster must meet the [CPU and memory requirements.](../explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md)
+The nodes in your cluster must meet the [CPU and memory requirements.](../integrations-in-rancher/istio/cpu-and-memory-allocations.md)
 
 The workloads and services that you want to be controlled by Istio must meet [Istio's requirements.](https://istio.io/docs/setup/additional-setup/requirements/)
 
diff --git a/docs/pages-for-subheaders/istio.md b/docs/pages-for-subheaders/istio.md
index 01e9dd262c7..76d7bd4a1d8 100644
--- a/docs/pages-for-subheaders/istio.md
+++ b/docs/pages-for-subheaders/istio.md
@@ -51,7 +51,7 @@ Note that this is not a production-qualified deployment of Jaeger. This deployme
 
 ## Prerequisites
 
-Before enabling Istio, we recommend that you confirm that your Rancher worker nodes have enough [CPU and memory](../explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md) to run all of the components of Istio.
+Before enabling Istio, we recommend that you confirm that your Rancher worker nodes have enough [CPU and memory](../integrations-in-rancher/istio/cpu-and-memory-allocations.md) to run all of the components of Istio.
 
 If you are installing Istio on RKE2 cluster, some additional steps are required. For details, see [this section.](#additional-steps-for-installing-istio-on-an-rke2-cluster)
 
@@ -63,7 +63,7 @@ Refer to the [setup guide](istio-setup-guide.md) for instructions on how to set
 
 ## Remove Istio
 
-To remove Istio components from a cluster, namespace, or workload, refer to the section on [uninstalling Istio.](../explanations/integrations-in-rancher/istio/disable-istio.md)
+To remove Istio components from a cluster, namespace, or workload, refer to the section on [uninstalling Istio.](../integrations-in-rancher/istio/disable-istio.md)
 
 ## Migrate From Previous Istio Version
 
@@ -75,7 +75,7 @@ Another option is to manually uninstall istio resources one at a time, but leave
 
 ## Accessing Visualizations
 
-> By default, only cluster-admins have access to Kiali. For instructions on how to allow admin, edit or views roles to access them, see [this section.](../explanations/integrations-in-rancher/istio/rbac-for-istio.md)
+> By default, only cluster-admins have access to Kiali. For instructions on how to allow admin, edit or views roles to access them, see [this section.](../integrations-in-rancher/istio/rbac-for-istio.md)
 
 After Istio is set up in a cluster, Grafana, Prometheus, and Kiali are available in the Rancher UI.
 
@@ -93,7 +93,7 @@ To access the Kiali visualization,
 1. In the left navigation bar, click **Istio**.
 1. Click **Kiali**. From here you can access the **Traffic Graph** tab or the **Traffic Metrics** tab to see network visualizations and metrics.
 
-By default, all namespace will picked up by prometheus and make data available for Kiali graphs. Refer to [selector/scrape config setup](../explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md) if you would like to use a different configuration for prometheus data scraping.
+By default, all namespace will picked up by prometheus and make data available for Kiali graphs. Refer to [selector/scrape config setup](../integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md) if you would like to use a different configuration for prometheus data scraping. 
 
 Your access to the visualizations depend on your role. Grafana and Prometheus are only available for `cluster-admin` roles. The Kiali UI is available only to `cluster-admin` by default, but `cluster-admin` can allow other roles to access them by editing the Istio values.yaml.
 
@@ -121,4 +121,4 @@ By default the Egress gateway is disabled, but can be enabled on install or upgr
 
 ## Additional Steps for Installing Istio on an RKE2 Cluster
 
-To install Istio on an RKE2 cluster, follow the steps in [this section.](../explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md)
+To install Istio on an RKE2 cluster, follow the steps in [this section.](../integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md)
diff --git a/docs/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md b/docs/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md
index 22c21b7b33c..b7f2f0a3bb0 100644
--- a/docs/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md
+++ b/docs/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md
@@ -37,7 +37,7 @@ These nodes can be dynamically provisioned through Rancher's UI, which calls [Do
 
 If you already have a node that you want to add to an RKE cluster, you can add it to the cluster by running a Rancher agent container on it.
 
-For more information, refer to the section on [RKE clusters.](launch-kubernetes-with-rancher.md)
+For more information, refer to the section on [RKE clusters.](../pages-for-subheaders/launch-kubernetes-with-rancher.md)
 
 ### Launching Kubernetes and Provisioning Nodes in an Infrastructure Provider
 
diff --git a/docs/pages-for-subheaders/kubernetes-components.md b/docs/pages-for-subheaders/kubernetes-components.md
index e93dd6bc8fd..b316a70dbde 100644
--- a/docs/pages-for-subheaders/kubernetes-components.md
+++ b/docs/pages-for-subheaders/kubernetes-components.md
@@ -2,7 +2,7 @@
 title: Kubernetes Components
 ---
 
-The commands and steps listed in this section apply to the core Kubernetes components on [Rancher Launched Kubernetes](launch-kubernetes-with-rancher.md) clusters.
+The commands and steps listed in this section apply to the core Kubernetes components on [Rancher Launched Kubernetes](../pages-for-subheaders/launch-kubernetes-with-rancher.md) clusters.
 
 This section includes troubleshooting tips in the following categories:
 
diff --git a/docs/pages-for-subheaders/launch-kubernetes-with-rancher.md b/docs/pages-for-subheaders/launch-kubernetes-with-rancher.md
index 04afe7ac941..2ef362e38c3 100644
--- a/docs/pages-for-subheaders/launch-kubernetes-with-rancher.md
+++ b/docs/pages-for-subheaders/launch-kubernetes-with-rancher.md
@@ -30,7 +30,7 @@ For more information, refer to the section on [launching Kubernetes on new nodes
 
 In this scenario, you want to install Kubernetes on bare-metal servers, on-prem virtual machines, or virtual machines that already exist in a cloud provider. With this option, you will run a Rancher agent Docker container on the machine.
 
-If you want to reuse a node from a previous custom cluster, [clean the node](../how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md) before using it in a cluster again. If you reuse a node that hasn't been cleaned, cluster provisioning may fail.
+If you want to reuse a node from a previous custom cluster, [clean the node](../how-to-guides/new-user-guides/manage-clusters/clean-cluster-nodes.md) before using it in a cluster again. If you reuse a node that hasn't been cleaned, cluster provisioning may fail.
 
 For more information, refer to the section on [custom nodes.](use-existing-nodes.md)
 
diff --git a/docs/pages-for-subheaders/logging.md b/docs/pages-for-subheaders/logging.md
index 9ef66ecf043..adea902d1e1 100644
--- a/docs/pages-for-subheaders/logging.md
+++ b/docs/pages-for-subheaders/logging.md
@@ -5,7 +5,7 @@ description: Rancher integrates with popular logging services. Learn the require
 
 The [Banzai Cloud Logging operator](https://banzaicloud.com/docs/one-eye/logging-operator/) now powers Rancher's logging solution in place of the former, in-house solution.
 
-For an overview of the changes in v2.5, see [this section.](../explanations/integrations-in-rancher/logging/logging-architecture.md#changes-in-rancher-v2-5) For information about migrating from Logging V1, see [this page.](../explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md)
+For an overview of the changes in v2.5, see [this section.](../integrations-in-rancher/logging/logging-architecture.md#changes-in-rancher-v2-5) For information about migrating from Logging V1, see [this page.](../integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md)
 
 
 ## Enabling Logging
@@ -30,13 +30,13 @@ You can enable the logging for a Rancher managed cluster by going to the Apps pa
 
 ## Architecture
 
-For more information about how the logging application works, see [this section.](../explanations/integrations-in-rancher/logging/logging-architecture.md)
+For more information about how the logging application works, see [this section.](../integrations-in-rancher/logging/logging-architecture.md)
 
 
 
 ## Role-based Access Control
 
-Rancher logging has two roles, `logging-admin` and `logging-view`. For more information on how and when to use these roles, see [this page.](../explanations/integrations-in-rancher/logging/rbac-for-logging.md)
+Rancher logging has two roles, `logging-admin` and `logging-view`. For more information on how and when to use these roles, see [this page.](../integrations-in-rancher/logging/rbac-for-logging.md)
 
 ## Configuring Logging Custom Resources
 
@@ -48,39 +48,39 @@ To manage `Flows,` `ClusterFlows`, `Outputs`, and `ClusterOutputs`,
 
 ### Flows and ClusterFlows
 
-For help with configuring `Flows` and `ClusterFlows`, see [this page.](../explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md)
+For help with configuring `Flows` and `ClusterFlows`, see [this page.](../integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md)
 
 ### Outputs and ClusterOutputs
 
-For help with configuring `Outputs` and `ClusterOutputs`, see [this page.](../explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md)
+For help with configuring `Outputs` and `ClusterOutputs`, see [this page.](../integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md)
 
 ## Configuring the Logging Helm Chart
 
-For a list of options that can be configured when the logging application is installed or upgraded, see [this page.](../explanations/integrations-in-rancher/logging/logging-helm-chart-options.md)
+For a list of options that can be configured when the logging application is installed or upgraded, see [this page.](../integrations-in-rancher/logging/logging-helm-chart-options.md)
 
 ### Windows Support
 
 Logging support for Windows clusters is available and logs can be collected from Windows nodes.
 
-For details on how to enable or disable Windows node logging, see [this section.](../explanations/integrations-in-rancher/logging/logging-helm-chart-options.md#enable-disable-windows-node-logging)
+For details on how to enable or disable Windows node logging, see [this section.](../integrations-in-rancher/logging/logging-helm-chart-options.md#enable-disable-windows-node-logging)
 
 ### Working with a Custom Docker Root Directory
 
-For details on using a custom Docker root directory, see [this section.](../explanations/integrations-in-rancher/logging/logging-helm-chart-options.md#working-with-a-custom-docker-root-directory)
+For details on using a custom Docker root directory, see [this section.](../integrations-in-rancher/logging/logging-helm-chart-options.md#working-with-a-custom-docker-root-directory)
 
 
 ### Working with Taints and Tolerations
 
-For information on how to use taints and tolerations with the logging application, see [this page.](../explanations/integrations-in-rancher/logging/taints-and-tolerations.md)
+For information on how to use taints and tolerations with the logging application, see [this page.](../integrations-in-rancher/logging/taints-and-tolerations.md)
 
 
 ### Logging V2 with SELinux
 
-For information on enabling the logging application for SELinux-enabled nodes, see [this section.](../explanations/integrations-in-rancher/logging/logging-helm-chart-options.md#enabling-the-logging-application-to-work-with-selinux)
+For information on enabling the logging application for SELinux-enabled nodes, see [this section.](../integrations-in-rancher/logging/logging-helm-chart-options.md#enabling-the-logging-application-to-work-with-selinux)
 
 ### Additional Logging Sources
 
-By default, Rancher collects logs for control plane components and node components for all cluster types. In some cases additional logs can be collected. For details, see [this section.](../explanations/integrations-in-rancher/logging/logging-helm-chart-options.md#additional-logging-sources)
+By default, Rancher collects logs for control plane components and node components for all cluster types. In some cases additional logs can be collected. For details, see [this section.](../integrations-in-rancher/logging/logging-helm-chart-options.md#additional-logging-sources)
 
 
 ## Troubleshooting
diff --git a/docs/pages-for-subheaders/manage-clusters.md b/docs/pages-for-subheaders/manage-clusters.md
index 17efb1bfd13..7280d1342f2 100644
--- a/docs/pages-for-subheaders/manage-clusters.md
+++ b/docs/pages-for-subheaders/manage-clusters.md
@@ -18,7 +18,7 @@ This section assumes a basic familiarity with Docker and Kubernetes. For a brief
 
 ## Managing Clusters in Rancher
 
-After clusters have been [provisioned into Rancher](kubernetes-clusters-in-rancher-setup.md), [cluster owners](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#cluster-roles) will need to manage these clusters. There are many different options of how to manage your cluster.
+After clusters have been [provisioned into Rancher](kubernetes-clusters-in-rancher-setup.md), [cluster owners](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#cluster-roles) will need to manage these clusters. There are many different options of how to manage your cluster.
 
 import ClusterCapabilitiesTable from '../shared-files/_cluster-capabilities-table.md';
 
diff --git a/docs/pages-for-subheaders/manage-persistent-storage.md b/docs/pages-for-subheaders/manage-persistent-storage.md
deleted file mode 100644
index 38f9b23fe1c..00000000000
--- a/docs/pages-for-subheaders/manage-persistent-storage.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: Manage Persistent Storage
----
-
-The following sections will explain how to manage persistent storage:
-
-- [How Persistent Storage Works](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md)
-- [Set Up Existing Storage](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md)
-- [Dynamically Provision New Storage in Rancher](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md)
-- [Use an External Ceph Driver](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md)
-- [GlusterFS Volumes](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md)
-- [iSCSI Volumes](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md)
\ No newline at end of file
diff --git a/docs/pages-for-subheaders/manage-project-resource-quotas.md b/docs/pages-for-subheaders/manage-project-resource-quotas.md
index f9207286307..7110306ba7a 100644
--- a/docs/pages-for-subheaders/manage-project-resource-quotas.md
+++ b/docs/pages-for-subheaders/manage-project-resource-quotas.md
@@ -6,7 +6,7 @@ In situations where several teams share a cluster, one team may overconsume the
 
 This page is a how-to guide for creating resource quotas in existing projects.
 
-Resource quotas can also be set when a new project is created. For details, refer to the section on [creating new projects.](../how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md#creating-projects)
+Resource quotas can also be set when a new project is created. For details, refer to the section on [creating new projects.](../how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces.md#creating-projects)
 
 Resource quotas in Rancher include the same functionality as the [native version of Kubernetes](https://kubernetes.io/docs/concepts/policy/resource-quotas/). In Rancher, resource quotas have been extended so that you can apply them to projects. For details on how resource quotas work with projects in Rancher, refer to [this page.](../how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md)
 
diff --git a/docs/pages-for-subheaders/manage-projects.md b/docs/pages-for-subheaders/manage-projects.md
index 1b6bb990325..3c421c9b10d 100644
--- a/docs/pages-for-subheaders/manage-projects.md
+++ b/docs/pages-for-subheaders/manage-projects.md
@@ -15,19 +15,19 @@ Rancher projects resolve this issue by allowing you to apply resources and acces
 
 You can use projects to perform actions like:
 
-- [Assign users access to a group of namespaces](../how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md)
-- Assign users [specific roles in a project](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#project-roles). A role can be owner, member, read-only, or [custom](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md)
+- [Assign users access to a group of namespaces](../how-to-guides/new-user-guides/add-users-to-projects.md)
+- Assign users [specific roles in a project](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#project-roles). A role can be owner, member, read-only, or [custom](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md)
 - [Set resource quotas](manage-project-resource-quotas.md)
-- [Manage namespaces](../how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md)
+- [Manage namespaces](../how-to-guides/new-user-guides/manage-namespaces.md)
 - [Configure tools](../reference-guides/rancher-project-tools.md)
 - [Set up pipelines for continuous integration and deployment](../how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines.md)
 - [Configure pod security policies](../how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md)
 
 ### Authorization
 
-Non-administrative users are only authorized for project access after an [administrator](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md), [cluster owner or member](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#cluster-roles), or [project owner](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#project-roles) adds them to the project's **Members** tab.
+Non-administrative users are only authorized for project access after an [administrator](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md), [cluster owner or member](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#cluster-roles), or [project owner](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#project-roles) adds them to the project's **Members** tab.
 
-Whoever creates the project automatically becomes a [project owner](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#project-roles).
+Whoever creates the project automatically becomes a [project owner](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#project-roles).
 
 ## Switching between Projects
 
diff --git a/docs/pages-for-subheaders/manage-role-based-access-control-rbac.md b/docs/pages-for-subheaders/manage-role-based-access-control-rbac.md
index 8d63e7ad740..b2674b753b9 100644
--- a/docs/pages-for-subheaders/manage-role-based-access-control-rbac.md
+++ b/docs/pages-for-subheaders/manage-role-based-access-control-rbac.md
@@ -2,7 +2,7 @@
 title: Role-Based Access Control (RBAC)
 ---
 
-Within Rancher, each person authenticates as a _user_, which is a login that grants you access to Rancher. As mentioned in [Authentication](about-authentication.md), users can either be local or external.
+Within Rancher, each person authenticates as a _user_, which is a login that grants you access to Rancher. As mentioned in [Authentication](authentication-config.md), users can either be local or external.
 
 After you configure external authentication, the users that display on the **Users** page changes.
 
@@ -14,11 +14,11 @@ After you configure external authentication, the users that display on the **Use
 
 Once the user logs in to Rancher, their _authorization_, or their access rights within the system, is determined by _global permissions_, and _cluster and project roles_.
 
-- [Global Permissions](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md):
+- [Global Permissions](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md):
 
     Define user authorization outside the scope of any particular cluster.
 
-- [Cluster and Project Roles](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md):
+- [Cluster and Project Roles](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md):
 
     Define user authorization inside the specific cluster or project where they are assigned the role.
 
diff --git a/docs/pages-for-subheaders/monitoring-and-alerting.md b/docs/pages-for-subheaders/monitoring-and-alerting.md
index e28fd4fbb88..5153d5123ff 100644
--- a/docs/pages-for-subheaders/monitoring-and-alerting.md
+++ b/docs/pages-for-subheaders/monitoring-and-alerting.md
@@ -25,7 +25,7 @@ The monitoring application allows you to:
 
 # How Monitoring Works
 
-For an explanation of how the monitoring components work together, see [this page.](../explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)
+For an explanation of how the monitoring components work together, see [this page.](../integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)
 
 # Default Components and Deployments
 
@@ -33,7 +33,7 @@ For an explanation of how the monitoring components work together, see [this pag
 
 By default, the monitoring application deploys Grafana dashboards (curated by the [kube-prometheus](https://github.com/prometheus-operator/kube-prometheus) project) onto a cluster.
 
-It also deploys an Alertmanager UI and a Prometheus UI. For more information about these tools, see [Built-in Dashboards.](../explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md)
+It also deploys an Alertmanager UI and a Prometheus UI. For more information about these tools, see [Built-in Dashboards.](../integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md)
 ### Default Metrics Exporters
 
 By default, Rancher Monitoring deploys exporters (such as [node-exporter](https://github.com/prometheus/node_exporter) and [kube-state-metrics](https://github.com/kubernetes/kube-state-metrics)).
@@ -42,15 +42,15 @@ These default exporters automatically scrape metrics for CPU and memory from all
 
 ### Default Alerts
 
-The monitoring application deploys some alerts by default. To see the default alerts, go to the [Alertmanager UI](../explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md#alertmanager-ui) and click **Expand all groups.**
+The monitoring application deploys some alerts by default. To see the default alerts, go to the [Alertmanager UI](../integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md#alertmanager-ui) and click **Expand all groups.**
 
 ### Components Exposed in the Rancher UI
 
-For a list of monitoring components exposed in the Rancher UI, along with common use cases for editing them, see [this section.](../explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md#components-exposed-in-the-rancher-ui)
+For a list of monitoring components exposed in the Rancher UI, along with common use cases for editing them, see [this section.](../integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md#components-exposed-in-the-rancher-ui)
 
 # Role-based Access Control
 
-For information on configuring access to monitoring, see [this page.](../explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md)
+For information on configuring access to monitoring, see [this page.](../integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md)
 
 # Guides
 
@@ -66,7 +66,7 @@ For information on configuring access to monitoring, see [this page.](../explana
 
 ### Configuring Monitoring Resources in Rancher
 
-> The configuration reference assumes familiarity with how monitoring components work together. For more information, see [How Monitoring Works.](../explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)
+> The configuration reference assumes familiarity with how monitoring components work together. For more information, see [How Monitoring Works.](../integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)
 
 - [ServiceMonitor and PodMonitor](../reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md)
 - [Receiver](../reference-guides/monitoring-v2-configuration/receivers.md)
@@ -85,7 +85,7 @@ When deployed onto an RKE1 Windows cluster, Monitoring V2 will now automatically
 
 To be able to fully deploy Monitoring V2 for Windows, all of your Windows hosts must have a minimum [wins](https://github.com/rancher/wins) version of v0.1.0.
 
-For more details on how to upgrade wins on existing Windows hosts, refer to the section on [Windows cluster support for Monitoring V2.](../explanations/integrations-in-rancher/monitoring-and-alerting/windows-support.md)
+For more details on how to upgrade wins on existing Windows hosts, refer to the section on [Windows cluster support for Monitoring V2.](../integrations-in-rancher/monitoring-and-alerting/windows-support.md)
 
 
 
diff --git a/docs/pages-for-subheaders/nutanix.md b/docs/pages-for-subheaders/nutanix.md
index 3d2072eb508..8d2d43c05e5 100644
--- a/docs/pages-for-subheaders/nutanix.md
+++ b/docs/pages-for-subheaders/nutanix.md
@@ -9,9 +9,9 @@ Rancher can provision nodes in AOS (AHV) and install Kubernetes on them. When cr
 
 A Nutanix cluster may consist of multiple groups of VMs with distinct properties, such as the amount of memory or the number of vCPUs. This grouping allows for fine-grained control over the sizing of nodes for each Kubernetes role.
 
-- [Creating a Nutanix Cluster](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md#creating-a-nutanix-aos-cluster)
-- [Provisioning Storage](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos)
+- [Creating a Nutanix Cluster](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md#creating-a-nutanix-aos-cluster)
+- [Provisioning Storage](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos)
 
 # Creating a Nutanix Cluster
 
-In [this section,](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md) you'll learn how to use Rancher to install an [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes cluster in Nutanix AOS.
\ No newline at end of file
+In [this section,](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.mdu'll learn how to use Rancher to install an [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes cluster in Nutanix AOS.
\ No newline at end of file
diff --git a/docs/pages-for-subheaders/other-cloud-providers.md b/docs/pages-for-subheaders/other-cloud-providers.md
deleted file mode 100644
index b9d8965a762..00000000000
--- a/docs/pages-for-subheaders/other-cloud-providers.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: Other Cloud Providers
----
-
-The following sections will outline how to set up the following cloud providers:
-
-- [Amazon Cloud Provider](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md)
-- [Azure Cloud Provider](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md)
-- [Google Compute Cloud Engine Provider](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md)
\ No newline at end of file
diff --git a/docs/pages-for-subheaders/other-troubleshooting-tips.md b/docs/pages-for-subheaders/other-troubleshooting-tips.md
deleted file mode 100644
index 75ff99c90b2..00000000000
--- a/docs/pages-for-subheaders/other-troubleshooting-tips.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: Other Troubleshooting Tips
----
-
-- [Kubernetes Resources](../troubleshooting/other-troubleshooting-tips/kubernetes-resources.md)
-- [Networking](../troubleshooting/other-troubleshooting-tips/networking.md)
-- [DNS](../troubleshooting/other-troubleshooting-tips/dns.md)
-- [Rancher HA](../troubleshooting/other-troubleshooting-tips/rancher-ha.md)
-- [Registered Clusters](../troubleshooting/other-troubleshooting-tips/registered-clusters.md)
-- [Logging](../troubleshooting/other-troubleshooting-tips/logging.md)
-- [User ID Tracking in Audit Logs](../troubleshooting/other-troubleshooting-tips/user-id-tracking-in-audit-logs.md)
-- [Expired Webhook Certificate Rotation](../troubleshooting/other-troubleshooting-tips/expired-webhook-certificate-rotation.md)
\ No newline at end of file
diff --git a/docs/pages-for-subheaders/pipelines.md b/docs/pages-for-subheaders/pipelines.md
index feac9b9457e..27486546c86 100644
--- a/docs/pages-for-subheaders/pipelines.md
+++ b/docs/pages-for-subheaders/pipelines.md
@@ -76,7 +76,7 @@ When you configure a pipeline in one of your projects, a namespace specifically
 
 If you can access a project, you can enable repositories to start building pipelines.
 
-Only [administrators](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md), [cluster owners or members](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#cluster-roles), or [project owners](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#project-roles) can configure version control providers and manage global pipeline execution settings.
+Only [administrators](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md), [cluster owners or members](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#cluster-roles), or [project owners](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#project-roles) can configure version control providers and manage global pipeline execution settings.
 
 Project members can only configure repositories and pipelines.
 
diff --git a/docs/pages-for-subheaders/provisioning-storage-examples.md b/docs/pages-for-subheaders/provisioning-storage-examples.md
index 72d452efcc1..7dcd3960ae5 100644
--- a/docs/pages-for-subheaders/provisioning-storage-examples.md
+++ b/docs/pages-for-subheaders/provisioning-storage-examples.md
@@ -6,6 +6,6 @@ Rancher supports persistent storage with a variety of volume plugins. However, b
 
 For your convenience, Rancher offers documentation on how to configure some of the popular storage methods:
 
-- [NFS](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md)
-- [vSphere](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md)
-- [EBS](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md)
+- [NFS](../how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/nfs-storage.md)
+- [vSphere](../how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md)
+- [EBS](../how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md)
diff --git a/docs/pages-for-subheaders/rancher-manager-architecture.md b/docs/pages-for-subheaders/rancher-manager-architecture.md
index db2e5229a15..03ec604e3f6 100644
--- a/docs/pages-for-subheaders/rancher-manager-architecture.md
+++ b/docs/pages-for-subheaders/rancher-manager-architecture.md
@@ -6,7 +6,7 @@ This section focuses on the [Rancher server and its components](../reference-gui
 
 For information on the different ways that Rancher can be installed, refer to the [overview of installation options.](installation-and-upgrade.md#overview-of-installation-options)
 
-For a list of main features of the Rancher API server, refer to the [overview section.](../getting-started/introduction/overview.md#features-of-the-rancher-api-server)
+For a list of main features of the Rancher API server, refer to the [overview section.](../getting-started/overview.md#features-of-the-rancher-api-server)
 
 For guidance about setting up the underlying infrastructure for the Rancher server, refer to the [architecture recommendations.](../reference-guides/rancher-manager-architecture/architecture-recommendations.md)
 
diff --git a/docs/pages-for-subheaders/rancher-on-a-single-node-with-docker.md b/docs/pages-for-subheaders/rancher-on-a-single-node-with-docker.md
index 21bb416c546..4dd65127b1d 100644
--- a/docs/pages-for-subheaders/rancher-on-a-single-node-with-docker.md
+++ b/docs/pages-for-subheaders/rancher-on-a-single-node-with-docker.md
@@ -9,7 +9,7 @@ In this installation scenario, you'll install Docker on a single Linux host, and
 
 :::note Want to use an external load balancer?
 
-See [Docker Install with an External Load Balancer](../getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md) instead.
+See [Docker Install with an External Load Balancer](../how-to-guides/advanced-user-guides/configure-layer-7-nginx-load-balancer.md) instead.
 
 :::
 
diff --git a/docs/pages-for-subheaders/rancher-security.md b/docs/pages-for-subheaders/rancher-security.md
index ce013cad554..53ad77d370f 100644
--- a/docs/pages-for-subheaders/rancher-security.md
+++ b/docs/pages-for-subheaders/rancher-security.md
@@ -26,7 +26,7 @@ On this page, we provide security related documentation along with resources to
 
 _New in v2.6.5_
 
-NeuVector is an open-source, container-focused security application that is now integrated into Rancher. NeuVector provides production security, DevOps vulnerability protection, and a container firewall, et al. Please see the [Rancher docs](../explanations/integrations-in-rancher/neuvector.md) and the [NeuVector docs](https://open-docs.neuvector.com/) for more information.
+NeuVector is an open-source, container-focused security application that is now integrated into Rancher. NeuVector provides production security, DevOps vulnerability protection, and a container firewall, et al. Please see the [Rancher docs](../integrations-in-rancher/neuvector.md) and the [NeuVector docs](https://open-docs.neuvector.com/) for more information.
 
 ### Running a CIS Security Scan on a Kubernetes Cluster
 
diff --git a/docs/pages-for-subheaders/resources.md b/docs/pages-for-subheaders/resources.md
index e0686b4860b..57f6ee1e7b6 100644
--- a/docs/pages-for-subheaders/resources.md
+++ b/docs/pages-for-subheaders/resources.md
@@ -19,7 +19,7 @@ An air gapped environment could be where Rancher server will be installed offlin
 When installing Rancher, there are several advanced options that can be enabled during installation. Within each install guide, these options are presented. Learn more about these options:
 
 - [Custom CA Certificate](../getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md)
-- [API Audit Log](../getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md)
-- [TLS Settings](../reference-guides/installation-references/tls-settings.md)
-- [etcd configuration](../getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md)
+- [API Audit Log](../how-to-guides/advanced-user-guides/enable-api-audit-log.md)
+- [TLS Settings](../getting-started/installation-and-upgrade/installation-references/tls-settings.md)
+- [etcd configuration](../how-to-guides/advanced-user-guides/tune-etcd-for-large-installs.md)
 - [Local System Charts for Air Gap Installations](../getting-started/installation-and-upgrade/resources/local-system-charts.md) | v2.3.0          |
diff --git a/docs/pages-for-subheaders/set-up-cloud-providers.md b/docs/pages-for-subheaders/set-up-cloud-providers.md
index b26be09828d..0e912b57c4e 100644
--- a/docs/pages-for-subheaders/set-up-cloud-providers.md
+++ b/docs/pages-for-subheaders/set-up-cloud-providers.md
@@ -19,19 +19,19 @@ The following cloud providers can be enabled:
 
 ### Setting up the Amazon Cloud Provider
 
-For details on enabling the Amazon cloud provider, refer to [this page.](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md)
+For details on enabling the Amazon cloud provider, refer to [this page.](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md)
 
 ### Setting up the Azure Cloud Provider
 
-For details on enabling the Azure cloud provider, refer to [this page.](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md)
+For details on enabling the Azure cloud provider, refer to [this page.](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/azure.md)
 
 ### Setting up the GCE Cloud Provider
 
-For details on enabling the Google Compute Engine cloud provider, refer to [this page.](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md)
+For details on enabling the Google Compute Engine cloud provider, refer to [this page.](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/google-compute-engine.md)
 
 ### Setting up the vSphere Cloud Provider
 
-For details on enabling the vSphere cloud provider, refer to [this page.](vsphere-cloud-provider.md)
+For details on enabling the vSphere cloud provider, refer to [in-tree vSphere config](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-in-tree-vsphere.md) and [out-of-tree vSphere config](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-out-of-tree-vsphere.md).
 
 ### Setting up a Custom Cloud Provider
 
diff --git a/docs/pages-for-subheaders/use-existing-nodes.md b/docs/pages-for-subheaders/use-existing-nodes.md
index 6f1156df423..f4e0a01f7ae 100644
--- a/docs/pages-for-subheaders/use-existing-nodes.md
+++ b/docs/pages-for-subheaders/use-existing-nodes.md
@@ -26,7 +26,7 @@ Begin creation of a custom cluster by provisioning a Linux host. Your host can b
 - An on-prem VM
 - A bare-metal server
 
-If you want to reuse a node from a previous custom cluster, [clean the node](../how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md) before using it in a cluster again. If you reuse a node that hasn't been cleaned, cluster provisioning may fail.
+If you want to reuse a node from a previous custom cluster, [clean the node](../how-to-guides/new-user-guides/manage-clusters/clean-cluster-nodes.md) before using it in a cluster again. If you reuse a node that hasn't been cleaned, cluster provisioning may fail.
 
 Provision the host according to the [installation requirements](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md) and the [checklist for production-ready clusters.](checklist-for-production-ready-clusters.md)
 
@@ -66,7 +66,7 @@ If you're using Amazon EC2 as your host and want to use the [dual-stack](https:/
 
 :::
 
-8. **Optional**: Click **[Show advanced options](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md)** to specify IP address(es) to use when registering the node, override the hostname of the node, or to add [labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) or [taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) to the node.
+8. **Optional**: Click **[Show advanced options](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/about-rancher-agents.md)** to specify IP address(es) to use when registering the node, override the hostname of the node, or to add [labels](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) or [taints](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) to the node.
 
 9. Copy the command displayed on screen to your clipboard.
 
@@ -134,5 +134,5 @@ Key=kubernetes.io/cluster/CLUSTERID, Value=shared
 
 After creating your cluster, you can access it through the Rancher UI. As a best practice, we recommend setting up these alternate ways of accessing your cluster:
 
-- **Access your cluster with the kubectl CLI:** Follow [these steps](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#accessing-clusters-with-kubectl-on-your-workstation) to access clusters with kubectl on your workstation. In this case, you will be authenticated through the Rancher server’s authentication proxy, then Rancher will connect you to the downstream cluster. This method lets you manage the cluster without the Rancher UI.
-- **Access your cluster with the kubectl CLI, using the authorized cluster endpoint:** Follow [these steps](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) to access your cluster with kubectl directly, without authenticating through Rancher. We recommend setting up this alternative method to access your cluster so that in case you can’t connect to Rancher, you can still access the cluster.
+- **Access your cluster with the kubectl CLI:** Follow [these steps](../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#accessing-clusters-with-kubectl-on-your-workstation) to access clusters with kubectl on your workstation. In this case, you will be authenticated through the Rancher server’s authentication proxy, then Rancher will connect you to the downstream cluster. This method lets you manage the cluster without the Rancher UI.
+- **Access your cluster with the kubectl CLI, using the authorized cluster endpoint:** Follow [these steps](../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) to access your cluster with kubectl directly, without authenticating through Rancher. We recommend setting up this alternative method to access your cluster so that in case you can’t connect to Rancher, you can still access the cluster.
diff --git a/docs/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md b/docs/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md
index 1e2351d6b65..80772e5f5c7 100644
--- a/docs/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md
+++ b/docs/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md
@@ -125,7 +125,7 @@ After cloud credentials are created, the user can start [managing the cloud cred
 
 ### Node Drivers
 
-If you don't find the node driver that you want to use, you can see if it is available in Rancher's built-in [node drivers and activate it](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md#activating-deactivating-node-drivers), or you can [add your own custom node driver](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md#adding-custom-node-drivers).
+If you don't find the node driver that you want to use, you can see if it is available in Rancher's built-in [node drivers and activate it](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md#activating-deactivating-node-drivers), or you can [add your own custom node driver](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md#adding-custom-node-drivers).
 
 ## RKE2 Clusters
 
@@ -133,7 +133,7 @@ Rancher v2.6 introduces provisioning for [RKE2](https://docs.rke2.io/) clusters
 
 :::note
 
-For RKE2 cluster templates, please refer to [this page](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md#rke2-cluster-template) for additional information.
+For RKE2 cluster templates, please refer to [this page](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md#rke2-cluster-template) for additional information. 
 
 :::
 
diff --git a/docs/pages-for-subheaders/use-windows-clusters.md b/docs/pages-for-subheaders/use-windows-clusters.md
index 3eeb0e5e80e..db5bc9a3d30 100644
--- a/docs/pages-for-subheaders/use-windows-clusters.md
+++ b/docs/pages-for-subheaders/use-windows-clusters.md
@@ -79,7 +79,7 @@ Rancher only supports Windows using Flannel as the network provider.
 
 There are two network options: [**Host Gateway (L2bridge)**](https://github.com/coreos/flannel/blob/master/Documentation/backends.md#host-gw) and [**VXLAN (Overlay)**](https://github.com/coreos/flannel/blob/master/Documentation/backends.md#vxlan). The default option is **VXLAN (Overlay)** mode.
 
-For **Host Gateway (L2bridge)** networking, it's best to use the same Layer 2 network for all nodes. Otherwise, you need to configure the route rules for them. For details, refer to the [documentation on configuring cloud-hosted VM routes.](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md#cloud-hosted-vm-routes-configuration) You will also need to [disable private IP address checks](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md#disabling-private-ip-address-checks) if you are using Amazon EC2, Google GCE, or Azure VM.
+For **Host Gateway (L2bridge)** networking, it's best to use the same Layer 2 network for all nodes. Otherwise, you need to configure the route rules for them. For details, refer to the [documentation on configuring cloud-hosted VM routes.](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/network-requirements-for-host-gateway.md#cloud-hosted-vm-routes-configuration) You will also need to [disable private IP address checks](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/network-requirements-for-host-gateway.md#disabling-private-ip-address-checks) if you are using Amazon EC2, Google GCE, or Azure VM.
 
 For **VXLAN (Overlay)** networking, the [KB4489899](https://support.microsoft.com/en-us/help/4489899) hotfix must be installed. Most cloud-hosted VMs already have this hotfix.
 
@@ -139,11 +139,11 @@ Windows requires that containers must be built on the same Windows Server versio
 
 ### Cloud Provider Specific Requirements
 
-If you set a Kubernetes cloud provider in your cluster, some additional steps are required. You might want to set a cloud provider if you want to want to leverage a cloud provider's capabilities, for example, to automatically provision storage, load balancers, or other infrastructure for your cluster. Refer to [this page](set-up-cloud-providers.md) for details on how to configure a cloud provider cluster of nodes that meet the prerequisites.
+If you set a Kubernetes cloud provider in your cluster, some additional steps are required. You might want to set a cloud provider if you want to want to leverage a cloud provider's capabilities, for example, to automatically provision storage, load balancers, or other infrastructure for your cluster. Refer to [this page](../pages-for-subheaders/set-up-cloud-providers.md) for details on how to configure a cloud provider cluster of nodes that meet the prerequisites.
 
 If you are using the GCE (Google Compute Engine) cloud provider, you must do the following:
 
-- Enable the GCE cloud provider in the `cluster.yml` by following [these steps.](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md)
+- Enable the GCE cloud provider in the `cluster.yml` by following [these steps.](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/google-compute-engine.md)
 - When provisioning the cluster in Rancher, choose **Custom cloud provider** as the cloud provider in the Rancher UI.
 
 ## Tutorial: How to Create a Cluster with Windows Support
@@ -177,7 +177,7 @@ You will provision three nodes:
 | Node 2 | Linux (Ubuntu Server 18.04 recommended)                      |
 | Node 3 | Windows (Windows Server core version 1809 or above required) |
 
-If your nodes are hosted by a **Cloud Provider** and you want automation support such as loadbalancers or persistent storage devices, your nodes have additional configuration requirements. For details, see [Selecting Cloud Providers.](set-up-cloud-providers.md)
+If your nodes are hosted by a **Cloud Provider** and you want automation support such as loadbalancers or persistent storage devices, your nodes have additional configuration requirements. For details, see [Selecting Cloud Providers.](../pages-for-subheaders/set-up-cloud-providers.md)
 
 ### 2. Create the Cluster on Existing Nodes
 
@@ -195,7 +195,7 @@ The instructions for creating a Windows cluster on existing nodes are very simil
 
 :::note Important:
 
-For <b>Host Gateway (L2bridge)</b> networking, it's best to use the same Layer 2 network for all nodes. Otherwise, you need to configure the route rules for them. For details, refer to the [documentation on configuring cloud-hosted VM routes.](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md#cloud-hosted-vm-routes-configuration) You will also need to [disable private IP address checks](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md#disabling-private-ip-address-checks) if you are using Amazon EC2, Google GCE, or Azure VM.
+For <b>Host Gateway (L2bridge)</b> networking, it's best to use the same Layer 2 network for all nodes. Otherwise, you need to configure the route rules for them. For details, refer to the [documentation on configuring cloud-hosted VM routes.](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/network-requirements-for-host-gateway.md#cloud-hosted-vm-routes-configuration) You will also need to [disable private IP address checks](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/network-requirements-for-host-gateway.md#disabling-private-ip-address-checks) if you are using Amazon EC2, Google GCE, or Azure VM.
 
 :::
 
@@ -278,9 +278,9 @@ You can add Windows hosts to the cluster by editing the cluster and choosing the
 
 After creating your cluster, you can access it through the Rancher UI. As a best practice, we recommend setting up these alternate ways of accessing your cluster:
 
-- **Access your cluster with the kubectl CLI:** Follow [these steps](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#accessing-clusters-with-kubectl-on-your-workstation) to access clusters with kubectl on your workstation. In this case, you will be authenticated through the Rancher server’s authentication proxy, then Rancher will connect you to the downstream cluster. This method lets you manage the cluster without the Rancher UI.
-- **Access your cluster with the kubectl CLI, using the authorized cluster endpoint:** Follow [these steps](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) to access your cluster with kubectl directly, without authenticating through the Rancher server. We recommend setting up this alternative method to access your cluster so that in case you can’t connect to Rancher, you can still access the cluster.
+- **Access your cluster with the kubectl CLI:** Follow [these steps](../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#accessing-clusters-with-kubectl-on-your-workstation) to access clusters with kubectl on your workstation. In this case, you will be authenticated through the Rancher server’s authentication proxy, then Rancher will connect you to the downstream cluster. This method lets you manage the cluster without the Rancher UI.
+- **Access your cluster with the kubectl CLI, using the authorized cluster endpoint:** Follow [these steps](../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) to access your cluster with kubectl directly, without authenticating through the Rancher server. We recommend setting up this alternative method to access your cluster so that in case you can’t connect to Rancher, you can still access the cluster.
 
 ## Configuration for Storage Classes in Azure
 
-If you are using Azure VMs for your nodes, you can use [Azure files](https://docs.microsoft.com/en-us/azure/aks/azure-files-dynamic-pv) as a StorageClass for the cluster. For details, refer to [this section.](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md)
+If you are using Azure VMs for your nodes, you can use [Azure files](https://docs.microsoft.com/en-us/azure/aks/azure-files-dynamic-pv) as a StorageClass for the cluster. For details, refer to [this section.](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/azure-storageclass-configuration.md)
diff --git a/docs/pages-for-subheaders/user-settings.md b/docs/pages-for-subheaders/user-settings.md
index 9b5db2f3278..db2376f3df8 100644
--- a/docs/pages-for-subheaders/user-settings.md
+++ b/docs/pages-for-subheaders/user-settings.md
@@ -9,7 +9,7 @@ Within Rancher, each user has a number of settings associated with their login:
 The available user settings are:
 
 - [API & Keys](../reference-guides/user-settings/api-keys.md): If you want to interact with Rancher programmatically, you need an API key. Follow the directions in this section to obtain a key.
-- [Cloud Credentials](../reference-guides/user-settings/manage-cloud-credentials.md): Manage cloud credentials [used by node templates](use-new-nodes-in-an-infra-provider.md#node-templates) to [provision nodes for clusters](launch-kubernetes-with-rancher.md).
-- [Node Templates](../reference-guides/user-settings/manage-node-templates.md): Manage templates [used by Rancher to provision nodes for clusters](launch-kubernetes-with-rancher.md).
+- [Cloud Credentials](../reference-guides/user-settings/manage-cloud-credentials.md): Manage cloud credentials [used by node templates](use-new-nodes-in-an-infra-provider.md#node-templates) to [provision nodes for clusters](../pages-for-subheaders/launch-kubernetes-with-rancher.md).
+- [Node Templates](../reference-guides/user-settings/manage-node-templates.md): Manage templates [used by Rancher to provision nodes for clusters](../pages-for-subheaders/launch-kubernetes-with-rancher.md).
 - [Preferences](../reference-guides/user-settings/user-preferences.md): Sets superficial preferences for the Rancher UI.
 - Log Out: Ends your user session.
diff --git a/docs/pages-for-subheaders/vsphere-cloud-provider.md b/docs/pages-for-subheaders/vsphere-cloud-provider.md
deleted file mode 100644
index c203f97184f..00000000000
--- a/docs/pages-for-subheaders/vsphere-cloud-provider.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-title: Setting up the vSphere Cloud Provider
----
-
-In this section, you'll learn how to set up a vSphere cloud provider for a Rancher managed RKE Kubernetes cluster in vSphere.
-
-# In-tree Cloud Provider
-
-To use the in-tree vSphere cloud provider, you will need to use an RKE configuration option. For details, refer to [this page.](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere.md)
-
-# Out-of-tree Cloud Provider
-
-To set up the out-of-tree vSphere cloud provider, you will need to install Helm charts from the Rancher marketplace. For details, refer to [this page.](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere.md)
diff --git a/docs/pages-for-subheaders/vsphere.md b/docs/pages-for-subheaders/vsphere.md
index 25cb8a57eb7..54b4587aef1 100644
--- a/docs/pages-for-subheaders/vsphere.md
+++ b/docs/pages-for-subheaders/vsphere.md
@@ -28,7 +28,7 @@ It is not recommended to enable node auto-replace on a node pool of master nodes
 
 Node templates for vSphere have been updated so that when you create a node template with your vSphere credentials, the template is automatically populated with the same options for provisioning VMs that you have access to in the vSphere console.
 
-For the fields to be populated, your setup needs to fulfill the [prerequisites.](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md#prerequisites)
+For the fields to be populated, your setup needs to fulfill the [prerequisites.](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md#prerequisites)
 
 ### More Supported Operating Systems
 
@@ -42,14 +42,14 @@ In this YouTube video, we demonstrate how to set up a node template with the new
 
 ## Creating a vSphere Cluster
 
-In [this section,](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md) you'll learn how to use Rancher to install an [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes cluster in vSphere.
+In [this section,](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.mdu'll learn how to use Rancher to install an [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes cluster in vSphere.
 
 ## Provisioning Storage
 
-For an example of how to provision storage in vSphere using Rancher, refer to [this section.](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md) In order to dynamically provision storage in vSphere, the vSphere provider must be [enabled.](vsphere-cloud-provider.md)
+For an example of how to provision storage in vSphere using Rancher, refer to [this section.](../how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md) In order to dynamically provision storage in vSphere, the vSphere provider must be enabled. Refer to [in-tree vSphere config](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-in-tree-vsphere.md) and [out-of-tree vSphere config](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-out-of-tree-vsphere.md).
 
 ## Enabling the vSphere Cloud Provider
 
 When a cloud provider is set up in Rancher, the Rancher server can automatically provision new infrastructure for the cluster, including new nodes or persistent storage devices.
 
-For details, refer to the section on [enabling the vSphere cloud provider.](vsphere-cloud-provider.md)
+For details on enabling the vSphere cloud provider, refer to [in-tree vSphere config](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-in-tree-vsphere.md) and [out-of-tree vSphere config](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-out-of-tree-vsphere.md).
diff --git a/docs/rancher-manager.md b/docs/rancher-manager.md
index 72e752d5702..0abaef71dea 100644
--- a/docs/rancher-manager.md
+++ b/docs/rancher-manager.md
@@ -1,6 +1,7 @@
 ---
 slug: /
-title: "Rancher 2.6"
+title: "What is Rancher?"
+sidebar_label: What is Rancher?
 description: "Rancher adds significant value on top of Kubernetes: managing hundreds of clusters from one interface, centralizing RBAC, enabling monitoring and alerting. Read more."
 ---
 Rancher is a Kubernetes management tool to deploy and run clusters anywhere and on any provider.
diff --git a/docs/reference-guides.md b/docs/reference-guides.md
deleted file mode 100644
index d2e85baa0b1..00000000000
--- a/docs/reference-guides.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-title: Reference Guides
----
-
-**Reference guides** are technical descriptions of processes or products that users can study. Reference guides are designed to be "information-oriented" and their primary function is to describe.
-
-These docs may also include some usage steps in the course of description; however, their purpose is not to explain concepts nor to outline steps to achieve tasks. 
-
-The users who utilize reference guides are knowledgeable with the Rancher product as well as how to use it. They will benefit from detailed descriptions of something to be used when needing to refer to specifics of usage.
-
-Good examples of Rancher reference guides would be the [Rancher Manager architecture](./pages-for-subheaders/rancher-manager-architecture.md) and [cluster configuration guides](./pages-for-subheaders/cluster-configuration.md).
diff --git a/docs/reference-guides/backup-restore-configuration/storage-configuration.md b/docs/reference-guides/backup-restore-configuration/storage-configuration.md
index bb64bd86e2f..96271a64862 100644
--- a/docs/reference-guides/backup-restore-configuration/storage-configuration.md
+++ b/docs/reference-guides/backup-restore-configuration/storage-configuration.md
@@ -29,7 +29,7 @@ You can choose to not have any operator-level storage location configured. If yo
 
 Installing the `rancher-backup` chart by selecting the StorageClass option will create a Persistent Volume Claim (PVC), and Kubernetes will in turn dynamically provision a Persistent Volume (PV) where all the backups will be saved by default.
 
-For information about creating storage classes refer to [this section.](../../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md)
+For information about creating storage classes refer to [this section.](../../how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md)
 
 :::note Important:
 
@@ -40,7 +40,7 @@ If no such StorageClass is available, after the PV is provisioned, make sure to
 
 ### Existing Persistent Volume
 
-Select an existing Persistent Volume (PV) that will be used to store your backups. For information about creating PersistentVolumes in Rancher, refer to [this section.](../../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md#2-add-a-persistent-volume-that-refers-to-the-persistent-storage)
+Select an existing Persistent Volume (PV) that will be used to store your backups. For information about creating PersistentVolumes in Rancher, refer to [this section.](../../how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md#2-add-a-persistent-volume-that-refers-to-the-persistent-storage)
 
 :::note Important:
 
diff --git a/docs/reference-guides/cli-with-rancher/rancher-cli.md b/docs/reference-guides/cli-with-rancher/rancher-cli.md
index 8fe63c0e565..42ac8554b65 100644
--- a/docs/reference-guides/cli-with-rancher/rancher-cli.md
+++ b/docs/reference-guides/cli-with-rancher/rancher-cli.md
@@ -32,7 +32,7 @@ If Rancher Server uses a self-signed certificate, Rancher CLI prompts you to con
 
 ### Project Selection
 
-Before you can perform any commands, you must select a Rancher project to perform those commands against. To select a [project](../../how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md) to work on, use the command `./rancher context switch`. When you enter this command, a list of available projects displays. Enter a number to choose your project.
+Before you can perform any commands, you must select a Rancher project to perform those commands against. To select a [project](../../how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces.md) to work on, use the command `./rancher context switch`. When you enter this command, a list of available projects displays. Enter a number to choose your project.
 
 **Example: `./rancher context switch` Output**
 ```
@@ -63,13 +63,13 @@ The following commands are available for use in Rancher CLI.
 | `apps, [app]`  | Performs operations on catalog applications (i.e., individual [Helm charts](https://docs.helm.sh/developing_charts/)) or Rancher charts.  |
 | `catalog`  | Performs operations on [catalogs](../../pages-for-subheaders/helm-charts-in-rancher.md).  |
 | `clusters, [cluster]`  | Performs operations on your [clusters](../../pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md).  |
-| `context`  | Switches between Rancher [projects](../../how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md). For an example, see [Project Selection](#project-selection).  |
-| `inspect [OPTIONS] [RESOURCEID RESOURCENAME]`  | Displays details about [Kubernetes resources](https://kubernetes.io/docs/reference/kubectl/cheatsheet/#resource-types) or Rancher resources (i.e.: [projects](../../how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md) and [workloads](../../pages-for-subheaders/workloads-and-pods.md)). Specify resources by name or ID.  |
+| `context`  | Switches between Rancher [projects](../../how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces.md). For an example, see [Project Selection](#project-selection).  |
+| `inspect [OPTIONS] [RESOURCEID RESOURCENAME]`  | Displays details about [Kubernetes resources](https://kubernetes.io/docs/reference/kubectl/cheatsheet/#resource-types) or Rancher resources (i.e.: [projects](../../how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces.md) and [workloads](../../pages-for-subheaders/workloads-and-pods.md)). Specify resources by name or ID.  |
 | `kubectl`  |Runs [kubectl commands](https://kubernetes.io/docs/reference/kubectl/overview/#operations).   |
 | `login, [l]`  | Logs into a Rancher Server. For an example, see [CLI Authentication](#cli-authentication).  |
 | `namespaces, [namespace]`  |Performs operations on namespaces.   |
 | `nodes, [node]`  |Performs operations on nodes.   |
-| `projects, [project]`  | Performs operations on [projects](../../how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md).  |
+| `projects, [project]`  | Performs operations on [projects](../../how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces.md).  |
 | `ps`  | Displays [workloads](../../pages-for-subheaders/workloads-and-pods.md) in a project.  |
 | `settings, [setting]`  | Shows the current settings for your Rancher Server.  |
 | `ssh`  | Connects to one of your cluster nodes using the SSH protocol.  |
diff --git a/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md b/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md
index f907c674f52..68e530bcf8c 100644
--- a/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md
+++ b/docs/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md
@@ -19,9 +19,9 @@ See [Amazon Documentation: Adding Permissions to a User (Console)](https://docs.
 
 See our three example JSON policies:
 
-- [Example IAM Policy](../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md#example-iam-policy)
-- [Example IAM Policy with PassRole](../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md#example-iam-policy-with-passrole) (needed if you want to use [Kubernetes Cloud Provider](../../../../pages-for-subheaders/set-up-cloud-providers.md) or want to pass an IAM Profile to an instance)
-- [Example IAM Policy to allow encrypted EBS volumes](../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md#example-iam-policy-to-allow-encrypted-ebs-volumes) policy to an user.
+- [Example IAM Policy](../../../../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md#example-iam-policy)
+- [Example IAM Policy with PassRole](../../../../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md#example-iam-policy-with-passrole) (needed if you want to use [Kubernetes Cloud Provider](../../../../pages-for-subheaders/set-up-cloud-providers.md) or want to pass an IAM Profile to an instance)
+- [Example IAM Policy to allow encrypted EBS volumes](../../../../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md#example-iam-policy-to-allow-encrypted-ebs-volumes) policy to an user.
 
 ### Authenticate & Configure Nodes
 
diff --git a/docs/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md b/docs/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md
index cc46c742a60..c9646a49402 100644
--- a/docs/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md
+++ b/docs/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md
@@ -100,7 +100,7 @@ If the cloud provider you want to use is not listed as an option, you will need
 
 The cluster-level private registry configuration is only used for provisioning clusters.
 
-There are two main ways to set up private registries in Rancher: by setting up the [global default registry](../../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md) through the **Settings** tab in the global view, and by setting up a private registry in the advanced options in the cluster-level settings. The global default registry is intended to be used for air-gapped setups, for registries that do not require credentials. The cluster-level private registry is intended to be used in all setups in which the private registry requires credentials.
+There are two main ways to set up private registries in Rancher: by setting up the [global default registry](../../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md) through the **Settings** tab in the global view, and by setting up a private registry in the advanced options in the cluster-level settings. The global default registry is intended to be used for air-gapped setups, for registries that do not require credentials. The cluster-level private registry is intended to be used in all setups in which the private registry requires credentials.
 
 If your private registry requires credentials, you need to pass the credentials to Rancher by editing the cluster options for each cluster that needs to pull images from the registry.
 
@@ -145,7 +145,7 @@ Each cloud provider capable of launching a cluster using RKE can collect metrics
 
 ### Pod Security Policy Support
 
-Enables [pod security policies](../../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md) for the cluster. After enabling this option, choose a policy using the **Default Pod Security Policy** drop-down.
+Enables [pod security policies](../../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md) for the cluster. After enabling this option, choose a policy using the **Default Pod Security Policy** drop-down.
 
 You must have an existing Pod Security Policy configured before you can use this option.
 
@@ -175,7 +175,7 @@ Option to enable or disable [recurring etcd snapshots](https://rancher.com/docs/
 
 ### Agent Environment Variables
 
-Option to set environment variables for [rancher agents](../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md). The environment variables can be set using key value pairs. If rancher agent requires use of proxy to communicate with Rancher server, `HTTP_PROXY`, `HTTPS_PROXY` and `NO_PROXY` environment variables can be set using agent environment variables.
+Option to set environment variables for [rancher agents](../../../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/about-rancher-agents.md). The environment variables can be set using key value pairs. If rancher agent requires use of proxy to communicate with Rancher server, `HTTP_PROXY`, `HTTPS_PROXY` and `NO_PROXY` environment variables can be set using agent environment variables.
 
 ### Updating ingress-nginx
 
diff --git a/docs/reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md b/docs/reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md
index cefd1305335..698033845f2 100644
--- a/docs/reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md
+++ b/docs/reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md
@@ -126,7 +126,7 @@ If the cloud provider you want to use is not listed as an option, you will need
 
 #### Default Pod Security Policy
 
-Choose the default [pod security policy](../../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md) for the cluster. Please refer to the [RKE2 documentation](https://docs.rke2.io/security/policies/) on the specifications of each available policy.
+Choose the default [pod security policy](../../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md) for the cluster. Please refer to the [RKE2 documentation](https://docs.rke2.io/security/policies/) on the specifications of each available policy.
 
 #### Worker CIS Profile
 
diff --git a/docs/reference-guides/monitoring-v2-configuration/helm-chart-options.md b/docs/reference-guides/monitoring-v2-configuration/helm-chart-options.md
index 3edfaa3159f..9a89669c567 100644
--- a/docs/reference-guides/monitoring-v2-configuration/helm-chart-options.md
+++ b/docs/reference-guides/monitoring-v2-configuration/helm-chart-options.md
@@ -41,7 +41,7 @@ If the scrape configuration you want cannot be specified via a ServiceMonitor or
 
 A [scrape_config section](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config) specifies a set of targets and parameters describing how to scrape them. In the general case, one scrape configuration specifies a single job.
 
-An example of where this might be used is with Istio. For more information, see [this section.](../../explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md)
+An example of where this might be used is with Istio. For more information, see [this section.](../../integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md)
 
 
 ## Configuring Applications Packaged within Monitoring v2
diff --git a/docs/reference-guides/monitoring-v2-configuration/receivers.md b/docs/reference-guides/monitoring-v2-configuration/receivers.md
index 724250b17e0..fc8ee7db512 100644
--- a/docs/reference-guides/monitoring-v2-configuration/receivers.md
+++ b/docs/reference-guides/monitoring-v2-configuration/receivers.md
@@ -9,7 +9,7 @@ The [Alertmanager Config](https://prometheus.io/docs/alerting/latest/configurati
 
 :::note
 
-This section assumes familiarity with how monitoring components work together. For more information about Alertmanager, see [this section.](../../explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md#3-how-alertmanager-works)
+This section assumes familiarity with how monitoring components work together. For more information about Alertmanager, see [this section.](../../integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md#3-how-alertmanager-works)
 
 :::
 
diff --git a/docs/reference-guides/monitoring-v2-configuration/routes.md b/docs/reference-guides/monitoring-v2-configuration/routes.md
index 637cc9ca569..6ddbbe746ab 100644
--- a/docs/reference-guides/monitoring-v2-configuration/routes.md
+++ b/docs/reference-guides/monitoring-v2-configuration/routes.md
@@ -13,7 +13,7 @@ For more information about configuring routes, refer to the [official Alertmanag
 
 :::note
 
-This section assumes familiarity with how monitoring components work together. For more information, see [this section.](../../explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)
+This section assumes familiarity with how monitoring components work together. For more information, see [this section.](../../integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)
 
 :::
 
diff --git a/docs/reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md b/docs/reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md
index 4577417fe45..5a31612294a 100644
--- a/docs/reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md
+++ b/docs/reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md
@@ -10,7 +10,7 @@ ServiceMonitors are more commonly used than PodMonitors, and we recommend them f
 
 :::note
 
-This section assumes familiarity with how monitoring components work together. For more information about Alertmanager, see [this section.](../../explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)
+This section assumes familiarity with how monitoring components work together. For more information about Alertmanager, see [this section.](../../integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)
 
 :::
 
diff --git a/docs/reference-guides/pipelines/configure-persistent-data.md b/docs/reference-guides/pipelines/configure-persistent-data.md
index e6e52708ca5..3c7d337c3c6 100644
--- a/docs/reference-guides/pipelines/configure-persistent-data.md
+++ b/docs/reference-guides/pipelines/configure-persistent-data.md
@@ -7,7 +7,7 @@ import TabItem from '@theme/TabItem';
 
 The pipelines' internal Docker registry and the Minio workloads use ephemeral volumes by default. This default storage works out-of-the-box and makes testing easy, but you lose the build images and build logs if the node running the Docker Registry or Minio fails. In most cases this is fine. If you want build images and logs to survive node failures, you can configure the Docker Registry and Minio to use persistent volumes.
 
-This section assumes that you understand how persistent storage works in Kubernetes. For more information, refer to the section on [how storage works.](../../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md)
+This section assumes that you understand how persistent storage works in Kubernetes. For more information, refer to the section on [how storage works.](../../how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md)
 
 :::note Prerequisites for both parts A and B:
 
diff --git a/docs/reference-guides/rancher-cluster-tools.md b/docs/reference-guides/rancher-cluster-tools.md
index 2fb06d20f4e..41305db554b 100644
--- a/docs/reference-guides/rancher-cluster-tools.md
+++ b/docs/reference-guides/rancher-cluster-tools.md
@@ -39,7 +39,7 @@ Rancher's integration with Istio was improved in Rancher v2.5.
 For more information, refer to the Istio documentation [here.](../pages-for-subheaders/istio.md)
 ## OPA Gatekeeper
 
-[OPA Gatekeeper](https://github.com/open-policy-agent/gatekeeper) is an open-source project that provides integration between OPA and Kubernetes to provide policy control via admission controller webhooks. For details on how to enable Gatekeeper in Rancher, refer to the [OPA Gatekeeper section.](../explanations/integrations-in-rancher/opa-gatekeeper.md)
+[OPA Gatekeeper](https://github.com/open-policy-agent/gatekeeper) is an open-source project that provides integration between OPA and Kubernetes to provide policy control via admission controller webhooks. For details on how to enable Gatekeeper in Rancher, refer to the [OPA Gatekeeper section.](../integrations-in-rancher/opa-gatekeeper.md)
 
 ## CIS Scans
 
diff --git a/docs/reference-guides/rancher-manager-architecture/architecture-recommendations.md b/docs/reference-guides/rancher-manager-architecture/architecture-recommendations.md
index 28b8e219222..f8bc2f030cf 100644
--- a/docs/reference-guides/rancher-manager-architecture/architecture-recommendations.md
+++ b/docs/reference-guides/rancher-manager-architecture/architecture-recommendations.md
@@ -101,6 +101,6 @@ For more best practices for downstream clusters, refer to the [production checkl
 
 If you are using an [authorized cluster endpoint (ACE),](../../pages-for-subheaders/rancher-manager-architecture.md#4-authorized-cluster-endpoint) we recommend creating an FQDN pointing to a load balancer which balances traffic across your nodes with the `controlplane` role.
 
-If you are using private CA signed certificates on the load balancer, you have to supply the CA certificate, which will be included in the generated kubeconfig file to validate the certificate chain. See the documentation on [kubeconfig files](../../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md) and [API keys](../user-settings/api-keys.md#creating-an-api-key) for more information.
+If you are using private CA signed certificates on the load balancer, you have to supply the CA certificate, which will be included in the generated kubeconfig file to validate the certificate chain. See the documentation on [kubeconfig files](../../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md) and [API keys](../user-settings/api-keys.md#creating-an-api-key) for more information.
 
 As of Rancher v2.6.3, ACE support is available for registered RKE2 and K3s clusters. To view the manual steps to perform on the downstream cluster to enable the ACE, click [here](../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md#authorized-cluster-endpoint-support-for-rke2-and-k3s-clusters).
diff --git a/docs/reference-guides/rancher-manager-architecture/communicating-with-downstream-user-clusters.md b/docs/reference-guides/rancher-manager-architecture/communicating-with-downstream-user-clusters.md
index e432001b419..6eabc6401a2 100644
--- a/docs/reference-guides/rancher-manager-architecture/communicating-with-downstream-user-clusters.md
+++ b/docs/reference-guides/rancher-manager-architecture/communicating-with-downstream-user-clusters.md
@@ -26,7 +26,7 @@ The authentication proxy forwards all Kubernetes API calls to downstream cluster
 
 Rancher communicates with Kubernetes clusters using a [service account,](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) which provides an identity for processes that run in a pod.
 
-By default, Rancher generates a [kubeconfig file](../../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md) that contains credentials for proxying through the Rancher server to connect to the Kubernetes API server on a downstream user cluster. The kubeconfig file (`kube_config_rancher-cluster.yml`) contains full access to the cluster.
+By default, Rancher generates a [kubeconfig file](../../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md) that contains credentials for proxying through the Rancher server to connect to the Kubernetes API server on a downstream user cluster. The kubeconfig file (`kube_config_rancher-cluster.yml`) contains full access to the cluster.
 
 ### 2. Cluster Controllers and Cluster Agents
 
@@ -73,7 +73,7 @@ Like the authorized cluster endpoint, the `kube-api-auth` authentication service
 
 With this endpoint enabled for the downstream cluster, Rancher generates an extra Kubernetes context in the kubeconfig file in order to connect directly to the cluster. This file has the credentials for `kubectl` and `helm`. 
 
-You will need to use a context defined in this kubeconfig file to access the cluster if Rancher goes down. Therefore, we recommend exporting the kubeconfig file so that if Rancher goes down, you can still use the credentials in the file to access your cluster. For more information, refer to the section on accessing your cluster with [kubectl and the kubeconfig file.](../../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md)
+You will need to use a context defined in this kubeconfig file to access the cluster if Rancher goes down. Therefore, we recommend exporting the kubeconfig file so that if Rancher goes down, you can still use the credentials in the file to access your cluster. For more information, refer to the section on accessing your cluster with [kubectl and the kubeconfig file.](../../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md)
 
 # Important Files
 
@@ -85,7 +85,7 @@ The files mentioned below are needed to maintain, troubleshoot and upgrade your
 
 > **Note:** The "rancher-cluster" parts of the two latter file names are dependent on how you name the RKE cluster configuration file.
 
-For more information on connecting to a cluster without the Rancher authentication proxy and other configuration options, refer to the [kubeconfig file](../../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md) documentation.
+For more information on connecting to a cluster without the Rancher authentication proxy and other configuration options, refer to the [kubeconfig file](../../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md) documentation.
 
 # Tools for Provisioning Kubernetes Clusters
 
diff --git a/docs/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-hardening-guide-with-cis-v1.6-benchmark.md b/docs/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-hardening-guide-with-cis-v1.6-benchmark.md
index 79936e518cc..f7a60103433 100644
--- a/docs/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-hardening-guide-with-cis-v1.6-benchmark.md
+++ b/docs/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-hardening-guide-with-cis-v1.6-benchmark.md
@@ -28,7 +28,7 @@ For more details about evaluating a hardened cluster against the official CIS be
 #### Known Issues
 
 - Rancher **exec shell** and **view logs** for pods are **not** functional in a CIS v1.6 hardened setup when only public IP is provided when registering custom nodes. This functionality requires a private IP to be provided when registering the custom nodes.
-- When setting the `default_pod_security_policy_template_id:` to `restricted` or `restricted-noroot`, based on the pod security policies (PSP) [provided](../../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md) by Rancher, Rancher creates **RoleBindings** and **ClusterRoleBindings** on the default service accounts. The CIS v1.6 check 5.1.5 requires that the default service accounts have no roles or cluster roles bound to it apart from the defaults. In addition the default service accounts should be configured such that it does not provide a service account token and does not have any explicit rights assignments.
+- When setting the `default_pod_security_policy_template_id:` to `restricted` or `restricted-noroot`, based on the pod security policies (PSP) [provided](../../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md) by Rancher, Rancher creates **RoleBindings** and **ClusterRoleBindings** on the default service accounts. The CIS v1.6 check 5.1.5 requires that the default service accounts have no roles or cluster roles bound to it apart from the defaults. In addition the default service accounts should be configured such that it does not provide a service account token and does not have any explicit rights assignments.
 
 ### Configure Kernel Runtime Parameters
 
diff --git a/docs/reference-guides/single-node-rancher-in-docker/advanced-options.md b/docs/reference-guides/single-node-rancher-in-docker/advanced-options.md
index d1962d9f84e..b4bf08318d2 100644
--- a/docs/reference-guides/single-node-rancher-in-docker/advanced-options.md
+++ b/docs/reference-guides/single-node-rancher-in-docker/advanced-options.md
@@ -33,7 +33,7 @@ The API Audit Log records all the user and system transactions made through Ranc
 
 The API Audit Log writes to `/var/log/auditlog` inside the rancher container by default. Share that directory as a volume and set your `AUDIT_LEVEL` to enable the log.
 
-See [API Audit Log](../../getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md) for more information and options.
+See [API Audit Log](../../how-to-guides/advanced-user-guides/enable-api-audit-log.md) for more information and options.
 
 Privileged access is [required.](../../pages-for-subheaders/rancher-on-a-single-node-with-docker.md#privileged-access-for-rancher)
 
@@ -60,7 +60,7 @@ docker run -d --restart=unless-stopped \
 
 Privileged access is [required.](../../pages-for-subheaders/rancher-on-a-single-node-with-docker.md#privileged-access-for-rancher)
 
-See [TLS settings](../installation-references/tls-settings.md) for more information and options.
+See [TLS settings](../../getting-started/installation-and-upgrade/installation-references/tls-settings.md) for more information and options.
 
 ### Air Gap
 
diff --git a/docs/reference-guides/user-settings/manage-cloud-credentials.md b/docs/reference-guides/user-settings/manage-cloud-credentials.md
index 4de81116e82..e387346c02c 100644
--- a/docs/reference-guides/user-settings/manage-cloud-credentials.md
+++ b/docs/reference-guides/user-settings/manage-cloud-credentials.md
@@ -20,7 +20,7 @@ All cloud credentials are bound to the user profile of who created it. They **ca
 1. Click **☰ > Cluster Management**.
 1. Click **Cloud Credentials**.
 1. Click **Create**.
-1. Click a cloud credential type. The values of this dropdown is based on the `active` [node drivers](../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md) in Rancher.
+1. Click a cloud credential type. The values of this dropdown is based on the `active` [node drivers](../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md) in Rancher.
 1. Enter a name for the cloud credential.
 1. Based on the selected cloud credential type, enter the required values to authenticate with the infrastructure provider.
 1. Click **Create**.
diff --git a/docs/reference-guides/user-settings/manage-node-templates.md b/docs/reference-guides/user-settings/manage-node-templates.md
index 82e717cd8ce..984bf0aea2c 100644
--- a/docs/reference-guides/user-settings/manage-node-templates.md
+++ b/docs/reference-guides/user-settings/manage-node-templates.md
@@ -25,8 +25,8 @@ When you create a node template, it is bound to your user profile. Node template
 1. Choose the node template that you want to edit and click the **⋮ > Edit**.
 
     :::note
-
-    The default `active` [node drivers](../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md) and any node driver, that has fields marked as `password`, are required to use [cloud credentials](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#cloud-credentials).
+    
+    The default `active` [node drivers](../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md) and any node driver, that has fields marked as `password`, are required to use [cloud credentials](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#cloud-credentials).
 
     :::
 
diff --git a/docs/shared-files/_cluster-capabilities-table.md b/docs/shared-files/_cluster-capabilities-table.md
index 878a8a3b6b9..2d566c47478 100644
--- a/docs/shared-files/_cluster-capabilities-table.md
+++ b/docs/shared-files/_cluster-capabilities-table.md
@@ -1,19 +1,19 @@
 | Action | Rancher Launched Kubernetes Clusters |  EKS, GKE and AKS Clusters<sup>1</sup> | Other Hosted Kubernetes Clusters | Non-EKS or GKE Registered Clusters |
 | --- | --- | ---| ---|----|
-| [Using kubectl and a kubeconfig file to Access a Cluster](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md) | ✓ | ✓ | ✓ | ✓ |
-| [Managing Cluster Members](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md) | ✓ | ✓ | ✓ | ✓ |
+| [Using kubectl and a kubeconfig file to Access a Cluster](../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md) | ✓ | ✓ | ✓ | ✓ |
+| [Managing Cluster Members](../how-to-guides/new-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md) | ✓ | ✓ | ✓ | ✓ |
 | [Editing and Upgrading Clusters](../pages-for-subheaders/cluster-configuration.md) | ✓ | ✓ | ✓ | ✓<sup>2</sup> |
-| [Managing Nodes](../how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md) | ✓ | ✓ | ✓ | ✓<sup>3</sup> |
+| [Managing Nodes](../how-to-guides/new-user-guides/manage-clusters/nodes-and-node-pools.md) | ✓ | ✓ | ✓ | ✓<sup>3</sup> |
 | [Managing Persistent Volumes and Storage Classes](../pages-for-subheaders/create-kubernetes-persistent-storage.md) | ✓ | ✓ | ✓ | ✓ |
-| [Managing Projects, Namespaces and Workloads](../how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md) | ✓ | ✓ | ✓ | ✓ |
+| [Managing Projects, Namespaces and Workloads](../how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces.md) | ✓ | ✓ | ✓ | ✓ |
 | [Using App Catalogs](../pages-for-subheaders/helm-charts-in-rancher.md) | ✓ | ✓ | ✓ | ✓ |
 | Configuring Tools ([Alerts, Notifiers, Monitoring](../pages-for-subheaders/monitoring-and-alerting.md), [Logging](../pages-for-subheaders/logging.md), [Istio](../pages-for-subheaders/istio.md)) | ✓ | ✓ | ✓ | ✓ |
 | [Running Security Scans](../pages-for-subheaders/cis-scan-guides.md) | ✓ | ✓ | ✓ | ✓ |
-| [Use existing configuration to create additional clusters](../how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md)| ✓ | ✓ | ✓ | |
-| [Ability to rotate certificates](../how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md) | ✓ | ✓  |  | |
+| [Use existing configuration to create additional clusters](../how-to-guides/new-user-guides/manage-clusters/clone-cluster-configuration.md)| ✓ | ✓ | ✓ | |
+| [Ability to rotate certificates](../how-to-guides/new-user-guides/manage-clusters/rotate-certificates.md) | ✓ | ✓  |  | |
 | Ability to [backup](../how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher-launched-kubernetes-clusters.md) and [restore](../how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md) Rancher-launched clusters | ✓ | ✓ |  | ✓<sup>4</sup> |
-| [Cleaning Kubernetes components when clusters are no longer reachable from Rancher](../how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md) | ✓ | | | |
-| [Configuring Pod Security Policies](../how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md) | ✓ | ✓ |  ||
+| [Cleaning Kubernetes components when clusters are no longer reachable from Rancher](../how-to-guides/new-user-guides/manage-clusters/clean-cluster-nodes.md) | ✓ | | | |
+| [Configuring Pod Security Policies](../how-to-guides/new-user-guides/manage-clusters/add-a-pod-security-policy.md) | ✓ | ✓ |  ||
 
 1. Registered GKE and EKS clusters have the same options available as GKE and EKS clusters created from the Rancher UI. The  difference is that when a registered cluster is deleted from the Rancher UI, it is not destroyed.
 
diff --git a/docs/troubleshooting.md b/docs/troubleshooting/general-troubleshooting.md
similarity index 55%
rename from docs/troubleshooting.md
rename to docs/troubleshooting/general-troubleshooting.md
index 4adae5c007c..4b28735357b 100644
--- a/docs/troubleshooting.md
+++ b/docs/troubleshooting/general-troubleshooting.md
@@ -1,10 +1,10 @@
 ---
-title: Troubleshooting
+title: General Troubleshooting
 ---
 
 This section contains information to help you troubleshoot issues when using Rancher.
 
-- [Kubernetes components](pages-for-subheaders/kubernetes-components.md)
+- [Kubernetes components](../pages-for-subheaders/kubernetes-components.md)
 
     If you need help troubleshooting core Kubernetes cluster components like:
     * `etcd`
@@ -15,30 +15,30 @@ This section contains information to help you troubleshoot issues when using Ran
     * `kube-proxy`
     * `nginx-proxy`
 
-- [Kubernetes resources](troubleshooting/other-troubleshooting-tips/kubernetes-resources.md)
+- [Kubernetes resources](other-troubleshooting-tips/kubernetes-resources.md)
 
     Options for troubleshooting Kubernetes resources like Nodes, Ingress Controller and Rancher Agents are described in this section.
 
-- [Networking](troubleshooting/other-troubleshooting-tips/networking.md)
+- [Networking](other-troubleshooting-tips/networking.md)
 
     Steps to troubleshoot networking issues can be found here.
 
-- [DNS](troubleshooting/other-troubleshooting-tips/dns.md)
+- [DNS](other-troubleshooting-tips/dns.md)
 
     When you experience name resolution issues in your cluster.
 
-- [Troubleshooting Rancher installed on Kubernetes](troubleshooting/other-troubleshooting-tips/rancher-ha.md)
+- [Troubleshooting Rancher installed on Kubernetes](other-troubleshooting-tips/rancher-ha.md)
 
-    If you experience issues with your [Rancher server installed on Kubernetes](pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md)
+    If you experience issues with your [Rancher server installed on Kubernetes](../pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md)
 
-- [Logging](troubleshooting/other-troubleshooting-tips/logging.md)
+- [Logging](other-troubleshooting-tips/logging.md)
 
     Read more about what log levels can be configured and how to configure a log level.
 
-- [User ID Tracking in Audit Logs](troubleshooting/other-troubleshooting-tips/user-id-tracking-in-audit-logs.md)
+- [User ID Tracking in Audit Logs](other-troubleshooting-tips/user-id-tracking-in-audit-logs.md)
 
     Read more about how a Rancher Admin can trace an event from the Rancher audit logs and into the Kubernetes audit logs using the external Identity Provider username.
 
-- [Expired Webhook Certificates](troubleshooting/other-troubleshooting-tips/expired-webhook-certificate-rotation.md)
+- [Expired Webhook Certificates](other-troubleshooting-tips/expired-webhook-certificate-rotation.md)  
 
     Read more about how to rotate a Rancher webhook certificate secret after it expires on an annual basis.
diff --git a/docs/troubleshooting/other-troubleshooting-tips/user-id-tracking-in-audit-logs.md b/docs/troubleshooting/other-troubleshooting-tips/user-id-tracking-in-audit-logs.md
index d2aae7fe228..8c851f1e333 100644
--- a/docs/troubleshooting/other-troubleshooting-tips/user-id-tracking-in-audit-logs.md
+++ b/docs/troubleshooting/other-troubleshooting-tips/user-id-tracking-in-audit-logs.md
@@ -5,7 +5,7 @@ title: User ID Tracking in Audit Logs
 The following audit logs are used in Rancher to track events occuring on the local and downstream clusters:
 
 * [Kubernetes Audit Logs](https://rancher.com/docs/rke/latest/en/config-options/audit-log/)
-* [Rancher API Audit Logs](../../getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md)
+* [Rancher API Audit Logs](../../how-to-guides/advanced-user-guides/enable-api-audit-log)
 
 Audit logs in Rancher v2.6 have been enhanced to include the external Identity Provider name (common name of the user in the external Auth provider) in both the Rancher and downstream Kubernetes audit logs.
 
diff --git a/sidebars.js b/sidebars.js
index 2fc06547320..d1ebc5feb2f 100644
--- a/sidebars.js
+++ b/sidebars.js
@@ -19,34 +19,19 @@ const sidebars = {
   // But you can create a sidebar manually
   tutorialSidebar: [
 
-      'rancher-manager',
+    'rancher-manager',
     {
       type: 'category',
       label: 'Getting Started',
-      link: {
-        type: 'doc',
-        id: "getting-started",
-      },
-      items: [
-        {
-          type: 'category',
-          label: 'Introduction',
-          link: {
-            type: 'doc',
-            id: "pages-for-subheaders/introduction",
-          },
-          items: [
-            "getting-started/introduction/overview",
-            "getting-started/introduction/what-are-divio-docs",
-                 ],
-        },
+      items: [ 
+          "getting-started/overview",
         {
           type: 'category',
           label: 'Quick Start Guides',
           link: {
             type: 'doc',
-            id: "pages-for-subheaders/quick-start-guides",
-          },
+            id: "pages-for-subheaders/quick-start-guides",        
+                },
           items: [
             {
               type: 'category',
@@ -54,7 +39,7 @@ const sidebars = {
               link: {
                 type: 'doc',
                 id: "pages-for-subheaders/deploy-rancher-manager",
-             },
+                    },
               items: [
                     "getting-started/quick-start-guides/deploy-rancher-manager/aws",
                     "getting-started/quick-start-guides/deploy-rancher-manager/aws-marketplace",
@@ -65,7 +50,7 @@ const sidebars = {
                     "getting-started/quick-start-guides/deploy-rancher-manager/vagrant",
                     "getting-started/quick-start-guides/deploy-rancher-manager/equinix-metal",
                     "getting-started/quick-start-guides/deploy-rancher-manager/helm-cli",
-              ]
+                     ]
             },
             {
               type: 'category',
@@ -77,9 +62,9 @@ const sidebars = {
               items: [
                     "getting-started/quick-start-guides/deploy-workloads/workload-ingress",
                     "getting-started/quick-start-guides/deploy-workloads/nodeports",
-                     ],
-                  }
-              ]
+                     ]
+                    }
+                  ]
         },
         {
           type: 'category',
@@ -102,6 +87,19 @@ const sidebars = {
                     "getting-started/installation-and-upgrade/installation-requirements/port-requirements",
                      ]
             },
+            {
+              type: 'category',
+              label: 'Installation References',
+              link: {
+                type: 'doc',
+                id: "pages-for-subheaders/installation-references",
+              },
+              items: [
+              "getting-started/installation-and-upgrade/installation-references/helm-chart-options",
+              "getting-started/installation-and-upgrade/installation-references/tls-settings",
+              "getting-started/installation-and-upgrade/installation-references/feature-flags"
+                    ]
+            },
             {
               type: 'category',
               label: 'Install/Upgrade on a Kubernetes Cluster',
@@ -191,51 +189,13 @@ const sidebars = {
                     "getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes",
 
                     "getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher",
-            {
-              type: 'category',
-              label: 'Advanced Options',
-              link: {
-                type: 'doc',
-                id: "pages-for-subheaders/advanced-options",
-              },
-              items: [
-                {
-                    type: 'category',
-                    label: 'Enable Experimental Features',
-                    link: {
-                      type: 'doc',
-                      id: "pages-for-subheaders/enable-experimental-features",
-                    },
-                    items: [
-                          "getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64",
-                          "getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers",
-                          "getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features",
-                          "getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/continuous-delivery",
-                           ]
-                },
-                {
-                    type: 'category',
-                    label: 'Advanced Use Cases',
-                    items: [
-                          "getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld",
-                          "getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs",
-                          "getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log",
-                          "getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer",
-                           ]
-                }
-                    ]
-                  }
-                ]
-              }
-            ]
-          },
+          ]
+        }
+      ]
+    },
     {
       type: 'category',
       label: 'How-to Guides',
-      link: {
-        type: 'doc',
-        id: "how-to-guides",
-      },
       items: [
         {
           type: 'category',
@@ -244,493 +204,467 @@ const sidebars = {
             type: 'doc',
             id: "pages-for-subheaders/new-user-guides",
                 },
-          items: [
-             {
-                type: 'category',
-                label: 'Kubernetes Cluster Setup',
-                link: {
-                  type: 'doc',
-                  id: "pages-for-subheaders/kubernetes-cluster-setup",
-                          },
+            items: [
+                  {
+              type: 'category',
+              label: 'Authentication, Permissions, and Global Configuration',
+              link: {
+                type: 'doc',
+                id: "pages-for-subheaders/authentication-permissions-and-global-configuration",
+                    },
                 items: [
-                    "how-to-guides/new-user-guides/kubernetes-cluster-setup/high-availability-installs",
-                    "how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher",
-                    "how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher",
-                    "how-to-guides/new-user-guides/kubernetes-cluster-setup/rke2-for-rancher",
-                       ],
-              },
-              {
-                type: 'category',
-                label: 'Infrastructure Setup',
-                link: {
-                  type: 'doc',
-                  id: "pages-for-subheaders/infrastructure-setup",
-                      },
-                  items: [
-                     "how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster",
-                     "how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster",
-                     "how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster",
-                     "how-to-guides/new-user-guides/infrastructure-setup/nodes-in-amazon-ec2",
-                     "how-to-guides/new-user-guides/infrastructure-setup/mysql-database-in-amazon-rds",
-                     "how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer",
-                     "how-to-guides/new-user-guides/infrastructure-setup/amazon-elb-load-balancer",
-                         ],
-              },
-              {
-                type: 'category',
-                label: 'Kubernetes Clusters in Rancher Setup',
-                link: {
-                  type: 'doc',
-                  id: "pages-for-subheaders/kubernetes-clusters-in-rancher-setup",
-                },
-                items: [
-                        "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters",
-                  {
+                    {
                     type: 'category',
-                    label: 'Checklist for Production-Ready Clusters',
+                    label: 'Authentication Config',
                     link: {
                       type: 'doc',
-                      id: "pages-for-subheaders/checklist-for-production-ready-clusters",
-                        },
-                      items: [
-                        "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/recommended-cluster-architecture",
-                        "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/roles-for-nodes-in-kubernetes",
-                              ],
-                  },
-                  {
-                    type: 'category',
-                    label: 'Set Up Clusters from Hosted Kubernetes Providers',
-                    link: {
-                      type: 'doc',
-                      id: "pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers",
-                        },
-                      items: [
-                          "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/gke",
-                          "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/aks",
-                          "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba",
-                          "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent",
-                          "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei",
-                            ]
-                  },
-                  {
-                    type: 'category',
-                    label: 'Launch Kubernetes with Rancher',
-                    link: {
-                      type: 'doc',
-                      id: "pages-for-subheaders/launch-kubernetes-with-rancher",
-                          },
+                      id: "pages-for-subheaders/authentication-config",
+                    },
                     items: [
-                         {
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/manage-users-and-groups",
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/create-local-users",
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-google-oauth",
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-active-directory",
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-freeipa",
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad",
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-github",
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-keycloak-oidc",
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-keycloak-saml",
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-pingidentity",
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-okta-saml",
+                                  ]    
+                        },
+                        {
                           type: 'category',
-                          label: 'Use New Nodes in an Infra Provider',
+                          label: 'Configure OpenLDAP',
                           link: {
                             type: 'doc',
-                            id: "pages-for-subheaders/use-new-nodes-in-an-infra-provider",
-                                },
+                            id: "pages-for-subheaders/configure-openldap",
+                          },
+                          items: [
+                            "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-openldap/openldap-config-reference",
+                                    ]
+                        },
+                        {
+                        type: 'category',
+                        label: 'Configure Microsoft AD Federation Service (SAML)',
+                        link: {
+                          type: 'doc',
+                          id: "pages-for-subheaders/configure-microsoft-ad-federation-service-saml",
+                              },
+                        items: [
+                            "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher",
+                            "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs",
+                              ]
+                        },
+                        {
+                        type: 'category',
+                        label: 'Configure Shibboleth (SAML)',
+                        link: {
+                          type: 'doc',
+                          id: "pages-for-subheaders/configure-shibboleth-saml",
+                              },
+                        items: [
+                                "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-shibboleth-saml/about-group-permissions",
+                               ]
+                        },
+                        {
+                        type: 'category',
+                        label: 'Manage Role-Based Access Control (RBAC)',
+                        link: {
+                          type: 'doc',
+                          id: "pages-for-subheaders/manage-role-based-access-control-rbac",
+                        },
+                        items: [
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions",
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles",
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles",
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles",
+                                ]
+                        },
+                        {
+                        type: 'category',
+                        label: 'About Provisioning Drivers',
+                        link: {
+                          type: 'doc',
+                          id: "pages-for-subheaders/about-provisioning-drivers",
+                        },
+                        items: [
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers",
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers",
+                                ]
+                        },
+                        {
+                        type: 'category',
+                        label: 'About RKE1 Templates',
+                        link: {
+                          type: 'doc',
+                          id: "pages-for-subheaders/about-rke1-templates",
+                        },
+                        items: [
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions",
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates",
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates",
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates",
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings",
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates",
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure",
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases",
+                                ]
+                        },
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates",
+
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies",
+
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry",
+
+                          "how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/custom-branding",
+                      ]
+                    },
+                        {
+                          type: 'category',
+                          label: 'Manage Clusters',
+                          link: {
+                            type: 'doc',
+                            id: "pages-for-subheaders/manage-clusters",
+                          },
+                          items: [
+                              {
+                              type: 'category',
+                              label: 'Access Clusters',
+                              link: {
+                                type: 'doc',
+                                id: "pages-for-subheaders/access-clusters",
+                              },
+                              items: [
+                                    "how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig",
+                                    "how-to-guides/new-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint",
+                                    "how-to-guides/new-user-guides/manage-clusters/access-clusters/add-users-to-clusters",
+                                      ]
+                            },
+                            {
+                              type: 'category',
+                              label: 'Install Cluster Autoscaler',
+                              link: {
+                                type: 'doc',
+                                id: "pages-for-subheaders/install-cluster-autoscaler",
+                              },
+                              items: [
+                                    "how-to-guides/new-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups",
+                                      ]
+                              },
+                              {
+                              type: 'category',
+                              label: 'Create Kubernetes Persistent Storage',
+                              link: {
+                                type: 'doc',
+                                id: "pages-for-subheaders/create-kubernetes-persistent-storage",
+                              },
+                              items: [
+                                    "how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage",
+                                    "how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage",
+                                    "how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage",
+                                    "how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver",
+                                    "how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes",
+                                    "how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes",
+                                    ]
+                              },
+                              {
+                              type: 'category',
+                              label: 'Provisioning Storage Examples',
+                              link: {
+                                type: 'doc',
+                                id: "pages-for-subheaders/provisioning-storage-examples",
+                              },
+                              items: [
+                                    "how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/persistent-storage-in-amazon-ebs",
+                                    "how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/nfs-storage",
+                                    "how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage",
+                                      ]
+                              },
+                              "how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces",
+
+                              "how-to-guides/new-user-guides/manage-clusters/clone-cluster-configuration",
+
+                              "how-to-guides/new-user-guides/manage-clusters/rotate-certificates",
+
+                              "how-to-guides/new-user-guides/manage-clusters/rotate-encryption-key",
+
+                              "how-to-guides/new-user-guides/manage-clusters/nodes-and-node-pools",
+
+                              "how-to-guides/new-user-guides/manage-clusters/clean-cluster-nodes",
+
+                              "how-to-guides/new-user-guides/manage-clusters/add-a-pod-security-policy",
+
+                              "how-to-guides/new-user-guides/manage-clusters/assign-pod-security-policies",
+                            ]
+                            },
+                            {
+                              type: 'category',
+                              label: 'Kubernetes Cluster Setup',
+                              link: {
+                                type: 'doc',
+                                id: "pages-for-subheaders/kubernetes-cluster-setup",
+                                        },
+                              items: [
+                                  "how-to-guides/new-user-guides/kubernetes-cluster-setup/high-availability-installs",
+                                  "how-to-guides/new-user-guides/kubernetes-cluster-setup/k3s-for-rancher",
+                                  "how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher",
+                                  "how-to-guides/new-user-guides/kubernetes-cluster-setup/rke2-for-rancher",
+                                      ],
+                            },
+                            {
+                              type: 'category',
+                              label: 'Infrastructure Setup',
+                              link: {
+                                type: 'doc',
+                                id: "pages-for-subheaders/infrastructure-setup",
+                                    },
+                              items: [
+                                "how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster",
+                                "how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster",
+                                "how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster",
+                                "how-to-guides/new-user-guides/infrastructure-setup/nodes-in-amazon-ec2",
+                                "how-to-guides/new-user-guides/infrastructure-setup/mysql-database-in-amazon-rds",
+                                "how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer",
+                                "how-to-guides/new-user-guides/infrastructure-setup/amazon-elb-load-balancer",
+                                    ],
+                           },
+                           {
+                            type: 'category',
+                            label: 'Kubernetes Clusters in Rancher Setup',
+                            link: {
+                              type: 'doc',
+                              id: "pages-for-subheaders/kubernetes-clusters-in-rancher-setup",
+                            },
                             items: [
-                                    "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster",
-
-                                    "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster",
-
-                                    "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster",
-                                   {
-                                    type: 'category',
-                                    label: 'vSphere',
-                                    link: {
-                                      type: 'doc',
-                                      id: "pages-for-subheaders/vsphere",
-                                          },
+                                    "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters",
+                                {
+                                  type: 'category',
+                                  label: 'Checklist for Production-Ready Clusters',
+                                  link: {
+                                    type: 'doc',
+                                    id: "pages-for-subheaders/checklist-for-production-ready-clusters",
+                                      },
                                     items: [
-                                      "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere",
-                                      "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials",
-                                      "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template",
-                                            ]
+                                      "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/recommended-cluster-architecture",
+                                      "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/checklist-for-production-ready-clusters/roles-for-nodes-in-kubernetes",
+                                            ],
                                 },
                                 {
-                                    type: 'category',
-                                    label: 'Nutanix',
-                                    link: {
-                                      type: 'doc',
-                                      id: "pages-for-subheaders/nutanix",
-                                          },
+                                  type: 'category',
+                                  label: 'Set Up Clusters from Hosted Kubernetes Providers',
+                                  link: {
+                                    type: 'doc',
+                                    id: "pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers",
+                                      },
                                     items: [
-                                      "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos",
-                                          ]
-                                        }
-                                      ]
-                      },
-                      {
-                          type: 'category',
-                          label: 'Use Windows Clusters',
-                          link: {
-                            type: 'doc',
-                            id: "pages-for-subheaders/use-windows-clusters",
-                              },
-                              items: [
-                                "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration",
-                                "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/windows-linux-cluster-feature-parity",
-                                "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway",
-                                "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/workload-migration-guidance"
-                                    ]
-                      },
-                      {
-                          type: 'category',
-                          label: 'Set Up Cloud Providers',
-                          link: {
-                            type: 'doc',
-                            id: "pages-for-subheaders/set-up-cloud-providers",
-                              },
-                              items: [
-                                  {
-                                    type: 'category',
-                                    label: 'Other Cloud Providers',
-                                    link: {
-                                      type: 'doc',
-                                      id: "pages-for-subheaders/other-cloud-providers",
-                                    },
-                                    items: [
-                                      "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon",
-                                      "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure",
-                                      "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine",
+                                        "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/gke",
+                                        "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/aks",
+                                        "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba",
+                                        "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent",
+                                        "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei",
                                           ]
+                                        },
+                            {
+                              type: 'category',
+                              label: 'Use Windows Clusters',
+                              link: {
+                                type: 'doc',
+                                id: "pages-for-subheaders/use-windows-clusters",
                                   },
-                                  {
-                                    type: 'category',
-                                    label: 'vSphere',
-                                    link: {
-                                      type: 'doc',
-                                      id: "pages-for-subheaders/vsphere-cloud-provider"
-                                    },
-                                    items: [
-                                      "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere",
-                                      "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere",
-                                      "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/migrate-from-in-tree-to-out-of-tree",
-                                          ]
-                                  }
-                                     ]
-                      },
-                          "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/rke1-vs-rke2-differences",
+                              items: [
+                                "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/azure-storageclass-configuration",
+                                "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/windows-linux-cluster-feature-parity",
+                                "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/network-requirements-for-host-gateway",
+                                "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/workload-migration-guidance"
+                                    ]
+                              },
+                              {
+                              type: 'category',
+                              label: 'Set Up Cloud Providers',
+                              link: {
+                                type: 'doc',
+                                id: "pages-for-subheaders/set-up-cloud-providers",
+                                  },
+                              items: [
+                              "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon",
+                              "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/azure",
+                              "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/google-compute-engine",
+                              "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-in-tree-vsphere",
+                              "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-out-of-tree-vsphere",
+                              "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/migrate-from-in-tree-to-out-of-tree",
+                                    ]
+                              },
+                              "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters",
+                              ]
+                        },
+                        {
+                          type: 'category',
+                          label: 'Launch Kubernetes with Rancher',
+                          link: {
+                            type: 'doc',
+                            id: "pages-for-subheaders/launch-kubernetes-with-rancher",
+                              },
+                            items: [
+                              {   
+                                type: 'category',
+                                label: 'Use New Nodes in an Infra Provider',
+                                link: {
+                                  type: 'doc',
+                                  id: "pages-for-subheaders/use-new-nodes-in-an-infra-provider",
+                                      },
+                                  items: [
+                                      "how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster",
 
-                          "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents",
-                     ]
-                  },
-                  "how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters",
-                ]
-              },
-              {
-                type: 'category',
-                label: 'Kubernetes Resources Setup',
-                link: {
-                  type: 'doc',
-                  id: "pages-for-subheaders/kubernetes-resources-setup",
-                },
-                items: [
-                  {
-                    type: 'category',
-                    label: 'Workloads and Pods',
-                    link: {
-                      type: 'doc',
-                      id: "pages-for-subheaders/workloads-and-pods",
-                    },
-                    items: [
-                          "how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads",
-                          "how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/roll-back-workloads",
-                          "how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads",
-                          "how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar",
-                          ]
-                  },
-                  {
-                    type: 'category',
-                    label: 'Horizontal Pod Autoscaler',
-                    link: {
-                      type: 'doc',
-                      id: "pages-for-subheaders/horizontal-pod-autoscaler",
-                    },
-                    items: [
-                          "how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/about-hpas",
-                          "how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-ui",
-                          "how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-kubectl",
-                          "how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl",
-                          ]
+                                      "how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster",
+
+                                      "how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster",
+                                      {
+                                      type: 'category',
+                                      label: 'vSphere',
+                                      link: {
+                                        type: 'doc',
+                                        id: "pages-for-subheaders/vsphere",
+                                            },
+                                      items: [
+                                        "how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere",
+                                        "how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials",
+                                        "how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template",
+                                              ]
+                                      },
+                                      {
+                                      type: 'category',
+                                      label: 'Nutanix',
+                                      link: {
+                                        type: 'doc',
+                                        id: "pages-for-subheaders/nutanix",
+                                            },
+                                      items: [
+                                        "how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos",
+                                            ]
+                              }
+                            ]
                           },
-                  {
-                    type: 'category',
-                    label: 'Load Balancer and Ingress Controller',
-                    link: {
-                      type: 'doc',
-                      id: "pages-for-subheaders/load-balancer-and-ingress-controller",
-                    },
-                    items: [
-                          "how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/layer-4-and-layer-7-load-balancing",
-                          "how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/add-ingresses",
-                          "how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/ingress-configuration",
+                              "how-to-guides/new-user-guides/launch-kubernetes-with-rancher/rke1-vs-rke2-differences",
+
+                              "how-to-guides/new-user-guides/launch-kubernetes-with-rancher/about-rancher-agents",
+                        ]
+                      },
+                        {
+                          type: 'category',
+                          label: 'Kubernetes Resources Setup',
+                          link: {
+                            type: 'doc',
+                            id: "pages-for-subheaders/kubernetes-resources-setup",
+                          },
+                          items: [
+                            {
+                          type: 'category',
+                          label: 'Workloads and Pods',
+                          link: {
+                            type: 'doc',
+                            id: "pages-for-subheaders/workloads-and-pods",
+                          },
+                          items: [
+                                "how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads",
+                                "how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/roll-back-workloads",
+                                "how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads",
+                                "how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar",
+                                ]
+                          },
+                          {
+                            type: 'category',
+                            label: 'Horizontal Pod Autoscaler',
+                            link: {
+                              type: 'doc',
+                              id: "pages-for-subheaders/horizontal-pod-autoscaler",
+                            },
+                            items: [
+                                  "how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/about-hpas",
+                                  "how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-ui",
+                                  "how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/manage-hpas-with-kubectl",
+                                  "how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl",
+                                  ]
+                          },
+                          {
+                            type: 'category',
+                            label: 'Load Balancer and Ingress Controller',
+                            link: {
+                              type: 'doc',
+                              id: "pages-for-subheaders/load-balancer-and-ingress-controller",
+                            },
+                            items: [
+                                  "how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/layer-4-and-layer-7-load-balancing",
+                                  "how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/add-ingresses",
+                                  "how-to-guides/new-user-guides/kubernetes-resources-setup/load-balancer-and-ingress-controller/ingress-configuration",
+                                  ]
+                          },
+                                  "how-to-guides/new-user-guides/kubernetes-resources-setup/create-services",
+
+                                  "how-to-guides/new-user-guides/kubernetes-resources-setup/encrypt-http-communication",
+
+                                  "how-to-guides/new-user-guides/kubernetes-resources-setup/configmaps",
+
+                                  "how-to-guides/new-user-guides/kubernetes-resources-setup/secrets",
+
+                                  "how-to-guides/new-user-guides/kubernetes-resources-setup/kubernetes-and-docker-registries",
+                                  ]
+                           },
+                           {
+                            type: 'category',
+                            label: 'Helm Charts in Rancher',
+                            link: {
+                              type: 'doc',
+                              id: "pages-for-subheaders/helm-charts-in-rancher",
+                            },
+                            items: [
+                                  "how-to-guides/new-user-guides/helm-charts-in-rancher/create-apps",
+                                      ]
+                            },
+                            {
+                              type: 'category',
+                              label: 'Deploy Apps Across Clusters',
+                              link: {
+                                type: 'doc',
+                                id: "pages-for-subheaders/deploy-apps-across-clusters",
+                              },
+                              items: [
+                                    "how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet",
+                                    "how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps",
+                                        ]
+                            },
+                            {
+                              type: 'category',
+                              label: 'Backup, Restore, and Disaster Recovery',
+                              link: {
+                                type: 'doc',
+                                id: "pages-for-subheaders/backup-restore-and-disaster-recovery",
+                              },
+                              items: [
+                                "how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher",
+                                "how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher",
+                                "how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster",
+                                "how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher",
+                                "how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher",
+                                "how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher-launched-kubernetes-clusters",
+                                "how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup",
+                                     ]
+                            },
+                              "how-to-guides/new-user-guides/add-users-to-projects",
+
+                              "how-to-guides/new-user-guides/manage-namespaces",      
                           ]
-                  },
-                     "how-to-guides/new-user-guides/kubernetes-resources-setup/create-services",
-
-                     "how-to-guides/new-user-guides/kubernetes-resources-setup/encrypt-http-communication",
-
-                     "how-to-guides/new-user-guides/kubernetes-resources-setup/configmaps",
-
-                     "how-to-guides/new-user-guides/kubernetes-resources-setup/secrets",
-
-                     "how-to-guides/new-user-guides/kubernetes-resources-setup/kubernetes-and-docker-registries",
-                     ],
-              },
-              {
-                type: 'category',
-                label: 'Helm Charts in Rancher',
-                link: {
-                  type: 'doc',
-                  id: "pages-for-subheaders/helm-charts-in-rancher",
-                },
-                items: [
-                      "how-to-guides/new-user-guides/helm-charts-in-rancher/create-apps",
-                          ]
-              },
-              {
-                type: 'category',
-                label: 'Deploy Apps Across Clusters',
-                link: {
-                  type: 'doc',
-                  id: "pages-for-subheaders/deploy-apps-across-clusters",
-                },
-                items: [
-                      "how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet",
-                      "how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps",
-                          ]
-              },
-              {
-                type: 'category',
-                label: 'Backup, Restore, and Disaster Recovery',
-                link: {
-                  type: 'doc',
-                  id: "pages-for-subheaders/backup-restore-and-disaster-recovery",
-                },
-                items: [
-                  "how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher",
-                  "how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher",
-                  "how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster",
-                  "how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher",
-                  "how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher",
-                  "how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher-launched-kubernetes-clusters",
-                  "how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup",
-                ]
-              }
-            ]
-        },
-        {
+                        },
+          {
             type: 'category',
             label: 'Advanced User Guides',
             link: {
               type: 'doc',
               id: "pages-for-subheaders/advanced-user-guides",
                   },
-            items: [
-              {
-                type: 'category',
-                label: 'Authentication, Permissions, and Global Configuration',
-                link: {
-                  type: 'doc',
-                  id: "pages-for-subheaders/authentication-permissions-and-global-configuration",
-                      },
-                items: [
-                      {
-                      type: 'category',
-                      label: 'About Authentication',
-                      link: {
-                        type: 'doc',
-                        id: "pages-for-subheaders/about-authentication",
-                              },
-                        items: [
-                            {
-                            type: 'category',
-                            label: 'Authentication Config',
-                            link: {
-                              type: 'doc',
-                              id: "pages-for-subheaders/authentication-config",
-                            },
-                            items: [
-                                 "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups",
-                                 "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users",
-                                 "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth",
-                                 "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory",
-                                 "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa",
-                                 "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad",
-                                 "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github",
-                                 "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-oidc",
-                                 "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-saml",
-                                 "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity",
-                                 "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml",
-                                   ]
-                            },
-                            {
-                            type: 'category',
-                            label: 'Configure Microsoft AD Federation Service (SAML)',
-                            link: {
-                              type: 'doc',
-                              id: "pages-for-subheaders/configure-microsoft-ad-federation-service-saml",
-                                  },
-                            items: [
-                                "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher",
-                                "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs",
-                                   ]
-                            },
-                            {
-                            type: 'category',
-                            label: 'Configure Shibboleth (SAML)',
-                            link: {
-                              type: 'doc',
-                              id: "pages-for-subheaders/configure-shibboleth-saml",
-                                  },
-                            items: [
-                                "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions",
-                                    ]
-                            }
-                          ]
-
-                      },
-                      {
-                      type: 'category',
-                      label: 'Manage Role-Based Access Control (RBAC)',
-                      link: {
-                        type: 'doc',
-                        id: "pages-for-subheaders/manage-role-based-access-control-rbac",
-                      },
-                      items: [
-                        "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions",
-                        "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles",
-                        "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles",
-                        "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles",
-                             ]
-                      },
-                      {
-                      type: 'category',
-                      label: 'About Provisioning Drivers',
-                      link: {
-                        type: 'doc',
-                        id: "pages-for-subheaders/about-provisioning-drivers",
-                      },
-                      items: [
-                        "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers",
-                        "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers",
-                             ]
-                      },
-                      {
-                      type: 'category',
-                      label: 'About RKE1 Templates',
-                      link: {
-                        type: 'doc',
-                        id: "pages-for-subheaders/about-rke1-templates",
-                      },
-                      items: [
-                        "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions",
-                        "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates",
-                        "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates",
-                        "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates",
-                        "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings",
-                        "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates",
-                        "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure",
-                        "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases",
-                              ]
-                      },
-                        "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates",
-
-                        "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies",
-
-                        "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry",
-
-                        "how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/custom-branding",
-                  ]
-              },
-              {
-                type: 'category',
-                label: 'Manage Clusters',
-                link: {
-                  type: 'doc',
-                  id: "pages-for-subheaders/manage-clusters",
-                },
-                items: [
-                   {
-                    type: 'category',
-                    label: 'Access Clusters',
-                    link: {
-                      type: 'doc',
-                      id: "pages-for-subheaders/access-clusters",
-                    },
-                    items: [
-                          "how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig",
-                          "how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint",
-                          "how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters",
-                            ]
-                   },
-                   {
-                    type: 'category',
-                    label: 'Install Cluster Autoscaler',
-                    link: {
-                      type: 'doc',
-                      id: "pages-for-subheaders/install-cluster-autoscaler",
-                    },
-                    items: [
-                          "how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups",
-                            ]
-                    },
-                    {
-                    type: 'category',
-                    label: 'Create Kubernetes Persistent Storage',
-                    link: {
-                      type: 'doc',
-                      id: "pages-for-subheaders/create-kubernetes-persistent-storage",
-                    },
-                    items: [
-                          {
-                          type: 'category',
-                          label: 'Manage Persistent Storage',
-                          link: {
-                            type: 'doc',
-                            id: "pages-for-subheaders/manage-persistent-storage",
-                          },
-                          items: [
-                          "how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage",
-                          "how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage",
-                          "how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage",
-                          "how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver",
-                          "how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes",
-                          "how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes",
-                                  ]
-                          },
-                          {
-                          type: 'category',
-                          label: 'Provisioning Storage Examples',
-                          link: {
-                            type: 'doc',
-                            id: "pages-for-subheaders/provisioning-storage-examples",
-                          },
-                          items: [
-                                "how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs",
-                                "how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage",
-                                "how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage",
-                           ]
-                          }
-                        ]
-                    },
-                    "how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces",
-
-                    "how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration",
-
-                    "how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates",
-                    "how-to-guides/advanced-user-guides/manage-clusters/rotate-encryption-key",
-
-                    "how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools",
-
-                    "how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes",
-
-                    "how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy",
-
-                    "how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies",
-                ]
-              },
-              {
+              items: [
+                  {
                 type: 'category',
                 label: 'Manage Projects',
                 link: {
@@ -738,8 +672,6 @@ const sidebars = {
                   id: "pages-for-subheaders/manage-projects",
                 },
                 items: [
-                    "how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects",
-                    "how-to-guides/advanced-user-guides/manage-projects/manage-namespaces",
                     "how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines",
                     "how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies",
                       {
@@ -754,9 +686,9 @@ const sidebars = {
                             "how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces",
                             "how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/set-container-default-resource-limits",
                             "how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/resource-quota-types",
-                        ]
-                      }
-                    ]
+                               ]
+                              }
+                            ]
               },
               {
                 type: 'category',
@@ -787,8 +719,8 @@ const sidebars = {
                             "how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/set-up-workloads",
                             "how-to-guides/advanced-user-guides/monitoring-alerting-guides/prometheus-federator-guides/project-monitors"
                              ]
-                            }
-                          ]
+                    }
+                  ]
               },
               {
               type: 'category',
@@ -835,7 +767,7 @@ const sidebars = {
               link: {
                 type: 'doc',
                 id: "pages-for-subheaders/cis-scan-guides",
-              },
+                    },
               items: [
                   "how-to-guides/advanced-user-guides/cis-scan-guides/install-rancher-cis-benchmark",
                   "how-to-guides/advanced-user-guides/cis-scan-guides/uninstall-rancher-cis-benchmark",
@@ -847,18 +779,32 @@ const sidebars = {
                   "how-to-guides/advanced-user-guides/cis-scan-guides/configure-alerts-for-periodic-scan-on-a-schedule",
                   "how-to-guides/advanced-user-guides/cis-scan-guides/create-a-custom-benchmark-version-to-run",
                   ]
-                }
-              ]
-            }
-          ]
-    },
+              },
+              {
+                type: 'category',
+                label: 'Enable Experimental Features',
+                link: {
+                  type: 'doc',
+                  id: "pages-for-subheaders/enable-experimental-features",
+                      },
+                      items: [
+                            "how-to-guides/advanced-user-guides/enable-experimental-features/rancher-on-arm64",
+                            "how-to-guides/advanced-user-guides/enable-experimental-features/unsupported-storage-drivers",
+                            "how-to-guides/advanced-user-guides/enable-experimental-features/istio-traffic-management-features",
+                            "how-to-guides/advanced-user-guides/enable-experimental-features/continuous-delivery",
+                             ]
+              },
+                "how-to-guides/advanced-user-guides/open-ports-with-firewalld",
+                "how-to-guides/advanced-user-guides/tune-etcd-for-large-installs",
+                "how-to-guides/advanced-user-guides/enable-api-audit-log",
+                "how-to-guides/advanced-user-guides/configure-layer-7-nginx-load-balancer",
+            ]
+          }
+       ]
+      },
     {
       type: 'category',
       label: 'Reference Guides',
-      link: {
-        type: 'doc',
-        id: "reference-guides",
-      },
       items: [
         {
           type: 'category',
@@ -1008,19 +954,6 @@ const sidebars = {
             "reference-guides/single-node-rancher-in-docker/advanced-options",
                   ]
           },
-          {
-            type: 'category',
-            label: 'Installation References',
-            link: {
-              type: 'doc',
-              id: "pages-for-subheaders/installation-references",
-            },
-            items: [
-            "reference-guides/installation-references/helm-chart-options",
-            "reference-guides/installation-references/tls-settings",
-            "reference-guides/installation-references/feature-flags"
-                  ]
-          },
           {
             type: 'category',
             label: 'Amazon EKS Permissions',
@@ -1045,17 +978,6 @@ const sidebars = {
                   "reference-guides/backup-restore-configuration/storage-configuration",
                   "reference-guides/backup-restore-configuration/examples",
                   ],
-          },
-          {
-            type: 'category',
-            label: 'Configure OpenLDAP',
-            link: {
-              type: 'doc',
-              id: "pages-for-subheaders/configure-openldap",
-            },
-            items: [
-                  "reference-guides/configure-openldap/openldap-config-reference",
-                      ]
           },
               "reference-guides/kubernetes-concepts",
           {
@@ -1186,43 +1108,31 @@ const sidebars = {
     },
     {
       type: 'category',
-      label: 'Explanations',
-      link: {
-        type: 'doc',
-        id: "explanations",
-      },
+      label: 'Integrations in Rancher',
       items: [
-      {
-        type: 'category',
-        label: 'Integrations in Rancher',
-        link: {
-          type: 'doc',
-          id: "pages-for-subheaders/integrations-in-rancher",
-              },
-          items: [
-            {
-              type: 'category',
-              label: 'Cloud Marketplace Integration',
-              link: {
-                type: 'doc',
-                id: "pages-for-subheaders/cloud-marketplace"
-              },
-              items: [
+        {
+           type: 'category',
+           label: 'Cloud Marketplace Integration',
+           link: {
+             type: 'doc',
+             id: "pages-for-subheaders/cloud-marketplace"
+                 },
+             items: [
                 {
-                  type: 'category',
-                  label: 'AWS Marketplace Integration',
-                  link: {
-                    type: 'doc',
-                    id: "pages-for-subheaders/aws-cloud-marketplace"
-                  },
+                type: 'category',
+                label: 'AWS Marketplace Integration',
+                link: {
+                  type: 'doc',
+                  id: "pages-for-subheaders/aws-cloud-marketplace"
+                     },
                   items: [
-                    'explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements',
-                    'explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter',
-                    'explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter',
-                    'explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues'
+                    'integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements',
+                    'integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter',
+                    'integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter',
+                    'integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues'
                   ]
                 },
-                'explanations/integrations-in-rancher/cloud-marketplace/supportconfig'
+                'integrations-in-rancher/cloud-marketplace/supportconfig'
               ]
             },
             {
@@ -1233,10 +1143,10 @@ const sidebars = {
               id: "pages-for-subheaders/cis-scans",
                   },
             items: [
-                "explanations/integrations-in-rancher/cis-scans/configuration-reference",
-                "explanations/integrations-in-rancher/cis-scans/rbac-for-cis-scans",
-                "explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests",
-                "explanations/integrations-in-rancher/cis-scans/custom-benchmark",
+                "integrations-in-rancher/cis-scans/configuration-reference",
+                "integrations-in-rancher/cis-scans/rbac-for-cis-scans",
+                "integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests",
+                "integrations-in-rancher/cis-scans/custom-benchmark",
                    ],
             },
             {
@@ -1247,12 +1157,12 @@ const sidebars = {
               id: "pages-for-subheaders/fleet-gitops-at-scale",
                   },
             items: [
-              "explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture",
-              "explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support",
-              "explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy",
+              "integrations-in-rancher/fleet-gitops-at-scale/architecture",
+              "integrations-in-rancher/fleet-gitops-at-scale/windows-support",
+              "integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy",
                   ]
             },
-              "explanations/integrations-in-rancher/harvester",
+              "integrations-in-rancher/harvester",
             {
             type: 'category',
             label: 'Istio',
@@ -1261,9 +1171,9 @@ const sidebars = {
               id: "pages-for-subheaders/istio",
                   },
               items: [
-                  "explanations/integrations-in-rancher/istio/cpu-and-memory-allocations",
-                  "explanations/integrations-in-rancher/istio/rbac-for-istio",
-                  "explanations/integrations-in-rancher/istio/disable-istio",
+                  "integrations-in-rancher/istio/cpu-and-memory-allocations",
+                  "integrations-in-rancher/istio/rbac-for-istio",
+                  "integrations-in-rancher/istio/disable-istio",
                    {
                     type: 'category',
                     label: 'Configuration Options',
@@ -1272,15 +1182,15 @@ const sidebars = {
                       id: "pages-for-subheaders/configuration-options",
                           },
                     items: [
-                          "explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies",
-                          "explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations",
-                          "explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster",
-                          "explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation",
+                          "integrations-in-rancher/istio/configuration-options/pod-security-policies",
+                          "integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations",
+                          "integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster",
+                          "integrations-in-rancher/istio/configuration-options/project-network-isolation",
                            ]
                    }
                   ]
             },
-              "explanations/integrations-in-rancher/longhorn",
+              "integrations-in-rancher/longhorn",
             {
             type: 'category',
             label: 'Logging',
@@ -1289,11 +1199,11 @@ const sidebars = {
               id: "pages-for-subheaders/logging",
                   },
                 items: [
-                  "explanations/integrations-in-rancher/logging/logging-architecture",
-                  "explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging",
-                  "explanations/integrations-in-rancher/logging/rbac-for-logging",
-                  "explanations/integrations-in-rancher/logging/logging-helm-chart-options",
-                  "explanations/integrations-in-rancher/logging/taints-and-tolerations",
+                  "integrations-in-rancher/logging/logging-architecture",
+                  "integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging",
+                  "integrations-in-rancher/logging/rbac-for-logging",
+                  "integrations-in-rancher/logging/logging-helm-chart-options",
+                  "integrations-in-rancher/logging/taints-and-tolerations",
                     {
                       type: 'category',
                       label: 'Custom Resource Configuration',
@@ -1302,8 +1212,8 @@ const sidebars = {
                         id: "pages-for-subheaders/custom-resource-configuration",
                             },
                       items: [
-                            "explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows",
-                            "explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs"
+                            "integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows",
+                            "integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs"
                       ]
                     }
                   ]
@@ -1316,28 +1226,23 @@ const sidebars = {
               id: "pages-for-subheaders/monitoring-and-alerting",
                   },
             items: [
-              "explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works",
-              "explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring",
-              "explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards",
-              "explanations/integrations-in-rancher/monitoring-and-alerting/windows-support",
-              "explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions",
+              "integrations-in-rancher/monitoring-and-alerting/how-monitoring-works",
+              "integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring",
+              "integrations-in-rancher/monitoring-and-alerting/built-in-dashboards",
+              "integrations-in-rancher/monitoring-and-alerting/windows-support",
+              "integrations-in-rancher/monitoring-and-alerting/promql-expressions",
                   ]
             },
-              "explanations/integrations-in-rancher/neuvector",
+              "integrations-in-rancher/neuvector",
 
-              "explanations/integrations-in-rancher/opa-gatekeeper",
+              "integrations-in-rancher/opa-gatekeeper",
                   ]
-                }
-              ]
     },
     {
       type: 'category',
       label: 'FAQ',
-      link: {
-        type: 'doc',
-        id: "faq",
-      },
       items: [
+        "faq/general-faq",
         "faq/deprecated-features-in-v2.5",
         "faq/install-and-configure-kubectl",
         "faq/dockershim",
@@ -1351,11 +1256,8 @@ const sidebars = {
     {
       type: 'category',
       label: 'Troubleshooting',
-      link: {
-        type: 'doc',
-        id: "troubleshooting",
-      },
       items: [
+            "troubleshooting/general-troubleshooting",
         {
           type: 'category',
           label: 'Kubernetes Components',
@@ -1373,10 +1275,6 @@ const sidebars = {
         {
           type: 'category',
           label: 'Other Troubleshooting Tips',
-          link: {
-            type: 'doc',
-            id: "pages-for-subheaders/other-troubleshooting-tips",
-          },
           items: [
             "troubleshooting/other-troubleshooting-tips/kubernetes-resources",
             "troubleshooting/other-troubleshooting-tips/networking",
@@ -1386,11 +1284,11 @@ const sidebars = {
             "troubleshooting/other-troubleshooting-tips/logging",
             "troubleshooting/other-troubleshooting-tips/user-id-tracking-in-audit-logs",
             "troubleshooting/other-troubleshooting-tips/expired-webhook-certificate-rotation",
-                 ],
+                 ]
                 }
               ]
-    },
+            },
         "contribute-to-rancher",
-  ],
+  ]
 }
 module.exports = sidebars;

From 3fedca05b7f99d8e7a2b079c8bde3814dd72710f Mon Sep 17 00:00:00 2001
From: Jennifer Travinski <jennifer.travinski@suse.com>
Date: Thu, 6 Oct 2022 10:26:24 -0400
Subject: [PATCH 07/15] Updating links

---
 .../installation-references/feature-flags.md  |   2 +-
 .../enable-api-audit-log.md                   |   2 +-
 .../configure-azure-ad.md                     |   2 +-
 .../configure-freeipa.md                      |   2 +-
 .../openldap-config-reference.md              |   6 +-
 .../launch-kubernetes-with-rancher/amazon.md  | 153 ------------------
 .../create-an-azure-cluster.md                |   4 +-
 .../provision-kubernetes-clusters-in-aos.md   |   4 +-
 8 files changed, 11 insertions(+), 164 deletions(-)
 delete mode 100644 docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/amazon.md

diff --git a/docs/getting-started/installation-and-upgrade/installation-references/feature-flags.md b/docs/getting-started/installation-and-upgrade/installation-references/feature-flags.md
index 045ebea21b0..d41c822709a 100644
--- a/docs/getting-started/installation-and-upgrade/installation-references/feature-flags.md
+++ b/docs/getting-started/installation-and-upgrade/installation-references/feature-flags.md
@@ -17,7 +17,7 @@ The following is a list of the feature flags available in Rancher:
 - `harvester`: This feature flag is available starting in v2.6.1. It is used to manage access to the Virtualization Management page where users can navigate directly to Harvester clusters and access the Harvester UI. For more information, see [this page](../../../integrations-in-rancher/harvester.md#feature-flag/).
 - `rke2`: Used to enable the ability to provision RKE2 clusters. By default, this feature flag is enabled, which allows users to attempt to provision these type of clusters.
 - `fleet`: The previous `fleet` feature flag is now required to be enabled as the Fleet capabilities are leveraged within the new provisioning framework. If you had this feature flag disabled in earlier versions, upon upgrading to Rancher v2.6, the flag will automatically be enabled. See this [page](../../../how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md) for more information.
-- `continuous-delivery`: In Rancher v2.5.x, Fleet came with a GitOps feature that could not be disabled separately from Fleet. In Rancher v2.6, the `continuous-delivery` feature flag was introduced to allow the GitOps feature of Fleet to be disabled. For more information, see [this page.](../../../how-to-guides/advanced-user-guides/enable-experimental-features/continuous-delivery.md).
+- `continuous-delivery`: In Rancher v2.5.x, Fleet came with a GitOps feature that could not be disabled separately from Fleet. In Rancher v2.6, the `continuous-delivery` feature flag was introduced to allow the GitOps feature of Fleet to be disabled. For more information, see [this page.](../../../how-to-guides/advanced-user-guides/enable-experimental-features/continuous-delivery.md)
 - `legacy`: There are a set of features from previous versions that are slowly being phased out of Rancher for newer iterations of the feature. This is a mix of deprecated features as well as features that will eventually be moved to newer variations in Rancher. By default, this feature flag is disabled for new installations. If you are upgrading from a previous version, this feature flag would be enabled.
 - `token-hashing`: Used to enable new token-hashing feature. Once enabled, existing tokens will be hashed and all new tokens will be hashed automatically using the SHA256 algorithm. Once a token is hashed it cannot be undone. Once this feature flag is enabled, it cannot be disabled. See [hashing of tokens](../../../reference-guides/about-the-api/api-tokens.md) for more information.
 - `unsupported-storage-drivers`: This feature [allows unsupported storage drivers.](../../../how-to-guides/advanced-user-guides/enable-experimental-features/unsupported-storage-drivers.md). In other words, it enables types for storage providers and provisioners that are not enabled by default.
diff --git a/docs/how-to-guides/advanced-user-guides/enable-api-audit-log.md b/docs/how-to-guides/advanced-user-guides/enable-api-audit-log.md
index 0e46c8a486c..bd0dc8ab5d6 100644
--- a/docs/how-to-guides/advanced-user-guides/enable-api-audit-log.md
+++ b/docs/how-to-guides/advanced-user-guides/enable-api-audit-log.md
@@ -12,7 +12,7 @@ The Audit Log is enabled and configured by passing environment variables to the
 
 - [Docker Install](../../reference-guides/single-node-rancher-in-docker/advanced-options.md#api-audit-log)
 
-- [Kubernetes Install](../../reference-guides/installation-references/helm-chart-options.md#api-audit-log)
+- [Kubernetes Install](../../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#api-audit-log)
 
 ## API Audit Log Options
 
diff --git a/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md
index bdcfa3b79ca..b124eec67e9 100644
--- a/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md
+++ b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md
@@ -309,7 +309,7 @@ Token Endpoint   | https://login.partner.microsoftonline.cn/{tenantID}/oauth2/v2
 >
 >- For existing users who do not wish to upgrade to v2.6.7 after the Azure AD Graph API is retired, they will need to either:
     - Use the built-in Rancher auth or
-    - Use another third-party auth system and set that up in Rancher. Please see the [authentication docs](../../../../pages-for-subheaders/about-authentication.md) to learn how to configure other open authentication providers.
+    - Use another third-party auth system and set that up in Rancher. Please see the [authentication docs](../../../../pages-for-subheaders/authentication-config.md) to learn how to configure other open authentication providers.
 
 </TabItem>
 </Tabs>
\ No newline at end of file
diff --git a/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-freeipa.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-freeipa.md
index 3f240fcb913..5d1cda2e306 100644
--- a/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-freeipa.md
+++ b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-freeipa.md
@@ -8,7 +8,7 @@ If your organization uses FreeIPA for user authentication, you can configure Ran
 
 - You must have a [FreeIPA Server](https://www.freeipa.org/) configured.
 - Create a service account in FreeIPA with `read-only` access. Rancher uses this account to verify group membership when a user makes a request using an API key.
-- Read [External Authentication Configuration and Principal Users](../../../../pages-for-subheaders/about-authentication.md#external-authentication-configuration-and-principal-users).
+- Read [External Authentication Configuration and Principal Users](../../../../pages-for-subheaders/authentication-config.md#external-authentication-configuration-and-principal-users).
 
 :::
 
diff --git a/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-openldap/openldap-config-reference.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-openldap/openldap-config-reference.md
index c13f0d1d37c..5e5df96b3c7 100644
--- a/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-openldap/openldap-config-reference.md
+++ b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-openldap/openldap-config-reference.md
@@ -6,7 +6,7 @@ This section is intended to be used as a reference when setting up an OpenLDAP a
 
 For further details on configuring OpenLDAP, refer to the [official documentation.](https://www.openldap.org/doc/)
 
-> Before you proceed with the configuration, please familiarize yourself with the concepts of [External Authentication Configuration and Principal Users](../../../../pages-for-subheaders/about-authentication.md#external-authentication-configuration-and-principal-users).
+> Before you proceed with the configuration, please familiarize yourself with the concepts of [External Authentication Configuration and Principal Users](../../../../pages-for-subheaders/authentication-config.md#external-authentication-configuration-and-principal-users).
 
 
 ## Background: OpenLDAP Authentication Flow
@@ -24,7 +24,7 @@ You will need to enter the address, port, and protocol to connect to your OpenLD
 >
 > If the certificate used by the OpenLDAP server is self-signed or not from a recognized certificate authority, make sure have at hand the CA certificate (concatenated with any intermediate certificates) in PEM format. You will have to paste in this certificate during the configuration so that Rancher is able to validate the certificate chain.
 
-If you are in doubt about the correct values to enter in the user/group Search Base configuration fields, consult your LDAP administrator or refer to the section [Identify Search Base and Schema using ldapsearch](../../../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md#annex-identify-search-base-and-schema-using-ldapsearch) in the Active Directory authentication documentation.
+If you are in doubt about the correct values to enter in the user/group Search Base configuration fields, consult your LDAP administrator or refer to the section [Identify Search Base and Schema using ldapsearch](../../../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-active-directory.md#annex-identify-search-base-and-schema-using-ldapsearch) in the Active Directory authentication documentation.
 
 <figcaption>OpenLDAP Server Parameters</figcaption>
 
@@ -45,7 +45,7 @@ If your OpenLDAP directory deviates from the standard OpenLDAP schema, you must
 
 Note that the attribute mappings configured in this section are used by Rancher to construct search filters and resolve group membership. It is therefore always recommended to verify that the configuration here matches the schema used in your OpenLDAP.
 
-If you are unfamiliar with the user/group schema used in the OpenLDAP server, consult your LDAP administrator or refer to the section [Identify Search Base and Schema using ldapsearch](../../../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md#annex-identify-search-base-and-schema-using-ldapsearch) in the Active Directory authentication documentation.
+If you are unfamiliar with the user/group schema used in the OpenLDAP server, consult your LDAP administrator or refer to the section [Identify Search Base and Schema using ldapsearch](../../../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-active-directory.md#annex-identify-search-base-and-schema-using-ldapsearch) in the Active Directory authentication documentation.
 
 ### User Schema Configuration
 
diff --git a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/amazon.md b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/amazon.md
deleted file mode 100644
index e079ba2bf36..00000000000
--- a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/amazon.md
+++ /dev/null
@@ -1,153 +0,0 @@
----
-title: Setting up the Amazon Cloud Provider
----
-
-When using the `Amazon` cloud provider, you can leverage the following capabilities:
-
-- **Load Balancers:** Launches an AWS Elastic Load Balancer (ELB) when choosing `Layer-4 Load Balancer` in **Port Mapping** or when launching a `Service` with `type: LoadBalancer`.
-- **Persistent Volumes**: Allows you to use AWS Elastic Block Stores (EBS) for persistent volumes.
-
-See [cloud-provider-aws README](https://kubernetes.github.io/cloud-provider-aws/) for all information regarding the Amazon cloud provider.
-
-To set up the Amazon cloud provider,
-
-1. [Create an IAM role and attach to the instances](#1-create-an-iam-role-and-attach-to-the-instances)
-2. [Configure the ClusterID](#2-configure-the-clusterid)
-
-### 1. Create an IAM Role and attach to the instances
-
-All nodes added to the cluster must be able to interact with EC2 so that they can create and remove resources. You can enable this interaction by using an IAM role attached to the instance. See [Amazon documentation: Creating an IAM Role](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html#create-iam-role) how to create an IAM role. There are two example policies:
-
-* The first policy is for the nodes with the `controlplane` role. These nodes have to be able to create/remove EC2 resources. The following IAM policy is an example, please remove any unneeded permissions for your use case.
-* The second policy is for the nodes with the `etcd` or `worker` role. These nodes only have to be able to retrieve information from EC2.
-
-While creating an [Amazon EC2 cluster](../launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md), you must fill in the **IAM Instance Profile Name** (not ARN) of the created IAM role when creating the **Node Template**.
-
-While creating a [Custom cluster](../../../pages-for-subheaders/use-existing-nodes.md), you must manually attach the IAM role to the instance(s).
-
-IAM Policy for nodes with the `controlplane` role:
-
-```json
-{
-"Version": "2012-10-17",
-"Statement": [
-  {
-    "Effect": "Allow",
-    "Action": [
-      "autoscaling:DescribeAutoScalingGroups",
-      "autoscaling:DescribeLaunchConfigurations",
-      "autoscaling:DescribeTags",
-      "ec2:DescribeInstances",
-      "ec2:DescribeRegions",
-      "ec2:DescribeRouteTables",
-      "ec2:DescribeSecurityGroups",
-      "ec2:DescribeSubnets",
-      "ec2:DescribeVolumes",
-      "ec2:CreateSecurityGroup",
-      "ec2:CreateTags",
-      "ec2:CreateVolume",
-      "ec2:ModifyInstanceAttribute",
-      "ec2:ModifyVolume",
-      "ec2:AttachVolume",
-      "ec2:AuthorizeSecurityGroupIngress",
-      "ec2:CreateRoute",
-      "ec2:DeleteRoute",
-      "ec2:DeleteSecurityGroup",
-      "ec2:DeleteVolume",
-      "ec2:DetachVolume",
-      "ec2:RevokeSecurityGroupIngress",
-      "ec2:DescribeVpcs",
-      "elasticloadbalancing:AddTags",
-      "elasticloadbalancing:AttachLoadBalancerToSubnets",
-      "elasticloadbalancing:ApplySecurityGroupsToLoadBalancer",
-      "elasticloadbalancing:CreateLoadBalancer",
-      "elasticloadbalancing:CreateLoadBalancerPolicy",
-      "elasticloadbalancing:CreateLoadBalancerListeners",
-      "elasticloadbalancing:ConfigureHealthCheck",
-      "elasticloadbalancing:DeleteLoadBalancer",
-      "elasticloadbalancing:DeleteLoadBalancerListeners",
-      "elasticloadbalancing:DescribeLoadBalancers",
-      "elasticloadbalancing:DescribeLoadBalancerAttributes",
-      "elasticloadbalancing:DetachLoadBalancerFromSubnets",
-      "elasticloadbalancing:DeregisterInstancesFromLoadBalancer",
-      "elasticloadbalancing:ModifyLoadBalancerAttributes",
-      "elasticloadbalancing:RegisterInstancesWithLoadBalancer",
-      "elasticloadbalancing:SetLoadBalancerPoliciesForBackendServer",
-      "elasticloadbalancing:AddTags",
-      "elasticloadbalancing:CreateListener",
-      "elasticloadbalancing:CreateTargetGroup",
-      "elasticloadbalancing:DeleteListener",
-      "elasticloadbalancing:DeleteTargetGroup",
-      "elasticloadbalancing:DescribeListeners",
-      "elasticloadbalancing:DescribeLoadBalancerPolicies",
-      "elasticloadbalancing:DescribeTargetGroups",
-      "elasticloadbalancing:DescribeTargetHealth",
-      "elasticloadbalancing:ModifyListener",
-      "elasticloadbalancing:ModifyTargetGroup",
-      "elasticloadbalancing:RegisterTargets",
-      "elasticloadbalancing:SetLoadBalancerPoliciesOfListener",
-      "iam:CreateServiceLinkedRole",
-      "kms:DescribeKey"
-    ],
-    "Resource": [
-      "*"
-    ]
-  }
-]
-}
-```
-
-IAM policy for nodes with the `etcd` or `worker` role:
-
-```json
-{
-"Version": "2012-10-17",
-"Statement": [
-    {
-        "Effect": "Allow",
-        "Action": [
-            "ec2:DescribeInstances",
-            "ec2:DescribeRegions",
-            "ecr:GetAuthorizationToken",
-            "ecr:BatchCheckLayerAvailability",
-            "ecr:GetDownloadUrlForLayer",
-            "ecr:GetRepositoryPolicy",
-            "ecr:DescribeRepositories",
-            "ecr:ListImages",
-            "ecr:BatchGetImage"
-        ],
-        "Resource": "*"
-    }
-]
-}
-```
-
-### 2. Configure the ClusterID
-
-The following resources need to tagged with a `ClusterID`:
-
-- **Nodes**: All hosts added in Rancher.
-- **Subnet**: The subnet used for your cluster.
-- **Security Group**: The security group used for your cluster.
-
-:::note
-
-Do not tag multiple security groups. Tagging multiple groups generates an error when creating an Elastic Load Balancer (ELB).
-
-:::
-
-When you create an [Amazon EC2 Cluster](../launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md), the `ClusterID` is automatically configured for the created nodes. Other resources still need to be tagged manually.
-
-Use the following tag:
-
-**Key** = `kubernetes.io/cluster/CLUSTERID` **Value** = `owned`
-
-`CLUSTERID` can be any string you like, as long as it is equal across all tags set.
-
-Setting the value of the tag to `owned` tells the cluster that all resources with this tag are owned and managed by this cluster. If you share resources between clusters, you can change the tag to:
-
-**Key** = `kubernetes.io/cluster/CLUSTERID` **Value** = `shared`.
-
-### Using Amazon Elastic Container Registry (ECR)
-
-The kubelet component has the ability to automatically obtain ECR credentials, when the IAM profile mentioned in [Create an IAM Role and attach to the instances](#1-create-an-iam-role-and-attach-to-the-instances) is attached to the instance(s). When using a Kubernetes version older than v1.15.0, the Amazon cloud provider needs be configured in the cluster. Starting with Kubernetes version v1.15.0, the kubelet can obtain ECR credentials without having the Amazon cloud provider configured in the cluster.
\ No newline at end of file
diff --git a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
index e98a26855ca..afc9aff2f0a 100644
--- a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
+++ b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
@@ -74,7 +74,7 @@ Creating a [node template](../../../../pages-for-subheaders/use-new-nodes-in-an-
 1. Click **RKE1 Configuration > Node Templates**.
 1. Click **Add Template**.
 1. Click **Azure**.
-1. Fill out a node template for Azure. For help filling out the form, refer to [Azure Node Template Configuration.](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md)
+1. Fill out a node template for Azure. For help filling out the form, refer to [Azure Node Template Configuration.](../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md)
 
 ### 3. Create a cluster with node pools using the node template
 
@@ -85,7 +85,7 @@ Use Rancher to create a Kubernetes cluster in Azure.
 1. Click **Azure**.
 1. Enter a **Cluster Name**.
 1. Add one or more node pools to your cluster. Each node pool uses a node template to provision new nodes. For more information about node pools, including best practices, see [this section.](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)
-1. In the **Cluster Configuration** to choose the version of Kubernetes that will be installed, what network provider will be used and if you want to enable project network isolation. To see more cluster options, click on **Show advanced options**. For help configuring the cluster, refer to the [RKE cluster configuration reference.](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
+1. In the **Cluster Configuration** to choose the version of Kubernetes that will be installed, what network provider will be used and if you want to enable project network isolation. To see more cluster options, click on **Show advanced options**. For help configuring the cluster, refer to the [RKE cluster configuration reference.](../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
 1. Use **Member Roles** to configure user authorization for the cluster. Click **Add Member** to add users that can access the cluster. Use the **Role** drop-down to set permissions for each user.
 1. Click **Create**.
 
diff --git a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
index 6f27f903f5b..f0c27ae45c4 100644
--- a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
+++ b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
@@ -57,7 +57,7 @@ Creating a [node template](../../../../../pages-for-subheaders/use-new-nodes-in-
 1. Click **Create**.
 1. Click **Add Template**.
 1. Click **Nutanix**.
-1. Fill out a node template for Nutanix AOS. For help filling out the form, refer to the Nutanix AOS node template [configuration reference.](../../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/nutanix.md).
+1. Fill out a node template for Nutanix AOS. For help filling out the form, refer to the Nutanix AOS node template [configuration reference.](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/nutanix.md).
 1. Click **Create**.
 
 ### 2. Create a cluster with node pools using the node template
@@ -69,7 +69,7 @@ Use Rancher to create a Kubernetes cluster in Nutanix AOS.
 1. Click **Nutanix**.
 1. Enter a **Cluster Name**, then click **Continue**.
 1. Use **Member Roles** to configure user authorization for the cluster. Click **Add Member** to add users who can access the cluster. Use the **Role** drop-down to set permissions for each user.
-1. Use **Cluster Options** to choose the version of Kubernetes that will be installed, what network provider will be used, and whether you want to enable project network isolation. To see more cluster options, click on **Show advanced options**. For help configuring the cluster, refer to the [RKE cluster configuration reference.](../../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
+1. Use **Cluster Options** to choose the version of Kubernetes that will be installed, what network provider will be used, and whether you want to enable project network isolation. To see more cluster options, click on **Show advanced options**. For help configuring the cluster, refer to the [RKE cluster configuration reference.](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
 1. Add one or more node pools to your cluster. Each node pool uses a node template to provision new nodes. For more information about node pools, including best practices for assigning Kubernetes roles to the nodes, see [this section.](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-pools)
 1. Review your options to confirm they're correct. Then click **Create**.
 

From 43542e03d73dabc855003e810559e28669e2d715 Mon Sep 17 00:00:00 2001
From: Jennifer Travinski <jennifer.travinski@suse.com>
Date: Thu, 6 Oct 2022 17:39:34 -0400
Subject: [PATCH 08/15] Updating links

---
 docs/faq/technical-items.md                                   | 2 +-
 .../installation-references/helm-chart-options.md             | 4 ++--
 .../installation-requirements/port-requirements.md            | 4 ++--
 .../upgrade-kubernetes-without-upgrading-rancher.md           | 2 +-
 .../enable-experimental-features/rancher-on-arm64.md          | 2 +-
 .../advanced-configuration/prometheusrules.md                 | 2 +-
 .../authentication-config/configure-github.md                 | 2 +-
 ...estore-rancher-launched-kubernetes-clusters-from-backup.md | 2 +-
 .../create-an-amazon-ec2-cluster.md                           | 4 ++--
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/faq/technical-items.md b/docs/faq/technical-items.md
index 5a438ff0fe1..459059cc597 100644
--- a/docs/faq/technical-items.md
+++ b/docs/faq/technical-items.md
@@ -51,7 +51,7 @@ Node Templates can be accessed by opening your account menu (top right) and sele
 
 ### Why is my Layer-4 Load Balancer in `Pending` state?
 
-The Layer-4 Load Balancer is created as `type: LoadBalancer`. In Kubernetes, this needs a cloud provider or controller that can satisfy these requests, otherwise these will be in `Pending` state forever. More information can be found on [Cloud Providers](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers.md) or [Create External Load Balancer](https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/)
+The Layer-4 Load Balancer is created as `type: LoadBalancer`. In Kubernetes, this needs a cloud provider or controller that can satisfy these requests, otherwise these will be in `Pending` state forever. More information can be found on [Cloud Providers](../pages-for-subheaders/set-up-cloud-providers.md) or [Create External Load Balancer](https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/)
 
 ### Where is the state of Rancher stored?
 
diff --git a/docs/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md b/docs/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md
index 3dc13ccbf95..88d0cabbee4 100644
--- a/docs/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md
+++ b/docs/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md
@@ -75,7 +75,7 @@ kubectl get secret --namespace cattle-system bootstrap-secret -o go-template='{{
 
 ### API Audit Log
 
-Enabling the [API Audit Log](../../how-to-guides/advanced-user-guides/advanced-options/advanced-use-cases/enable-api-audit-log.md)
+Enabling the [API Audit Log](../../how-to-guides/advanced-user-guides/enable-api-audit-log.md)
 
 You can collect this log as you would any container log. Enable [logging](../../../pages-for-subheaders/logging.md) for the `System` Project on the Rancher server cluster.
 
@@ -83,7 +83,7 @@ You can collect this log as you would any container log. Enable [logging](../../
 --set auditLog.level=1
 ```
 
-By default enabling Audit Logging will create a sidecar container in the Rancher pod. This container (`rancher-audit-log`) will stream the log to `stdout`. You can collect this log as you would any container log. When using the sidecar as the audit log destination, the `hostPath`, `maxAge`, `maxBackups`, and `maxSize` options do not apply. It's advised to use your OS or Docker daemon's log rotation features to control disk space use. Enable [logging](../../pages-for-subheaders/logging.md) for the Rancher server cluster or System Project.
+By default enabling Audit Logging will create a sidecar container in the Rancher pod. This container (`rancher-audit-log`) will stream the log to `stdout`. You can collect this log as you would any container log. When using the sidecar as the audit log destination, the `hostPath`, `maxAge`, `maxBackups`, and `maxSize` options do not apply. It's advised to use your OS or Docker daemon's log rotation features to control disk space use. Enable [logging](../../../pages-for-subheaders/logging.md) for the Rancher server cluster or System Project.
 
 Set the `auditLog.destination` to `hostPath` to forward logs to volume shared with the host system instead of streaming to a sidecar container. When setting the destination to `hostPath` you may want to adjust the other auditLog parameters for log rotation.
 
diff --git a/docs/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md b/docs/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md
index 3a65daa6dc5..61dd449096f 100644
--- a/docs/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md
+++ b/docs/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md
@@ -214,7 +214,7 @@ The required ports are automatically opened by Rancher during creation of cluste
 <details>
   <summary>Click to expand</summary>
 
-The following table depicts the port requirements for [Rancher Launched Kubernetes](../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher.md) with [Custom Nodes](../../../pages-for-subheaders/use-existing-nodes.md).
+The following table depicts the port requirements for [Rancher Launched Kubernetes](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) with [Custom Nodes](../../../pages-for-subheaders/use-existing-nodes.md).
 
 <PortsCustomNodes/>
 
@@ -275,7 +275,7 @@ In these cases, you have to explicitly allow this traffic in your host firewall,
 
 ### Rancher AWS EC2 Security Group
 
-When using the [AWS EC2 node driver](../../../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.mdcreate-an-amazon-ec2-cluster.md) to provision cluster nodes in Rancher, you can choose to let Rancher create a security group called `rancher-nodes`. The following rules are automatically added to this security group.
+When using the [AWS EC2 node driver](../../../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md) to provision cluster nodes in Rancher, you can choose to let Rancher create a security group called `rancher-nodes`. The following rules are automatically added to this security group.
 
 |       Type      | Protocol |  Port Range | Source/Destination     | Rule Type |
 |-----------------|:--------:|:-----------:|------------------------|:---------:|
diff --git a/docs/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md b/docs/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md
index 75b07f0ee3f..c95b897dd7f 100644
--- a/docs/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md
+++ b/docs/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md
@@ -10,7 +10,7 @@ The Kubernetes API can change between minor versions. Therefore, we don't suppor
 
 :::
 
-Rancher's Kubernetes metadata contains information specific to the Kubernetes version that Rancher uses to provision [RKE clusters](../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher.md). Rancher syncs the data periodically and creates custom resource definitions (CRDs) for **system images,** **service options** and **addon templates**. Consequently, when a new Kubernetes version is compatible with the Rancher server version, the Kubernetes metadata makes the new version available to Rancher for provisioning clusters. The metadata gives you an overview of the information that the [Rancher Kubernetes Engine](https://rancher.com/docs/rke/latest/en/) (RKE) uses for deploying various Kubernetes versions.
+Rancher's Kubernetes metadata contains information specific to the Kubernetes version that Rancher uses to provision [RKE clusters](../../pages-for-subheaders/launch-kubernetes-with-rancher.md). Rancher syncs the data periodically and creates custom resource definitions (CRDs) for **system images,** **service options** and **addon templates**. Consequently, when a new Kubernetes version is compatible with the Rancher server version, the Kubernetes metadata makes the new version available to Rancher for provisioning clusters. The metadata gives you an overview of the information that the [Rancher Kubernetes Engine](https://rancher.com/docs/rke/latest/en/) (RKE) uses for deploying various Kubernetes versions.
 
 This table below describes the CRDs that are affected by the periodic data sync.
 
diff --git a/docs/how-to-guides/advanced-user-guides/enable-experimental-features/rancher-on-arm64.md b/docs/how-to-guides/advanced-user-guides/enable-experimental-features/rancher-on-arm64.md
index 7b3b12df707..51a0182e120 100644
--- a/docs/how-to-guides/advanced-user-guides/enable-experimental-features/rancher-on-arm64.md
+++ b/docs/how-to-guides/advanced-user-guides/enable-experimental-features/rancher-on-arm64.md
@@ -11,7 +11,7 @@ Running on an ARM64 platform is currently an experimental feature and is not yet
 The following options are available when using an ARM64 platform:
 
 - Running Rancher on ARM64 based node(s)
-  - Only for Docker Install. Please note that the following installation command replaces the examples found in the [Docker Install](../../../../../versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-on-a-single-node-with-docker.md) link:
+  - Only for Docker Install. Please note that the following installation command replaces the examples found in the [Docker Install link](../../../pages-for-subheaders/rancher-on-a-single-node-with-docker.md):
 
   ```
   # In the last line `rancher/rancher:vX.Y.Z`, be certain to replace "X.Y.Z" with a released version in which ARM64 builds exist. For  example, if your matching version is v2.5.8, you would fill in this line with `rancher/rancher:v2.5.8`.
diff --git a/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md b/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md
index 9dea3a0ff7c..592ee6d3f81 100644
--- a/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md
+++ b/docs/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md
@@ -76,5 +76,5 @@ For examples, refer to the Prometheus documentation on [recording rules](https:/
 | Field | Description |
 |-------|----------------|
 | Time Series Name |   The name of the time series to output to. Must be a valid metric name.  |
-| PromQL Expression |  The PromQL expression to evaluate. Prometheus will evaluate the current value of this PromQL expression on every evaluation cycle and the result will be recorded as a new set of time series with the metric name as given by 'record'.  For more information about expressions, refer to the [Prometheus documentation](https://prometheus.io/docs/prometheus/latest/querying/basics/) or our [example PromQL expressions.](../../../../explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md)  |
+| PromQL Expression |  The PromQL expression to evaluate. Prometheus will evaluate the current value of this PromQL expression on every evaluation cycle and the result will be recorded as a new set of time series with the metric name as given by 'record'.  For more information about expressions, refer to the [Prometheus documentation](https://prometheus.io/docs/prometheus/latest/querying/basics/) or our [example PromQL expressions.](../../../../integrations-in-rancher/monitoring-and-alerting/promql-expressions.md)  |
 | Labels |   Labels to add or overwrite before storing the result.     |
diff --git a/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-github.md b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-github.md
index f2af93fdf43..0d90d1766ac 100644
--- a/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-github.md
+++ b/docs/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-github.md
@@ -6,7 +6,7 @@ In environments using GitHub, you can configure Rancher to allow sign on using G
 
 :::note Prerequisites:
 
-Read [External Authentication Configuration and Principal Users](../../../../pages-for-subheaders/about-authentication.md#external-authentication-configuration-and-principal-users).
+Read [External Authentication Configuration and Principal Users](../../../../pages-for-subheaders/authentication-config.md#external-authentication-configuration-and-principal-users).
 
 :::
 
diff --git a/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md b/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md
index 459a74a33e1..57975cbcae1 100644
--- a/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md
+++ b/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md
@@ -2,7 +2,7 @@
 title: Restoring a Cluster from Backup
 ---
 
-etcd backup and recovery for [Rancher launched Kubernetes clusters](../kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher.md) can be easily performed. Snapshots of the etcd database are taken and saved either locally onto the etcd nodes or to a S3 compatible target. The advantages of configuring S3 is that if all etcd nodes are lost, your snapshot is saved remotely and can be used to restore the cluster.
+etcd backup and recovery for [Rancher launched Kubernetes clusters](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) can be easily performed. Snapshots of the etcd database are taken and saved either locally onto the etcd nodes or to a S3 compatible target. The advantages of configuring S3 is that if all etcd nodes are lost, your snapshot is saved remotely and can be used to restore the cluster.
 
 Rancher recommends enabling the [ability to set up recurring snapshots of etcd](back-up-rancher-launched-kubernetes-clusters.md#configuring-recurring-snapshots), but [one-time snapshots](back-up-rancher-launched-kubernetes-clusters.md#one-time-snapshots) can easily be taken as well. Rancher allows restore from [saved snapshots](#restoring-a-cluster-from-a-snapshot) or if you don't have any snapshots, you can still [restore etcd](#recovering-etcd-without-a-snapshot).
 
diff --git a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
index 9ecf6058ccb..55526c4f22c 100644
--- a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
+++ b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
@@ -63,14 +63,14 @@ Creating a [node template](../../../../pages-for-subheaders/use-new-nodes-in-an-
 
 ### 3. Create a cluster with node pools using the node template
 
-Add one or more node pools to your cluster. For more information about node pools, see [this section.](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)
+Add one or more node pools to your cluster. For more information about node pools, see [this section.](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)
 
 1. Click **☰ > Cluster Management**.
 1. On the **Clusters** page, click **Create**.
 1. Click **Amazon EC2**.
 1. Create a node pool for each Kubernetes role. For each node pool, choose a node template that you created. For more information about node pools, including best practices for assigning Kubernetes roles to them, see [this section.](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)
 1. Click **Add Member** to add users that can access the cluster. Use the **Role** drop-down to set permissions for each user.
-1. Use **Cluster Options** to choose the version of Kubernetes that will be installed, what network provider will be used and if you want to enable project network isolation. Refer to [Selecting Cloud Providers](../../../../../pages-for-subheaders/set-up-cloud-providers.md) to configure the Kubernetes Cloud Provider. For help configuring the cluster, refer to the [RKE cluster configuration reference.](../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
+1. Use **Cluster Options** to choose the version of Kubernetes that will be installed, what network provider will be used and if you want to enable project network isolation. Refer to [Selecting Cloud Providers](../../../../pages-for-subheaders/set-up-cloud-providers.md) to configure the Kubernetes Cloud Provider. For help configuring the cluster, refer to the [RKE cluster configuration reference.](../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
 
     :::note
 

From 8739f85e5cf6dba8baff45b71ea1d855f0f991a4 Mon Sep 17 00:00:00 2001
From: Jennifer Travinski <jennifer.travinski@suse.com>
Date: Fri, 7 Oct 2022 16:38:21 -0400
Subject: [PATCH 09/15] Updating links

---
 .../nutanix/provision-kubernetes-clusters-in-aos.md       | 2 +-
 .../vsphere/provision-kubernetes-clusters-in-vsphere.md   | 8 ++++----
 .../aws-cloud-marketplace/install-adapter.md              | 2 +-
 docs/pages-for-subheaders/about-provisioning-drivers.md   | 6 +++---
 docs/pages-for-subheaders/authentication-config.md        | 4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
index f0c27ae45c4..53c8aa0e63b 100644
--- a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
+++ b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
@@ -57,7 +57,7 @@ Creating a [node template](../../../../../pages-for-subheaders/use-new-nodes-in-
 1. Click **Create**.
 1. Click **Add Template**.
 1. Click **Nutanix**.
-1. Fill out a node template for Nutanix AOS. For help filling out the form, refer to the Nutanix AOS node template [configuration reference.](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/nutanix.md).
+1. Fill out a node template for Nutanix AOS. For help filling out the form, refer to the Nutanix AOS node template [configuration reference.](../../../../..//reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/nutanix.md).
 1. Click **Create**.
 
 ### 2. Create a cluster with node pools using the node template
diff --git a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
index a59648bf5d2..9d2c73072ed 100644
--- a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
+++ b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
@@ -60,7 +60,7 @@ The a vSphere cluster is created in Rancher depends on the Rancher version.
 1. Click **Cloud Credentials**.
 1. Click **Create**.
 1. Click **VMware vSphere**.
-1. Enter your vSphere credentials. For help, refer to **Account Access** in the [node template configuration reference.](../../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere.md)
+1. Enter your vSphere credentials. For help, refer to **Account Access** in the [node template configuration reference.](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere.md)
 1. Click **Create**.
 
 **Result:** You have created the cloud credentials that will be used to provision nodes in your cluster. You can reuse these credentials for other node templates, or in other clusters.
@@ -86,8 +86,8 @@ Use Rancher to create a Kubernetes cluster in vSphere.
 1. Click **VMware vSphere**.
 1. Enter a **Cluster Name** and use your vSphere cloud credentials. Click **Continue**.
 1. Use **Member Roles** to configure user authorization for the cluster. Click **Add Member** to add users that can access the cluster. Use the **Role** drop-down to set permissions for each user.
-1. Use **Cluster Options** to choose the version of Kubernetes that will be installed, what network provider will be used and if you want to enable project network isolation. To see more cluster options, click on **Show advanced options**. For help configuring the cluster, refer to the [RKE cluster configuration reference.](../../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
-1. If you want to dynamically provision persistent storage or other infrastructure later, you will need to enable the vSphere cloud provider by modifying the cluster YAML file. For details, refer to [this section.](../../../../../pages-for-subheaders/vsphere-cloud-provider.md)
+1. Use **Cluster Options** to choose the version of Kubernetes that will be installed, what network provider will be used and if you want to enable project network isolation. To see more cluster options, click on **Show advanced options**. For help configuring the cluster, refer to the [RKE cluster configuration reference.](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
+1. If you want to dynamically provision persistent storage or other infrastructure later, you will need to enable the vSphere cloud provider by modifying the cluster YAML file. For details, refer to [in-tree vSphere cloud provider docs](../../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere) and [out-of-tree vSphere cloud provider docs](../../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere).
 1. Add one or more node pools to your cluster. Each node pool uses a node template to provision new nodes. For more information about node pools, including best practices for assigning Kubernetes roles to the nodes, see [this section.](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-pools)
 1. Review your options to confirm they're correct. Then click **Create**.
 
@@ -109,4 +109,4 @@ After creating your cluster, you can access it through the Rancher UI. As a best
 
 - **Access your cluster with the kubectl CLI:** Follow [these steps](../../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#accessing-clusters-with-kubectl-on-your-workstation) to access clusters with kubectl on your workstation. In this case, you will be authenticated through the Rancher server’s authentication proxy, then Rancher will connect you to the downstream cluster. This method lets you manage the cluster without the Rancher UI.
 - **Access your cluster with the kubectl CLI, using the authorized cluster endpoint:** Follow [these steps](../../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) to access your cluster with kubectl directly, without authenticating through Rancher. We recommend setting up this alternative method to access your cluster so that in case you can’t connect to Rancher, you can still access the cluster.
-- **Provision Storage:** For an example of how to provision storage in vSphere using Rancher, refer to [this section.](../../../../new-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md) In order to dynamically provision storage in vSphere, the vSphere provider must be [enabled.](../../../../../../pages-for-subheaders/vsphere-cloud-provider.md)
\ No newline at end of file
+- **Provision Storage:** For an example of how to provision storage in vSphere using Rancher, refer to [this section.](../../../../new-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md) In order to dynamically provision storage in vSphere, the vSphere provider must be enabled. For details, refer to [in-tree vSphere cloud provider docs](../../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere) and [out-of-tree vSphere cloud provider docs](../../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere).
\ No newline at end of file
diff --git a/docs/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md b/docs/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
index c997e394517..60bd51a5e27 100644
--- a/docs/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
+++ b/docs/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
@@ -41,7 +41,7 @@ kubectl create ns cattle-csp-adapter-system
 
 ### 3. Create Certificate Secrets
 
-The adapter requires access to the root CA that Rancher is using to communicate with the Rancher server. You can read more about which certificate options Rancher supports in the [chart options page](../../../reference-guides/installation-references/helm-chart-options.md).
+The adapter requires access to the root CA that Rancher is using to communicate with the Rancher server. You can read more about which certificate options Rancher supports in the [chart options page](../../../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md).
 
 If your Rancher install uses a certificate signed by a recognized Certificate Authority such as Let's Encrypt, then you can safely skip to [Step 4](#4-install-the-chart).
 
diff --git a/docs/pages-for-subheaders/about-provisioning-drivers.md b/docs/pages-for-subheaders/about-provisioning-drivers.md
index 1202cfedb10..99425147ef4 100644
--- a/docs/pages-for-subheaders/about-provisioning-drivers.md
+++ b/docs/pages-for-subheaders/about-provisioning-drivers.md
@@ -37,9 +37,9 @@ If there are specific node drivers that you don't want to show to your users, yo
 
 Rancher supports several major cloud providers, but by default, these node drivers are active and available for deployment:
 
-*   [Amazon EC2](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.mdcreate-an-amazon-ec2-cluster.md)
-*   [Azure](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.mdider/create-an-azure-cluster.md)
-*   [Digital Ocean](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.mdreate-a-digitalocean-cluster.md)
+*   [Amazon EC2](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md)
+*   [Azure](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md)
+*   [Digital Ocean](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md)
 *   [vSphere](vsphere.md)
 
 There are several other node drivers that are disabled by default, but are packaged in Rancher:
diff --git a/docs/pages-for-subheaders/authentication-config.md b/docs/pages-for-subheaders/authentication-config.md
index 42389ef3328..c61ade4854d 100644
--- a/docs/pages-for-subheaders/authentication-config.md
+++ b/docs/pages-for-subheaders/authentication-config.md
@@ -27,7 +27,7 @@ The Rancher authentication proxy integrates with the following external authenti
 | [Shibboleth](configure-shibboleth-saml.md)           |
 
 <br/>
-However, Rancher also provides [local authentication](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md).
+However, Rancher also provides [local authentication](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/create-local-users.md).
 
 In most cases, you should use an external authentication service over local authentication, as external authentication allows user management from a central location. However, you may want a few local authentication users for managing Rancher under rare circumstances, such as if your external authentication provider is unavailable or undergoing maintenance.
 
@@ -41,7 +41,7 @@ Local authentication does not support creating or managing groups.
 
 :::
 
-For more information, see [Users and Groups](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md)
+For more information, see [Users and Groups](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/manage-users-and-groups.md)
 
 ## Scope of Rancher Authorization
 

From 85285f7a54350d95f18cec2833b11aed4f9105fe Mon Sep 17 00:00:00 2001
From: Jennifer Travinski <jennifer.travinski@suse.com>
Date: Tue, 11 Oct 2022 14:37:36 -0400
Subject: [PATCH 10/15] Updating links, correcting typos

---
 .../installation-references/helm-chart-options.md               | 2 +-
 .../launch-kubernetes-with-rancher/about-rancher-agents.md      | 2 +-
 .../nutanix/provision-kubernetes-clusters-in-aos.md             | 2 +-
 .../manage-clusters/access-clusters/add-users-to-clusters.md    | 2 +-
 .../use-aws-ec2-auto-scaling-groups.md                          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md b/docs/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md
index 88d0cabbee4..83c8e7da685 100644
--- a/docs/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md
+++ b/docs/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md
@@ -75,7 +75,7 @@ kubectl get secret --namespace cattle-system bootstrap-secret -o go-template='{{
 
 ### API Audit Log
 
-Enabling the [API Audit Log](../../how-to-guides/advanced-user-guides/enable-api-audit-log.md)
+Enabling the [API Audit Log](../../../how-to-guides/advanced-user-guides/enable-api-audit-log.md).
 
 You can collect this log as you would any container log. Enable [logging](../../../pages-for-subheaders/logging.md) for the `System` Project on the Rancher server cluster.
 
diff --git a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/about-rancher-agents.md b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/about-rancher-agents.md
index 6eaea3617da..338005fb879 100644
--- a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/about-rancher-agents.md
+++ b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/about-rancher-agents.md
@@ -7,7 +7,7 @@ There are two different agent resources deployed on Rancher managed clusters:
 - [cattle-cluster-agent](#cattle-cluster-agent)
 - [cattle-node-agent](#cattle-node-agent)
 
-For a conceptual overview of how the Rancher server provisions clusters and communicates with them, refer to the [architecture](../../../pages-for-subheaders/rancher-manager-architecture.md)
+For a conceptual overview of how the Rancher server provisions clusters and communicates with them, refer to the [architecture](../../../pages-for-subheaders/rancher-manager-architecture.md).
 
 ### cattle-cluster-agent
 
diff --git a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
index 53c8aa0e63b..f0c27ae45c4 100644
--- a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
+++ b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
@@ -57,7 +57,7 @@ Creating a [node template](../../../../../pages-for-subheaders/use-new-nodes-in-
 1. Click **Create**.
 1. Click **Add Template**.
 1. Click **Nutanix**.
-1. Fill out a node template for Nutanix AOS. For help filling out the form, refer to the Nutanix AOS node template [configuration reference.](../../../../..//reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/nutanix.md).
+1. Fill out a node template for Nutanix AOS. For help filling out the form, refer to the Nutanix AOS node template [configuration reference.](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/nutanix.md).
 1. Click **Create**.
 
 ### 2. Create a cluster with node pools using the node template
diff --git a/docs/how-to-guides/new-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md b/docs/how-to-guides/new-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
index adca3bea9b8..e16ca7a0654 100644
--- a/docs/how-to-guides/new-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
+++ b/docs/how-to-guides/new-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
@@ -35,7 +35,7 @@ Cluster administrators can edit the membership for a cluster, controlling which
 
 		:::note Using AD but can't find your users?
 
-		There may be an issue with your search attribute configuration. See [Configuring Active Directory Authentication: Step 5](../../../new-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md).
+		There may be an issue with your search attribute configuration. See [Configuring Active Directory Authentication: Step 5](../../../new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-active-directory.md).
 
 		:::
 
diff --git a/docs/how-to-guides/new-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md b/docs/how-to-guides/new-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
index f59df583114..9b1ca75b6c0 100644
--- a/docs/how-to-guides/new-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
+++ b/docs/how-to-guides/new-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
@@ -140,7 +140,7 @@ On AWS EC2, we should create a few objects to configure our system. We've define
       ```
 
     * IAM role: `K8sMasterRole: [K8sMasterProfile,K8sAutoscalerProfile]`
-    * Security group: `K8sMasterSg` More info at[RKE ports (custom nodes tab)](../../../../getting-started/installation-and-upgrade/installation-requirements/port-requirements.md#downstream-kubernetes-cluster-nodes)
+    * Security group: `K8sMasterSg` More info at [RKE ports (custom nodes tab)](../../../../getting-started/installation-and-upgrade/installation-requirements/port-requirements.md#downstream-kubernetes-cluster-nodes)
     * Tags:
       `kubernetes.io/cluster/<clusterID>: owned`
     * User data: `K8sMasterUserData` Ubuntu 18.04(ami-0e11cbb34015ff725), installs docker and add etcd+controlplane node to the k8s cluster

From 8ba6298ef87db69529c163c9f609a3cbd5693b84 Mon Sep 17 00:00:00 2001
From: Jennifer Travinski <jennifer.travinski@suse.com>
Date: Tue, 11 Oct 2022 15:16:48 -0400
Subject: [PATCH 11/15] Updated links

---
 docs/faq/rancher-is-no-longer-needed.md                       | 2 +-
 .../vsphere/provision-kubernetes-clusters-in-vsphere.md       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/faq/rancher-is-no-longer-needed.md b/docs/faq/rancher-is-no-longer-needed.md
index 74a9c5df220..f9bf03699c1 100644
--- a/docs/faq/rancher-is-no-longer-needed.md
+++ b/docs/faq/rancher-is-no-longer-needed.md
@@ -15,7 +15,7 @@ The capability to access a downstream cluster without Rancher depends on the typ
 
 - **Registered clusters:** The cluster will be unaffected and you can access the cluster using the same methods that you did before the cluster was registered into Rancher.
 - **Hosted Kubernetes clusters:** If you created the cluster in a cloud-hosted Kubernetes provider such as EKS, GKE, or AKS, you can continue to manage the cluster using your provider's cloud credentials.
-- **RKE clusters:** To access an [RKE cluster,](../pages-with-subheaders/launch-kubernetes-with-rancher.md) the cluster must have the [authorized cluster endpoint](../pages-for-subheaders/rancher-manager-architecture.md#4-authorized-cluster-endpoint) enabled, and you must have already downloaded the cluster's kubeconfig file from the Rancher UI. (The authorized cluster endpoint is enabled by default for RKE clusters.) With this endpoint, you can access your cluster with kubectl directly instead of communicating through the Rancher server's [authentication proxy.](../pages-for-subheaders/rancher-manager-architecture.md#1-the-authentication-proxy) For instructions on how to configure kubectl to use the authorized cluster endpoint, refer to the section about directly accessing clusters with [kubectl and the kubeconfig file.](../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) These clusters will use a snapshot of the authentication as it was configured when Rancher was removed.
+- **RKE clusters:** To access an [RKE cluster,](../pages-for-subheaders/launch-kubernetes-with-rancher.md) the cluster must have the [authorized cluster endpoint](../pages-for-subheaders/rancher-manager-architecture.md#4-authorized-cluster-endpoint) enabled, and you must have already downloaded the cluster's kubeconfig file from the Rancher UI. (The authorized cluster endpoint is enabled by default for RKE clusters.) With this endpoint, you can access your cluster with kubectl directly instead of communicating through the Rancher server's [authentication proxy.](../pages-for-subheaders/rancher-manager-architecture.md#1-the-authentication-proxy) For instructions on how to configure kubectl to use the authorized cluster endpoint, refer to the section about directly accessing clusters with [kubectl and the kubeconfig file.](../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) These clusters will use a snapshot of the authentication as it was configured when Rancher was removed.
 
 ### What if I don't want Rancher anymore?
 
diff --git a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
index 9d2c73072ed..5ce89c381db 100644
--- a/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
+++ b/docs/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
@@ -87,7 +87,7 @@ Use Rancher to create a Kubernetes cluster in vSphere.
 1. Enter a **Cluster Name** and use your vSphere cloud credentials. Click **Continue**.
 1. Use **Member Roles** to configure user authorization for the cluster. Click **Add Member** to add users that can access the cluster. Use the **Role** drop-down to set permissions for each user.
 1. Use **Cluster Options** to choose the version of Kubernetes that will be installed, what network provider will be used and if you want to enable project network isolation. To see more cluster options, click on **Show advanced options**. For help configuring the cluster, refer to the [RKE cluster configuration reference.](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)
-1. If you want to dynamically provision persistent storage or other infrastructure later, you will need to enable the vSphere cloud provider by modifying the cluster YAML file. For details, refer to [in-tree vSphere cloud provider docs](../../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere) and [out-of-tree vSphere cloud provider docs](../../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere).
+1. If you want to dynamically provision persistent storage or other infrastructure later, you will need to enable the vSphere cloud provider by modifying the cluster YAML file. For details, refer to [in-tree vSphere cloud provider docs](../../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-in-tree-vsphere) and [out-of-tree vSphere cloud provider docs](../../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-out-of-tree-vsphere).
 1. Add one or more node pools to your cluster. Each node pool uses a node template to provision new nodes. For more information about node pools, including best practices for assigning Kubernetes roles to the nodes, see [this section.](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#node-pools)
 1. Review your options to confirm they're correct. Then click **Create**.
 
@@ -109,4 +109,4 @@ After creating your cluster, you can access it through the Rancher UI. As a best
 
 - **Access your cluster with the kubectl CLI:** Follow [these steps](../../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#accessing-clusters-with-kubectl-on-your-workstation) to access clusters with kubectl on your workstation. In this case, you will be authenticated through the Rancher server’s authentication proxy, then Rancher will connect you to the downstream cluster. This method lets you manage the cluster without the Rancher UI.
 - **Access your cluster with the kubectl CLI, using the authorized cluster endpoint:** Follow [these steps](../../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#authenticating-directly-with-a-downstream-cluster) to access your cluster with kubectl directly, without authenticating through Rancher. We recommend setting up this alternative method to access your cluster so that in case you can’t connect to Rancher, you can still access the cluster.
-- **Provision Storage:** For an example of how to provision storage in vSphere using Rancher, refer to [this section.](../../../../new-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md) In order to dynamically provision storage in vSphere, the vSphere provider must be enabled. For details, refer to [in-tree vSphere cloud provider docs](../../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere) and [out-of-tree vSphere cloud provider docs](../../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere).
\ No newline at end of file
+- **Provision Storage:** For an example of how to provision storage in vSphere using Rancher, refer to [this section.](../../../../../pages-for-subheaders/provisioning-storage-examples.md) In order to dynamically provision storage in vSphere, the vSphere provider must be enabled. For details, refer to [in-tree vSphere cloud provider docs](../../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-in-tree-vsphere) and [out-of-tree vSphere cloud provider docs](../../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-out-of-tree-vsphere).
\ No newline at end of file

From d3084557d6006c557970d44feb6c70e94ebb70ca Mon Sep 17 00:00:00 2001
From: Jennifer Travinski <jennifer.travinski@suse.com>
Date: Thu, 13 Oct 2022 14:26:14 -0400
Subject: [PATCH 12/15] Fixed incorrect links

---
 .../advanced-user-guides/open-ports-with-firewalld.md           | 2 +-
 docs/pages-for-subheaders/nutanix.md                            | 2 +-
 docs/pages-for-subheaders/vsphere.md                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/how-to-guides/advanced-user-guides/open-ports-with-firewalld.md b/docs/how-to-guides/advanced-user-guides/open-ports-with-firewalld.md
index bb888b13ca5..bda07e5ecc6 100644
--- a/docs/how-to-guides/advanced-user-guides/open-ports-with-firewalld.md
+++ b/docs/how-to-guides/advanced-user-guides/open-ports-with-firewalld.md
@@ -31,7 +31,7 @@ You can check the default firewall rules with this command:
 sudo iptables --list
 ```
 
-This section describes how to use `firewalld` to apply the [firewall port rules](../../pages-for-subheaders/installation-requirements#port-requirements.md) for nodes in a high-availability Rancher server cluster.
+This section describes how to use `firewalld` to apply the [firewall port rules](../../pages-for-subheaders/installation-requirements.md#port-requirements) for nodes in a high-availability Rancher server cluster.
 
 ## Prerequisite
 
diff --git a/docs/pages-for-subheaders/nutanix.md b/docs/pages-for-subheaders/nutanix.md
index 8d2d43c05e5..c4424818752 100644
--- a/docs/pages-for-subheaders/nutanix.md
+++ b/docs/pages-for-subheaders/nutanix.md
@@ -14,4 +14,4 @@ A Nutanix cluster may consist of multiple groups of VMs with distinct properties
 
 # Creating a Nutanix Cluster
 
-In [this section,](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.mdu'll learn how to use Rancher to install an [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes cluster in Nutanix AOS.
\ No newline at end of file
+In [this section,](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md) you'll learn how to use Rancher to install an [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes cluster in Nutanix AOS.
\ No newline at end of file
diff --git a/docs/pages-for-subheaders/vsphere.md b/docs/pages-for-subheaders/vsphere.md
index 54b4587aef1..a1075adc222 100644
--- a/docs/pages-for-subheaders/vsphere.md
+++ b/docs/pages-for-subheaders/vsphere.md
@@ -42,7 +42,7 @@ In this YouTube video, we demonstrate how to set up a node template with the new
 
 ## Creating a vSphere Cluster
 
-In [this section,](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.mdu'll learn how to use Rancher to install an [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes cluster in vSphere.
+In [this section,](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md) you'll learn how to use Rancher to install an [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes cluster in vSphere.
 
 ## Provisioning Storage
 

From 3ed4ed10dac9cee3fc0a398f3cdc86c54c95d3c7 Mon Sep 17 00:00:00 2001
From: Jennifer Travinski <jennifer.travinski@suse.com>
Date: Fri, 14 Oct 2022 17:14:08 -0400
Subject: [PATCH 13/15] Removed test brackets

---
 .../configure-layer-7-nginx-load-balancer.md                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/how-to-guides/advanced-user-guides/configure-layer-7-nginx-load-balancer.md b/docs/how-to-guides/advanced-user-guides/configure-layer-7-nginx-load-balancer.md
index 041d7978b66..ed1f32baaa7 100644
--- a/docs/how-to-guides/advanced-user-guides/configure-layer-7-nginx-load-balancer.md
+++ b/docs/how-to-guides/advanced-user-guides/configure-layer-7-nginx-load-balancer.md
@@ -173,7 +173,7 @@ http {
 ## FAQ and Troubleshooting
 
 For help troubleshooting certificates, see [this section.](../../getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/certificate-troubleshooting.md)
-[](../)
+
 ## Advanced Options
 
 ### API Auditing

From 82db405820b4e8eb00aadc001e4a8ea2ba3ea125 Mon Sep 17 00:00:00 2001
From: Jennifer Travinski <jennifer.travinski@suse.com>
Date: Wed, 19 Oct 2022 18:04:37 -0400
Subject: [PATCH 14/15] Added docusaurus redirects

---
 docusaurus.config.js | 500 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 496 insertions(+), 4 deletions(-)

diff --git a/docusaurus.config.js b/docusaurus.config.js
index f50d2e3af8c..9893528db30 100644
--- a/docusaurus.config.js
+++ b/docusaurus.config.js
@@ -131,10 +131,502 @@ module.exports = {
       {
         fromExtensions: ['html', 'htm'],
         redirects: [
-          // {
-          //   to: '/test',
-          //   from: '/testold',
-          // },
+          {
+            to: '/faq/general-faq',
+            from: '/faq'
+          },
+          {
+            to: '/troubleshooting/general-troubleshooting',
+            from: '/troubleshooting'
+          },
+          {
+            to: '/getting-started/overview',
+            from: '/getting-started/introduction/overview'
+          },
+          {
+            to: '/how-to-guides/advanced-user-guides/enable-experimental-features/rancher-on-arm64',
+            from: '/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64'
+          },
+          {
+            to: '/how-to-guides/advanced-user-guides/enable-experimental-features/unsupported-storage-drivers',
+            from: '/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers'
+          },
+          {
+            to: '/how-to-guides/advanced-user-guides/enable-experimental-features/istio-traffic-management-features',
+            from: '/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features'
+          },
+          {
+            to: '/how-to-guides/advanced-user-guides/enable-experimental-features/continuous-delivery',
+            from: '/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/continuous-delivery'
+          },
+          {
+            to: '/getting-started/installation-and-upgrade/installation-references/helm-chart-options',
+            from: '/reference-guides/installation-references/helm-chart-options'
+          },
+          {
+            to: '/getting-started/installation-and-upgrade/installation-references/tls-settings',
+            from: '/reference-guides/installation-references/tls-settings'
+          },
+          {
+            to: '/getting-started/installation-and-upgrade/installation-references/feature-flags',
+            from: '/reference-guides/installation-references/feature-flags'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/manage-users-and-groups',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/create-local-users',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-google-oauth',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-active-directory',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-freeipa',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-github',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-keycloak-oidc',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-oidc'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-keycloak-saml',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-saml'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-pingidentity',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-okta-saml',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-shibboleth-saml/about-group-permissions',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-openldap/openldap-config-reference',
+            from: '/reference-guides/configure-openldap/openldap-config-reference'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/custom-branding',
+            from: '/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/custom-branding'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig',
+            from: '/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint',
+            from: '/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-clusters/access-clusters/add-users-to-clusters',
+            from: '/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups',
+            from: '/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage',
+            from: '/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage',
+            from: '/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage',
+            from: '/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver',
+            from: '/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes',
+            from: '/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes',
+            from: '/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/persistent-storage-in-amazon-ebs',
+            from: '/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/nfs-storage',
+            from: '/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage',
+            from: '/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces',
+            from: '/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-clusters/clone-cluster-configuration',
+            from: '/how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-clusters/rotate-certificates',
+            from: '/how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-clusters/rotate-encryption-key',
+            from: '/how-to-guides/advanced-user-guides/manage-clusters/rotate-encryption-key'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-clusters/nodes-and-node-pools',
+            from: '/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-clusters/clean-cluster-nodes',
+            from: '/how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-clusters/add-a-pod-security-policy',
+            from: '/how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-clusters/assign-pod-security-policies',
+            from: '/how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster',
+            from: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster',
+            from: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster',
+            from: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere',
+            from: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials',
+            from: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template',
+            from: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos',
+            from: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/rke1-vs-rke2-differences',
+            from: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/rke1-vs-rke2-differences'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/about-rancher-agents',
+            from: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/azure-storageclass-configuration',
+            from: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/windows-linux-cluster-feature-parity',
+            from: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/windows-linux-cluster-feature-parity'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/network-requirements-for-host-gateway',
+            from: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/workload-migration-guidance',
+            from: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/workload-migration-guidance'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon',
+            from: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/azure',
+            from: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/google-compute-engine',
+            from: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-in-tree-vsphere',
+            from: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-out-of-tree-vsphere',
+            from: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/migrate-from-in-tree-to-out-of-tree',
+            from: '/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/migrate-from-in-tree-to-out-of-tree'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/add-users-to-projects',
+            from: '/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects'
+          },
+          {
+            to: '/how-to-guides/new-user-guides/manage-namespaces',
+            from: '/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces'
+          },
+          {
+            to: '/how-to-guides/advanced-user-guides/open-ports-with-firewalld',
+            from: '/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld'
+          },
+          {
+            to: '/how-to-guides/advanced-user-guides/tune-etcd-for-large-installs',
+            from: '/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs'
+          },
+          {
+            to: '/how-to-guides/advanced-user-guides/enable-api-audit-log',
+            from: '/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log'
+          },
+          {
+            to: '/how-to-guides/advanced-user-guides/configure-layer-7-nginx-load-balancer',
+            from: '/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer'
+          },
+          {
+            to: '/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements',
+            from: '/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements'
+          },
+          {
+            to: '/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter',
+            from: '/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter'
+          },
+          {
+            to: '/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter',
+            from: '/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter'
+          },
+          {
+            to: '/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues',
+            from: '/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues'
+          },
+          {
+            to: '/integrations-in-rancher/cloud-marketplace/supportconfig',
+            from: '/explanations/integrations-in-rancher/cloud-marketplace/supportconfig'
+          },
+          {
+            to: '/integrations-in-rancher/cis-scans/configuration-reference',
+            from: '/explanations/integrations-in-rancher/cis-scans/configuration-reference'
+          },
+          {
+            to: '/integrations-in-rancher/cis-scans/rbac-for-cis-scans',
+            from: '/explanations/integrations-in-rancher/cis-scans/rbac-for-cis-scans'
+          },
+          {
+            to: '/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests',
+            from: '/explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests'
+          },
+          {
+            to: '/integrations-in-rancher/cis-scans/custom-benchmark',
+            from: '/explanations/integrations-in-rancher/cis-scans/custom-benchmark'
+          },
+          {
+            to: '/integrations-in-rancher/fleet-gitops-at-scale/architecture',
+            from: '/explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture'
+          },
+          {
+            to: '/integrations-in-rancher/fleet-gitops-at-scale/windows-support',
+            from: '/explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support'
+          },
+          {
+            to: '/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy',
+            from: '/explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy'
+          },
+          {
+            to: '/integrations-in-rancher/harvester',
+            from: '/explanations/integrations-in-rancher/harvester'
+          },
+          {
+            to: '/integrations-in-rancher/istio/cpu-and-memory-allocations',
+            from: '/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations'
+          },
+          {
+            to: '/integrations-in-rancher/istio/rbac-for-istio',
+            from: '/explanations/integrations-in-rancher/istio/rbac-for-istio'
+          },
+          {
+            to: '/integrations-in-rancher/istio/disable-istio',
+            from: '/explanations/integrations-in-rancher/istio/disable-istio'
+          },
+          {
+            to: '/integrations-in-rancher/istio/configuration-options/pod-security-policies',
+            from: '/explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies'
+          },
+          {
+            to: '/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations',
+            from: '/explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations'
+          },
+          {
+            to: '/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster',
+            from: '/explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster'
+          },
+          {
+            to: '/integrations-in-rancher/istio/configuration-options/project-network-isolation',
+            from: '/explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation'
+          },
+          {
+            to: '/integrations-in-rancher/longhorn',
+            from: '/explanations/integrations-in-rancher/longhorn'
+          },
+          {
+            to: '/integrations-in-rancher/logging/logging-architecture',
+            from: '/explanations/integrations-in-rancher/logging/logging-architecture'
+          },
+          {
+            to: '/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging',
+            from: '/explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging'
+          },
+          {
+            to: '/integrations-in-rancher/logging/rbac-for-logging',
+            from: '/explanations/integrations-in-rancher/logging/rbac-for-logging'
+          },
+          {
+            to: '/integrations-in-rancher/logging/logging-helm-chart-options',
+            from: '/explanations/integrations-in-rancher/logging/logging-helm-chart-options'
+          },
+          {
+            to: '/integrations-in-rancher/logging/taints-and-tolerations',
+            from: '/explanations/integrations-in-rancher/logging/taints-and-tolerations'
+          },
+          {
+            to: '/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows',
+            from: '/explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows'
+          },
+          {
+            to: '/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs',
+            from: '/explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs'
+          },
+          {
+            to: '/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works',
+            from: '/explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works'
+          },
+          {
+            to: '/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring',
+            from: '/explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring'
+          },
+          {
+            to: '/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards',
+            from: '/explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards'
+          },
+          {
+            to: '/integrations-in-rancher/monitoring-and-alerting/windows-support',
+            from: '/explanations/integrations-in-rancher/monitoring-and-alerting/windows-support'
+          },
+          {
+            to: '/integrations-in-rancher/monitoring-and-alerting/promql-expressions',
+            from: '/explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions'
+          },
+          {
+            to: '/integrations-in-rancher/neuvector',
+            from: '/explanations/integrations-in-rancher/neuvector'
+          },
+          {
+            to: '/integrations-in-rancher/opa-gatekeeper',
+            from: '/explanations/integrations-in-rancher/opa-gatekeeper'
+          },
         ],
       },
     ],

From 4789edd92c7db8b528a8d1a5c09241dc93090fee Mon Sep 17 00:00:00 2001
From: vickyhella <vickyhella@hotmail.com>
Date: Thu, 20 Oct 2022 11:37:20 +0800
Subject: [PATCH 15/15] Restructure Chinese docs

---
 .../migrate-rancher-to-new-cluster.md         |   6 +-
 .../current.json                              |  28 -
 .../current/explanations.md                   |   5 -
 .../current/{faq.md => faq/general-faq.md}    |   8 +-
 .../current/faq/networking/networking.md      |   8 -
 .../faq/rancher-is-no-longer-needed.md        |   2 +-
 .../current/faq/security.md                   |   1 +
 .../current/faq/technical-items.md            |   2 +-
 .../current/getting-started.md                |  10 -
 .../upgrades.md                               |  11 +-
 .../installation-references/feature-flags.md  |  14 +-
 .../helm-chart-options.md                     |  20 +-
 .../installation-references/tls-settings.md   |   0
 .../installation-requirements/dockershim.md   |   2 +
 .../install-docker.md                         |   8 +-
 .../port-requirements.md                      |   2 +-
 .../docker-install-commands.md                |   6 +-
 .../infrastructure-private-registry.md        |   4 +-
 .../install-kubernetes.md                     |   6 +
 .../install-rancher-ha.md                     |   6 +-
 .../install-rancher.md                        |   2 +-
 .../set-up-infrastructure.md                  |   2 +-
 .../upgrade-docker-installed-rancher.md       |  18 +-
 .../resources/custom-ca-root-certificates.md  |   2 +-
 .../upgrade-and-roll-back-kubernetes.md       |   2 +-
 ...de-kubernetes-without-upgrading-rancher.md |   2 +-
 .../introduction/what-are-divio-docs.md       | 100 ----
 .../{introduction => }/overview.md            |  24 +-
 .../current/how-to-guides.md                  |   5 -
 ...reate-a-custom-benchmark-version-to-run.md |   2 +-
 .../configure-layer-7-nginx-load-balancer.md  |  14 +-
 .../enable-api-audit-log.md                   |   6 +-
 .../continuous-delivery.md                    |   4 +-
 .../istio-traffic-management-features.md      |   4 +-
 .../rancher-on-arm64.md                       |   4 +-
 .../unsupported-storage-drivers.md            |   2 +-
 .../enable-istio-in-cluster.md                |   8 +-
 .../generate-and-view-traffic.md              |   2 +-
 .../manage-pod-security-policies.md           |   4 +-
 .../about-project-resource-quotas.md          |   9 +-
 .../override-default-limit-in-namespaces.md   |   4 +-
 .../create-persistent-grafana-dashboard.md    |   2 +-
 .../customize-grafana-dashboard.md            |   2 +-
 .../enable-monitoring.md                      |   2 +-
 .../migrate-to-rancher-v2.5+-monitoring.md    |   2 +-
 .../advanced-configuration/alertmanager.md    |   2 +-
 .../advanced-configuration/prometheus.md      |   2 +-
 .../advanced-configuration/prometheusrules.md |   6 +-
 .../open-ports-with-firewalld.md              |   2 +-
 .../tune-etcd-for-large-installs.md           |   0
 .../add-users-to-projects.md                  |  10 +-
 .../manage-cluster-drivers.md                 |   0
 .../manage-node-drivers.md                    |   0
 .../access-or-share-templates.md              |   0
 .../about-rke1-templates/apply-templates.md   |   0
 .../creator-permissions.md                    |   0
 .../about-rke1-templates/enforce-templates.md |   0
 .../about-rke1-templates/example-use-cases.md |   0
 .../about-rke1-templates/infrastructure.md    |   0
 .../manage-rke1-templates.md                  |   0
 .../override-template-settings.md             |   0
 .../configure-active-directory.md             |   6 +-
 .../configure-azure-ad.md                     |   6 +-
 .../configure-freeipa.md                      |   2 +-
 .../authentication-config/configure-github.md |   2 +-
 .../configure-google-oauth.md                 |   4 +-
 .../configure-keycloak-oidc.md                |   2 +-
 .../configure-keycloak-saml.md                |   2 +-
 .../configure-okta-saml.md                    |   0
 .../configure-pingidentity.md                 |   0
 .../create-local-users.md                     |   0
 .../manage-users-and-groups.md                |   2 +-
 .../configure-ms-adfs-for-rancher.md          |   0
 .../configure-rancher-for-ms-adfs.md          |   0
 .../openldap-config-reference.md              |   6 +-
 .../about-group-permissions.md                |   1 -
 .../create-pod-security-policies.md           |   0
 .../custom-branding.md                        |   0
 .../global-default-private-registry.md        |   0
 .../manage-cluster-templates.md               |   0
 .../cluster-and-project-roles.md              |   0
 .../custom-roles.md                           |   4 +-
 .../global-permissions.md                     |   6 +-
 .../locked-roles.md                           |   0
 .../migrate-rancher-to-new-cluster.md         | 186 +++---
 ...aunched-kubernetes-clusters-from-backup.md |  14 +-
 .../deploy-apps-across-clusters/fleet.md      |   6 +-
 .../multi-cluster-apps.md                     |   8 +-
 .../helm-charts-in-rancher/create-apps.md     |   3 +-
 .../ha-k3s-kubernetes-cluster.md              |   2 +-
 .../ha-rke1-kubernetes-cluster.md             |   2 +-
 .../ha-rke2-kubernetes-cluster.md             |   2 +-
 .../rke1-for-rancher.md                       |   2 +-
 .../rke2-for-rancher.md                       |   1 +
 ...quirements-for-rancher-managed-clusters.md |   2 +-
 .../register-existing-clusters.md             |   8 +-
 .../amazon.md                                 |   7 +-
 .../azure.md                                  |   0
 .../configure-in-tree-vsphere.md              |   0
 .../configure-out-of-tree-vsphere.md          |   0
 .../google-compute-engine.md                  |   0
 .../migrate-from-in-tree-to-out-of-tree.md    |   0
 .../alibaba.md                                |   2 +-
 .../huawei.md                                 |   2 +-
 .../tencent.md                                |   2 +-
 .../azure-storageclass-configuration.md       |   2 +-
 .../network-requirements-for-host-gateway.md  |   0
 .../windows-linux-cluster-feature-parity.md   |   0
 .../workload-migration-guidance.md            |   0
 .../test-hpas-with-kubectl.md                 |   2 +-
 .../workloads-and-pods/add-a-sidecar.md       |   1 +
 .../workloads-and-pods/deploy-workloads.md    |   2 +-
 .../workloads-and-pods/upgrade-workloads.md   |   1 +
 .../about-rancher-agents.md                   |   8 +-
 .../rke1-vs-rke2-differences.md               |   0
 .../create-a-digitalocean-cluster.md          |  18 +-
 .../create-an-amazon-ec2-cluster.md           |  22 +-
 .../create-an-azure-cluster.md                |  22 +-
 .../provision-kubernetes-clusters-in-aos.md   |  20 +-
 .../vsphere/create-a-vm-template.md           |   0
 .../vsphere/create-credentials.md             |   0
 ...rovision-kubernetes-clusters-in-vsphere.md |  24 +-
 .../access-clusters/add-users-to-clusters.md  |  22 +-
 .../authorized-cluster-endpoint.md            |   0
 .../use-kubectl-and-kubeconfig.md             |   0
 .../add-a-pod-security-policy.md              |   0
 .../assign-pod-security-policies.md           |   0
 .../manage-clusters/clean-cluster-nodes.md    |   0
 .../clone-cluster-configuration.md            |   0
 .../about-glusterfs-volumes.md                |   0
 .../about-persistent-storage.md               |   0
 .../dynamically-provision-new-storage.md      |   4 +-
 .../install-iscsi-volumes.md                  |   0
 .../set-up-existing-storage.md                |   4 +-
 .../use-external-ceph-driver.md               |   0
 .../use-aws-ec2-auto-scaling-groups.md        |   2 +-
 .../manage-clusters/nodes-and-node-pools.md   |   0
 .../projects-and-namespaces.md                |   4 +-
 .../nfs-storage.md                            |   2 +-
 .../persistent-storage-in-amazon-ebs.md       |   2 +-
 .../vsphere-storage.md                        |   4 +-
 .../manage-clusters/rotate-certificates.md    |   0
 .../manage-clusters/rotate-encryption-key.md  |   0
 .../manage-namespaces.md                      |  24 +-
 .../cis-scans/configuration-reference.md      |   0
 .../cis-scans/custom-benchmark.md             |   0
 .../cis-scans/rbac-for-cis-scans.md           |   0
 .../skipped-and-not-applicable-tests.md       |   0
 .../adapter-requirements.md                   |   4 +-
 .../aws-cloud-marketplace/common-issues.md    |   0
 .../aws-cloud-marketplace/install-adapter.md  |   4 +-
 .../uninstall-adapter.md                      |   0
 .../cloud-marketplace/supportconfig.md        |   0
 .../fleet-gitops-at-scale/architecture.md     |   0
 .../use-fleet-behind-a-proxy.md               |   0
 .../fleet-gitops-at-scale/windows-support.md  |   0
 .../integrations-in-rancher/harvester.md      |   4 +-
 .../install-istio-on-rke2-cluster.md          |   0
 .../pod-security-policies.md                  |   0
 .../project-network-isolation.md              |   0
 .../selectors-and-scrape-configurations.md    |   0
 .../istio/cpu-and-memory-allocations.md       |   2 +-
 .../istio/disable-istio.md                    |   0
 .../istio/rbac-for-istio.md                   |   0
 .../flows-and-clusterflows.md                 |   0
 .../outputs-and-clusteroutputs.md             |   0
 .../logging/logging-architecture.md           |   0
 .../logging/logging-helm-chart-options.md     |   2 +-
 .../migrate-to-rancher-v2.5+-logging.md       |   2 +-
 .../logging/rbac-for-logging.md               |   0
 .../logging/taints-and-tolerations.md         |   0
 .../integrations-in-rancher/longhorn.md       |   0
 .../built-in-dashboards.md                    |   8 +-
 .../how-monitoring-works.md                   |   2 +-
 .../promql-expressions.md                     |   0
 .../rbac-for-monitoring.md                    |   0
 .../windows-support.md                        |   2 +-
 .../integrations-in-rancher/neuvector.md      |   2 +-
 .../integrations-in-rancher/opa-gatekeeper.md |   0
 .../horizontal-pod-autoscaler.md              |  26 -
 .../hpa-background/hpa-background.md          |  39 --
 .../manage-hpa-with-kubectl.md                | 204 -------
 .../manage-hpa-with-rancher-ui.md             |  51 --
 .../testing-hpa/testing-hpa.md                | 531 ------------------
 .../about-authentication.md                   | 104 ----
 .../about-provisioning-drivers.md             |   8 +-
 .../about-rke1-templates.md                   |  38 +-
 .../pages-for-subheaders/about-the-api.md     |   2 +-
 .../pages-for-subheaders/access-clusters.md   |   8 +-
 .../pages-for-subheaders/advanced-options.md  |   5 -
 .../authentication-config.md                  | 115 +++-
 ...on-permissions-and-global-configuration.md |   6 +-
 .../aws-cloud-marketplace.md                  |   6 +-
 .../current/pages-for-subheaders/cis-scans.md |   4 +-
 .../cluster-configuration.md                  |   2 +-
 .../configuration-options.md                  |   8 +-
 ...re-microsoft-ad-federation-service-saml.md |   6 +-
 .../configure-openldap.md                     |   4 +-
 .../configure-shibboleth-saml.md              |   6 +-
 .../create-kubernetes-persistent-storage.md   |  20 +-
 .../custom-resource-configuration.md          |   4 +-
 .../enable-experimental-features.md           |   4 +-
 .../fleet-gitops-at-scale.md                  |   6 +-
 .../install-cluster-autoscaler.md             |   2 +-
 ...install-upgrade-on-a-kubernetes-cluster.md |  14 +-
 .../installation-and-upgrade.md               |  12 +-
 .../installation-references.md                |   2 +-
 .../installation-requirements.md              |  30 +-
 .../integrations-in-rancher.md                |   7 -
 .../pages-for-subheaders/introduction.md      |   5 -
 .../pages-for-subheaders/istio-setup-guide.md |   2 +-
 .../current/pages-for-subheaders/istio.md     |  10 +-
 .../kubernetes-clusters-in-rancher-setup.md   |   2 +-
 .../kubernetes-components.md                  |   2 +-
 .../launch-kubernetes-with-rancher.md         |   2 +-
 .../current/pages-for-subheaders/logging.md   |  22 +-
 .../pages-for-subheaders/manage-clusters.md   |   2 +-
 .../manage-persistent-storage.md              |  12 -
 .../manage-project-resource-quotas.md         |   2 +-
 .../pages-for-subheaders/manage-projects.md   |  10 +-
 .../manage-role-based-access-control-rbac.md  |   6 +-
 .../monitoring-and-alerting.md                |  14 +-
 .../current/pages-for-subheaders/nutanix.md   |   6 +-
 .../other-cloud-providers.md                  |   9 -
 .../other-troubleshooting-tips.md             |  12 -
 .../current/pages-for-subheaders/pipelines.md |   2 +-
 .../provisioning-storage-examples.md          |   6 +-
 .../quick-start-guides.md                     |   1 -
 .../rancher-manager-architecture.md           |   2 +-
 .../rancher-on-a-single-node-with-docker.md   |   2 +-
 .../pages-for-subheaders/rancher-security.md  |   2 +-
 .../current/pages-for-subheaders/resources.md |   6 +-
 .../set-up-cloud-providers.md                 |   9 +-
 .../use-existing-nodes.md                     |   8 +-
 .../use-new-nodes-in-an-infra-provider.md     |   4 +-
 .../use-windows-clusters.md                   |  16 +-
 .../pages-for-subheaders/user-settings.md     |   4 +-
 .../vsphere-cloud-provider.md                 |  13 -
 .../current/pages-for-subheaders/vsphere.md   |   8 +-
 .../current/rancher-manager.md                |   3 +-
 .../current/reference-guides.md               |  13 -
 .../backup-configuration.md                   |  29 +-
 .../storage-configuration.md                  |   6 +-
 .../logging-best-practices.md                 |   1 +
 .../monitoring-best-practices.md              |   2 +-
 .../rancher-deployment-strategy.md            |  23 +-
 .../cli-with-rancher/rancher-cli.md           |   8 +-
 .../node-template-configuration/amazon-ec2.md |   6 +-
 .../node-template-configuration/azure.md      |   6 +
 .../rke1-cluster-configuration.md             |   6 +-
 .../rke2-cluster-configuration.md             |   2 +-
 .../helm-chart-options.md                     |   2 +-
 .../monitoring-v2-configuration/receivers.md  |   2 +-
 .../monitoring-v2-configuration/routes.md     |   2 +-
 .../servicemonitors-and-podmonitors.md        |   2 +-
 .../pipelines/configure-persistent-data.md    |   4 +-
 .../reference-guides/rancher-cluster-tools.md |   2 +-
 .../architecture-recommendations.md           |   2 +-
 ...unicating-with-downstream-user-clusters.md |   6 +-
 ...hardening-guide-with-cis-v1.6-benchmark.md |   2 +-
 .../rke1-template-example-yaml.md             |   2 +-
 .../advanced-options.md                       |   4 +-
 .../current/reference-guides/system-tools.md  |   1 +
 .../user-settings/manage-cloud-credentials.md |   2 +-
 .../user-settings/manage-node-templates.md    |   2 +-
 .../_cluster-capabilities-table.md            |  16 +-
 .../current/troubleshooting.md                |  44 --
 .../general-troubleshooting.md                |  44 ++
 .../user-id-tracking-in-audit-logs.md         |   2 +-
 269 files changed, 803 insertions(+), 1831 deletions(-)
 delete mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/explanations.md
 rename i18n/zh/docusaurus-plugin-content-docs/current/{faq.md => faq/general-faq.md} (87%)
 delete mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/faq/networking/networking.md
 delete mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/getting-started.md
 rename i18n/zh/docusaurus-plugin-content-docs/current/{reference-guides => getting-started/installation-and-upgrade}/installation-references/feature-flags.md (76%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{reference-guides => getting-started/installation-and-upgrade}/installation-references/helm-chart-options.md (92%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{reference-guides => getting-started/installation-and-upgrade}/installation-references/tls-settings.md (100%)
 delete mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/getting-started/introduction/what-are-divio-docs.md
 rename i18n/zh/docusaurus-plugin-content-docs/current/getting-started/{introduction => }/overview.md (65%)
 delete mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides.md
 rename i18n/zh/docusaurus-plugin-content-docs/current/{getting-started/installation-and-upgrade/advanced-options/advanced-use-cases => how-to-guides/advanced-user-guides}/configure-layer-7-nginx-load-balancer.md (85%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{getting-started/installation-and-upgrade/advanced-options/advanced-use-cases => how-to-guides/advanced-user-guides}/enable-api-audit-log.md (98%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{getting-started/installation-and-upgrade/advanced-options => how-to-guides/advanced-user-guides}/enable-experimental-features/continuous-delivery.md (59%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{getting-started/installation-and-upgrade/advanced-options => how-to-guides/advanced-user-guides}/enable-experimental-features/istio-traffic-management-features.md (90%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{getting-started/installation-and-upgrade/advanced-options => how-to-guides/advanced-user-guides}/enable-experimental-features/rancher-on-arm64.md (86%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{getting-started/installation-and-upgrade/advanced-options => how-to-guides/advanced-user-guides}/enable-experimental-features/unsupported-storage-drivers.md (94%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{getting-started/installation-and-upgrade/advanced-options/advanced-use-cases => how-to-guides/advanced-user-guides}/open-ports-with-firewalld.md (96%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{getting-started/installation-and-upgrade/advanced-options/advanced-use-cases => how-to-guides/advanced-user-guides}/tune-etcd-for-large-installs.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides/manage-projects => new-user-guides}/add-users-to-projects.md (78%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/configure-active-directory.md (97%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/configure-azure-ad.md (95%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/configure-freeipa.md (94%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/configure-github.md (92%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/configure-google-oauth.md (94%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/configure-keycloak-oidc.md (98%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/configure-keycloak-saml.md (98%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/configure-okta-saml.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/configure-pingidentity.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/create-local-users.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/authentication-config/manage-users-and-groups.md (98%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{reference-guides => how-to-guides/new-user-guides/authentication-permissions-and-global-configuration}/configure-openldap/openldap-config-reference.md (90%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication => new-user-guides/authentication-permissions-and-global-configuration}/configure-shibboleth-saml/about-group-permissions.md (99%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/create-pod-security-policies.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/custom-branding.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/global-default-private-registry.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/manage-cluster-templates.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md (96%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md (96%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/{launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers => set-up-cloud-providers}/amazon.md (90%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/{launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers => set-up-cloud-providers}/azure.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/{launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere => set-up-cloud-providers}/configure-in-tree-vsphere.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/{launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere => set-up-cloud-providers}/configure-out-of-tree-vsphere.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/{launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers => set-up-cloud-providers}/google-compute-engine.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/{launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere => set-up-cloud-providers}/migrate-from-in-tree-to-out-of-tree.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/{launch-kubernetes-with-rancher => }/use-windows-clusters/azure-storageclass-configuration.md (90%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/{launch-kubernetes-with-rancher => }/use-windows-clusters/network-requirements-for-host-gateway.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/{launch-kubernetes-with-rancher => }/use-windows-clusters/windows-linux-cluster-feature-parity.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/{launch-kubernetes-with-rancher => }/use-windows-clusters/workload-migration-guidance.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/{kubernetes-clusters-in-rancher-setup => }/launch-kubernetes-with-rancher/about-rancher-agents.md (71%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/{kubernetes-clusters-in-rancher-setup => }/launch-kubernetes-with-rancher/rke1-vs-rke2-differences.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/{kubernetes-clusters-in-rancher-setup => }/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md (71%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/{kubernetes-clusters-in-rancher-setup => }/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md (82%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/{kubernetes-clusters-in-rancher-setup => }/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md (73%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/{kubernetes-clusters-in-rancher-setup => }/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md (68%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/{kubernetes-clusters-in-rancher-setup => }/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/{kubernetes-clusters-in-rancher-setup => }/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/{kubernetes-clusters-in-rancher-setup => }/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md (64%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/access-clusters/add-users-to-clusters.md (58%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/access-clusters/authorized-cluster-endpoint.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/add-a-pod-security-policy.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/assign-pod-security-policies.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/clean-cluster-nodes.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/clone-cluster-configuration.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md (95%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md (93%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md (98%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/nodes-and-node-pools.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/projects-and-namespaces.md (98%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage => new-user-guides/manage-clusters}/provisioning-storage-examples/nfs-storage.md (96%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage => new-user-guides/manage-clusters}/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md (76%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage => new-user-guides/manage-clusters}/provisioning-storage-examples/vsphere-storage.md (82%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/rotate-certificates.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides => new-user-guides}/manage-clusters/rotate-encryption-key.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/{advanced-user-guides/manage-projects => new-user-guides}/manage-namespaces.md (72%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/cis-scans/configuration-reference.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/cis-scans/custom-benchmark.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md (84%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md (97%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/cloud-marketplace/supportconfig.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/fleet-gitops-at-scale/architecture.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/harvester.md (93%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/istio/configuration-options/pod-security-policies.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/istio/configuration-options/project-network-isolation.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/istio/cpu-and-memory-allocations.md (93%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/istio/disable-istio.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/istio/rbac-for-istio.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/logging/logging-architecture.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/logging/logging-helm-chart-options.md (97%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md (99%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/logging/rbac-for-logging.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/logging/taints-and-tolerations.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/longhorn.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md (89%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md (99%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md (100%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/monitoring-and-alerting/windows-support.md (97%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/neuvector.md (98%)
 rename i18n/zh/docusaurus-plugin-content-docs/current/{explanations => }/integrations-in-rancher/opa-gatekeeper.md (100%)
 delete mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/horizontal-pod-autoscaler.md
 delete mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/hpa-background/hpa-background.md
 delete mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-kubectl/manage-hpa-with-kubectl.md
 delete mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-rancher-ui/manage-hpa-with-rancher-ui.md
 delete mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/testing-hpa/testing-hpa.md
 delete mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-authentication.md
 delete mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/advanced-options.md
 delete mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/integrations-in-rancher.md
 delete mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/introduction.md
 delete mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-persistent-storage.md
 delete mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/other-cloud-providers.md
 delete mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/other-troubleshooting-tips.md
 delete mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/vsphere-cloud-provider.md
 delete mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/reference-guides.md
 delete mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting.md
 create mode 100644 i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/general-troubleshooting.md

diff --git a/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md b/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md
index bff68136406..eff64956087 100644
--- a/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md
+++ b/docs/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md
@@ -64,11 +64,11 @@ Kubernetes v1.22, available as an experimental feature of v2.6.3, does not suppo
 1. Update the default `resourceSet` to collect the CRDs with the apiVersion v1.
 1. Update the default `resourceSet` and the client to use the new APIs internally, with `apiextensions.k8s.io/v1` as the replacement.
 
-  :::note
+    :::note
 
-  When making or restoring backups for v1.22, the Rancher version and the local cluster's Kubernetes version should be the same. The Kubernetes version should be considered when restoring a backup since the supported apiVersion in the cluster and in the backup file could be different.
+    When making or restoring backups for v1.22, the Rancher version and the local cluster's Kubernetes version should be the same. The Kubernetes version should be considered when restoring a backup since the supported apiVersion in the cluster and in the backup file could be different.
 
-  :::
+    :::
 
 :::
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current.json b/i18n/zh/docusaurus-plugin-content-docs/current.json
index b3123298fd0..4388463e6a1 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current.json
+++ b/i18n/zh/docusaurus-plugin-content-docs/current.json
@@ -7,10 +7,6 @@
     "message": "开始使用",
     "description": "The label for category Getting Started in sidebar tutorialSidebar"
   },
-  "sidebar.tutorialSidebar.category.Introduction": {
-    "message": "介绍",
-    "description": "The label for category Introduction in sidebar tutorialSidebar"
-  },
   "sidebar.tutorialSidebar.category.Quick Start Guides": {
     "message": "快速入门指南",
     "description": "The label for category Quick Start Guides in sidebar tutorialSidebar"
@@ -55,18 +51,10 @@
     "message": "资源",
     "description": "The label for category Resources in sidebar tutorialSidebar"
   },
-  "sidebar.tutorialSidebar.category.Advanced Options": {
-    "message": "高级选项",
-    "description": "The label for category Advanced Options in sidebar tutorialSidebar"
-  },
   "sidebar.tutorialSidebar.category.Enable Experimental Features": {
     "message": "启用实验功能",
     "description": "The label for category Enable Experimental Features in sidebar tutorialSidebar"
   },
-  "sidebar.tutorialSidebar.category.Advanced Use Cases": {
-    "message": "高级用例",
-    "description": "The label for category Advanced Use Cases in sidebar tutorialSidebar"
-  },
   "sidebar.tutorialSidebar.category.How-to Guides": {
     "message": "操作指南",
     "description": "The label for category How-to Guides in sidebar tutorialSidebar"
@@ -119,10 +107,6 @@
     "message": "设置云提供商",
     "description": "The label for category Set Up Cloud Providers in sidebar tutorialSidebar"
   },
-  "sidebar.tutorialSidebar.category.Other Cloud Providers": {
-    "message": "其他云提供商",
-    "description": "The label for category Other Cloud Providers in sidebar tutorialSidebar"
-  },
   "sidebar.tutorialSidebar.category.Kubernetes Resources Setup": {
     "message": "Kubernetes 资源设置",
     "description": "The label for category Kubernetes Resources Setup in sidebar tutorialSidebar"
@@ -159,10 +143,6 @@
     "message": "身份验证、权限和全局配置",
     "description": "The label for category Authentication, Permissions, and Global Configuration in sidebar tutorialSidebar"
   },
-  "sidebar.tutorialSidebar.category.About Authentication": {
-    "message": "身份验证",
-    "description": "The label for category About Authentication in sidebar tutorialSidebar"
-  },
   "sidebar.tutorialSidebar.category.Authentication Config": {
     "message": "身份验证配置",
     "description": "The label for category Authentication Config in sidebar tutorialSidebar"
@@ -203,10 +183,6 @@
     "message": "创建 Kubernetes 持久存储",
     "description": "The label for category Create Kubernetes Persistent Storage in sidebar tutorialSidebar"
   },
-  "sidebar.tutorialSidebar.category.Manage Persistent Storage": {
-    "message": "管理持久存储",
-    "description": "The label for category Manage Persistent Storage in sidebar tutorialSidebar"
-  },
   "sidebar.tutorialSidebar.category.Provisioning Storage Examples": {
     "message": "配置存储示例",
     "description": "The label for category Provisioning Storage Examples in sidebar tutorialSidebar"
@@ -347,10 +323,6 @@
     "message": "SELinux RPM",
     "description": "The label for category SELinux RPM in sidebar tutorialSidebar"
   },
-  "sidebar.tutorialSidebar.category.Explanations": {
-    "message": "说明",
-    "description": "The label for category Explanations in sidebar tutorialSidebar"
-  },
   "sidebar.tutorialSidebar.category.Integrations in Rancher": {
     "message": "Rancher 中的集成",
     "description": "The label for category Integrations in Rancher in sidebar tutorialSidebar"
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations.md b/i18n/zh/docusaurus-plugin-content-docs/current/explanations.md
deleted file mode 100644
index 94873dcb53f..00000000000
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 说明
----
-
-**说明文档**主要用于为某个任务或主题背后的“原因”提供理论知识。说明文档是“理解导向”的，用于拓宽用户的知识。在本节中，用户可以找到有关主题的上下文和背景、替代方案和意见等，还可能找到历史原因、相关限制以及流程的工作原理。
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/faq.md b/i18n/zh/docusaurus-plugin-content-docs/current/faq/general-faq.md
similarity index 87%
rename from i18n/zh/docusaurus-plugin-content-docs/current/faq.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/faq/general-faq.md
index c69ce532363..8022655b815 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/faq.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/faq/general-faq.md
@@ -1,10 +1,10 @@
 ---
-title: 常见问题
+title: 一般常见问题解答
 ---
 
 本文包含了用户常见的 Rancher 2.x 问题。
 
-有关常见技术问题，请参阅[常见技术问题解答](faq/technical-items.md)。
+有关常见技术问题，请参阅[常见技术问题解答](technical-items.md)。
 
 <br/>
 
@@ -22,13 +22,13 @@ title: 常见问题
 
 **Rancher 是否支持 Windows？**
 
-从 Rancher 2.3.0 开始，我们支持 Windows Server 1809 容器。有关如何使用 Windows Worker 节点设置集群的详细信息，请参阅[为 Windows 配置自定义集群](pages-for-subheaders/use-windows-clusters.md)。
+从 Rancher 2.3.0 开始，我们支持 Windows Server 1809 容器。有关如何使用 Windows Worker 节点设置集群的详细信息，请参阅[为 Windows 配置自定义集群](../pages-for-subheaders/use-windows-clusters.md)。
 
 <br/>
 
 **Rancher 是否支持 Istio？**
 
-从 Rancher 2.3.0 开始，我们支持 [Istio.](pages-for-subheaders/istio.md)
+从 Rancher 2.3.0 开始，我们支持 [Istio.](../pages-for-subheaders/istio.md)
 
 此外，Istio 是在我们的微型 PaaS “Rio” 中实现的，它可以运行在 Rancher 2.x 以及任何符合 CNCF 的 Kubernetes 集群上。详情请参阅[这里](https://rio.io/)。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/faq/networking/networking.md b/i18n/zh/docusaurus-plugin-content-docs/current/faq/networking/networking.md
deleted file mode 100644
index efeff588a7e..00000000000
--- a/i18n/zh/docusaurus-plugin-content-docs/current/faq/networking/networking.md
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: 网络
----
-
-网络常见问题
-
-- [CNI 网络插件](../container-network-interface-providers.md)
-
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/faq/rancher-is-no-longer-needed.md b/i18n/zh/docusaurus-plugin-content-docs/current/faq/rancher-is-no-longer-needed.md
index 8a1a28ae50f..17877cfb343 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/faq/rancher-is-no-longer-needed.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/faq/rancher-is-no-longer-needed.md
@@ -15,7 +15,7 @@ title: 卸载 Rancher
 
 - **注册集群**：集群不受影响，你可以注册集群前的方法访问该集群。
 - **托管的 Kubernetes 集群**：如果你在 Kubernetes 云提供商（例如 EKS、GKE 或 AKS）中创建集群，你可以继续使用提供商的云凭证来管理集群。
-- **RKE 集群**：要访问 [RKE 集群](../pages-for-subheaders/launch-kubernetes-with-rancher.md)，集群必须启用了[授权集群端点（authorized cluster endpoint，ACE）](../pages-for-subheaders/rancher-manager-architecture.md#4-授权集群端点)，而且你必须从 Rancher UI 下载了集群的 kubeconfig 文件。RKE 集群默认启用授权集群端点。通过使用此端点，你可以直接使用 kubectl 访问你的集群，而不用通过 Rancher Server 的[认证代理](../pages-for-subheaders/rancher-manager-architecture.md#1-认证代理)进行通信。有关配置 kubectl 以使用授权集群端点的说明，请参阅[使用 kubectl 和 kubeconfig 文件直接访问集群](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#直接使用下游集群进行身份验证)。这些集群将使用删除 Rancher 时配置的身份验证快照。
+- **RKE 集群**：要访问 [RKE 集群](../pages-for-subheaders/launch-kubernetes-with-rancher.md)，集群必须启用了[授权集群端点（authorized cluster endpoint，ACE）](../pages-for-subheaders/rancher-manager-architecture.md#4-授权集群端点)，而且你必须从 Rancher UI 下载了集群的 kubeconfig 文件。RKE 集群默认启用授权集群端点。通过使用此端点，你可以直接使用 kubectl 访问你的集群，而不用通过 Rancher Server 的[认证代理](../pages-for-subheaders/rancher-manager-architecture.md#1-认证代理)进行通信。有关配置 kubectl 以使用授权集群端点的说明，请参阅[使用 kubectl 和 kubeconfig 文件直接访问集群](../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#直接使用下游集群进行身份验证)。这些集群将使用删除 Rancher 时配置的身份验证快照。
 
 ### 如果我不想再使用 Rancher 了该怎么做？
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/faq/security.md b/i18n/zh/docusaurus-plugin-content-docs/current/faq/security.md
index 6675b6344e9..0078c58eac7 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/faq/security.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/faq/security.md
@@ -1,5 +1,6 @@
 ---
 title: 安全
+
 ---
 
 **是否有强化指南？**
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/faq/technical-items.md b/i18n/zh/docusaurus-plugin-content-docs/current/faq/technical-items.md
index 47ee529cd1c..ffca3549cf6 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/faq/technical-items.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/faq/technical-items.md
@@ -85,7 +85,7 @@ UI 由静态文件组成，并根据 API 的响应工作。换言之，UI 中可
 
 节点需要配置静态 IP（或使用 DHCP 保留的 IP）。如果节点的 IP 已更改，你必须在集群中删除并重新添加它。删除后，Rancher 会将集群更新为正确的状态。如果集群不再处于 `Provisioning` 状态，则已从集群删除该节点。
 
-节点的 IP 地址发生变化时，Rancher 会失去与节点的连接，因此无法正常清理节点。请参阅[清理集群节点](../how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md)来清理节点。
+节点的 IP 地址发生变化时，Rancher 会失去与节点的连接，因此无法正常清理节点。请参阅[清理集群节点](../how-to-guides/new-user-guides/manage-clusters/clean-cluster-nodes.md)来清理节点。
 
 在集群中移除并清理节点时，你可以将节点重新添加到集群中。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started.md
deleted file mode 100644
index b56e58de70d..00000000000
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title: 开始使用
----
-
-**开始使用**章节能帮助你快速启动和运行 Rancher。
-
-本章节旨在帮助用户部署 Rancher 和工作负载，并快速有效地安装或升级 Rancher。
-
-请参阅[简介](./pages-for-subheaders/introduction.md)、[快速入门指南](./pages-for-subheaders/quick-start-guides.md)以及[安装和升级](./pages-for-subheaders/installation-and-upgrade.md)部分了解更多信息。
-
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades.md
index 390a092ecd7..127e6131018 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/upgrades.md
@@ -22,8 +22,7 @@ kubeconfig 也可以通过 `--kubeconfig` 标签（详情请参见 https://helm.
 
 如需查看每个 Rancher 版本的已知问题，请参见 [GitHub](https://github.com/rancher/rancher/releases) 中的发行说明，或查看 [Rancher 论坛](https://forums.rancher.com/c/announcements/12)。
 
-不支持 _升级_ 或 _升级到_ [rancher-alpha 仓库](../../../reference-guides/installation-references/helm-chart-options.md#helm-chart-仓库)中的任何 Chart。
-
+不支持 _升级_ 或 _升级到_ [rancher-alpha 仓库](../../../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#helm-chart-仓库)中的任何 Chart。
 ### Helm 版本
 
 本安装指南假定你使用的是 Helm 3。
@@ -36,7 +35,7 @@ kubeconfig 也可以通过 `--kubeconfig` 标签（详情请参见 https://helm.
 
 ### 升级 Rancher Server 并使用隐藏的本地集群
 
-如果你从使用 Helm Chart 选项 `--add-local=false` 启动的 Rancher Server 升级到 Rancher 2.5，你需要在升级时取消该标志。否则，Rancher Server 将无法启动。`restricted-admin` 角色可以继续用来限制对本地集群的访问。详情请参见[本章节](../../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md#在-rancher-中使用隐藏的-local-集群进行升级)。
+如果你从使用 Helm Chart 选项 `--add-local=false` 启动的 Rancher Server 升级到 Rancher 2.5，你需要在升级时取消该标志。否则，Rancher Server 将无法启动。`restricted-admin` 角色可以继续用来限制对本地集群的访问。详情请参见[本章节](../../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md#在-rancher-中使用隐藏的-local-集群进行升级)。
 
 ### 使用 cert-manager 0.8.0 之前的版本升级
 
@@ -63,7 +62,7 @@ kubeconfig 也可以通过 `--kubeconfig` 标签（详情请参见 https://helm.
 
 1. 获取你用来安装 Rancher 的仓库名称。
 
-   关于仓库及其区别，请参见 [Helm Chart Repositories](../../../reference-guides/installation-references/helm-chart-options.md#helm-chart-仓库)。
+   关于仓库及其区别，请参见 [Helm Chart Repositories](../installation-references/helm-chart-options.md#helm-chart-仓库)。
 
    - Latest：建议用于试用最新功能
       ```
@@ -103,7 +102,7 @@ kubeconfig 也可以通过 `--kubeconfig` 标签（详情请参见 https://helm.
    你可以通过 `--version=` 标记，来指定要升级的目标 Chart 版本。例如：
 
    ```plain
-   helm fetch rancher-<CHART_REPO>/rancher --version=v2.4.11
+   helm fetch rancher-<CHART_REPO>/rancher --version=2.6.8
    ```
 
 ### 3. 升级 Rancher
@@ -160,7 +159,7 @@ helm get values rancher -n cattle-system -o yaml > values.yaml
 helm upgrade rancher rancher-<CHART_REPO>/rancher \
   --namespace cattle-system \
   -f values.yaml \
-  --version=2.4.5
+  --version=2.6.8
 ```
 
 ### 4. 验证升级
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/installation-references/feature-flags.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-references/feature-flags.md
similarity index 76%
rename from i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/installation-references/feature-flags.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-references/feature-flags.md
index 294ecae480f..ee021898eb8 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/installation-references/feature-flags.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-references/feature-flags.md
@@ -4,7 +4,7 @@ title: 功能开关
 
 为了让你试用默认关闭的实验功能，我们引入了功能开关（feature flag）。
 
-如需了解功能的值以及如何启用功能，请参阅[此处](../../pages-for-subheaders/enable-experimental-features.md)。
+如需了解功能的值以及如何启用功能，请参阅[此处](../../../pages-for-subheaders/enable-experimental-features.md)。
 
 :::note
 
@@ -14,14 +14,14 @@ title: 功能开关
 
 以下是 Rancher 中可用的功能开关列表：
 
-- `harvester`：从 2.6.1 开始可用。Harvester 用于管理 Virtualization Management 页面的访问。用户可以在该页面直接导航到 Harvester 集群并访问 Harvester UI。详情请参见[本页](../../explanations/integrations-in-rancher/harvester.md#功能开关)。
+- `harvester`：从 2.6.1 开始可用。Harvester 用于管理 Virtualization Management 页面的访问。用户可以在该页面直接导航到 Harvester 集群并访问 Harvester UI。详情请参见[本页](../../../integrations-in-rancher/harvester.md#功能开关)。
 - `rke2`：用于启用配置 RKE2 集群的功能。这个功能开关默认开启，即允许用户尝试配置此类集群。
-- `fleet`：由于 Fleet 功能已应用到新的配置框架中，因此我们需要启用先前的 `fleet` 功能开关。如果你在早期版本中禁用了此功能开关，升级到 Rancher 2.6 后，该功能开关会自动启用。详情请参见[此页](../../how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md)。
-- `continuous-delivery`：在 Rancher v2.5.x 中，Fleet 带有 GitOps 功能，该功能不能与 Fleet 分开禁用。在 Rancher 2.6 中，我们引入了 `continuous-delivery` 功能开关，让你可以单独禁用 Fleet 的 GitOps 功能。详情请参见[本页](../../getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/continuous-delivery.md)。
+- `fleet`：由于 Fleet 功能已应用到新的配置框架中，因此我们需要启用先前的 `fleet` 功能开关。如果你在早期版本中禁用了此功能开关，升级到 Rancher 2.6 后，该功能开关会自动启用。详情请参见[此页](../../../how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md)。
+- `continuous-delivery`：在 Rancher v2.5.x 中，Fleet 带有 GitOps 功能，该功能不能与 Fleet 分开禁用。在 Rancher 2.6 中，我们引入了 `continuous-delivery` 功能开关，让你可以单独禁用 Fleet 的 GitOps 功能。如需更多信息，请参阅[此页面](../../../how-to-guides/advanced-user-guides/enable-experimental-features/continuous-delivery.md)。
 - `legacy`：Rancher 会逐渐淘汰之前版本中的某些功能，以实现功能迭代。此处包括已弃用，以及之后会转移到其他地方的功能。默认情况下，新安装会禁用此功能开关。如果你从先前的版本升级，此功能开关会启用。
-- `token-hashing`：用于启动新的 token-hashing 功能。启用后，会使用 SHA256 算法对现有 Token 和所有新 Token 进行哈希处理。一旦对 Token 进行哈希处理，就无法撤消操作。该功能开关启用后无法被禁用。详情请参见[哈西处理 Token](../../reference-guides/about-the-api/api-tokens.md)。
-- `unsupported-storage-drivers`：该功能[允许使用不支持的存储驱动](../../getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md)。换言之，此功能允许你使用默认情况下未启用的存储提供商和卷插件。
-- `istio-virtual-service-ui`：此功能让你[启动用于管理 Istio 流量的 UI，其中包括创建、读取、更新和删除 Istio 虚拟服务（Virtual Service）和目标规则（Destination Rule）](../../getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md)。
+- `token-hashing`：用于启动新的 token-hashing 功能。启用后，会使用 SHA256 算法对现有 Token 和所有新 Token 进行哈希处理。一旦对 Token 进行哈希处理，就无法撤消操作。该功能开关启用后无法被禁用。详情请参见[哈西处理 Token](../../../reference-guides/about-the-api/api-tokens.md)。
+- `unsupported-storage-drivers`：该功能[允许使用不支持的存储驱动](../../../how-to-guides/advanced-user-guides/enable-experimental-features/unsupported-storage-drivers.md)。换言之，此功能允许你使用默认情况下未启用的存储提供商和卷插件。
+- `istio-virtual-service-ui`：此功能让你[启动用于管理 Istio 流量的 UI，其中包括创建、读取、更新和删除 Istio 虚拟服务（Virtual Service）和目标规则（Destination Rule）](../../../how-to-guides/advanced-user-guides/enable-experimental-features/istio-traffic-management-features.md)。
 - `multi-cluster-management`：用于配置和管理多个 Kubernetes 集群。此功能开关只能在安装时设置，之后不能更改。
 
 下表介绍了 Rancher 中功能开关的可用版本和默认值：
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/installation-references/helm-chart-options.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md
similarity index 92%
rename from i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/installation-references/helm-chart-options.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md
index cafacc98c43..26bf7e2d916 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/installation-references/helm-chart-options.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-references/helm-chart-options.md
@@ -4,9 +4,9 @@ title: Rancher Helm Chart 选项
 
 本文提供了 Rancher Helm Chart 的配置参考。
 
-如需选择 Helm Chart 版本，请参见[本页](../../getting-started/installation-and-upgrade/resources/choose-a-rancher-version.md)。
+如需选择 Helm Chart 版本，请参见[本页](../../../getting-started/installation-and-upgrade/resources/choose-a-rancher-version.md)。
 
-了解开启实验性功能的详情，请参见[本页](../../pages-for-subheaders/enable-experimental-features.md)。
+了解开启实验性功能的详情，请参见[本页](../../../pages-for-subheaders/enable-experimental-features.md)。
 
 ## 常用选项
 
@@ -30,7 +30,7 @@ title: Rancher Helm Chart 选项
 | `antiAffinity` | "preferred" | `string` - Rancher Pod 的反亲和性规则 - "preferred, required" |
 | `auditLog.destination` | "sidecar" | `string` - 发送审计日志到 Sidecar 容器的控制台或 hostPath 卷 - "sidecar, hostPath" |
 | `auditLog.hostPath` | "/var/log/rancher/audit" | `string` - 主机上的日志文件目标地址（仅当`auditLog.destination` 的值是 `hostPath` 时生效） |
-| `auditLog.level` | 0 | `int` - 设置 [API 审计日志](../../getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md)等级。0 代表关闭。[0-3] |
+| `auditLog.level` | 0 | `int` - 设置 [API 审计日志](../../../how-to-guides/advanced-user-guides/enable-api-audit-log.md)等级。0 代表关闭。[0-3] |
 | `auditLog.maxAge` | 1 | `int` - 旧审计日志文件最多可保留的天数（仅当`auditLog.destination` 的值是 `hostPath` 时生效） |
 | `auditLog.maxBackup` | 1 | `int` - 审计文件最大可保留的个数（仅当 `auditLog.destination` 的值是 `hostPath` 时生效） |
 | `auditLog.maxSize` | 100 | `int` - 在审计日志被轮换前的最大容量，单位是 MB（仅当 `auditLog.destination` 的值是 `hostPath` 时生效） |
@@ -50,8 +50,8 @@ title: Rancher Helm Chart 选项
 | `rancherImageTag` | 和 Chart 版本一致 | `string` - rancher/rancher 镜像标签 |
 | `replicas` | 3 | `int` - Rancher Server 副本数。如果设为 -1，会根据集群中的可用节点数自动选择 1，2或3。 |
 | `resources` | {} | `map` - Rancher Pod 资源请求和限制 |
-| `restrictedAdmin` | `false` | `bool` - 如果值为 true，初始的 Rancher 用户访问本地 Kubernetes 集群会受到限制，以避免权限升级。详情请参见 [restricted-admin 角色](../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md#受限管理员)。 |
-| `systemDefaultRegistry` | "" | `string` - 用于所有系统容器镜像的私有仓库，例如 registry.example.com |
+| `restrictedAdmin` | `false` | `bool` - 如果值为 true，初始的 Rancher 用户访问本地 Kubernetes 集群会受到限制，以避免权限升级。详情请参见 [restricted-admin 角色](../../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md#受限管理员)。 |
+| `systemDefaultRegistry` | "" | `string` - 用于所有系统容器镜像的私有仓库，例如 http://registry.example.com/ |
 | `tls` | "ingress" | `string` - 详情请参见[外部 TLS 终止](#外部-tls-终止)。- "ingress, external" |
 | `useBundledSystemChart` | `false` | `bool` - 选择 Rancher Server 打包的 system-charts。此参数用于离线环境安装。 |
 
@@ -75,15 +75,15 @@ kubectl get secret --namespace cattle-system bootstrap-secret -o go-template='{{
 
 ### API 审计日志
 
-启用 [API 审计日志](../../getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md)
+启用 [API 审计日志](../../../how-to-guides/advanced-user-guides/enable-api-audit-log.md)。
 
-你可以像收集其他容器日志一样收集此日志。在 Rancher Server 集群上为 `System` 项目启用 [Logging](../../pages-for-subheaders/logging.md)。
+你可以像收集其他容器日志一样收集此日志。在 Rancher Server 集群上为 `System` 项目启用 [Logging](../../../pages-for-subheaders/logging.md)。
 
 ```plain
 --set auditLog.level=1
 ```
 
-默认情况下，启用审计日志会在 Rancher pod 中创建一个 Sidecar 容器。这个容器（`rancher-audit-log`）会把日志流传输到 `stdout`。你可以像收集其他容器日志一样收集此日志。如果你使用 Sidecar 作为审计日志的目标时， `hostPath`，`maxAge`，`maxBackups` 和 `maxSize` 选项不会生效。建议使用你的操作系统或 Docker Daemon 的日志轮换功能来控制磁盘空间的使用。请为 Rancher Server 集群或 System 项目启用 [Logging](../../pages-for-subheaders/logging.md)。
+默认情况下，启用审计日志会在 Rancher pod 中创建一个 Sidecar 容器。这个容器（`rancher-audit-log`）会把日志流传输到 `stdout`。你可以像收集其他容器日志一样收集此日志。如果你使用 Sidecar 作为审计日志的目标时， `hostPath`，`maxAge`，`maxBackups` 和 `maxSize` 选项不会生效。建议使用你的操作系统或 Docker Daemon 的日志轮换功能来控制磁盘空间的使用。请为 Rancher Server 集群或 System 项目启用 [Logging](../../../pages-for-subheaders/logging.md)。
 
 将 `auditLog.destination` 的值设为 `hostPath`，可以将日志转发到与主机系统共享的卷，而不是传输到 Sidecar 容器。如果目标设置为 `hostPath`，你可能需要调整其他 auditLog 参数以进行日志轮换。
 
@@ -163,7 +163,7 @@ kubectl -n cattle-system create secret generic tls-ca-additional --from-file=ca-
 
 ### 私有仓库和离线安装
 
-有关使用私有仓库安装 Rancher 的详情，请参见[离线安装](../../pages-for-subheaders/air-gapped-helm-cli-install.md)。
+有关使用私有仓库安装 Rancher 的详情，请参见[离线安装](../../../pages-for-subheaders/air-gapped-helm-cli-install.md)。
 
 # 外部 TLS 终止
 
@@ -173,7 +173,7 @@ kubectl -n cattle-system create secret generic tls-ca-additional --from-file=ca-
 
 :::note
 
-如果你使用的是私有 CA 签名的证书，请添加 `--set privateCA=true` 并参见[添加 TLS 密文 - 使用私有 CA 签名证书](../../getting-started/installation-and-upgrade/resources/add-tls-secrets.md)，为 Rancher 添加 CA 证书。
+如果你使用的是私有 CA 签名的证书，请添加 `--set privateCA=true` 并参见[添加 TLS 密文 - 使用私有 CA 签名证书](../../../getting-started/installation-and-upgrade/resources/add-tls-secrets.md)，为 Rancher 添加 CA 证书。
 
 :::
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/installation-references/tls-settings.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-references/tls-settings.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/installation-references/tls-settings.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-references/tls-settings.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/dockershim.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/dockershim.md
index bb5204674c5..84f2383eaf7 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/dockershim.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/dockershim.md
@@ -6,6 +6,8 @@ Dockershim 是 Kubelet 和 Docker Daemon 之间的 CRI 兼容层。Kubernetes 1.
 
 RKE 集群现在支持外部 Dockershim，来让用户继续使用 Docker 作为 CRI 运行时。现在，我们通过使用 [Mirantis 和 Docker ](https://www.mirantis.com/blog/mirantis-to-take-over-support-of-kubernetes-dockershim-2/) 来确保 RKE 集群可以继续使用 Docker，从而实现上游开源社区的外部 Dockershim。
 
+RKE2 和 K3s 集群使用嵌入的 containerd 作为容器运行时，因此不受影响。
+
 要在 1.24 之前的 RKE 版本中启用外部 Dockershim，请配置以下选项：
 
 ```
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/install-docker.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/install-docker.md
index f909b01339f..5514a3af62a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/install-docker.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/install-docker.md
@@ -2,7 +2,7 @@
 title: 安装 Docker
 ---
 
-在使用 Helm 或 Docker 在节点上安装 Rancher Server 前，你需要先安装 Docker。
+在使用 Helm 或 Docker 在 RKE 集群节点上安装 Rancher Server 前，你需要先安装 Docker。RKE2 和 K3s 集群不要求使用 Docker。
 
 Docker 有几个安装方法。一种方法是参见 [Docker 官方文档](https://docs.docker.com/install/)以了解如何在 Linux 上安装 Docker。不同 Linux 发行版的安装步骤可能有所不同。
 
@@ -15,3 +15,9 @@ curl https://releases.rancher.com/install-docker/20.10.sh | sh
 ```
 
 Rancher 提供 Kubernetes 支持的所有上游 Docker 版本的安装脚本。如需了解我们是否提供某个 Docker 版本的安装脚本，请参见包含了 Rancher 所有的 Docker 安装脚本的 [GitHub 仓库](https://github.com/rancher/install-docker)。
+
+请注意，必须应用以下 sysctl 设置：
+
+```
+net.bridge.bridge-nf-call-iptables=1
+```
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md
index b9d77b5f8b2..fb2a324345f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/installation-requirements/port-requirements.md
@@ -277,7 +277,7 @@ import CommonPortsTable from '../../../shared-files/_common-ports-table.md';
 
 ### Rancher AWS EC2 安全组
 
-当你使用 [AWS EC2 Node Driver](../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md) 在 Rancher 中配置集群节点时，你可以让 Rancher 创建一个名为 `rancher-nodes` 的安全组。以下规则会自动添加到该安全组中。
+当你使用 [AWS EC2 Node Driver](../../../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md) 在 Rancher 中配置集群节点时，你可以让 Rancher 创建一个名为 `rancher-nodes` 的安全组。以下规则会自动添加到该安全组中。
 
 | 类型 | 协议 | 端口范围 | 源/目标 | 规则类型 |
 |-----------------|:--------:|:-----------:|------------------------|:---------:|
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/docker-install-commands.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/docker-install-commands.md
index d7fef7cf85a..deed134dc57 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/docker-install-commands.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/docker-install-commands.md
@@ -36,7 +36,7 @@ Docker 安装适用于想要测试 Rancher 的用户。
 | 占位符 | 描述 |
 | -------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
 | `<REGISTRY.YOURDOMAIN.COM:PORT>` | 私有镜像仓库的 URL 和端口。 |
-| `<RANCHER_VERSION_TAG>` | 你想要安装的 [Rancher 版本](../../../../reference-guides/installation-references/helm-chart-options.md)的版本标签。 |
+| `<RANCHER_VERSION_TAG>` | 你想要安装的 [Rancher 版本](../../installation-references/helm-chart-options.md)的版本标签。 |
 
 特权访问是[必须](#rancher-特权访问)的。
 
@@ -76,7 +76,7 @@ docker run -d --restart=unless-stopped \
 | `<PRIVATE_KEY.pem>` | 证书私钥的路径。 |
 | `<CA_CERTS.pem>` | CA 证书的路径。 |
 | `<REGISTRY.YOURDOMAIN.COM:PORT>` | 私有镜像仓库的 URL 和端口。 |
-| `<RANCHER_VERSION_TAG>` | 你想要安装的 [Rancher 版本](../../../../reference-guides/installation-references/helm-chart-options.md)的版本标签。 |
+| `<RANCHER_VERSION_TAG>` | 你想要安装的 [Rancher 版本](../../installation-references/helm-chart-options.md)的版本标签。 |
 
 特权访问是[必须](#rancher-特权访问)的。
 
@@ -115,7 +115,7 @@ docker run -d --restart=unless-stopped \
 | `<FULL_CHAIN.pem>` | 完整证书链的路径。 |
 | `<PRIVATE_KEY.pem>` | 证书私钥的路径。 |
 | `<REGISTRY.YOURDOMAIN.COM:PORT>` | 私有镜像仓库的 URL 和端口。 |
-| `<RANCHER_VERSION_TAG>` | 你想要安装的 [Rancher 版本](../../../../reference-guides/installation-references/helm-chart-options.md)的版本标签。 |
+| `<RANCHER_VERSION_TAG>` | 你想要安装的 [Rancher 版本](../../installation-references/helm-chart-options.md)的版本标签。 |
 
 :::note
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md
index 54552764ffc..3017a5af3c0 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/infrastructure-private-registry.md
@@ -59,7 +59,7 @@ K3s 与其他 Kubernetes 发行版不同，在于其支持使用 etcd 以外的
 在你的实现中，你可以考虑是否需要使用 4 层或 7 层的负载均衡器：
 
 - **4 层负载均衡器**：两种选择中较为简单的一种，它将 TCP 流量转发到你的节点中。我们建议使用 4 层负载均衡器，将流量从 TCP/80 端口和 TCP/443 端口转发到 Rancher Management 集群节点上。集群上的 Ingress Controller 会将 HTTP 流量重定向到 HTTPS，并在 TCP/443 端口上终止 SSL/TLS。Ingress Controller 会将流量转发到 Rancher deployment 中 Ingress Pod 的 TCP/80 端口。
-- **7 层负载均衡器**：相对比较复杂，但功能更全面。例如，与 Rancher 本身进行 TLS 终止相反，7 层负载均衡器能够在负载均衡器处处理 TLS 终止。如果你需要集中在基础设施中进行 TLS 终止，7 层负载均衡可能会很适合你。7 层负载均衡还能让你的负载均衡器基于 HTTP 属性（例如 cookie 等）做出决策，而 4 层负载均衡器则不能。如果你选择在 7 层负载均衡器上终止 SSL/TLS 流量，则在安装 Rancher 时（后续步骤）需要使用 `--set tls=external` 选项。详情请参见 [Rancher Helm Chart 选项](../../../../reference-guides/installation-references/helm-chart-options.md#外部-tls-终止)。
+- **7 层负载均衡器**：相对比较复杂，但功能更全面。例如，与 Rancher 本身进行 TLS 终止相反，7 层负载均衡器能够在负载均衡器处处理 TLS 终止。如果你需要集中在基础设施中进行 TLS 终止，7 层负载均衡可能会很适合你。7 层负载均衡还能让你的负载均衡器基于 HTTP 属性（例如 cookie 等）做出决策，而 4 层负载均衡器则不能。如果你选择在 7 层负载均衡器上终止 SSL/TLS 流量，则在安装 Rancher 时（后续步骤）需要使用 `--set tls=external` 选项。详情请参见 [Rancher Helm Chart 选项](../../installation-references/helm-chart-options.md#外部-tls-终止)。
 
 如需获取配置 NGINX 负载均衡器的示例，请参见[本页](../../../../how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md)。
 
@@ -126,7 +126,7 @@ Rancher 支持使用私有镜像仓库进行离线安装。你必须有自己的
 在你的实现中，你可以考虑是否需要使用 4 层或 7 层的负载均衡器：
 
 - **4 层负载均衡器**：两种选择中较为简单的一种，它将 TCP 流量转发到你的节点中。我们建议使用 4 层负载均衡器，将流量从 TCP/80 端口和 TCP/443 端口转发到 Rancher Management 集群节点上。集群上的 Ingress Controller 会将 HTTP 流量重定向到 HTTPS，并在 TCP/443 端口上终止 SSL/TLS。Ingress Controller 会将流量转发到 Rancher deployment 中 Ingress Pod 的 TCP/80 端口。
-- **7 层负载均衡器**：相对比较复杂，但功能更全面。例如，与 Rancher 本身进行 TLS 终止相反，7 层负载均衡器能够在负载均衡器处处理 TLS 终止。如果你需要集中在基础设施中进行 TLS 终止，7 层负载均衡可能会很适合你。7 层负载均衡还能让你的负载均衡器基于 HTTP 属性（例如 cookie 等）做出决策，而 4 层负载均衡器则不能。如果你选择在 7 层负载均衡器上终止 SSL/TLS 流量，则在安装 Rancher 时（后续步骤）需要使用 `--set tls=external` 选项。详情请参见 [Rancher Helm Chart 选项](../../../../reference-guides/installation-references/helm-chart-options.md#外部-tls-终止)。
+- **7 层负载均衡器**：相对比较复杂，但功能更全面。例如，与 Rancher 本身进行 TLS 终止相反，7 层负载均衡器能够在负载均衡器处处理 TLS 终止。如果你需要集中在基础设施中进行 TLS 终止，7 层负载均衡可能会很适合你。7 层负载均衡还能让你的负载均衡器基于 HTTP 属性（例如 cookie 等）做出决策，而 4 层负载均衡器则不能。如果你选择在 7 层负载均衡器上终止 SSL/TLS 流量，则在安装 Rancher 时（后续步骤）需要使用 `--set tls=external` 选项。详情请参见 [Rancher Helm Chart 选项](../../installation-references/helm-chart-options.md#外部-tls-终止)。
 
 如需获取配置 NGINX 负载均衡器的示例，请参见[本页](../../../../how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md)。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md
index 661ca47b02e..59c11b3f348 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-kubernetes.md
@@ -295,6 +295,12 @@ kubectl --kubeconfig ~/.kube/config/rke2.yaml get pods --all-namespaces
 
 参照 [RKE 官方文档](https://rancher.com/docs/rke/latest/en/installation/)的说明安装 RKE。
 
+:::note
+
+你可以在 [Rancher 支持矩阵](https://www.suse.com/suse-rancher/support-matrix/all-supported-versions/)中找到基于 Rancher 版本的 RKE 认证版本。
+
+:::
+
 ### 2. 创建 RKE 配置文件
 
 在可访问你 Linux 主机节点上的 22/TCP 端口和 6443/TCP 端口的系统上，使用以下示例创建一个名为 `rancher-cluster.yml` 的新文件。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md
index af39f190317..8a8e88a66ac 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/air-gapped-helm-cli-install/install-rancher-ha.md
@@ -22,7 +22,7 @@ title: 4. 安装 Rancher
 
 1. 如果你还没有安装 `helm`，请在可访问互联网的工作站上进行本地安装。注意：参考 [Helm 版本要求](../../resources/helm-version-requirements.md)选择 Helm 版本来安装 Rancher。
 
-2. 执行 `helm repo add` 命令，以添加包含安装 Rancher 的 Chart 的 Helm Chart 仓库。有关如何选择仓库，以及哪个仓库最适合你的用例，请参见[选择 Rancher 版本](../../../../reference-guides/installation-references/helm-chart-options.md#helm-chart-仓库)。
+2. 执行 `helm repo add` 命令，以添加包含安装 Rancher 的 Chart 的 Helm Chart 仓库。有关如何选择仓库，以及哪个仓库最适合你的用例，请参见[选择 Rancher 版本](../../installation-references/helm-chart-options.md#helm-chart-仓库)。
    - Latest：建议用于试用最新功能
       ```
       helm repo add rancher-latest https://releases.rancher.com/server-charts/latest
@@ -55,7 +55,7 @@ Rancher Server 默认设计为安全的，并且需要 SSL/TLS 配置。
 
 :::note
 
-如果你想在外部终止 SSL/TLS，请参见[外部负载均衡器的 TLS 终止](../../../../reference-guides/installation-references/helm-chart-options.md#外部-tls-终止)。
+如果你想在外部终止 SSL/TLS，请参见[外部负载均衡器的 TLS 终止](../../installation-references/helm-chart-options.md#外部-tls-终止)。
 
 :::
 
@@ -258,6 +258,6 @@ kubectl -n cattle-system apply -R -f ./rancher
 
 以下资源可能对安装 Rancher 有帮助：
 
-- [Rancher Helm Chart 选项](../../../../reference-guides/installation-references/helm-chart-options.md)
+- [Rancher Helm Chart 选项](../../installation-references/helm-chart-options.md)
 - [添加 TLS 密文](../../resources/add-tls-secrets.md)
 - [Rancher Kubernetes 安装的故障排除](../../install-upgrade-on-a-kubernetes-cluster/troubleshooting.md)
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md
index ed831af4a1f..7d926da39f9 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/install-rancher.md
@@ -95,6 +95,6 @@ kubectl rollout status deployment -n cattle-system rancher
 
 以下资源可能对安装 Rancher 有帮助：
 
-- [Rancher Helm Chart 选项](../../../../reference-guides/installation-references/helm-chart-options.md)
+- [Rancher Helm Chart 选项](../../installation-references/helm-chart-options.md)
 - [添加 TLS 密文](../../resources/add-tls-secrets.md)
 - [Rancher Kubernetes 安装的故障排除](../../install-upgrade-on-a-kubernetes-cluster/troubleshooting.md)
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md
index 99b0da6a0fb..58414b8ed1d 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-behind-an-http-proxy/set-up-infrastructure.md
@@ -37,7 +37,7 @@ title: '1. 配置基础设施'
 在你的实现中，你可以考虑是否需要使用 4 层或 7 层的负载均衡器：
 
 - **4 层负载均衡器**：两种选择中较为简单的一种，它将 TCP 流量转发到你的节点中。我们建议使用 4 层负载均衡器，将流量从 TCP/80 端口和 TCP/443 端口转发到 Rancher Management 集群节点上。集群上的 Ingress Controller 会将 HTTP 流量重定向到 HTTPS，并在 TCP/443 端口上终止 SSL/TLS。Ingress Controller 会将流量转发到 Rancher deployment 中 Ingress Pod 的 TCP/80 端口。
-- **7 层负载均衡器**：相对比较复杂，但功能更全面。例如，与 Rancher 本身进行 TLS 终止相反，7 层负载均衡器能够在负载均衡器处处理 TLS 终止。如果你需要集中在基础设施中进行 TLS 终止，7 层负载均衡可能会很适合你。7 层负载均衡还能让你的负载均衡器基于 HTTP 属性（例如 cookie 等）做出决策，而 4 层负载均衡器则不能。如果你选择在 7 层负载均衡器上终止 SSL/TLS 流量，则在安装 Rancher 时（后续步骤）需要使用 `--set tls=external` 选项。详情请参见 [Rancher Helm Chart 选项](../../../../reference-guides/installation-references/helm-chart-options.md#外部-tls-终止)。
+- **7 层负载均衡器**：相对比较复杂，但功能更全面。例如，与 Rancher 本身进行 TLS 终止相反，7 层负载均衡器能够在负载均衡器处处理 TLS 终止。如果你需要集中在基础设施中进行 TLS 终止，7 层负载均衡可能会很适合你。7 层负载均衡还能让你的负载均衡器基于 HTTP 属性（例如 cookie 等）做出决策，而 4 层负载均衡器则不能。如果你选择在 7 层负载均衡器上终止 SSL/TLS 流量，则在安装 Rancher 时（后续步骤）需要使用 `--set tls=external` 选项。详情请参见 [Rancher Helm Chart 选项](../../installation-references/helm-chart-options.md#外部-tls-终止)。
 
 如需获取配置 NGINX 负载均衡器的示例，请参见[本页](../../../../how-to-guides/new-user-guides/infrastructure-setup/nginx-load-balancer.md)。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md
index 7d68be0f9da..dcdc1b9fc38 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/upgrade-docker-installed-rancher.md
@@ -15,7 +15,7 @@ import TabItem from '@theme/TabItem';
 
 ## 先决条件
 
-- 在 Rancher 文档中**检查[已知升级问题](../../install-upgrade-on-a-kubernetes-cluster/upgrades.md#已知升级问题)**，了解升级 Rancher 时最需要注意的问题。你可以在 [GitHub](https://github.com/rancher/rancher/releases) 发布说明以及 [Rancher 论坛](https://forums.rancher.com/c/announcements/12)中找到每个 Rancher 版本的已知问题。不支持升级或升级到 [rancher-alpha 仓库](../../../../reference-guides/installation-references/helm-chart-options.md#helm-chart-仓库)中的任何 Chart。
+- 在 Rancher 文档中**检查[已知升级问题](../../install-upgrade-on-a-kubernetes-cluster/upgrades.md#已知升级问题)**，了解升级 Rancher 时最需要注意的问题。你可以在 [GitHub](https://github.com/rancher/rancher/releases) 发布说明以及 [Rancher 论坛](https://forums.rancher.com/c/announcements/12)中找到每个 Rancher 版本的已知问题。不支持升级或升级到 [rancher-alpha 仓库](../../../../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#helm-chart-仓库)中的任何 Chart。
 - **[仅适用于离线安装](../../../../pages-for-subheaders/air-gapped-helm-cli-install.md)：为新的 Rancher Server 版本收集和推送镜像**。按照指南为你想要升级的目标 Rancher 版本[推送镜像到私有镜像仓库](../air-gapped-helm-cli-install/publish-images.md)。
 
 ## 占位符
@@ -99,7 +99,7 @@ docker ps
 
 | 占位符 | 描述 |
 ------------|-------------
-| `<RANCHER_VERSION_TAG>` | 你想要升级到的 [Rancher 版本](../../../../reference-guides/installation-references/helm-chart-options.md)的版本标签。 |
+| `<RANCHER_VERSION_TAG>` | 你想要升级到的 [Rancher 版本](../../installation-references/helm-chart-options.md)的版本标签。 |
 
 ```
 docker pull rancher/rancher:<RANCHER_VERSION_TAG>
@@ -140,7 +140,7 @@ docker pull rancher/rancher:<RANCHER_VERSION_TAG>
 
 | 占位符 | 描述 |
 ------------|-------------
-| `<RANCHER_VERSION_TAG>` | 你想要升级到的 [Rancher 版本](../../../../reference-guides/installation-references/helm-chart-options.md)的版本标签。 |
+| `<RANCHER_VERSION_TAG>` | 你想要升级到的 [Rancher 版本](../../installation-references/helm-chart-options.md)的版本标签。 |
 
 ```
 docker run -d --volumes-from rancher-data \
@@ -173,7 +173,7 @@ docker run -d --volumes-from rancher-data \
 | `<FULL_CHAIN.pem>` | 完整证书链的路径。 |
 | `<PRIVATE_KEY.pem>` | 证书私钥的路径。 |
 | `<CA_CERTS.pem>` | CA 证书的路径。 |
-| `<RANCHER_VERSION_TAG>` | 你想要升级到的 [Rancher 版本](../../../../reference-guides/installation-references/helm-chart-options.md)的版本标签。 |
+| `<RANCHER_VERSION_TAG>` | 你想要升级到的 [Rancher 版本](../../installation-references/helm-chart-options.md)的版本标签。 |
 
 ```
 docker run -d --volumes-from rancher-data \
@@ -208,7 +208,7 @@ docker run -d --volumes-from rancher-data \
 | `<CERT_DIRECTORY>` | 包含证书文件的目录的路径。 |
 | `<FULL_CHAIN.pem>` | 完整证书链的路径。 |
 | `<PRIVATE_KEY.pem>` | 证书私钥的路径。 |
-| `<RANCHER_VERSION_TAG>` | 你想要升级到的 [Rancher 版本](../../../../reference-guides/installation-references/helm-chart-options.md)的版本标签。 |
+| `<RANCHER_VERSION_TAG>` | 你想要升级到的 [Rancher 版本](../../installation-references/helm-chart-options.md)的版本标签。 |
 
 ```
 docker run -d --volumes-from rancher-data \
@@ -246,7 +246,7 @@ Let's Encrypt 对新证书请求有频率限制。因此，请限制创建或销
 
 | 占位符 | 描述 |
 ------------|-------------
-| `<RANCHER_VERSION_TAG>` | 你想要升级到的 [Rancher 版本](../../../../reference-guides/installation-references/helm-chart-options.md)的版本标签。 |
+| `<RANCHER_VERSION_TAG>` | 你想要升级到的 [Rancher 版本](../../installation-references/helm-chart-options.md)的版本标签。 |
 | `<YOUR.DNS.NAME>` | 你最初使用的域名 |
 
 ```
@@ -279,7 +279,7 @@ docker run -d --volumes-from rancher-data \
 | 占位符 | 描述 |
 ------------|-------------
 | `<REGISTRY.YOURDOMAIN.COM:PORT>` | 私有镜像仓库的 URL 和端口。 |
-| `<RANCHER_VERSION_TAG>` | 你想要升级到的 [Rancher 版本](../../../../reference-guides/installation-references/helm-chart-options.md)的版本标签。 |
+| `<RANCHER_VERSION_TAG>` | 你想要升级到的 [Rancher 版本](../../installation-references/helm-chart-options.md)的版本标签。 |
 
 ```
   docker run -d --volumes-from rancher-data \
@@ -314,7 +314,7 @@ docker run -d --volumes-from rancher-data \
 | `<PRIVATE_KEY.pem>` | 证书私钥的路径。 |
 | `<CA_CERTS.pem>` | CA 证书的路径。 |
 | `<REGISTRY.YOURDOMAIN.COM:PORT>` | 私有镜像仓库的 URL 和端口。 |
-| `<RANCHER_VERSION_TAG>` | 你想要升级到的 [Rancher 版本](../../../../reference-guides/installation-references/helm-chart-options.md)的版本标签。 |
+| `<RANCHER_VERSION_TAG>` | 你想要升级到的 [Rancher 版本](../../installation-references/helm-chart-options.md)的版本标签。 |
 
 ```
 docker run -d --restart=unless-stopped \
@@ -349,7 +349,7 @@ docker run -d --restart=unless-stopped \
 | `<FULL_CHAIN.pem>` | 完整证书链的路径。 |
 | `<PRIVATE_KEY.pem>` | 证书私钥的路径。 |
 | `<REGISTRY.YOURDOMAIN.COM:PORT>` | 私有镜像仓库的 URL 和端口。 |
-| `<RANCHER_VERSION_TAG>` | 你想要升级到的 [Rancher 版本](../../../../reference-guides/installation-references/helm-chart-options.md)的版本标签。 |
+| `<RANCHER_VERSION_TAG>` | 你想要升级到的 [Rancher 版本](../../installation-references/helm-chart-options.md)的版本标签。 |
 
 :::note
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md
index 18d577276ea..d454197c8a5 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md
@@ -20,5 +20,5 @@ Rancher 可以访问的服务示例：
 
 - [Docker 安装的自定义 CA 证书选项](../../../reference-guides/single-node-rancher-in-docker/advanced-options.md#自定义-ca-证书)
 
-- [Kubernetes 安装的其他受信 CA 选项](../../../reference-guides/installation-references/helm-chart-options.md#额外的授信-ca)
+- [Kubernetes 安装的其他受信 CA 选项](../installation-references/helm-chart-options.md#额外的授信-ca)
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md
index 18def9bb648..dcdb4972b69 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/upgrade-and-roll-back-kubernetes.md
@@ -82,7 +82,7 @@ RKE v1.1.0 改变了集群升级的方式。
 1. 在**集群**页面中，进入要启用节点清空的集群，然后点击 **⋮ > 编辑配置**。
 1. 单击 **⋮ > 编辑**。
 1. 在**升级策略**选项卡中，转到**清空节点**字段并单击**是**。controlplane 和 worker 节点的清空是单独配置的。
-1. 配置如何删除 pod 的选项。有关每个选项的详细信息，请参阅[本节](../../how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md#激进和安全的清空选项)。
+1. 配置如何删除 pod 的选项。有关每个选项的详细信息，请参阅[本节](../../how-to-guides/new-user-guides/manage-clusters/nodes-and-node-pools.md#激进和安全的清空选项)。
 1. （可选）配置宽限期。宽限期是给每个 pod 进行清理的超时时间，能让 pod 有机会优雅地退出。Pod 可能需要完成任何未完成的请求、回滚事务或将状态保存到某些外部存储。如果该值为负数，将使用 pod 中指定的默认值。
 1. （可选）配置超时，这是在清空放弃之前应该继续等待的时间。
 1. 单击**保存**。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md
index 392755cbaba..5778609354b 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/upgrade-kubernetes-without-upgrading-rancher.md
@@ -34,7 +34,7 @@ Rancher 的 Kubernetes 元数据包含 Rancher 用于配置 [RKE 集群](../../p
 
 ### 刷新 Kubernetes 元数据
 
-默认情况下，管理员或具有**管理集群驱动**[全局角色](../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)的用户，可以刷新 Kubernetes 元数据。
+默认情况下，管理员或具有**管理集群驱动**[全局角色](../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)的用户，可以刷新 Kubernetes 元数据。
 
 要强制 Rancher 刷新 Kubernetes 元数据，可以执行手动刷新操作：
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/introduction/what-are-divio-docs.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/introduction/what-are-divio-docs.md
deleted file mode 100644
index aad315528d9..00000000000
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/introduction/what-are-divio-docs.md
+++ /dev/null
@@ -1,100 +0,0 @@
----
-title: Divio 文档介绍
----
-
-[Divio 文档系统](https://documentation.divio.com/)是一种软件文档范式，它以功能为基础，旨在为用户提供具体、简明而且目的明确的文档。一般来说，Divio 由四个类别组成，分别是教程、操作指南、参考指南和解释。
-
-我们将文档划分为[开始使用](../../getting-started.md)、[操作指南](../../how-to-guides.md)（包括[新用户指南](../../pages-for-subheaders/new-user-guides.md)和[高级用户指南](../../pages-for-subheaders/advanced-user-guides.md)）、[参考指南](../../reference-guides.md)、[说明](../../explanations.md)、[常见问题](../../faq.md)、[故障排除](../../troubleshooting.md)，以及[参与 Rancher 社区贡献](../../contribute-to-rancher.md)几个部分。
-
-
-## 开始使用
-
-**开始使用**章节能帮助你快速启动和运行 Rancher。
-
-本章节旨在帮助用户部署 Rancher 和工作负载，并快速有效地安装或升级 Rancher。
-
-请参阅[简介](../../pages-for-subheaders/introduction.md)、[快速入门指南](../../pages-for-subheaders/quick-start-guides.md)以及[安装和升级](../../pages-for-subheaders/installation-and-upgrade.md)部分了解更多信息。
-
-## 操作指南
-
-操作指南描述了用户完成某些任务的实际步骤。在 Rancher 中，我们将操作指南进一步细分为[新用户指南](#新用户指南)和[高级用户指南](#高级用户指南)。
-
-### 新用户指南
-
-新用户指南（也称为教程）描述了某些操作的实际步骤。这些文档是“学习导向”的，也就是说用户通过“操作”来学习。
-
-新用户指南旨在引导初学者或 Rancher 的日常用户通过一系列步骤来学习如何进行某些操作。这些文档旨在帮助用户通过使用易于遵循、有意义且可重复的操作来了解如何完成任务。这些指南将帮助用户完成工作，并能立刻看到效果。
-
-正常来说，普通 Rancher 用户的技术水平高于“初学者”，但是，我们的新用户指南为初学者以及经验丰富的 Rancher 用户提供相同的指导。我们结合使用了高级语言和技术语言来介绍各个主题，并指导用户完成 Rancher 用户需要了解的通用任务。
-
-你可以在[此处](../../how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md)找到新用户指南的一个示例。
-
-### 高级用户指南
-
-高级用户指南是“问题导向”的文档，用户可以从中学习如何解决问题。高级用于指南与新用户指南的主要区别在于，高级用户指南面向更有经验或更高级的用户，这些用户对文档有更多的技术需求，而且已经了解 Rancher 及其功能。他们知道自己需要做什么，只是需要额外的指导来完成更复杂的任务。
-
-应该注意的是，新用户指南和高级用户指南都没有提供详细的解释或讨论（这些文档不包括在本部分）。操作指南侧重于引导用户通过可重复、有效的步骤来学习新技能、掌握某些操作或解决某些问题。
-
-你可以在[此处](../../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md)找到高级用户指南的一个示例。
-
-## 参考指南
-
-参考指南是用户可以学习的产品或流程描述。参考指南是“信息导向”的，主要用于描述。
-
-本章节的文档可能包含一些操作步骤，但是描述操作步骤不是本章节的主要目的。
-
-使用参考指南的用户熟悉且了解如何使用 Rancher。当用户需要参考具体使用细节时，用户可以获取更详细的使用描述。
-
-Rancher 参考指南示例：
-1. [Rancher Manager 架构](../../pages-for-subheaders/rancher-manager-architecture.md)
-2. [集群配置指南](../../pages-for-subheaders/cluster-configuration.md)
-
-## 说明
-
-说明文档主要用于为某个任务或主题背后的“原因”提供理论知识。说明文档是“理解导向”的，用于拓宽用户的知识。在本节中，用户可以找到有关主题的上下文和背景、替代方案和意见等，还可能找到历史原因、相关限制以及流程的工作原理。
-
-说明文档不会像操作指南那样指导用户进行操作，也不会像参考文档那样给出详细的描述。说明文档用于提供简单和复杂主题的实质和背景。
-
-由于我们以前的大多数文档都不是"以讨论为导向"的，因此我们的新文档会增加这一部分内容。目前，我们以[Rancher 中的集成](../../pages-for-subheaders/integrations-in-rancher.md)来讨论我们的集成产品。
-
-### Rancher 中的集成
-
-Rancher 已经积累了多个产品和项目，而且已将它们集成到 Rancher UI 中。为了帮助用户了解这些集成，我们已将此小节添加到**说明**下。
-
-集成示例：[Harvester](../../explanations/integrations-in-rancher/harvester.md) 和 [NeuVector](../../explanations/integrations-in-rancher/neuvector.md)
-
-## 其他文档类别
-
-### 常见问题
-
-[常见问题](../../faq.md)包含了用户常见的 Rancher v2.x 问题。这些问题可能是技术性的或非技术性的。
-
-我们会不断补充和优化这一部分，你可以常来浏览更新的内容。
-
-### 故障排除
-
-[故障排除](../../troubleshooting.md)旨在帮助新老 Rancher 用户解决他们在使用 Rancher 时可能遇到的已知问题。
-
-我们会不断补充和优化这一部分，你可以常来浏览更新的内容。
-
-### 参与 Rancher 社区贡献
-
-为了提高文档的质量，我们一直在更新、检查和改进 Rancher Manager 文档。同时，我们也呼吁社区用户参与贡献。
-
-你可以查阅[参与 Rancher 社区贡献](../../contribute-to-rancher.md)章节，了解 Rancher 使用的仓库，以及学习如何构建仓库、提交 issue 或创建 PR。
-
-我们会经常 review 用户的贡献，并将及时向贡献者提供反馈。
-
-## 重叠类别
-
-你可能会发现，各个文档类别（新用户指南、高级用户指南、参考资料）存在一些重叠。这是因为信息流是流动的，因此通常情况下，某些文档在逻辑上可能属于多个类别。虽然我们的文档有一些重叠，但如果我们记住每个类别的主要功能并努力区分它们，那么文档将更加清晰可用。
-
-## 新结构目标
-
-旧版 Rancher 文档侧重于单个功能和主题，而新的 Divio 范式则优先考虑功能和及其内在联系。
-
-我们旧版的文档结构没有采用 Divio 范式（例如，并非每个文档都可以合理地放入用户指南或参考文献中）。某些文档可能包含多个文档功能的内容。
-
-因此，我们一直在努力把现有的文档转移到基于文档功能的新结构。未来，我们将根据需要创建、重写和重塑我们的文档，使我们的文档更加符合 Divio 结构、目的及其设计概念。
-
-最终，我们的文档将强调单个主题或功能，从而更加有效地帮助我们的用户。
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/introduction/overview.md b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/overview.md
similarity index 65%
rename from i18n/zh/docusaurus-plugin-content-docs/current/getting-started/introduction/overview.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/getting-started/overview.md
index c17753633b5..5f8c0cc89bb 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/introduction/overview.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/overview.md
@@ -30,21 +30,21 @@ Rancher API Server 是基于嵌入式 Kubernetes API Server 和 etcd 数据库
 
 ### 授权和基于角色的权限控制（RBAC）
 
-- **用户管理**：Rancher API Server 除了管理本地用户，还[管理用户用来访问外部服务所需的认证信息](../../pages-for-subheaders/about-authentication.md)，如登录 Active Directory 和 GitHub 所需的账号密码。
-- **授权**：Rancher API Server 可以管理[访问控制策略](../../pages-for-subheaders/manage-role-based-access-control-rbac.md)和[安全策略](../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md)。
+- **用户管理**：Rancher API Server 除了管理本地用户，还[管理用户用来访问外部服务所需的认证信息](../pages-for-subheaders/authentication-config.md)，如登录 Active Directory 和 GitHub 所需的账号密码。
+- **授权**：Rancher API Server 可以管理[访问控制策略](../pages-for-subheaders/manage-role-based-access-control-rbac.md)和[安全策略](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md)。
 
 ### 使用 Kubernetes 的功能
 
-- **配置 Kubernetes 集群**：Rancher API Server 可以在已有节点上[配置 Kubernetes](../../pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md)，或进行 [Kubernetes 版本升级](../installation-and-upgrade/upgrade-and-roll-back-kubernetes.md)。
-- **管理应用商店**：Rancher 支持使用 [Helm Chart 应用商店](../../pages-for-subheaders/helm-charts-in-rancher.md)实现轻松重复部署应用。
-- **管理项目**：项目由集群中多个命名空间和访问控制策略组成，是 Rancher 中的一个概念，Kubernetes 中并没有这个概念。你可以使用项目实现以组为单位，管理多个命名空间，并进行 Kubernetes 相关操作。Rancher UI 提供用于[项目管理](../../pages-for-subheaders/manage-projects.md)和[项目内应用管理](../../pages-for-subheaders/kubernetes-resources-setup.md)的功能。
-- **Fleet 持续交付**：在 Rancher 中，你可以使用 [Fleet 持续交付](../../pages-for-subheaders/fleet-gitops-at-scale.md)将应用程序从 Git 仓库部署到目标下游 Kubernetes 集群，无需任何手动操作。
-- **Istio**：[Rancher 与 Istio 集成](../../pages-for-subheaders/istio.md)，使得管理员或集群所有者可以将 Istio 交给开发者，然后开发者使用 Istio 执行安全策略，排查问题，或为蓝绿部署，金丝雀部署，和 A/B 测试进行流量管理。
+- **配置 Kubernetes 集群**：Rancher API Server 可以在已有节点上[配置 Kubernetes](../pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md)，或进行 [Kubernetes 版本升级](installation-and-upgrade/upgrade-and-roll-back-kubernetes.md)。
+- **管理应用商店**：Rancher 支持使用 [Helm Chart 应用商店](../pages-for-subheaders/helm-charts-in-rancher.md)实现轻松重复部署应用。
+- **管理项目**：项目由集群中多个命名空间和访问控制策略组成，是 Rancher 中的一个概念，Kubernetes 中并没有这个概念。你可以使用项目实现以组为单位，管理多个命名空间，并进行 Kubernetes 相关操作。Rancher UI 提供用于[项目管理](../pages-for-subheaders/manage-projects.md)和[项目内应用管理](../pages-for-subheaders/kubernetes-resources-setup.md)的功能。
+- **Fleet 持续交付**：在 Rancher 中，你可以使用 [Fleet 持续交付](../pages-for-subheaders/fleet-gitops-at-scale.md)将应用程序从 Git 仓库部署到目标下游 Kubernetes 集群，无需任何手动操作。
+- **Istio**：[Rancher 与 Istio 集成](../pages-for-subheaders/istio.md)，使得管理员或集群所有者可以将 Istio 交给开发者，然后开发者使用 Istio 执行安全策略，排查问题，或为蓝绿部署，金丝雀部署，和 A/B 测试进行流量管理。
 
 ### 配置云基础设施
 
-- **同步节点信息**：Rancher API Server 可以同步所有集群中全部[节点](../../how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md)的信息。
-- **配置云基础设施**：如果你为 Rancher 配置了云提供商，Rancher 可以在云端动态配置[新节点](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)和[持久化存储](../../pages-for-subheaders/create-kubernetes-persistent-storage.md)。
+- **同步节点信息**：Rancher API Server 可以同步所有集群中全部[节点](../how-to-guides/new-user-guides/manage-clusters/nodes-and-node-pools.md)的信息。
+- **配置云基础设施**：如果你为 Rancher 配置了云提供商，Rancher 可以在云端动态配置[新节点](../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)和[持久化存储](../pages-for-subheaders/create-kubernetes-persistent-storage.md)。
 
 ### 查看集群信息
 
@@ -54,12 +54,12 @@ Rancher API Server 是基于嵌入式 Kubernetes API Server 和 etcd 数据库
 
 # 使用 Rancher 编辑下游集群
 
-对于已有集群而言，可提供的选项和设置取决于你配置集群的方法。例如，只有[通过 RKE 启动](../../pages-for-subheaders/launch-kubernetes-with-rancher.md)的集群才有可编辑的**集群选项**。
+对于已有集群而言，可提供的选项和设置取决于你配置集群的方法。例如，只有[通过 RKE 启动](../pages-for-subheaders/launch-kubernetes-with-rancher.md)的集群才有可编辑的**集群选项**。
 
-使用 Rancher 创建集群后，集群管理员可以管理集群成员，开启 Pod 安全策略，管理节点池，以及进行[其他操作](../../pages-for-subheaders/cluster-configuration.md)。
+使用 Rancher 创建集群后，集群管理员可以管理集群成员，开启 Pod 安全策略，管理节点池，以及进行[其他操作](../pages-for-subheaders/cluster-configuration.md)。
 
 下表总结了每一种类型的集群和对应的可编辑的选项和设置：
 
-import ClusterCapabilitiesTable from '../../shared-files/_cluster-capabilities-table.md';
+import ClusterCapabilitiesTable from '../shared-files/_cluster-capabilities-table.md';
 
 <ClusterCapabilitiesTable />
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides.md
deleted file mode 100644
index 1c620fae77e..00000000000
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 操作指南
----
-
-**操作指南**描述了用户完成某些任务的实际步骤。在 Rancher 中，我们将操作指南进一步细分为[新用户指南](./pages-for-subheaders/new-user-guides.md)和[高级用户指南](./pages-for-subheaders/advanced-user-guides.md)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/cis-scan-guides/create-a-custom-benchmark-version-to-run.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/cis-scan-guides/create-a-custom-benchmark-version-to-run.md
index 8af84c0f45f..fe8477f7b55 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/cis-scan-guides/create-a-custom-benchmark-version-to-run.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/cis-scan-guides/create-a-custom-benchmark-version-to-run.md
@@ -6,4 +6,4 @@ title: 为集群扫描创建自定义 Benchmark 版本
 
 现在，你可以使用 `rancher-cis-benchmark` 应用来创建自定义 Benchmark 版本，从而运行集群扫描。
 
-有关详细信息，请参阅[此页面](../../../explanations/integrations-in-rancher/cis-scans/custom-benchmark.md)。
\ No newline at end of file
+有关详细信息，请参阅[此页面](../../../integrations-in-rancher/cis-scans/custom-benchmark.md)。
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/configure-layer-7-nginx-load-balancer.md
similarity index 85%
rename from i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/configure-layer-7-nginx-load-balancer.md
index 06d41ae7e98..c34d930bf00 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/configure-layer-7-nginx-load-balancer.md
@@ -10,14 +10,14 @@ title: 7 层 NGINX 负载均衡器上的 TLS 终止（Docker 安装）
 
 ## 操作系统，Docker，硬件和网络要求
 
-请确保你的节点满足常规的[安装要求](../../../../pages-for-subheaders/installation-requirements.md)。
+请确保你的节点满足常规的[安装要求](../../pages-for-subheaders/installation-requirements.md)。
 
 ## 安装概要
 
 
 ## 1. 配置 Linux 主机
 
-根据我们的[要求](../../../../pages-for-subheaders/installation-requirements.md)配置一个 Linux 主机来启动 Rancher Server。
+根据我们的[要求](../../pages-for-subheaders/installation-requirements.md)配置一个 Linux 主机来启动 Rancher Server。
 
 ## 2. 选择一个 SSL 选项并安装 Rancher
 
@@ -165,14 +165,14 @@ http {
 
 ## 后续操作
 
-- **推荐**：检查单节点[备份](../../../../how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md)和[恢复](../../../../how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher.md)。你可能暂时没有需要备份的数据，但是我们建议你在常规使用 Rancher 后创建备份。
-- 创建 Kubernetes 集群：[配置 Kubernetes 集群](../../../../pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md)。
+- **推荐**：检查单节点[备份](../../how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-docker-installed-rancher.md)和[恢复](../../how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-docker-installed-rancher.md)。你可能暂时没有需要备份的数据，但是我们建议你在常规使用 Rancher 后创建备份。
+- 创建 Kubernetes 集群：[配置 Kubernetes 集群](../../pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md)。
 
 <br/>
 
 ## 常见问题和故障排除
 
-如果你需要对证书进行故障排除，请参见[此章节](../../other-installation-methods/rancher-on-a-single-node-with-docker/certificate-troubleshooting.md)。
+如果你需要对证书进行故障排除，请参见[此章节](../../getting-started/installation-and-upgrade/other-installation-methods/rancher-on-a-single-node-with-docker/certificate-troubleshooting.md)。
 
 ## 高级选项
 
@@ -188,7 +188,7 @@ http {
 
 ### 离线环境
 
-如果你访问此页面是为了完成[离线安装](../../../../pages-for-subheaders/air-gapped-helm-cli-install.md)，则在运行安装命令时，先将你的私有镜像仓库 URL 附加到 Server 标志中。也就是说，在 `rancher/rancher:latest` 前面添加 `<REGISTRY.DOMAIN.COM:PORT>` 和私有镜像仓库 URL。
+如果你访问此页面是为了完成[离线安装](../../pages-for-subheaders/air-gapped-helm-cli-install.md)，则在运行安装命令时，先将你的私有镜像仓库 URL 附加到 Server 标志中。也就是说，在 `rancher/rancher:latest` 前面添加 `<REGISTRY.DOMAIN.COM:PORT>` 和私有镜像仓库 URL。
 
 **示例**：
 
@@ -208,7 +208,7 @@ docker run -d --restart=unless-stopped \
   rancher/rancher:latest
 ```
 
-Rancher 2.5 开始需要[特权访问](../../../../pages-for-subheaders/rancher-on-a-single-node-with-docker.md#rancher-特权访问)。
+Rancher 2.5 开始需要[特权访问](../../pages-for-subheaders/rancher-on-a-single-node-with-docker.md#rancher-特权访问)。
 
 这个 7 层 NGINX 配置已经在 NGINX 1.13（Mainline）和 1.14（Stable）版本上进行了测试。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/enable-api-audit-log.md
similarity index 98%
rename from i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/enable-api-audit-log.md
index 7c79c13f5ae..94974cb52f7 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/enable-api-audit-log.md
@@ -10,9 +10,9 @@ API 审计可以在 Rancher 安装或升级期间启用。
 
 你可以将环境变量传递给 Rancher Server 容器，从而启用和配置审计日志。请参见以下文档，在安装时启用该功能：
 
-- [Docker 安装](../../../../reference-guides/single-node-rancher-in-docker/advanced-options.md#api-审计日志)
+- [Docker 安装](../../reference-guides/single-node-rancher-in-docker/advanced-options.md#api-审计日志)
 
-- [Kubernetes 安装](../../../../reference-guides/installation-references/helm-chart-options.md#api-审计日志)
+- [Kubernetes 安装](../../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#api-审计日志)
 
 ## API 审计日志选项
 
@@ -59,7 +59,7 @@ kubectl -n cattle-system logs -f rancher-84d886bdbb-s4s69 rancher-audit-log
 
 #### 发送审计日志
 
-你可以为集群启用 Rancher 的内置日志收集和传送功能，将审计日志和其他服务日志发送到支持的 endpoint。详情请参见 [Rancher 工具 - Logging](../../../../pages-for-subheaders/logging.md)。
+你可以为集群启用 Rancher 的内置日志收集和传送功能，将审计日志和其他服务日志发送到支持的 endpoint。详情请参见 [Rancher 工具 - Logging](../../pages-for-subheaders/logging.md)。
 
 ## 审计日志示例
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/continuous-delivery.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/enable-experimental-features/continuous-delivery.md
similarity index 59%
rename from i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/continuous-delivery.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/enable-experimental-features/continuous-delivery.md
index aa8ab564ca8..a96b9eac8c2 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/continuous-delivery.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/enable-experimental-features/continuous-delivery.md
@@ -2,9 +2,9 @@
 title: 持续交付
 ---
 
-从 Rancher 2.5 开始，[Fleet](../../../../how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md) 已经预装在 Rancher 中，且从 Rancher 2.6 开始，Fleet 不能再完全禁用。但是，你可以使用 `continuous-delivery` 功能开关来禁用 GitOps 持续交付的 Fleet 功能。
+从 Rancher 2.5 开始，[Fleet](../../../how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md) 已经预装在 Rancher 中，且从 Rancher 2.6 开始，Fleet 不能再完全禁用。但是，你可以使用 `continuous-delivery` 功能开关来禁用 GitOps 持续交付的 Fleet 功能。
 
-如需启用或禁用此功能，请参见[启用实验功能主页](../../../../pages-for-subheaders/enable-experimental-features.md)中的说明。
+如需启用或禁用此功能，请参见[启用实验功能主页](../../../pages-for-subheaders/enable-experimental-features.md)中的说明。
 
 | 环境变量键 | 默认值 | 描述 |
 ---|---|---
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/enable-experimental-features/istio-traffic-management-features.md
similarity index 90%
rename from i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/enable-experimental-features/istio-traffic-management-features.md
index d906144d15a..35801de23b4 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/istio-traffic-management-features.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/enable-experimental-features/istio-traffic-management-features.md
@@ -4,9 +4,9 @@ title: UI 管理 Istio 虚拟服务和目标规则
 
 此功能可启动一个 UI，用于管理 Istio 的流量，其中包括创建、读取、更新和删除虚拟服务（Virtual Service）和目标规则（Destination Rule）。
 
-> **注意**：启用此功能并不会启用 Istio。集群管理员需要[为集群启用 Istio](../../../../pages-for-subheaders/istio-setup-guide.md) 才能使用该功能。
+> **注意**：启用此功能并不会启用 Istio。集群管理员需要[为集群启用 Istio](../../../pages-for-subheaders/istio-setup-guide.md) 才能使用该功能。
 
-如需启用或禁用此功能，请参见[启用实验功能主页](../../../../pages-for-subheaders/enable-experimental-features.md)中的说明。
+如需启用或禁用此功能，请参见[启用实验功能主页](../../../pages-for-subheaders/enable-experimental-features.md)中的说明。
 
 | 环境变量键 | 默认值 | 状态 | 可用于 |
 ---|---|---|---
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/enable-experimental-features/rancher-on-arm64.md
similarity index 86%
rename from i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/enable-experimental-features/rancher-on-arm64.md
index 31daead898b..d97b98e2493 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/enable-experimental-features/rancher-on-arm64.md
@@ -11,7 +11,7 @@ title: "在 ARM64 上运行 Rancher（实验性）"
 如果你的节点使用 ARM64 架构，你可以使用以下选项：
 
 - 在 ARM64 架构的节点上运行 Rancher
-   - 此选项仅适用于 Docker 安装。请知悉，以下安装命令取代了 [Docker 安装](/versioned_docs/version-2.0-2.4/pages-for-subheaders/rancher-on-a-single-node-with-docker.md)链接中的示例：
+   - 此选项仅适用于 Docker 安装。请知悉，以下安装命令取代了 [Docker 安装链接](../../../pages-for-subheaders/rancher-on-a-single-node-with-docker.md)中的示例：
 
    ```
    # 在最后一行 `rancher/rancher:vX.Y.Z` 中，请务必将 "X.Y.Z" 替换为包含 ARM64 版本的发布版本。例如，如果你的匹配版本是 v2.5.8，请在此行填写 `rancher/rancher:v2.5.8`。
@@ -32,7 +32,7 @@ title: "在 ARM64 上运行 Rancher（实验性）"
 
 - 创建自定义集群并添加使用 ARM64 架构的节点
    - Kubernetes 集群必须为 1.12 或更高版本
-   - CNI 网络插件必须是 [Flannel](../../../../faq/container-network-interface-providers.md#flannel)
+   - CNI 网络插件必须是 [Flannel](../../../faq/container-network-interface-providers.md#flannel)
 - 导入包含使用 ARM64 架构的节点的集群
    - Kubernetes 集群必须为 1.12 或更高版本
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/enable-experimental-features/unsupported-storage-drivers.md
similarity index 94%
rename from i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/enable-experimental-features/unsupported-storage-drivers.md
index 1b09bd85143..19b9b27b2e0 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/enable-experimental-features/unsupported-storage-drivers.md
@@ -4,7 +4,7 @@ title: 使用非默认支持的存储驱动
 
 此功能允许你使用不是默认启用的存储提供商和卷插件。
 
-如需启用或禁用此功能，请参见[启用实验功能主页](../../../../pages-for-subheaders/enable-experimental-features.md)中的说明。
+如需启用或禁用此功能，请参见[启用实验功能主页](../../../pages-for-subheaders/enable-experimental-features.md)中的说明。
 
 | 环境变量键 | 默认值 | 描述 |
 ---|---|---
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md
index a518b3c461a..d0b33bd6611 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/enable-istio-in-cluster.md
@@ -5,9 +5,9 @@ title: 1. 在集群中启用 Istio
 :::note 先决条件：
 
 - 只有分配了 `cluster-admin` [Kubernetes 默认角色](https://kubernetes.io/docs/reference/access-authn-authz/rbac/#user-facing-roles)的用户可以在 Kubernetes 集群中配置和安装 Istio。
-- 如果你有 pod 安全策略，则需要安装启用了 CNI 的 Istio。有关详细信息，请参阅[本节](../../../explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies.md)。
-- 要在 RKE2 集群上安装 Istio，则需要执行额外的步骤。有关详细信息，请参阅[本节](../../../explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md)。
-- 要在启用了项目网络隔离的集群中安装 Istio，则需要执行额外的步骤。有关详细信息，请参阅[本节](../../../explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation.md)。
+- 如果你有 pod 安全策略，则需要安装启用了 CNI 的 Istio。有关详细信息，请参阅[本节](../../../integrations-in-rancher/istio/configuration-options/pod-security-policies.md)。
+- 要在 RKE2 集群上安装 Istio，则需要执行额外的步骤。有关详细信息，请参阅[本节](../../../integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md)。
+- 要在启用了项目网络隔离的集群中安装 Istio，则需要执行额外的步骤。有关详细信息，请参阅[本节](../../../integrations-in-rancher/istio/configuration-options/project-network-isolation.md)。
 
 :::
 
@@ -17,7 +17,7 @@ title: 1. 在集群中启用 Istio
 1. 单击 **Chart**。
 1. 单击 **Istio**。
 1. 如果你还没有安装 Monitoring 应用，系统会提示你安装 rancher-monitoring。你也可以选择在 Rancher-monitoring 安装上设置选择器或抓取配置选项。
-1. 可选：为 Istio 组件配置成员访问和[资源限制](../../../explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md)。确保你的 Worker 节点上有足够的资源来启用 Istio。
+1. 可选：为 Istio 组件配置成员访问和[资源限制](../../../integrations-in-rancher/istio/cpu-and-memory-allocations.md)。确保你的 Worker 节点上有足够的资源来启用 Istio。
 1. 可选：如果需要，对 values.yaml 进行额外的配置更改。
 1. 可选：通过[覆盖文件](../../../pages-for-subheaders/configuration-options.md#覆盖文件)来添加其他资源或配置。
 1. 单击**安装**。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md
index 0ec3e4ddee8..7439d9b1f8a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/istio-setup-guide/generate-and-view-traffic.md
@@ -10,7 +10,7 @@ Istio 概览页面提供了 Kiali 仪表板的链接。在 Kiali 仪表板中，
 
 :::note 先决条件：
 
-要显示流量图，请确保你在集群中安装了 Prometheus。Rancher-istio 安装了默认配置的 Kiali 来与 rancher-monitoring Chart 一起工作。你可以使用 rancher-monitoring 或安装自己的监控解决方案。你也可以通过设置[选择器 & 抓取配置](../../../explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md)选项来更改数据抓取的配置（可选）。
+要显示流量图，请确保你在集群中安装了 Prometheus。Rancher-istio 安装了默认配置的 Kiali 来与 rancher-monitoring Chart 一起工作。你可以使用 rancher-monitoring 或安装自己的监控解决方案。你也可以通过设置[选择器 & 抓取配置](../../../integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md)选项来更改数据抓取的配置（可选）。
 
 :::
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md
index 1674eeb62e0..91578148d71 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md
@@ -12,8 +12,8 @@ title: Pod 安全策略
 
 ### 先决条件
 
-- 在 Rancher 中创建 Pod 安全策略。在将默认 PSP 分配给现有项目之前，你必须有一个可分配的 PSP。有关说明，请参阅[创建 Pod 安全策略](../authentication-permissions-and-global-configuration/create-pod-security-policies.md)。
-- 将默认 Pod 安全策略分配给项目所属的集群。如果 PSP 还没有应用到集群，你无法将 PSP 分配给项目。有关详细信息，请参阅[将 pod 安全策略添加到集群](../manage-clusters/add-a-pod-security-policy.md)。
+- 在 Rancher 中创建 Pod 安全策略。在将默认 PSP 分配给现有项目之前，你必须有一个可分配的 PSP。有关说明，请参阅[创建 Pod 安全策略](../../new-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md)。
+- 将默认 Pod 安全策略分配给项目所属的集群。如果 PSP 还没有应用到集群，你无法将 PSP 分配给项目。有关详细信息，请参阅[将 pod 安全策略添加到集群](../../new-user-guides/manage-clusters/add-a-pod-security-policy.md)。
 
 ### 应用 Pod 安全策略
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md
index bd912fd3e66..26e87e8f31a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md
@@ -41,15 +41,22 @@ Rancher 中的资源配额包含与 [Kubernetes 原生版本](https://kubernetes
 但是，在 Rancher 的 UI **_外_** 创建的命名空间的处理方法则不一样。对于通过 `kubectl` 创建的命名空间，如果请求的资源量多余项目内的余量，Rancher 会分配一个数值为 **0** 的资源配额。
 
 要使用 `kubectl` 在现有项目中创建命名空间，请使用 `field.cattle.io/projectId` 注释。要覆盖默认的请求配额限制，请使用 `field.cattle.io/resourceQuota` 注释。
+
+请注意，Rancher 只会覆盖项目配额上定义的资源限制。
+
 ```
 apiVersion: v1
 kind: Namespace
 metadata:
   annotations:
     field.cattle.io/projectId: [your-cluster-ID]:[your-project-ID]
-    field.cattle.io/resourceQuota: '{"limit":{"limitsCpu":"100m", "limitsMemory":"100Mi", "configMaps": "50"}}'
+    field.cattle.io/resourceQuota: '{"limit":{"limitsCpu":"100m", "configMaps": "50"}}'
   name: my-ns
 ```
+在此示例中，如果项目配额在其资源列表中不包含 configMaps，那么 Rancher 将忽略此覆盖中的 `configMaps`。
+
+对于项目中未定义的资源，建议你在命名空间中创建专用的 `ResourceQuota` 对象来配置其它自定义限制。
+资源配额是原生 Kubernetes 对象，如果命名空间属于具有配额的项目，Rancher 将忽略用户定义的配额，从而给予用户更多的控制权。
 
 下表对比了 Rancher 和 Kubernetes 资源配额的主要区别：
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md
index 81a41d99d8e..f29c3004b85 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md
@@ -4,13 +4,13 @@ title: 覆盖命名空间的默认限制
 
 **命名空间默认限制**会在创建时从项目沿用到每个命名空间。但在某些情况下，你可能需要增加或减少特定命名空间的配额。在这种情况下，你可以通过编辑命名空间来覆盖默认限制。
 
-在下图中，Rancher 管理员的项目有一个已生效的资源配额。但是，管理员想要覆盖 `Namespace 3` 的命名空间限制，以便让该命名空间使用更多资源。因此，管理员[提高了 `Namespace 3` 的命名空间限制](../../manage-clusters/projects-and-namespaces.md)，以便命名空间可以访问更多资源。
+在下图中，Rancher 管理员的项目有一个已生效的资源配额。但是，管理员想要覆盖 `Namespace 3` 的命名空间限制，以便让该命名空间使用更多资源。因此，管理员[提高了 `Namespace 3` 的命名空间限制](../../../new-user-guides/manage-clusters/projects-and-namespaces.md)，以便命名空间可以访问更多资源。
 
 <sup>命名空间默认限制覆盖</sup>
 
 ![命名空间默认限制覆盖](/img/rancher-resource-quota-override.svg)
 
-有关详细信息，请参阅[如何编辑命名空间资源配额](../../manage-clusters/projects-and-namespaces.md)。
+有关详细信息，请参阅[如何编辑命名空间资源配额](../../../new-user-guides/manage-clusters/projects-and-namespaces.md)。
 
 ### 编辑命名空间资源配额
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md
index ab66028da06..9c7798ec320 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md
@@ -19,7 +19,7 @@ import TabItem from '@theme/TabItem';
 
 - 已安装 Monitoring 应用。
 - 要创建持久化仪表板，你必须在包含 Grafana 仪表板的项目或命名空间中至少具有**管理 ConfigMap** 的 Rancher RBAC 权限。这与 Monitoring Chart 公开的 `monitoring-dashboard-edit` 或 `monitoring-dashboard-admin` Kubernetes 原生 RBAC 角色对应。
-- 要查看指向外部监控 UI（包括 Grafana 仪表板）的链接，你至少需要一个 [project-member 角色](../../../explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md#具有-rancher-权限的用户)。
+- 要查看指向外部监控 UI（包括 Grafana 仪表板）的链接，你至少需要一个 [project-member 角色](../../../integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md#具有-rancher-权限的用户)。
 
 :::
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md
index fc4d9519f29..d1a1fae8a08 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md
@@ -8,7 +8,7 @@ title: 自定义 Grafana 仪表板
 
 在自定义 Grafana 仪表板之前，你必须先安装 `rancher-monitoring` 应用。
 
-要查看指向外部监控 UI（包括 Grafana 仪表板）的链接，你至少需要一个 [project-member 角色](../../../explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md#具有-rancher-权限的用户)。
+要查看指向外部监控 UI（包括 Grafana 仪表板）的链接，你至少需要一个 [project-member 角色](../../../integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md#具有-rancher-权限的用户)。
 
 ### 登录 Grafana
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md
index f919d611573..806a0f8e938 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/enable-monitoring.md
@@ -2,7 +2,7 @@
 title: 启用 Monitoring
 ---
 
-[管理员](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)或[集群所有者](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#集群角色)可以通过配置 Rancher 来部署 Prometheus，从而监控 Kubernetes 集群。
+[管理员](../../new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)或[集群所有者](../../new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#集群角色)可以通过配置 Rancher 来部署 Prometheus，从而监控 Kubernetes 集群。
 
 本文介绍如何使用新的 monitoring 应用在集群内启用监控和告警。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/migrate-to-rancher-v2.5+-monitoring.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/migrate-to-rancher-v2.5+-monitoring.md
index 76eecf498e6..9ab7401ceba 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/migrate-to-rancher-v2.5+-monitoring.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-alerting-guides/migrate-to-rancher-v2.5+-monitoring.md
@@ -29,7 +29,7 @@ Monitoring V2 只能在集群级别进行配置。不再支持项目级别的监
 
 默认情况下，项目所有者和成员不再可以访问 Grafana 或 Prometheus。如果只读用户有权访问 Grafana，他们将能够查看任何命名空间的数据。对于 Kiali，任何用户都可以在任何命名空间中编辑不属于该用户的东西。
 
-有关 `rancher-monitoring` 中 RBAC 的更多信息，请参阅[此页面](../../../explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md)。
+有关 `rancher-monitoring` 中 RBAC 的更多信息，请参阅[此页面](../../../integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md)。
 
 ## 从 Monitoring V1 迁移到 Monitoring V2
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md
index f2fd34ad716..b9e73892f2e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md
@@ -8,7 +8,7 @@ title: Alertmanager 配置
 
 :::note
 
-本节参考假设你已经熟悉 Monitoring 组件的协同工作方式。有关 Alertmanager 的详细信息，请参阅[本节](../../../../explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md#3-alertmanager-工作原理)。
+本节参考假设你已经熟悉 Monitoring 组件的协同工作方式。有关 Alertmanager 的详细信息，请参阅[本节](../../../../integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md#3-alertmanager-工作原理)。
 
 :::
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheus.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheus.md
index a1b84059905..c2524ceb835 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheus.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheus.md
@@ -6,7 +6,7 @@ title: Prometheus 配置
 
 :::note
 
-本节参考假设你已经熟悉 Monitoring 组件的协同工作方式。有关详细信息，请参阅[本节](../../../../explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)。
+本节参考假设你已经熟悉 Monitoring 组件的协同工作方式。有关详细信息，请参阅[本节](../../../../integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)。
 
 :::
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md
index 13779cd5ab7..10d7b9e192b 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md
@@ -6,7 +6,7 @@ PrometheusRule 定义了一组 Prometheus 告警和/或记录规则。
 
 :::note
 
-本节参考假设你已经熟悉 Monitoring 组件的协同工作方式。有关详细信息，请参阅[本节](../../../../explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)。
+本节参考假设你已经熟悉 Monitoring 组件的协同工作方式。有关详细信息，请参阅[本节](../../../../integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)。
 
 :::
 
@@ -63,7 +63,7 @@ Prometheus 规则文件保存在 PrometheusRule 自定义资源中。PrometheusR
 |-------|----------------|
 | 告警名称 | 告警的名称。必须是有效的标签值。 |
 | 告警触发等待时间 | 时长，以秒为单位。当告警触发时间到达该指定时长时，则视为触发。当告警未触发足够长的时间，则视为待处理。 |
-| PromQL 表达式 | 要评估的 PromQL 表达式。Prometheus 将在每个评估周期评估此 PromQL 表达式的当前值，并且所有生成的时间序列都将成为待处理/触发告警。有关详细信息，请参阅 [Prometheus 文档](https://prometheus.io/docs/prometheus/latest/querying/basics/)或我们的 [PromQL 表达式示例](../../../../explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md)。 |
+| PromQL 表达式 | 要评估的 PromQL 表达式。Prometheus 将在每个评估周期评估此 PromQL 表达式的当前值，并且所有生成的时间序列都将成为待处理/触发告警。有关详细信息，请参阅 [Prometheus 文档](https://prometheus.io/docs/prometheus/latest/querying/basics/)或我们的 [PromQL 表达式示例](../../../../integrations-in-rancher/monitoring-and-alerting/promql-expressions.md)。 |
 | Labels | 为每个告警添加或覆盖的标签。 |
 | 严重程度 | 启用后，标签​​会附加到告警或记录中，这些标签通过严重程度来标识告警/记录。 |
 | 严重程度 Label 值 | Critical，warning 或 none |
@@ -76,5 +76,5 @@ Prometheus 规则文件保存在 PrometheusRule 自定义资源中。PrometheusR
 | 字段 | 描述 |
 |-------|----------------|
 | 时间序列名称 | 要输出的时间序列的名称。必须是有效的指标名称。 |
-| PromQL 表达式 | 要评估的 PromQL 表达式。Prometheus 将在每个评估周期评估此 PromQL 表达式的当前值，并且将结果记录为一组新的时间序列，其指标名称由“记录”指定。有关表达式的更多信息，请参阅 [Prometheus 文档](https://prometheus.io/docs/prometheus/latest/querying/basics/)或我们的 [PromQL 表达式示例](../../../../explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md)。 |
+| PromQL 表达式 | 要评估的 PromQL 表达式。Prometheus 将在每个评估周期评估此 PromQL 表达式的当前值，并且将结果记录为一组新的时间序列，其指标名称由“记录”指定。有关表达式的更多信息，请参阅 [Prometheus 文档](https://prometheus.io/docs/prometheus/latest/querying/basics/)或我们的 [PromQL 表达式示例](../../../../integrations-in-rancher/monitoring-and-alerting/promql-expressions.md)。 |
 | Labels | 在存储结果之前要添加或覆盖的标签。 |
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/open-ports-with-firewalld.md
similarity index 96%
rename from i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/open-ports-with-firewalld.md
index 5b522727fcf..7e43c7234b2 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/open-ports-with-firewalld.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/open-ports-with-firewalld.md
@@ -31,7 +31,7 @@ target     prot opt source               destination
 sudo iptables --list
 ```
 
-下文介绍如何使用 `firewalld`，将[防火墙端口规则](../../installation-requirements/port-requirements.md)应用到高可用 Rancher Server 集群中的节点。
+下文介绍如何使用 `firewalld`，将[防火墙端口规则](../../pages-for-subheaders/installation-requirements.md#端口要求)应用到高可用 Rancher Server 集群中的节点。
 
 ## 先决条件
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/tune-etcd-for-large-installs.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/tune-etcd-for-large-installs.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/add-users-to-projects.md
similarity index 78%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/add-users-to-projects.md
index 763893847a0..44d4e03bcc4 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/add-users-to-projects.md
@@ -8,13 +8,13 @@ title: 添加项目成员
 
 :::tip
 
-如果你需要为用户提供对集群内 _所有_ 项目的访问权限，请参见[添加集群成员](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md)。
+如果你需要为用户提供对集群内 _所有_ 项目的访问权限，请参见[添加集群成员](../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md)。
 
 :::
 
 ### 将成员添加到新项目
 
-你可以在创建项目时将成员添加到项目中（建议）。有关创建新项目的详细信息，请参阅[集群管理](../manage-clusters/projects-and-namespaces.md)。
+你可以在创建项目时将成员添加到项目中（建议）。有关创建新项目的详细信息，请参阅[集群管理](../../how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces.md)。
 
 ### 将成员添加到现有项目
 
@@ -41,7 +41,7 @@ title: 添加项目成员
 
 1. 分配用户或组的**项目**角色。
 
-   [什么是项目角色？](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md)
+   [什么是项目角色？](../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md)
 
    :::note 注意事项：
 
@@ -51,8 +51,8 @@ title: 添加项目成员
 
    - 对于`自定义`角色，你可以修改可分配的角色列表。
 
-      - 要将角色添加到列表中，请[添加自定义角色](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md)。
-      - 要从列表中删除角色，请[锁定/解锁角色](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md)。
+      - 要将角色添加到列表中，请[添加自定义角色](../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md)。
+      - 要从列表中删除角色，请[锁定/解锁角色](../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md)。
 
    :::
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-active-directory.md
similarity index 97%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-active-directory.md
index d28db36b279..dc019d4f0d5 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-active-directory.md
@@ -4,11 +4,11 @@ title: 配置 Active Directory (AD)
 
 如果你的组织使用 Microsoft Active Directory 作为中心用户仓库，你可以将 Rancher 配置为与 Active Directory 服务器通信，从而对用户进行身份验证。这使 Rancher 管理员可以对外部用户系统中的用户和组进行集群和项目的访问控制，同时允许最终用户在登录 Rancher UI 时使用 Active Directory 凭证进行身份验证。
 
-Rancher 使用 LDAP 与 Active Directory 服务器通信。因此，Active Directory 与 [OpenLDAP 身份验证](../../../../../pages-for-subheaders/configure-openldap.md)的流程相同。
+Rancher 使用 LDAP 与 Active Directory 服务器通信。因此，Active Directory 与 [OpenLDAP 身份验证](../../../../pages-for-subheaders/configure-openldap.md)的流程相同。
 
 :::note
 
-在开始之前，请熟悉[外部身份验证配置和主体用户](../../../../../pages-for-subheaders/about-authentication.md#外部身份验证配置和用户主体)的概念。
+在开始之前，请熟悉[外部身份验证配置和主体用户](../../../../pages-for-subheaders/authentication-config.md#外部身份验证配置和用户主体)的概念。
 
 :::
 
@@ -216,4 +216,4 @@ $ ldapsearch -x -D "acme\jdoe" -w "secret" -p 389 \
 
 ## 附录：故障排除
 
-如果在测试与 Active Directory 服务器的连接时遇到问题，请首先仔细检查为 ServiceAccount 输入的凭证以及搜索库配置。你还可以检查 Rancher 日志来查明问题的原因。调试日志可能包含有关错误的更详细信息。详情请参见[如何启用调试日志](../../../../../faq/technical-items.md#如何启用调试日志记录？)。
+如果在测试与 Active Directory 服务器的连接时遇到问题，请首先仔细检查为 ServiceAccount 输入的凭证以及搜索库配置。你还可以检查 Rancher 日志来查明问题的原因。调试日志可能包含有关错误的更详细信息。详情请参见[如何启用调试日志](../../../../faq/technical-items.md#如何启用调试日志记录？)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md
similarity index 95%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md
index 62a8470e637..383fdaf7042 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md
@@ -222,7 +222,7 @@ Microsoft Graph API 现在是设置 Azure AD 的流程。下文将帮助[新用
 
 #### 在 Rancher UI 中更新端点
 
-> **重要提示**：管理员应该在他们提交下面第 4 步中的端点迁移之前创建一个[备份](../../../../new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher.md)。
+> **重要提示**：管理员应该在他们提交下面第 4 步中的端点迁移之前创建一个[备份](../../../new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher.md)。
 
 1. 按照[此处](#3-设置-rancher-所需的权限)所述更新 Azure AD 应用注册的权限
    (**重要**)。
@@ -253,7 +253,7 @@ Microsoft Graph API 现在是设置 Azure AD 的流程。下文将帮助[新用
 
 如果你需要回滚迁移，请注意以下事项：
 
-1. 如果管理员想要回滚，我们建议他们使用正确的恢复流程。有关参考信息，请参阅[备份文档](../../../../new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher.md)、[恢复文档](../../../../new-user-guides/backup-restore-and-disaster-recovery/restore-rancher.md)和[示例](../../../../../reference-guides/backup-restore-configuration/examples.md)。
+1. 如果管理员想要回滚，我们建议他们使用正确的恢复流程。有关参考信息，请参阅[备份文档](../../../new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher.md)、[恢复文档](../../../new-user-guides/backup-restore-and-disaster-recovery/restore-rancher.md)和[示例](../../../../reference-guides/backup-restore-configuration/examples.md)。
 
 1. 如果 Azure 应用程序所有者想要轮换应用程序密钥，他们也需要在 Rancher 中进行轮换（因为在 Azure 中更改应用程序密钥时，Rancher 不会自动更新应用程序密钥）。在 Rancher 中，它存储在名为 `azureadconfig-applicationsecret` 的 Kubernetes 密文中，该密文位于 `cattle-global-data` 命名空间中。
 
@@ -309,7 +309,7 @@ Token 端点   | https://login.chinacloudapi.cn/{tenantID}/oauth2/token
 >
 > - 对于在 Azure AD Graph API 停用后不希望升级到 v2.6.7 的现有用户，他们需要：
 >    - 使用内置的 Rancher 身份验证，或者
->    - 使用另一个第三方身份验证系统并在 Rancher 中进行设置。请参阅[身份验证文档](../../../../../pages-for-subheaders/about-authentication.md)，了解如何配置其他开放式身份验证提供程序。
+>    - 使用另一个第三方身份验证系统并在 Rancher 中进行设置。请参阅[身份验证文档](../../../../pages-for-subheaders/authentication-config.md)，了解如何配置其他开放式身份验证提供程序。
 
 </TabItem>
 </Tabs>
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-freeipa.md
similarity index 94%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-freeipa.md
index 19bef9d63a6..6f3100e462c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-freeipa.md
@@ -8,7 +8,7 @@ title: 配置 FreeIPA
 
 - 你必须配置了 [FreeIPA 服务器](https://www.freeipa.org/)。
 - 在 FreeIPA 中创建一个具有 `read-only` 访问权限的 ServiceAccount 。当用户使用 API​​ 密钥发出请求时，Rancher 使用此账号来验证组成员身份。
-- 参见[外部身份验证配置和主体用户](../../../../../pages-for-subheaders/about-authentication.md#外部身份验证配置和用户主体)。
+- 参见[外部身份验证配置和主体用户](../../../../pages-for-subheaders/authentication-config.md#外部身份验证配置和用户主体)。
 
 :::
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-github.md
similarity index 92%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-github.md
index aecf123035e..e903421611d 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-github.md
@@ -6,7 +6,7 @@ title: 配置 GitHub
 
 :::note 先决条件：
 
-参见[外部身份验证配置和主体用户](../../../../../pages-for-subheaders/about-authentication.md#外部身份验证配置和用户主体)。
+参见[外部身份验证配置和主体用户](../../../../pages-for-subheaders/authentication-config.md#外部身份验证配置和用户主体)。
 
 :::
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-google-oauth.md
similarity index 94%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-google-oauth.md
index ab90756f16e..95ce9ef6b4e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-google-oauth.md
@@ -6,7 +6,7 @@ title: 配置 Google OAuth
 
 只有 G Suite 域的管理员才能访问 Admin SDK。因此，只有 G Suite 管理员可以配置 Rancher 的 Google OAuth。
 
-在 Rancher 中，只有具有 **Manage Authentication** [全局角色](../../manage-role-based-access-control-rbac/global-permissions.md)的管理员或用户才能配置身份验证。
+在 Rancher 中，只有具有 **Manage Authentication** [全局角色](../../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)的管理员或用户才能配置身份验证。
 
 # 先决条件
 
@@ -95,7 +95,7 @@ title: 配置 Google OAuth
 
 # 在 Rancher 中配置 Google OAuth
 
-1. 使用分配了 [administrator](../../manage-role-based-access-control-rbac/global-permissions.md) 角色的本地用户登录到 Rancher。这个用户也称为本地主体。
+1. 使用分配了 [administrator](../../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md) 角色的本地用户登录到 Rancher。这个用户也称为本地主体。
 1. 在左上角，单击 **☰ > 用户 & 认证**。
 1. 在左侧导航栏，单击**认证**。
 1. 单击 **Google**。UI 中的说明介绍了使用 Google OAuth 设置身份验证的步骤。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-oidc.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-keycloak-oidc.md
similarity index 98%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-oidc.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-keycloak-oidc.md
index 93098d054dd..ba1a810d1ef 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-oidc.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-keycloak-oidc.md
@@ -125,7 +125,7 @@ description: 创建 Keycloak OpenID Connect (OIDC) 客户端并配置 Rancher 
 
 ## 附录：故障排除
 
-如果你在测试与 Keycloak 服务器的连接时遇到问题，请先检查 OIDC 客户端的配置选项。你还可以检查 Rancher 日志来查明问题的原因。调试日志可能包含有关错误的更详细信息。详情请参见[如何启用调试日志](../../../../../faq/technical-items.md#如何启用调试日志记录？)。
+如果你在测试与 Keycloak 服务器的连接时遇到问题，请先检查 OIDC 客户端的配置选项。你还可以检查 Rancher 日志来查明问题的原因。调试日志可能包含有关错误的更详细信息。详情请参见[如何启用调试日志](../../../../faq/technical-items.md#如何启用调试日志记录？)。
 
 所有与 Keycloak 相关的日志条目都将添加 `[generic oidc]` 或 `[keycloak oidc]`。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-saml.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-keycloak-saml.md
similarity index 98%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-saml.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-keycloak-saml.md
index e547b116239..936009a0663 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-saml.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-keycloak-saml.md
@@ -160,7 +160,7 @@ openssl req -x509 -sha256 -nodes -days 365 -newkey rsa:2048 -keyout myservice.ke
 
 ## 附录：故障排除
 
-如果你在测试与 Keycloak 服务器的连接时遇到问题，请先检查 SAML 客户端的配置选项。你还可以检查 Rancher 日志来查明问题的原因。调试日志可能包含有关错误的更详细信息。详情请参见[如何启用调试日志](../../../../../faq/technical-items.md#如何启用调试日志记录？)。
+如果你在测试与 Keycloak 服务器的连接时遇到问题，请先检查 SAML 客户端的配置选项。你还可以检查 Rancher 日志来查明问题的原因。调试日志可能包含有关错误的更详细信息。详情请参见[如何启用调试日志](../../../../faq/technical-items.md#如何启用调试日志记录？)。
 
 ### 不能重定向到 Keycloak
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-okta-saml.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-okta-saml.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-pingidentity.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-pingidentity.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/create-local-users.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/create-local-users.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/manage-users-and-groups.md
similarity index 98%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/manage-users-and-groups.md
index 3f92d35ee82..b44cc440312 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/manage-users-and-groups.md
@@ -4,7 +4,7 @@ title: 用户和组
 
 Rancher 依赖用户和组来决定允许登录到 Rancher 的用户，以及他们可以访问哪些资源。你配置外部身份验证提供程序后，该提供程序的用户将能够登录到你的 Rancher Server。用户登录时，验证提供程序将向你的 Rancher Server 提供该用户所属的组列表。
 
-你可以通过向资源添加用户或组，来控制其对集群、项目、多集群应用、全局 DNS 提供程序和相关资源的访问。将组添加到资源时，身份验证提供程序中属于该组的所有用户都将能够使用组的权限访问该资源。有关角色和权限的更多信息，请参见 [RBAC](../../../../../pages-for-subheaders/manage-role-based-access-control-rbac.md)。
+你可以通过向资源添加用户或组，来控制其对集群、项目、多集群应用、全局 DNS 提供程序和相关资源的访问。将组添加到资源时，身份验证提供程序中属于该组的所有用户都将能够使用组的权限访问该资源。有关角色和权限的更多信息，请参见 [RBAC](../../../../pages-for-subheaders/manage-role-based-access-control-rbac.md)。
 
 ## 管理成员
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/configure-openldap/openldap-config-reference.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-openldap/openldap-config-reference.md
similarity index 90%
rename from i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/configure-openldap/openldap-config-reference.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-openldap/openldap-config-reference.md
index be6f60de615..66eb56899f4 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/configure-openldap/openldap-config-reference.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-openldap/openldap-config-reference.md
@@ -6,7 +6,7 @@ title: OpenLDAP 配置参考
 
 有关配置 OpenLDAP 的更多详细信息，请参见[官方文档](https://www.openldap.org/doc/)。
 
-> 在开始之前，请熟悉[外部身份验证配置和主体用户](../../pages-for-subheaders/about-authentication.md#外部身份验证配置和用户主体)的概念。
+> 在开始之前，请熟悉[外部身份验证配置和主体用户](../../../../pages-for-subheaders/authentication-config.md#外部身份验证配置和用户主体)的概念。
 
 
 ## 背景：OpenLDAP 认证流程
@@ -24,7 +24,7 @@ title: OpenLDAP 配置参考
 >
 > 如果 OpenLDAP 服务器使用的证书是自签名的或不是来自认可的证书颁发机构，请确保手头有 PEM 格式的 CA 证书（包含所有中间证书）。你必须在配置期间粘贴此证书，以便 Rancher 能够验证证书链。
 
-如果你不确定要在用户/组`搜索库`字段中输入什么值，请咨询你的 LDAP 管理员，或参见 Active Directory 身份验证文档中的[使用 ldapsearch 确定搜索库和 Schema](../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md#附录：使用-ldapsearch-确定搜索库和-schema) 章节。
+如果你不确定要在用户/组`搜索库`字段中输入什么值，请咨询你的 LDAP 管理员，或参见 Active Directory 身份验证文档中的[使用 ldapsearch 确定搜索库和 Schema](../../../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-active-directory.md#附录：使用-ldapsearch-确定搜索库和-schema) 章节。
 
 <figcaption>OpenLDAP 服务器参数</figcaption>
 
@@ -45,7 +45,7 @@ title: OpenLDAP 配置参考
 
 请注意，Rancher 使用本节中配置的属性映射来构造搜索筛选器和解析组成员。因此，我们建议你验证此处的配置是否与你在 OpenLDAP 中使用的 Schema 匹配。
 
-如果你不确定 OpenLDAP 服务器中使用的用户/组 Schema，请咨询你的 LDAP 管理员，或参见 Active Directory 身份验证文档中的[使用 ldapsearch 确定搜索库和 Schema](../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md#附录：使用-ldapsearch-确定搜索库和-schema) 章节。
+如果你不确定 OpenLDAP 服务器中使用的用户/组 Schema，请咨询你的 LDAP 管理员，或参见 Active Directory 身份验证文档中的[使用 ldapsearch 确定搜索库和 Schema](../../../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-active-directory.md#附录：使用-ldapsearch-确定搜索库和-schema) 章节。
 
 ### 用户 Schema 配置
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-shibboleth-saml/about-group-permissions.md
similarity index 99%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-shibboleth-saml/about-group-permissions.md
index 57c9d03aaee..3a6969efa88 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-shibboleth-saml/about-group-permissions.md
@@ -28,4 +28,3 @@ title: Shibboleth 和 OpenLDAP 的组权限
 Shibboleth 会验证用户的凭证，并从 OpenLDAP 检索用户属性，其中包括用户所在的组信息。然后 Shibboleth 将向 Rancher 发送一个包含用户属性的 SAML 断言。Rancher 会使用组数据，以便用户可以访问他所在的组有权访问的所有资源。
 
 ![Adding OpenLDAP Group Permissions to Rancher Resources](/img/shibboleth-with-openldap-groups.svg)
-
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/custom-branding.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/custom-branding.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/custom-branding.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/custom-branding.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
similarity index 96%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
index c88b783ae1f..0ab8560983b 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md
@@ -98,8 +98,8 @@ title: 自定义角色
 
 只有在以下情况下，你才能将全局角色分配给组：
 
-* 你已设置[外部身份验证提供程序](../../../../pages-for-subheaders/about-authentication.md#外部验证与本地验证)。
-* 外部身份验证提供程序支持[用户组](../about-authentication/authentication-config/manage-users-and-groups.md)。
+* 你已设置[外部身份验证提供程序](../../../../pages-for-subheaders/authentication-config.md#外部验证与本地验证)。
+* 外部身份验证提供程序支持[用户组](../../authentication-permissions-and-global-configuration/authentication-config/manage-users-and-groups.md)。
 * 你已使用身份验证提供程序设置了至少一个用户组。
 
 :::
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
similarity index 96%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
index a542114495e..1bfc1238d40 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md
@@ -126,7 +126,7 @@ CATTLE_RESTRICTED_DEFAULT_ADMIN=true
 
 使用自定义权限可以为用户配置在 Rancher 中的更受限或指定的访问权限。
 
-当来自[外部身份验证系统](../../../../pages-for-subheaders/about-authentication.md)的用户首次登录 Rancher 时，他们会自动分配到一组全局权限（以下简称权限）。默认情况下，用户第一次登录后会被创建为用户，并分配到默认的`用户`权限。标准的`用户`权限允许用户登录和创建集群。
+当来自[外部身份验证系统](../../../../pages-for-subheaders/authentication-config.md)的用户首次登录 Rancher 时，他们会自动分配到一组全局权限（以下简称权限）。默认情况下，用户第一次登录后会被创建为用户，并分配到默认的`用户`权限。标准的`用户`权限允许用户登录和创建集群。
 
 但是，在某些组织中，这些权限可能会被认为权限过大。你可以为用户分配一组更具限制性的自定义全局权限，而不是为用户分配 `Administrator` 或 `Standard User` 的默认全局权限。
 
@@ -217,8 +217,8 @@ CATTLE_RESTRICTED_DEFAULT_ADMIN=true
 
 只有在以下情况下，你才能将全局角色分配给组：
 
-* 你已设置[外部身份验证提供程序](../../../../pages-for-subheaders/about-authentication.md#外部验证与本地验证)。
-* 外部身份验证提供程序支持[用户组](../about-authentication/authentication-config/manage-users-and-groups.md)。
+* 你已设置[外部身份验证提供程序](../../../../pages-for-subheaders/authentication-config.md#外部验证与本地验证)。
+* 外部身份验证提供程序支持[用户组](../authentication-config/manage-users-and-groups.md)。
 * 你已使用身份验证提供程序设置了至少一个用户组。
 
 :::
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md
index fec4859af40..b5048eb40d3 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md
@@ -22,18 +22,38 @@ Rancher 可以安装到任意 Kubernetes 集群上，包括托管的 Kubernetes
 - [K3s Kubernetes 安装文档](https://rancher.com/docs/k3s/latest/en/installation/)
 
 ### 1. 安装 rancher-backup Helm Chart
-安装 rancher-backup Chart 的 2.x.x 版本。下面命令假设你的环境可以访问 DockerHub：
-```
-helm repo add rancher-charts https://charts.rancher.io
-helm repo update
-helm install rancher-backup-crd rancher-charts/rancher-backup-crd -n cattle-resources-system --create-namespace --version $CHART_VERSION
-helm install rancher-backup rancher-charts/rancher-backup -n cattle-resources-system --version $CHART_VERSION
-```
+安装 [rancher-backup chart](https://github.com/rancher/backup-restore-operator/tags)，请使用 2.x.x 主要版本内的版本：
 
-如果是**离线环境**，在安装 `rancher-backup-crd` Helm Chart 时，使用以下选项从私有镜像仓库拉取 `backup-restore-operator` 镜像：
-```
---set image.repository $REGISTRY/rancher/backup-restore-operator
-```
+1. 添加 helm 仓库：
+
+   ```bash
+   helm repo add rancher-charts https://charts.rancher.io
+   helm repo update
+   ```
+
+1. 使用 2.x.x rancher-backup 版本设置 `CHART_VERSION` 变量：
+   ```bash
+   helm search repo --versions rancher-charts/rancher-backup
+   CHART_VERSION=<2.x.x>
+   ```
+
+1. 安装 Chart：
+   ```bash
+   helm install rancher-backup-crd rancher-charts/rancher-backup-crd -n cattle-resources-system --create-namespace --version $CHART_VERSION
+   helm install rancher-backup rancher-charts/rancher-backup -n cattle-resources-system --version $CHART_VERSION
+   ```
+
+   :::note
+
+   以上假设你的环境具有到 Docker Hub 的出站连接。
+
+   对于**离线环境**，在安装 rancher-backup Helm Chart 时，使用下面的 Helm 值从你的私有镜像仓库中拉取 `backup-restore-operator` 镜像。
+
+   ```bash
+   --set image.repository $REGISTRY/rancher/backup-restore-operator
+   ```
+
+   :::
 
 ### 2. 使用 Restore 自定义资源来还原备份
 
@@ -44,86 +64,91 @@ Kubernetes v1.22 是 Rancher 2.6.3 的实验功能，不支持使用 apiVersion
 1. 使用 apiVersion v1 来更新默认 `resourceSet`，从而收集 CRD。
 1. 使用 `apiextensions.k8s.io/v1` 作为替代，来更新默认 `resourceSet` 和客户端，从而在内部使用新的 API。
 
-- 请注意，在为 v1.22 版本制作或恢复备份时，Rancher 版本和本地集群的 Kubernetes 版本应该是一样的。由于集群中支持的 apiVersion 和备份文件中的 apiVersion 可能不同，因此在还原备份时请考虑 Kubernetes 的版本。
+   :::note
+
+   在为 v1.22 版本制作或恢复备份时，Rancher 版本和本地集群的 Kubernetes 版本应该是一样的。由于集群中支持的 apiVersion 和备份文件中的 apiVersion 可能不同，因此在还原备份时请考虑 Kubernetes 的版本。
+
+   :::
 
 :::
 
-如果你使用 S3 作为备份源，并且需要使用你的 S3 凭证进行还原，请使用 S3 凭证在集群中创建一个密文（Secret）。密文数据必须有两个 key，分别是包含 S3 凭证的 `accessKey` 和 `secretKey`。
+1. 在使用 S3 对象存储作为需要使用凭证的还原的备份源时，请在此集群中创建一个 `Secret` 对象以添加 S3 凭证。Secret 数据必须有两个密钥，分别是包含 S3 凭证的 `accessKey` 和 `secretKey`。
 
-:::caution
+   你可以在任何命名空间中创建 Secret，本示例使用 default 命名空间。
 
-在直接创建对象时，下方示例中的 `accessKey` 和 `secretKey` 必须先进行 base64 编码。否则，在你尝试备份或恢复时，粘贴的值会导致错误。
+   ```bash
+   kubectl create secret generic s3-creds \
+     --from-literal=accessKey=<access key> \
+     --from-literal=secretKey=<secret key>
+   ```
 
-:::
+   :::note
 
-```yaml
-apiVersion: v1
-kind: Secret
-metadata:
-  name: s3-creds
-type: Opaque
-data:
-  accessKey: <Enter your base64-encoded access key>
-  secretKey: <Enter your base64-encoded secret key>
-```
+   在上面的命令中添加你的 Access Key 和 Secret Key 作为 `accessKey` 和 `secretKey` 的值。
 
-你可以在任何命名空间中创建这个密文。在上述例子中，密文创建在默认命名空间中。
+   :::
 
-在 Restore 自定义资源中，`prune` 必须设为 `false`。
+1. 创建一个 `Restore` 对象：
 
-参考以下示例创建 Restore 自定义资源：
+   在迁移期间，`prune` 必须设置为 `false`。请参见下面的示例：
 
-```yaml
-# migrationResource.yaml
-apiVersion: resources.cattle.io/v1
-kind: Restore
-metadata:
-  name: restore-migration
-spec:
-  backupFilename: backup-b0450532-cee1-4aa1-a881-f5f48a007b1c-2020-09-15T07-27-09Z.tar.gz
-  prune: false
-  encryptionConfigSecretName: encryptionconfig
-  storageLocation:
-    s3:
-      credentialSecretName: s3-creds
-      credentialSecretNamespace: default
-      bucketName: backup-test
-      folder: ecm1
-      region: us-west-2
-      endpoint: s3.us-west-2.amazonaws.com
-```
+   ```yaml
+   # restore-migration.yaml
+   apiVersion: resources.cattle.io/v1
+   kind: Restore
+   metadata:
+     name: restore-migration
+   spec:
+     backupFilename: backup-b0450532-cee1-4aa1-a881-f5f48a007b1c-2020-09-15T07-27-09Z.tar.gz
+     // highlight-next-line
+     prune: false
+     // highlight-next-line
+     encryptionConfigSecretName: encryptionconfig
+     storageLocation:
+       s3:
+         credentialSecretName: s3-creds
+         credentialSecretNamespace: default
+         bucketName: backup-test
+         folder: ecm1
+         region: us-west-2
+         endpoint: s3.us-west-2.amazonaws.com
+   ```
 
-:::note 重要提示：
+   :::note 重要提示：
 
-只有在创建备份时启用了加密功能时，才必须设置 `encryptionConfigSecretName` 字段。提供包含加密配置文件的密文名称。如果你只有加密配置文件，但没有在此集群中用它来创建密文，请按照以下步骤创建密文。
+   只有在创建备份时启用了加密功能时，才需要设置 `encryptionConfigSecretName` 字段。
 
-:::
+   如果适用，请提供包含加密配置文件的 `Secret` 对象的名称。如果你只有加密配置文件，但没有在此集群中创建 Secret，请按照以下步骤创建 Secret。
 
-1. 加密配置文件必须命名为 `encryption-provider-config.yaml`，而且必须使用 `--from-file` 标志来创建这个密文。因此，将你的 `EncryptionConfiguration` 保存到名为 `encryption-provider-config.yaml` 的文件中，并运行以下命令：
-```
-kubectl create secret generic encryptionconfig \
-  --from-file=./encryption-provider-config.yaml \
-  -n cattle-resources-system
-```
+   1. 创建[加密配置文件](reference-guides/backup-restore-configuration/backup-configuration.md#encryption)
+   1. 下面的命令使用一个名为 `encryption-provider-config.yaml` 的文件，使用了 `--from-file` 标志。将 `EncryptionConfiguration` 保存到名为 `encryption-provider-config.yaml` 的文件中之后，运行以下命令：
 
-1. 应用清单，并观察 Restore 资源的状态：
+      ```bash
+      kubectl create secret generic encryptionconfig \
+        --from-file=./encryption-provider-config.yaml \
+        -n cattle-resources-system
+      ```
 
-   应用资源：
-```
-kubectl apply -f migrationResource.yaml
-```
+   :::
 
-    观察 Restore 的状态：
-```
-kubectl get restore
-```
+1. 应用清单，并监控 Restore 的状态：
+   1. 应用 `Restore` 对象资源：
 
-    查看恢复日志：
-```
-kubectl logs -n cattle-resources-system --tail 100 -f rancher-backup-xxx-xxx
-```
+      ```bash
+      kubectl apply -f restore-migration.yaml
+      ```
 
-Restore 资源的状态变成 `Completed` 后，你可以继续安装 Rancher。
+   1. 观察 Restore 的状态：
+      ```bash
+      kubectl get restore
+      ```
+
+   1. 查看恢复日志：
+      ```bash
+      kubectl logs -n cattle-resources-system --tail 100 -f -l app.kubernetes.io/instance=rancher-backup
+      ```
+
+   1. Restore 资源的状态变成 `Completed` 后，你可以继续安装 cert-manager 和 Rancher。
 
 ### 3. 安装 cert-manager
 
@@ -133,8 +158,25 @@ Restore 资源的状态变成 `Completed` 后，你可以继续安装 Rancher。
 
 使用与第一个集群上使用的相同版本的 Helm 来安装 Rancher：
 
-```
+```bash
 helm install rancher rancher-latest/rancher \
   --namespace cattle-system \
   --set hostname=<same hostname as the server URL from the first Rancher server> \
+  --version x.y.z
 ```
+
+:::note
+
+如果原始的 Rancher 环境正在运行，你可以使用 kubeconfig 为原始环境收集当前值：
+
+```bash
+helm get values rancher -n cattle-system -o yaml > rancher-values.yaml
+```
+
+你可以使用 `rancher-values.yaml` 文件来复用这些值。确保将 kubeconfig 切换到新的 Rancher 环境。
+
+```bash
+helm install rancher rancher-latest/rancher -n cattle-system -f rancher-values.yaml --version x.y.z
+```
+
+:::
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md
index d1cdf1cf8d2..6eca5add930 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md
@@ -50,17 +50,17 @@ Rancher UI 中提供了集群所有可用快照的列表：
 
 2. 在剩余的单个 etcd 节点上，运行以下命令：
 
-   ```
-   $ docker run --rm -v /var/run/docker.sock:/var/run/docker.sock assaflavie/runlike etcd
+   ```bash
+   docker run --rm -v /var/run/docker.sock:/var/run/docker.sock assaflavie/runlike etcd
    ```
 
    此命令会输出 etcd 要运行的命令，请保存此命令以备后用。
 
-3. 停止你在上一步中启动的 etcd 容器，并将其重命名为 `etcd-old`：
+3. 停止正在运行的 `etcd` 容器并将其重命名为 `etcd-old`。
 
-   ```
-   $ docker stop etcd
-   $ docker rename etcd etcd-old
+   ```bash
+   docker stop etcd
+   docker rename etcd etcd-old
    ```
 
 4. 修改步骤 2 中获取保存的命令：
@@ -70,7 +70,7 @@ Rancher UI 中提供了集群所有可用快照的列表：
 
 5. 运行修改后的命令。
 
-6. 在单个节点启动并运行后，Rancher 建议向你的集群添加额外的 etcd 节点。如果你有一个[自定义集群](../../../pages-for-subheaders/use-existing-nodes.md)，并且想要复用旧节点，则需要先[清理节点](../../advanced-user-guides/manage-clusters/clean-cluster-nodes.md)，然后再尝试将它们重新添加到集群中。
+6. 在单个节点启动并运行后，Rancher 建议向你的集群添加额外的 etcd 节点。如果你有一个[自定义集群](../../../pages-for-subheaders/use-existing-nodes.md)，并且想要复用旧节点，则需要先[清理节点](../manage-clusters/clean-cluster-nodes.md)，然后再尝试将它们重新添加到集群中。
 
 # 为使用 Rancher v2.2.0 之前的版本创建的集群启用快照功能
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md
index f1ce2a1d522..7308972bc03 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/deploy-apps-across-clusters/fleet.md
@@ -9,7 +9,7 @@ Fleet 是一个独立于 Rancher 的项目，你可以使用 Helm 将它安装
 
 ## 架构
 
-有关 Fleet 工作原理的信息，请参阅[此页面](../../../explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture.md)。
+有关 Fleet 工作原理的信息，请参阅[此页面](../../../integrations-in-rancher/fleet-gitops-at-scale/architecture.md)。
 
 ## 在 Rancher UI 中访问 Fleet
 
@@ -34,7 +34,7 @@ Fleet 预装在 Rancher 中，通过 Rancher UI 中的**持续交付**选项管
 
 ## Windows 支持
 
-有关对具有 Windows 节点的集群的支持的详细信息，请参阅[此页面](../../../explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md)。
+有关对具有 Windows 节点的集群的支持的详细信息，请参阅[此页面](../../../integrations-in-rancher/fleet-gitops-at-scale/windows-support.md)。
 
 
 ## GitHub 仓库
@@ -44,7 +44,7 @@ Fleet 预装在 Rancher 中，通过 Rancher UI 中的**持续交付**选项管
 
 ## 在代理后使用 Fleet
 
-有关在代理后使用 Fleet 的详细信息，请参阅[此页面](../../../explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md)。
+有关在代理后使用 Fleet 的详细信息，请参阅[此页面](../../../integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md)。
 
 ## Helm Chart 依赖
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps.md
index dc5408a4f35..897ebd36a58 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/deploy-apps-across-clusters/multi-cluster-apps.md
@@ -16,8 +16,8 @@ title: 多集群应用
 
 要在 Rancher 中创建多集群应用，你至少需要具有以下权限之一：
 
-- 目标集群中的[项目成员角色](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#项目角色)，能够创建、读取、更新和删除工作负载
-- 目标项目所在集群的[集群所有者角色](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#集群角色)
+- 目标集群中的[项目成员角色](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#项目角色)，能够创建、读取、更新和删除工作负载
+- 目标项目所在集群的[集群所有者角色](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#集群角色)
 
 ### 启用旧版功能
 
@@ -66,9 +66,9 @@ Rancher 将多集群应用的配置选项分为以下几个部分。
 
 Rancher 允许你选择**项目**或**集群**的角色选项。Rancher 将允许你根据用户的权限使用其中一个角色进行创建。
 
-- **项目** - 相当于[项目成员](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#项目角色)。如果你选择此角色，Rancher 将检查用户是否在所有目标项目中至少具有[项目成员](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#项目角色)的角色。虽然用户可能没有被明确授予 _项目成员_ 角色，但如果用户是[管理员](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)、[集群所有者](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#集群角色)或[项目所有者](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#项目角色)，则认为该用户具有所需的权限级别。
+- **项目** - 相当于[项目成员](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#项目角色)。如果你选择此角色，Rancher 将检查用户是否在所有目标项目中至少具有[项目成员](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#项目角色)的角色。虽然用户可能没有被明确授予 _项目成员_ 角色，但如果用户是[管理员](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)、[集群所有者](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#集群角色)或[项目所有者](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#项目角色)，则认为该用户具有所需的权限级别。
 
-- **集群** - 相当于[集群所有者](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#集群角色)。如果你选择此角色，Rancher 将检查用户是否在所有目标项目中至少具有[集群所有者](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#项目角色)的角色。虽然用户可能没有被明确授予 _集群所有者_ 角色，但如果用户是[管理员](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)，则认为该用户具有所需的权限级别。
+- **集群** - 相当于[集群所有者](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#集群角色)。如果你选择此角色，Rancher 将检查用户是否在所有目标项目中至少具有[集群所有者](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#项目角色)的角色。虽然用户可能没有被明确授予 _集群所有者_ 角色，但如果用户是[管理员](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)，则认为该用户具有所需的权限级别。
 
 在启动应用时，Rancher 会在启动应用之前确认你在目标项目中是否拥有这些权限。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/helm-charts-in-rancher/create-apps.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/helm-charts-in-rancher/create-apps.md
index 967dbf70bc2..a6a6b388627 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/helm-charts-in-rancher/create-apps.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/helm-charts-in-rancher/create-apps.md
@@ -60,7 +60,6 @@ Rancher Chart 添加了简化的 Chart 描述和配置表单，使应用部署
 
    包含表单问题的文件。这些表单问题简化了 Chart 的部署。没有它，你必须使用更复杂的 YAML 配置来配置部署。下图显示了 Rancher Chart（包含 `questions.yml`）和原生 Helm Chart（不包含）之间的区别。
 
-
 <figcaption>带有 <code>questions.yml</code> 的 Rancher Chart（上）与 Helm Chart（下）</figcaption>
 
    ![questions.yml](/img/rancher-app-2.6.png)
@@ -111,7 +110,7 @@ rancher_max_version: 2.3.99
 | description | string | false | 指定变量的描述。 |
 | type | string | false | 如果未指定，则默认为 `string`（支持的类型为 string、multiline、boolean、int、enum、password、storageclass、hostname、pvc 和 secret）。 |
 | required | bool | false | 定义变量是否是必须的（true \| false）。 |
-| default | string | false | 指定默认值。 |
+| default | string | false | 指定默认值。仅在 `values.yml` 文件中没有对应值时使用。 |
 | group | string | false | 按输入值对问题进行分组。 |
 | min_length | int | false | 最小字符长度。 |
 | max_length | int | false | 最大字符长度。 |
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md
index cf0046da7fa..0c69dee2b85 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-k3s-kubernetes-cluster.md
@@ -50,7 +50,7 @@ K3s 与其他 Kubernetes 发行版不同，在于其支持使用 etcd 以外的
 在你的实现中，你可以考虑是否需要使用 4 层或 7 层的负载均衡器：
 
 - **4 层负载均衡器**：两种选择中较为简单的一种，它将 TCP 流量转发到你的节点中。我们建议使用 4 层负载均衡器，将流量从 TCP/80 端口和 TCP/443 端口转发到 Rancher Management 集群节点上。集群上的 Ingress Controller 会将 HTTP 流量重定向到 HTTPS，并在 TCP/443 端口上终止 SSL/TLS。Ingress Controller 会将流量转发到 Rancher deployment 中 Ingress Pod 的 TCP/80 端口。
-- **7 层负载均衡器**：相对比较复杂，但功能更全面。例如，与 Rancher 本身进行 TLS 终止相反，7 层负载均衡器能够在负载均衡器处处理 TLS 终止。如果你需要集中在基础设施中进行 TLS 终止，7 层负载均衡可能会很适合你。7 层负载均衡还能让你的负载均衡器基于 HTTP 属性（例如 cookie 等）做出决策，而 4 层负载均衡器则不能。如果你选择在 7 层负载均衡器上终止 SSL/TLS 流量，则在安装 Rancher 时（后续步骤）需要使用 `--set tls=external` 选项。详情请参见 [Rancher Helm Chart 选项](../../../reference-guides/installation-references/helm-chart-options.md#外部-tls-终止)。
+- **7 层负载均衡器**：相对比较复杂，但功能更全面。例如，与 Rancher 本身进行 TLS 终止相反，7 层负载均衡器能够在负载均衡器处处理 TLS 终止。如果你需要集中在基础设施中进行 TLS 终止，7 层负载均衡可能会很适合你。7 层负载均衡还能让你的负载均衡器基于 HTTP 属性（例如 cookie 等）做出决策，而 4 层负载均衡器则不能。如果你选择在 7 层负载均衡器上终止 SSL/TLS 流量，则在安装 Rancher 时（后续步骤）需要使用 `--set tls=external` 选项。详情请参见 [Rancher Helm Chart 选项](../../../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#外部-tls-终止)。
 
 如需获取配置 NGINX 负载均衡器的示例，请参见[本页](nginx-load-balancer.md)。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md
index 793b5b2f691..c6d43954216 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-rke1-kubernetes-cluster.md
@@ -41,7 +41,7 @@ title: '为高可用 RKE Kubernetes 集群设置基础设施'
 在你的实现中，你可以考虑是否需要使用 4 层或 7 层的负载均衡器：
 
 - **4 层负载均衡器**：两种选择中较为简单的一种，它将 TCP 流量转发到你的节点中。我们建议使用 4 层负载均衡器，将流量从 TCP/80 端口和 TCP/443 端口转发到 Rancher Management 集群节点上。集群上的 Ingress Controller 会将 HTTP 流量重定向到 HTTPS，并在 TCP/443 端口上终止 SSL/TLS。Ingress Controller 会将流量转发到 Rancher deployment 中 Ingress Pod 的 TCP/80 端口。
-- **7 层负载均衡器**：相对比较复杂，但功能更全面。例如，与 Rancher 本身进行 TLS 终止相反，7 层负载均衡器能够在负载均衡器处处理 TLS 终止。如果你需要集中在基础设施中进行 TLS 终止，7 层负载均衡可能会很适合你。7 层负载均衡还能让你的负载均衡器基于 HTTP 属性（例如 cookie 等）做出决策，而 4 层负载均衡器则不能。如果你选择在 7 层负载均衡器上终止 SSL/TLS 流量，则在安装 Rancher 时（后续步骤）需要使用 `--set tls=external` 选项。详情请参见 [Rancher Helm Chart 选项](../../../reference-guides/installation-references/helm-chart-options.md#外部-tls-终止)。
+- **7 层负载均衡器**：相对比较复杂，但功能更全面。例如，与 Rancher 本身进行 TLS 终止相反，7 层负载均衡器能够在负载均衡器处处理 TLS 终止。如果你需要集中在基础设施中进行 TLS 终止，7 层负载均衡可能会很适合你。7 层负载均衡还能让你的负载均衡器基于 HTTP 属性（例如 cookie 等）做出决策，而 4 层负载均衡器则不能。如果你选择在 7 层负载均衡器上终止 SSL/TLS 流量，则在安装 Rancher 时（后续步骤）需要使用 `--set tls=external` 选项。详情请参见 [Rancher Helm Chart 选项](../../../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#外部-tls-终止)。
 
 如需获取配置 NGINX 负载均衡器的示例，请参见[本页](nginx-load-balancer.md)。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster.md
index 9c56a56dbba..6015e567dc2 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/infrastructure-setup/ha-rke2-kubernetes-cluster.md
@@ -35,7 +35,7 @@ title: '为高可用 RKE2 Kubernetes 集群设置基础设施'
 在你的实现中，你可以考虑是否需要使用 4 层或 7 层的负载均衡器：
 
 - **4 层负载均衡器**：两种选择中较为简单的一种，它将 TCP 流量转发到你的节点中。我们建议使用 4 层负载均衡器，将流量从 TCP/80 端口和 TCP/443 端口转发到 Rancher Management 集群节点上。集群上的 Ingress Controller 会将 HTTP 流量重定向到 HTTPS，并在 TCP/443 端口上终止 SSL/TLS。Ingress Controller 会将流量转发到 Rancher deployment 中 Ingress Pod 的 TCP/80 端口。
-- **7 层负载均衡器**：相对比较复杂，但功能更全面。例如，与 Rancher 本身进行 TLS 终止相反，7 层负载均衡器能够在负载均衡器处处理 TLS 终止。如果你需要集中在基础设施中进行 TLS 终止，7 层负载均衡可能会很适合你。7 层负载均衡还能让你的负载均衡器基于 HTTP 属性（例如 cookie 等）做出决策，而 4 层负载均衡器则不能。如果你选择在 7 层负载均衡器上终止 SSL/TLS 流量，则在安装 Rancher 时（后续步骤）需要使用 `--set tls=external` 选项。详情请参见 [Rancher Helm Chart 选项](../../../reference-guides/installation-references/helm-chart-options.md#外部-tls-终止)。
+- **7 层负载均衡器**：相对比较复杂，但功能更全面。例如，与 Rancher 本身进行 TLS 终止相反，7 层负载均衡器能够在负载均衡器处处理 TLS 终止。如果你需要集中在基础设施中进行 TLS 终止，7 层负载均衡可能会很适合你。7 层负载均衡还能让你的负载均衡器基于 HTTP 属性（例如 cookie 等）做出决策，而 4 层负载均衡器则不能。如果你选择在 7 层负载均衡器上终止 SSL/TLS 流量，则在安装 Rancher 时（后续步骤）需要使用 `--set tls=external` 选项。详情请参见 [Rancher Helm Chart 选项](../../../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#外部-tls-终止)。
 
 如需获取配置 NGINX 负载均衡器的示例，请参见[本页](nginx-load-balancer.md)。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md
index 67179a89d14..6b6ffabf66a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke1-for-rancher.md
@@ -86,7 +86,7 @@ RKE 提供大量配置选项，用于针对你的环境进行自定义安装。
 
 如需了解选项和功能的完整列表，请参见 [RKE 官方文档](https://rancher.com/docs/rke/latest/en/config-options/)。
 
-要为大规模 Rancher 安装优化 etcd 集群，请参见 [etcd 设置指南](../../../getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md)。
+要为大规模 Rancher 安装优化 etcd 集群，请参见 [etcd 设置指南](../../advanced-user-guides/tune-etcd-for-large-installs.md)。
 
 有关 Dockershim 支持的详情，请参见[此页面](../../../getting-started/installation-and-upgrade/installation-requirements/dockershim.md)。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke2-for-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke2-for-rancher.md
index 193265e0780..b89572bf097 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke2-for-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-cluster-setup/rke2-for-rancher.md
@@ -1,6 +1,7 @@
 ---
 title: 为 Rancher 设置高可用的 RKE2 Kubernetes 集群
 ---
+
 _已在 2.5.6 版本测试_
 
 本文介绍了如何根据 [Rancher Server 环境的最佳实践](../../../reference-guides/rancher-manager-architecture/architecture-recommendations.md#kubernetes-安装环境)安装 Kubernetes 集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md
index 1c42ce0b59f..a4ef3a36010 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md
@@ -21,7 +21,7 @@ Rancher 兼容当前所有的主流 Linux 发行版和任何通用的 Docker 版
 
 所有支持的操作系统都使用 64-bit x86 架构。
 
-如果你想使用 ARM64，请参阅[在 ARM64 上运行（实验功能）。](../../../getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md)
+如果你想使用 ARM64，请参阅[在 ARM64 上运行（实验功能）。](../../advanced-user-guides/enable-experimental-features/rancher-on-arm64.md)
 
 有关如何安装 Docker 的信息，请参阅 [Docker 官方文档](https://docs.docker.com/)。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md
index f9778a696bf..e844f63e631 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md
@@ -44,7 +44,7 @@ EKS 集群必须至少有一个托管节点组才能导入 Rancher 或通过 Ran
 1. 选择集群类型。
 1. 使用**成员角色**为集群配置用户授权。点击**添加成员**添加可以访问集群的用户。使用**角色**下拉菜单为每个用户设置权限。
 1. 如果你在 Rancher 中导入一个通用 Kubernetes 集群，请执行以下步骤：<br/>
-   a. 点击**集群选项**下的 **Agent 环境变量**，为 [rancher cluster agent](launch-kubernetes-with-rancher/about-rancher-agents.md) 设置环境变量。你可以使用键值对设置环境变量。如果 Rancher Agent 需要使用代理与 Rancher Server 通信，则可以使用 Agent 环境变量设置 `HTTP_PROXY`，`HTTPS_PROXY` 和 `NO_PROXY` 环境变量。<br/>
+   a. 点击**集群选项**下的 **Agent 环境变量**，为 [rancher cluster agent](../launch-kubernetes-with-rancher/about-rancher-agents.md) 设置环境变量。你可以使用键值对设置环境变量。如果 Rancher Agent 需要使用代理与 Rancher Server 通信，则可以使用 Agent 环境变量设置 `HTTP_PROXY`，`HTTPS_PROXY` 和 `NO_PROXY` 环境变量。<br/>
    b. 启用项目网络隔离，确保集群支持 Kubernetes `NetworkPolicy` 资源。用户可以通过**项目网络隔离**选项下的**高级选项**下拉菜单进行操作。
 1. 单击**创建**。
 1. 此处会显示 `cluster-admin` 权限的先决条件（参见上文的**先决条件**），其中包括满足先决条件的示例命令。
@@ -125,7 +125,7 @@ Rancher 管理注册集群的范围取决于集群的类型。
 
 注册集群后，集群所有者可以：
 
-- 通过 RBAC [管理集群访问](../../advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md)
+- 通过 RBAC [管理集群访问](../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md)
 - 启用[Monitoring、告警和 Notifiers](../../../pages-for-subheaders/monitoring-and-alerting.md)
 - 启用 [Logging](../../../pages-for-subheaders/logging.md)
 - 启用 [Istio](../../../pages-for-subheaders/istio.md)
@@ -195,7 +195,7 @@ kubectl get plans -A -o yaml
 
 _从 v2.6.3 起可用_
 
-授权集群端点 (ACE) 已支持注册的 RKE2 和 K3s 集群。此支持还包括你在下游集群上启用 ACE 的手动步骤。有关授权集群端点的更多信息，请单击[这里](../../advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md)。
+授权集群端点 (ACE) 已支持注册的 RKE2 和 K3s 集群。此支持还包括你在下游集群上启用 ACE 的手动步骤。有关授权集群端点的更多信息，请单击[这里](../manage-clusters/access-clusters/authorized-cluster-endpoint.md)。
 
 :::note 注意事项：
 
@@ -203,7 +203,7 @@ _从 v2.6.3 起可用_
 
 - 以下步骤适用于在 v2.6.x 中注册的 RKE2 和 K3s 集群，以及从先前的 Rancher 版本注册（或导入）并升级到 v2.6.x 的集群。
 
-- 这些步骤将改变下游 RKE2 和 K3s 集群的配置并部署 `kube-api-authn-webhook`。如果 ACE 的未来实现需要更新 `kube-api-authn-webhook`，那么这也必须手动完成。有关此 webhook 的更多信息，请单击[此处](../../advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md#关于-kube-api-auth-身份验证-webhook)。
+- 这些步骤将改变下游 RKE2 和 K3s 集群的配置并部署 `kube-api-authn-webhook`。如果 ACE 的未来实现需要更新 `kube-api-authn-webhook`，那么这也必须手动完成。有关此 webhook 的更多信息，请单击[此处](../manage-clusters/access-clusters/authorized-cluster-endpoint.md#关于-kube-api-auth-身份验证-webhook)。
 
 :::
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md
similarity index 90%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md
index 673a8e14f12..fa5fab6114d 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md
@@ -1,5 +1,6 @@
 ---
 title: 设置 Amazon 云提供商
+weight: 1
 ---
 
 使用 `Amazon` 云提供商时，你可以利用以下功能：
@@ -21,9 +22,9 @@ title: 设置 Amazon 云提供商
 * 第一个策略适用于具有 `controlplane` 角色的节点。这些节点必须能够创建/删除 EC2 资源。以下 IAM 策略是一个示例，请根据你的实际用例移除不需要的权限。
 * 第二个策略适用于具有 `etcd` 或 `worker` 角色的节点。这些节点只需能够从 EC2 检索信息。
 
-在创建 [Amazon EC2 集群](../../use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md)时，你必须在创建**节点模板**时填写创建的 IAM 角色的 **IAM Instance Profile Name**（不是 ARN）。
+在创建 [Amazon EC2 集群](../../launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md)时，你必须在创建**节点模板**时填写创建的 IAM 角色的 **IAM Instance Profile Name**（不是 ARN）。
 
-创建[自定义集群](../../../../../../pages-for-subheaders/use-existing-nodes.md)时，你必须手动将 IAM 角色附加到实例。
+创建[自定义集群](../../../../pages-for-subheaders/use-existing-nodes.md)时，你必须手动将 IAM 角色附加到实例。
 
 具有 `controlplane` 角色的节点的 IAM 策略：
 
@@ -136,7 +137,7 @@ title: 设置 Amazon 云提供商
 
 :::
 
-创建 [Amazon EC2 集群](../../use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md)时，会自动为创建的节点配置 `ClusterID`。其他资源仍然需要手动标记。
+创建 [Amazon EC2 集群](../../launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md)时，会自动为创建的节点配置 `ClusterID`。其他资源仍然需要手动标记。
 
 使用以下标签：
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/azure.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/azure.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-in-tree-vsphere.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-in-tree-vsphere.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-out-of-tree-vsphere.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-out-of-tree-vsphere.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/google-compute-engine.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/google-compute-engine.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/migrate-from-in-tree-to-out-of-tree.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/migrate-from-in-tree-to-out-of-tree.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/migrate-from-in-tree-to-out-of-tree.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/migrate-from-in-tree-to-out-of-tree.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md
index ebe5554d8d2..5e5d17473f5 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/alibaba.md
@@ -2,7 +2,7 @@
 title: 创建阿里云 ACK 集群
 ---
 
-你可以使用 Rancher 创建托管在阿里云 Alibaba Cloud Kubernetes (ACK) 中的集群。Rancher 已经为 ACK 实现并打包了针对 ACK 的[集群驱动](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md)，但是默认情况下，这个集群驱动的状态是 `inactive`。为了启动 ACK 集群，你需要[启用 ACK 集群驱动](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md#激活/停用集群驱动)。启用集群驱动后，你可以开始配置 ACK 集群。
+你可以使用 Rancher 创建托管在阿里云 Alibaba Cloud Kubernetes (ACK) 中的集群。Rancher 已经为 ACK 实现并打包了针对 ACK 的[集群驱动](../../authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md)，但是默认情况下，这个集群驱动的状态是 `inactive`。为了启动 ACK 集群，你需要[启用 ACK 集群驱动](../../authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md#激活/停用集群驱动)。启用集群驱动后，你可以开始配置 ACK 集群。
 
 ## Rancher 之外的先决条件
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md
index 4136c540753..7efdec90c6f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/huawei.md
@@ -2,7 +2,7 @@
 title: 创建华为 CCE 集群
 ---
 
-你可以使用 Rancher 创建托管在华为云容器引擎 (CCE) 中的集群。Rancher 已经为 CCE 实现并打包了针对 CCE 的[集群驱动](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md)，但是默认情况下，这个集群驱动的状态是 `inactive`。为了启动 CCE 集群，你需要[启用 CCE 集群驱动](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md#激活/停用集群驱动)。启用集群驱动后，你可以开始配置 CCE 集群。
+你可以使用 Rancher 创建托管在华为云容器引擎 (CCE) 中的集群。Rancher 已经为 CCE 实现并打包了针对 CCE 的[集群驱动](../../authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md)，但是默认情况下，这个集群驱动的状态是 `inactive`。为了启动 CCE 集群，你需要[启用 CCE 集群驱动](../../authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md#激活/停用集群驱动)。启用集群驱动后，你可以开始配置 CCE 集群。
 
 ## 华为先决条件
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md
index 1b4916a02c5..65cf6345721 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-clusters-from-hosted-kubernetes-providers/tencent.md
@@ -2,7 +2,7 @@
 title: 创建腾讯 TKE 集群
 ---
 
-你可以使用 Rancher 创建托管在腾讯 Tencent Kubernetes Engine (TKE) 中的集群。Rancher 已经为 TKE 实现并打包了针对 TKE 的[集群驱动](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md)，但是默认情况下，这个集群驱动的状态是 `inactive`。为了启动 TKE 集群，你需要[启用 TKE 集群驱动](../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md#激活/停用集群驱动)。启用集群驱动后，你可以开始配置 TKE 集群。
+你可以使用 Rancher 创建托管在腾讯 Tencent Kubernetes Engine (TKE) 中的集群。Rancher 已经为 TKE 实现并打包了针对 TKE 的[集群驱动](../../authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md)，但是默认情况下，这个集群驱动的状态是 `inactive`。为了启动 TKE 集群，你需要[启用 TKE 集群驱动](../../authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-cluster-drivers.md#激活/停用集群驱动)。启用集群驱动后，你可以开始配置 TKE 集群。
 
 ## 腾讯先决条件
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/azure-storageclass-configuration.md
similarity index 90%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/azure-storageclass-configuration.md
index f5e231feffc..3003cab8733 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/azure-storageclass-configuration.md
@@ -6,7 +6,7 @@ title: Azure 中存储类的配置
 
 为了让 Azure 创建所需的存储资源，请执行以下步骤操作：
 
-1. [配置 Azure 云提供商](../set-up-cloud-providers/other-cloud-providers/azure.md)。
+1. [配置 Azure 云提供商](../../kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/azure.md)。
 1. 配置 `kubectl` 以连接到你的集群。
 1. 复制 ServiceAccount 的 `ClusterRole` 和 `ClusterRoleBinding` 清单：
    ```yml
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/network-requirements-for-host-gateway.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/network-requirements-for-host-gateway.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/windows-linux-cluster-feature-parity.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/windows-linux-cluster-feature-parity.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/windows-linux-cluster-feature-parity.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/windows-linux-cluster-feature-parity.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/workload-migration-guidance.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/workload-migration-guidance.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/workload-migration-guidance.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/workload-migration-guidance.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl.md
index 52385fc16f5..d48c98b3e8c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/horizontal-pod-autoscaler/test-hpas-with-kubectl.md
@@ -173,7 +173,7 @@ title: 使用 kubectl 测试 HPA
          ```
          # kubectl describe hpa
          ```
-         You should receive the output that follows.
+         你应该会看到类似以下的输出：
          ```
          Name:                                                  hello-world
          Namespace:                                             default
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar.md
index cd24e9530e6..fe840f7005f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/add-a-sidecar.md
@@ -1,6 +1,7 @@
 ---
 title: 添加 Sidecar
 ---
+
 _sidecar_ 是一个容器，用于扩展或增强 pod 中的主容器。主容器和 Sidecar 共享一个 pod，因此共享相同的网络空间和存储。你可以使用**添加 Sidecar** 选项将 Sidecar 添加到现有工作负载。
 
 1. 在左上角，单击 **☰ > 集群管理**。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md
index b7c7fdf8a5d..6fecebc7341 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md
@@ -41,7 +41,7 @@ description: 阅读此步骤指南以部署工作负载。部署工作负载以
 
    - 在 [AWS](https://aws.amazon.com/) 中，节点必须位于同一可用区中并具有附加/分离卷的 IAM 权限。
 
-   - 集群必须使用 [AWS 云提供商](https://kubernetes.io/docs/concepts/cluster-administration/cloud-providers/#aws)选项。有关启用此选项的更多信息，请参阅[创建 AWS EC2 集群](../../kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md)或[创建自定义集群](../../../../pages-for-subheaders/use-existing-nodes.md)。
+   - 集群必须使用 [AWS 云提供商](https://kubernetes.io/docs/concepts/cluster-administration/cloud-providers/#aws)选项。有关启用此选项的更多信息，请参阅[创建 AWS EC2 集群](../../launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md)或[创建自定义集群](../../../../pages-for-subheaders/use-existing-nodes.md)。
 
    :::
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads.md
index 0139f80915e..6d2313f5514 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-resources-setup/workloads-and-pods/upgrade-workloads.md
@@ -1,6 +1,7 @@
 ---
 title: 升级工作负载
 ---
+
 如果 Docker Hub 发布新版本的应用程序镜像，你可以将运行旧版应用程序的工作负载升级到新版本。
 
 1. 在左上角，单击 **☰ > 集群管理**。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/about-rancher-agents.md
similarity index 71%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/about-rancher-agents.md
index 445af2200f6..766856a7c30 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/about-rancher-agents.md
@@ -7,15 +7,15 @@ Rancher 管理的集群上部署了两种不同的 Agent 资源：
 - [cattle-cluster-agent](#cattle-cluster-agent)
 - [cattle-node-agent](#cattle-node-agent)
 
-有关 Rancher Server 如何配置集群并与集群通信的概述，请参阅[产品架构](../../../../pages-for-subheaders/rancher-manager-architecture.md)。
+有关 Rancher Server 如何配置集群并与集群通信的概述，请参阅[产品架构](../../../pages-for-subheaders/rancher-manager-architecture.md)。
 
 ### cattle-cluster-agent
 
-`cattle-cluster-agent` 用于连接 [Rancher 启动的 Kubernetes](../../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) 集群的 Kubernetes API。`cattle-cluster-agent` 使用 Deployment 资源进行部署。
+`cattle-cluster-agent` 用于连接 [Rancher 启动的 Kubernetes](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) 集群的 Kubernetes API。`cattle-cluster-agent` 使用 Deployment 资源进行部署。
 
 ### cattle-node-agent
 
-`cattle-node-agent` 用于在执行集群操作时与 [Rancher 启动的 Kubernetes](../../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) 集群中的节点进行交互。集群操作包括升级 Kubernetes 版本和创建/恢复 etcd 快照。`cattle-node-agent` 使用 DaemonSet 资源进行部署，以确保能在每个节点上运行。当 `cattle-cluster-agent` 不可用时，`cattle-node-agent` 可以作为备选方案，用来连接 [Rancher 启动的 Kubernetes](../../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) 集群的 Kubernetes API。
+`cattle-node-agent` 用于在执行集群操作时与 [Rancher 启动的 Kubernetes](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) 集群中的节点进行交互。集群操作包括升级 Kubernetes 版本和创建/恢复 etcd 快照。`cattle-node-agent` 使用 DaemonSet 资源进行部署，以确保能在每个节点上运行。当 `cattle-cluster-agent` 不可用时，`cattle-node-agent` 可以作为备选方案，用来连接 [Rancher 启动的 Kubernetes](../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) 集群的 Kubernetes API。
 
 ### 调度规则
 
@@ -26,7 +26,7 @@ Rancher 管理的集群上部署了两种不同的 Agent 资源：
 | `cattle-cluster-agent` | `beta.kubernetes.io/os:NotIn:windows` | none | **注意**：这些是默认容忍度，并将替换为与 controlplane 节点的污点匹配的容忍度。<br/><br/>`effect:NoSchedule`<br/>`key:node-role.kubernetes.io/controlplane`<br/>`value:true`<br/><br/>`effect:NoSchedule`<br/>`key:node-role.kubernetes.io/control-plane`<br/>`operator:Exists`<br/><br/>`effect:NoSchedule`<br/>`key:node-role.kubernetes.io/master`<br/>`operator:Exists` |
 | `cattle-node-agent` | `beta.kubernetes.io/os:NotIn:windows` | none | `operator:Exists` |
 
-`cattle-cluster-agent` Deployment 使用 `preferredDuringSchedulingIgnoredDuringExecution` 的首选调度规则，倾向于在具有 `controlplane` 节点的节点上进行调度。当集群中没有可见的 controlplane 节点时（通常是使用[提供商托管的 Kubernetes 的集群](../../../../pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md)），你可以在节点上添加 `cattle.io/cluster-agent=true` 标签，从而优先将 `cattle-cluster-agent` pod 调度到该节点。
+`cattle-cluster-agent` Deployment 使用 `preferredDuringSchedulingIgnoredDuringExecution` 的首选调度规则，倾向于在具有 `controlplane` 节点的节点上进行调度。当集群中没有可见的 controlplane 节点时（通常是使用[提供商托管的 Kubernetes 的集群](../../../pages-for-subheaders/set-up-clusters-from-hosted-kubernetes-providers.md)），你可以在节点上添加 `cattle.io/cluster-agent=true` 标签，从而优先将 `cattle-cluster-agent` pod 调度到该节点。
 
 有关调度规则的更多信息，请参阅 [Kubernetes：将 Pod 分配给节点](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/)。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/rke1-vs-rke2-differences.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/rke1-vs-rke2-differences.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/rke1-vs-rke2-differences.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/rke1-vs-rke2-differences.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
similarity index 71%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
index 3c9b234231c..2b9d1fad4b4 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md
@@ -31,13 +31,13 @@ import TabItem from '@theme/TabItem';
 
 ### 2. 使用云凭证创建节点模板
 
-为 DigitalOcean 创建[节点模板](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#节点模板) 会允许 Rancher 在 DigitalOcean 中配置新节点。其他集群可以复用节点模板。
+为 DigitalOcean 创建[节点模板](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#节点模板) 会允许 Rancher 在 DigitalOcean 中配置新节点。其他集群可以复用节点模板。
 
 1. 点击 **☰ > 集群管理**。
 1. 单击 **RKE1 配置 > 节点模板**。
 1. 单击**添加模板**。
 1. 单击 **DigitalOcean**。
-1. 填写 DigitalOcean 的节点模板。有关填写表单的帮助，请参阅 [DigitalOcean 节点模板配置](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/digitalocean.md)。
+1. 填写 DigitalOcean 的节点模板。有关填写表单的帮助，请参阅 [DigitalOcean 节点模板配置](../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/digitalocean.md)。
 
 ### 3. 使用节点模板创建具有节点池的集群
 
@@ -45,8 +45,8 @@ import TabItem from '@theme/TabItem';
 1. 在**集群**页面上，单击**创建**。
 1. 单击 **DigitalOcean**。
 1. 输入**集群名称**。
-1. 将一个或多个节点池添加到你的集群。将一个或多个节点池添加到你的集群。每个节点池都使用节点模板来配置新节点。有关节点池的更多信息，包括为节点分配 Kubernetes 角色的最佳实践，请参阅[本节](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)。
-1. 在**集群配置**中，选择要安装的 Kubernetes 版本、要使用的网络提供商，以及是否启用项目网络隔离。要查看更多集群选项，请单击**显示高级选项**。如需获取配置集群的帮助，请参阅 [RKE 集群配置参考](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)。
+1. 将一个或多个节点池添加到你的集群。将一个或多个节点池添加到你的集群。每个节点池都使用节点模板来配置新节点。有关节点池的更多信息，包括为节点分配 Kubernetes 角色的最佳实践，请参阅[本节](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)。
+1. 在**集群配置**中，选择要安装的 Kubernetes 版本、要使用的网络提供商，以及是否启用项目网络隔离。要查看更多集群选项，请单击**显示高级选项**。如需获取配置集群的帮助，请参阅 [RKE 集群配置参考](../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)。
 1. 使用**成员角色**为集群配置用户授权。点击**添加成员**添加可以访问集群的用户。使用**角色**下拉菜单为每个用户设置权限。
 1. 单击**创建**。
 
@@ -74,9 +74,9 @@ import TabItem from '@theme/TabItem';
 1. 单击 **DigitalOcean**。
 1. 选择一个**云凭证**。如果存在多个则需要选择。否则，它是预选的。
 1. 输入**集群名称**。
-1. 为每个 Kubernetes 角色创建一个主机池。请参阅[最佳实践](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#rke2-中的节点角色)了解角色分配和计数的建议。
-   1. 为每个主机池定义主机配置。有关配置选项的信息，请参阅 [DigitalOcean 主机配置参考](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/digitalocean.md)。
-1. 使用**集群配置**，选择要安装的 Kubernetes 版本、要使用的网络提供商，以及是否启用项目网络隔离。有关配置集群的帮助，请参阅 [RKE2 集群配置参考](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md)。
+1. 为每个 Kubernetes 角色创建一个主机池。请参阅[最佳实践](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#rke2-中的节点角色)了解角色分配和计数的建议。
+   1. 为每个主机池定义主机配置。有关配置选项的信息，请参阅 [DigitalOcean 主机配置参考](../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/digitalocean.md)。
+1. 使用**集群配置**，选择要安装的 Kubernetes 版本、要使用的网络提供商，以及是否启用项目网络隔离。有关配置集群的帮助，请参阅 [RKE2 集群配置参考](../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md)。
 1. 使用**成员角色**为集群配置用户授权。点击**添加成员**添加可以访问集群的用户。使用**角色**下拉菜单为每个用户设置权限。
 1. 单击**创建**。
 
@@ -97,5 +97,5 @@ import TabItem from '@theme/TabItem';
 
 创建集群后，你可以通过 Rancher UI 访问集群。最佳实践建议你设置以下访问集群的备用方式：
 
-- **通过 kubectl CLI 访问你的集群**：按照[这些步骤](../../../../advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#在工作站使用-kubectl-访问集群)在你的工作站上使用 kubectl 访问集群。在这种情况下，你将通过 Rancher Server 的身份验证代理进行身份验证，然后 Rancher 会让你连接到下游集群。此方法允许你在没有 Rancher UI 的情况下管理集群。
-- **通过 kubectl CLI 使用授权的集群端点访问你的集群**：按照[这些步骤](../../../../advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#直接使用下游集群进行身份验证)直接使用 kubectl 访问集群，而无需通过 Rancher 进行身份验证。我们建议设置此替代方法来访问集群，以便在无法连接到 Rancher 时访问集群。
+- **通过 kubectl CLI 访问你的集群**：按照[这些步骤](../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#在工作站使用-kubectl-访问集群)在你的工作站上使用 kubectl 访问集群。在这种情况下，你将通过 Rancher Server 的身份验证代理进行身份验证，然后 Rancher 会让你连接到下游集群。此方法允许你在没有 Rancher UI 的情况下管理集群。
+- **通过 kubectl CLI 使用授权的集群端点访问你的集群**：按照[这些步骤](../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#直接使用下游集群进行身份验证)直接使用 kubectl 访问集群，而无需通过 Rancher 进行身份验证。我们建议设置此替代方法来访问集群，以便在无法连接到 Rancher 时访问集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
similarity index 82%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
index 499d2adf2b7..2ed2bf2d55a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md
@@ -17,7 +17,7 @@ import TabItem from '@theme/TabItem';
 - **AWS EC2 访问密钥和密文密钥**，用于创建实例。请参阅 [Amazon 文档：创建访问密钥](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_access-keys.html#Using_CreateAccessKey)来创建访问密钥和密文密钥。
 - **已创建 IAM 策略**，用于为用户添加的访问密钥和密文密钥。请参阅 [Amazon 文档：创建 IAM 策略（控制台）](https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_create.html#access_policies_create-start)来创建 IAM 策略。参阅下面的三个示例 JSON 策略：
    - [IAM 策略示例](#iam-策略示例)
-   - [带有 PassRole 的 IAM 策略示例](#带有-passrole-的-iam-策略示例)（如果要使用 [Kubernetes 云提供商](../../../../../pages-for-subheaders/set-up-cloud-providers.md)，或将 IAM 配置文件传递给实例，则需要）
+   - [带有 PassRole 的 IAM 策略示例](#带有-passrole-的-iam-策略示例)（如果要使用 [Kubernetes 云提供商](../../../../pages-for-subheaders/set-up-cloud-providers.md)，或将 IAM 配置文件传递给实例，则需要）
    - [允许加密 EBS 卷的 IAM 策略示例](#允许加密-ebs-卷的-iam-策略示例)
 - 为用户添加 **IAM 策略权限**。请参阅 [Amazon 文档：为用户添加权限（控制台）](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_users_change-permissions.html#users_change_permissions-add-console)，来将权限添加给用户。
 
@@ -47,12 +47,12 @@ import TabItem from '@theme/TabItem';
 
 ### 2. 使用云凭证和 EC2 的信息来创建节点模板
 
-为 EC2 创建[节点模板](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#节点模板)会允许 Rancher 在 EC2 中配置新节点。其他集群可以复用节点模板。
+为 EC2 创建[节点模板](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#节点模板)会允许 Rancher 在 EC2 中配置新节点。其他集群可以复用节点模板。
 
 1. 点击 **☰ > 集群管理**。
 1. 单击 **RKE1 配置 > 节点模板**。
 1. 单击**添加模板**。
-1. 填写 EC2 的节点模板。有关填写表单的帮助，请参阅 [EC2 节点模板配置](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md)。
+1. 填写 EC2 的节点模板。有关填写表单的帮助，请参阅 [EC2 节点模板配置](../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md)。
 1. 单击**创建**。
 
    :::note
@@ -63,14 +63,14 @@ import TabItem from '@theme/TabItem';
 
 ### 3. 使用节点模板创建具有节点池的集群
 
-将一个或多个节点池添加到你的集群。有关节点池的更多信息，请参阅[本节](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)。
+将一个或多个节点池添加到你的集群。有关节点池的更多信息，请参阅[本节](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)。
 
 1. 点击 **☰ > 集群管理**。
 1. 在**集群**页面上，单击**创建**。
 1. 单击 **Amazon EC2**。
-1. 为每个 Kubernetes 角色创建一个节点池。为每个节点池选择你已创建的节点模板。有关节点池的更多信息，包括为节点分配 Kubernetes 角色的最佳实践，请参阅[本节](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)。
+1. 为每个 Kubernetes 角色创建一个节点池。为每个节点池选择你已创建的节点模板。有关节点池的更多信息，包括为节点分配 Kubernetes 角色的最佳实践，请参阅[本节](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)。
 1. 点击**添加成员**添加可以访问集群的用户。使用**角色**下拉菜单为每个用户设置权限。
-1. 使用**集群选项**选择要安装的 Kubernetes 版本、要使用的网络提供商，以及是否启用项目网络隔离。参见[选择云提供商](../../../../../pages-for-subheaders/set-up-cloud-providers.md)来配置 Kubernetes 云提供商。如需获取配置集群的帮助，请参阅 [RKE 集群配置参考](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)。
+1. 使用**集群选项**选择要安装的 Kubernetes 版本、要使用的网络提供商，以及是否启用项目网络隔离。参见[选择云提供商](../../../../pages-for-subheaders/set-up-cloud-providers.md)来配置 Kubernetes 云提供商。如需获取配置集群的帮助，请参阅 [RKE 集群配置参考](../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)。
 
    :::note
 
@@ -106,9 +106,9 @@ import TabItem from '@theme/TabItem';
 1. 单击 **Amazon EC2**。
 1. 选择一个**云凭证**。如果存在多个则需要选择。否则，它是预选的。
 1. 输入**集群名称**。
-1. 为每个 Kubernetes 角色创建一个主机池。请参阅[最佳实践](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#rke2-中的节点角色)了解角色分配和计数的建议。
-   1. 为每个主机池定义主机配置。有关配置选项的信息，请参阅 [EC2 主机配置参考](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/amazon-ec2.md)。
-1. 使用**集群配置**，选择要安装的 Kubernetes 版本、要使用的网络提供商，以及是否启用项目网络隔离。有关配置集群的帮助，请参阅 [RKE2 集群配置参考](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md)。
+1. 为每个 Kubernetes 角色创建一个主机池。请参阅[最佳实践](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#rke2-中的节点角色)了解角色分配和计数的建议。
+   1. 为每个主机池定义主机配置。有关配置选项的信息，请参阅 [EC2 主机配置参考](../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/amazon-ec2.md)。
+1. 使用**集群配置**，选择要安装的 Kubernetes 版本、要使用的网络提供商，以及是否启用项目网络隔离。有关配置集群的帮助，请参阅 [RKE2 集群配置参考](../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md)。
 1. 使用**成员角色**为集群配置用户授权。点击**添加成员**添加可以访问集群的用户。使用**角色**下拉菜单为每个用户设置权限。
 1. 单击**创建**。
 
@@ -130,8 +130,8 @@ import TabItem from '@theme/TabItem';
 
 创建集群后，你可以通过 Rancher UI 访问集群。最佳实践建议你设置以下访问集群的备用方式：
 
-- **通过 kubectl CLI 访问你的集群**：按照[这些步骤](../../../../advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#在工作站使用-kubectl-访问集群)在你的工作站上使用 kubectl 访问集群。在这种情况下，你将通过 Rancher Server 的身份验证代理进行身份验证，然后 Rancher 会让你连接到下游集群。此方法允许你在没有 Rancher UI 的情况下管理集群。
-- **通过 kubectl CLI 使用授权的集群端点访问你的集群**：按照[这些步骤](../../../../advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#直接使用下游集群进行身份验证)直接使用 kubectl 访问集群，而无需通过 Rancher 进行身份验证。我们建议设置此替代方法来访问集群，以便在无法连接到 Rancher 时访问集群。
+- **通过 kubectl CLI 访问你的集群**：按照[这些步骤](../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#在工作站使用-kubectl-访问集群)在你的工作站上使用 kubectl 访问集群。在这种情况下，你将通过 Rancher Server 的身份验证代理进行身份验证，然后 Rancher 会让你连接到下游集群。此方法允许你在没有 Rancher UI 的情况下管理集群。
+- **通过 kubectl CLI 使用授权的集群端点访问你的集群**：按照[这些步骤](../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#直接使用下游集群进行身份验证)直接使用 kubectl 访问集群，而无需通过 Rancher 进行身份验证。我们建议设置此替代方法来访问集群，以便在无法连接到 Rancher 时访问集群。
 
 # IAM 策略
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
similarity index 73%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
index f9d41938f2c..4ec13bd515c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md
@@ -22,9 +22,9 @@ import TabItem from '@theme/TabItem';
 
 :::
 
-有关 Rancher 在 Azure 节点上安装的 Kubernetes 集群的更多信息，请参阅 [RKE 集群配置参考](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)。
+有关 Rancher 在 Azure 节点上安装的 Kubernetes 集群的更多信息，请参阅 [RKE 集群配置参考](../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)。
 
-有关配置 Azure 节点模板的详细信息，请参阅 [Azure 节点模板配置参考](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md)。
+有关配置 Azure 节点模板的详细信息，请参阅 [Azure 节点模板配置参考](../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md)。
 
 - [Azure 中的准备工作](#azure-中的准备工作)
 - [创建 Azure 集群](#创建-azure-集群)
@@ -68,13 +68,13 @@ az ad sp create-for-rbac \
 
 ### 2. 使用云凭证创建节点模板
 
-为 Azure 创建[节点模板](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#节点模板)会允许 Rancher 在 Azure 中配置新节点。其他集群可以复用节点模板。
+为 Azure 创建[节点模板](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#节点模板)会允许 Rancher 在 Azure 中配置新节点。其他集群可以复用节点模板。
 
 1. 点击 **☰ > 集群管理**。
 1. 单击 **RKE1 配置 > 节点模板**。
 1. 单击**添加模板**。
 1. 单击 **Azure**。
-1. 填写 Azure 的节点模板。有关填写表单的帮助，请参阅 [Azure 节点模板配置](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md)。
+1. 填写 Azure 的节点模板。有关填写表单的帮助，请参阅 [Azure 节点模板配置](../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md)。
 
 ### 3. 使用节点模板创建具有节点池的集群
 
@@ -84,8 +84,8 @@ az ad sp create-for-rbac \
 1. 在**集群**页面上，单击**创建**。
 1. 单击 **Azure**。
 1. 输入**集群名称**。
-1. 将一个或多个节点池添加到你的集群。每个节点池都使用节点模板来配置新节点。有关节点池及其最佳实践的更多信息，请参阅[本节](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)。
-1. 在**集群配置**中，选择要安装的 Kubernetes 版本、要使用的网络提供商，以及是否启用项目网络隔离。要查看更多集群选项，请单击**显示高级选项**。如需获取配置集群的帮助，请参阅 [RKE 集群配置参考](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)。
+1. 将一个或多个节点池添加到你的集群。每个节点池都使用节点模板来配置新节点。有关节点池及其最佳实践的更多信息，请参阅[本节](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md)。
+1. 在**集群配置**中，选择要安装的 Kubernetes 版本、要使用的网络提供商，以及是否启用项目网络隔离。要查看更多集群选项，请单击**显示高级选项**。如需获取配置集群的帮助，请参阅 [RKE 集群配置参考](../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)。
 1. 使用**成员角色**为集群配置用户授权。点击**添加成员**添加可以访问集群的用户。使用**角色**下拉菜单为每个用户设置权限。
 1. 单击**创建**。
 
@@ -115,9 +115,9 @@ az ad sp create-for-rbac \
 1. 单击 **Azure**。
 1. 选择一个**云凭证**。如果存在多个则需要选择。否则，它是预选的。
 1. 输入**集群名称**。
-1. 为每个 Kubernetes 角色创建一个主机池。请参阅[最佳实践](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#rke2-中的节点角色)了解角色分配和计数的建议。
-   1. 为每个主机池定义主机配置。有关配置选项的信息，请参阅 [Azure 主机配置参考](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/azure.md)。
-1. 使用**集群配置**，选择要安装的 Kubernetes 版本、要使用的网络提供商，以及是否启用项目网络隔离。有关配置集群的帮助，请参阅 [RKE2 集群配置参考](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md)。
+1. 为每个 Kubernetes 角色创建一个主机池。请参阅[最佳实践](../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#rke2-中的节点角色)了解角色分配和计数的建议。
+   1. 为每个主机池定义主机配置。有关配置选项的信息，请参阅 [Azure 主机配置参考](../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/machine-configuration/azure.md)。
+1. 使用**集群配置**，选择要安装的 Kubernetes 版本、要使用的网络提供商，以及是否启用项目网络隔离。有关配置集群的帮助，请参阅 [RKE2 集群配置参考](../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md)。
 1. 使用**成员角色**为集群配置用户授权。点击**添加成员**添加可以访问集群的用户。使用**角色**下拉菜单为每个用户设置权限。
 1. 单击**创建**。
 
@@ -140,5 +140,5 @@ az ad sp create-for-rbac \
 
 创建集群后，你可以通过 Rancher UI 访问集群。最佳实践建议你设置以下访问集群的备用方式：
 
-- **通过 kubectl CLI 访问你的集群**：按照[这些步骤](../../../../advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#在工作站使用-kubectl-访问集群)在你的工作站上使用 kubectl 访问集群。在这种情况下，你将通过 Rancher Server 的身份验证代理进行身份验证，然后 Rancher 会让你连接到下游集群。此方法允许你在没有 Rancher UI 的情况下管理集群。
-- **通过 kubectl CLI 使用授权的集群端点访问你的集群**：按照[这些步骤](../../../../advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#直接使用下游集群进行身份验证)直接使用 kubectl 访问集群，而无需通过 Rancher 进行身份验证。我们建议设置此替代方法来访问集群，以便在无法连接到 Rancher 时访问集群。
+- **通过 kubectl CLI 访问你的集群**：按照[这些步骤](../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#在工作站使用-kubectl-访问集群)在你的工作站上使用 kubectl 访问集群。在这种情况下，你将通过 Rancher Server 的身份验证代理进行身份验证，然后 Rancher 会让你连接到下游集群。此方法允许你在没有 Rancher UI 的情况下管理集群。
+- **通过 kubectl CLI 使用授权的集群端点访问你的集群**：按照[这些步骤](../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#直接使用下游集群进行身份验证)直接使用 kubectl 访问集群，而无需通过 Rancher 进行身份验证。我们建议设置此替代方法来访问集群，以便在无法连接到 Rancher 时访问集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
similarity index 68%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
index 76a1e3a5310..425969461dc 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md
@@ -4,15 +4,15 @@ title: 在 Nutanix AOS 中配置 Kubernetes 集群
 
 要使用 Rancher 在 Nutanix AOS (AHV) 中安装 [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes 集群：
 
-1. 找到 Rancher 的内置 Nutanix [主机驱动并激活它](../../../../../advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md#激活/停用主机驱动)。
+1. 找到 Rancher 的内置 Nutanix [主机驱动并激活它](../../../authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md#激活/停用主机驱动)。
 
 1. 创建一个节点模板，Rancher 将使用该模板在 Nutanix AOS 中配置节点。
 
 1. 在 Rancher 中创建 Nutanix AOS 集群。配置新集群时，你需要为它定义节点池。每个节点池都有一个 etcd、controlplane 或 worker 的 Kubernetes 角色。Rancher 会在新节点上安装 RKE Kubernetes，并为每个节点设置节点池定义的 Kubernetes 角色。
 
-有关配置 Nutanix AOS 节点模板的详细信息，请参阅 [Nutanix AOS 节点模板配置参考](../../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/nutanix.md)。
+有关配置 Nutanix AOS 节点模板的详细信息，请参阅 [Nutanix AOS 节点模板配置参考](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/nutanix.md)。
 
-有关在 Rancher 中配置 RKE Kubernetes 集群的详细信息，请参阅[集群配置参考](../../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)。
+有关在 Rancher 中配置 RKE Kubernetes 集群的详细信息，请参阅[集群配置参考](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)。
 
 - [Nutanix AOS 中的准备工作](#nutanix-aos-中的准备工作)
 - [创建 Nutanix AOS 集群](#创建-nutanix-aos-集群)
@@ -37,7 +37,7 @@ title: 在 Nutanix AOS 中配置 Kubernetes 集群
 - 连接到 Nutanix Prism Central API（通常是端口 9440/TCP）。
 - 连接到创建的 VM 上的 22/TCP 和 2376/TCP 端口。
 
-有关在基础设施提供商上创建节点的端口要求，请参阅[节点网络要求](../../../node-requirements-for-rancher-managed-clusters.md#网络要求)。
+有关在基础设施提供商上创建节点的端口要求，请参阅[节点网络要求](../../../kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md#网络要求)。
 
 ### VM-VM 反亲和性策略
 
@@ -50,14 +50,14 @@ title: 在 Nutanix AOS 中配置 Kubernetes 集群
 
 ### 1. 创建节点模板
 
-为 Nutanix AOS 创建[节点模板](../../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#节点模板)会允许 Rancher 在 Nutanix AOS 中配置新节点。其他集群可以复用节点模板。
+为 Nutanix AOS 创建[节点模板](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#节点模板)会允许 Rancher 在 Nutanix AOS 中配置新节点。其他集群可以复用节点模板。
 
 1. 点击 **☰ > 集群管理**。
 1. 单击 **RKE1 配置 > 节点模板**。
 1. 单击**创建**。
 1. 单击**添加模板**。
 1. 单击 **Nutanix**。
-1. 填写 Nutanix AOS 的节点模板。有关填写表格的帮助，请参阅 Nutanix AOS 节点模板[配置参考](../../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/nutanix.md)。
+1. 填写 Nutanix AOS 的节点模板。有关填写表格的帮助，请参阅 Nutanix AOS 节点模板[配置参考](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/nutanix.md)。
 1. 单击**创建**。
 
 ### 2. 使用节点模板创建具有节点池的集群
@@ -69,8 +69,8 @@ title: 在 Nutanix AOS 中配置 Kubernetes 集群
 1. 单击 **Nutanix**。
 1. 输入**集群名称**，然后点击**继续**。
 1. 使用**成员角色**为集群配置用户授权。点击**添加成员**添加可以访问集群的用户。使用**角色**下拉菜单为每个用户设置权限。
-1. 使用**集群选项**选择要安装的 Kubernetes 版本、要使用的网络提供商，以及是否启用项目网络隔离。要查看更多集群选项，请单击**显示高级选项**。如需获取配置集群的帮助，请参阅 [RKE 集群配置参考](../../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)。
-1. 将一个或多个节点池添加到你的集群。每个节点池都使用节点模板来配置新节点。有关节点池的更多信息，包括为节点分配 Kubernetes 角色的最佳实践，请参阅[本节](../../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#节点池)。
+1. 使用**集群选项**选择要安装的 Kubernetes 版本、要使用的网络提供商，以及是否启用项目网络隔离。要查看更多集群选项，请单击**显示高级选项**。如需获取配置集群的帮助，请参阅 [RKE 集群配置参考](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)。
+1. 将一个或多个节点池添加到你的集群。每个节点池都使用节点模板来配置新节点。有关节点池的更多信息，包括为节点分配 Kubernetes 角色的最佳实践，请参阅[本节](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#节点池)。
 1. 检查并确认你的选项。然后单击**创建**。
 
 **结果**：集群已创建，并处于 **Provisioning** 状态。Rancher 已在你的集群中。
@@ -87,6 +87,6 @@ title: 在 Nutanix AOS 中配置 Kubernetes 集群
 
 创建集群后，你可以通过 Rancher UI 访问集群。最佳实践建议你设置以下访问集群的备用方式：
 
-- **通过 kubectl CLI 访问你的集群**：按照[这些步骤](../../../../../advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#在工作站使用-kubectl-访问集群)在你的工作站上使用 kubectl 访问集群。在这种情况下，你将通过 Rancher Server 的身份验证代理进行身份验证，然后 Rancher 会让你连接到下游集群。此方法允许你在没有 Rancher UI 的情况下管理集群。
+- **通过 kubectl CLI 访问你的集群**：按照[这些步骤](../../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#在工作站使用-kubectl-访问集群)在你的工作站上使用 kubectl 访问集群。在这种情况下，你将通过 Rancher Server 的身份验证代理进行身份验证，然后 Rancher 会让你连接到下游集群。此方法允许你在没有 Rancher UI 的情况下管理集群。
 
-- **通过 kubectl CLI 使用授权的集群端点访问你的集群**：按照[这些步骤](../../../../../advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#直接使用下游集群进行身份验证)直接使用 kubectl 访问集群，而无需通过 Rancher 进行身份验证。我们建议设置此替代方法来访问集群，以便在无法连接到 Rancher 时访问集群。
\ No newline at end of file
+- **通过 kubectl CLI 使用授权的集群端点访问你的集群**：按照[这些步骤](../../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#直接使用下游集群进行身份验证)直接使用 kubectl 访问集群，而无需通过 Rancher 进行身份验证。我们建议设置此替代方法来访问集群，以便在无法连接到 Rancher 时访问集群。
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-a-vm-template.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/create-credentials.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
similarity index 64%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
index 3bafe4cc4d4..fda9835410e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md
@@ -8,9 +8,9 @@ title: 在 vSphere 中配置 Kubernetes 集群
 
 然后，在 Rancher 中创建一个 vSphere 集群，并在配置新集群时为集群定义节点池。每个节点池都有一个 etcd、controlplane 或 worker 的 Kubernetes 角色。Rancher 会在新节点上安装 RKE Kubernetes，并为每个节点设置节点池定义的 Kubernetes 角色。
 
-有关配置 vSphere 节点模板的详细信息，请参阅 [vSphere 节点模板配置参考](../../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere.md)。
+有关配置 vSphere 节点模板的详细信息，请参阅 [vSphere 节点模板配置参考](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere.md)。
 
-有关在 Rancher 中配置 RKE Kubernetes 集群的详细信息，请参阅[集群配置参考](../../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md#rke-集群配置文件参考)。
+有关在 Rancher 中配置 RKE Kubernetes 集群的详细信息，请参阅[集群配置参考](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md#rke-集群配置文件参考)。
 
 
 - [vSphere 中的准备工作](#vsphere-中的准备工作)
@@ -36,7 +36,7 @@ title: 在 vSphere 中配置 Kubernetes 集群
 - 连接到用于实例化集群虚拟机的所有 ESXi 主机上的 Host API（端口 443/TCP）（*仅在使用 ISO 创建模式时需要*）。
 - 连接到创建的 VM 上的 22/TCP 和 2376/TCP 端口。
 
-有关在基础设施提供商上创建节点的端口要求，请参阅[节点网络要求](../../../node-requirements-for-rancher-managed-clusters.md#网络要求)。
+有关在基础设施提供商上创建节点的端口要求，请参阅[节点网络要求](../../../kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md#网络要求)。
 
 ### 用于 vSphere API 访问的有效 ESXi 许可证
 
@@ -60,21 +60,21 @@ title: 在 vSphere 中配置 Kubernetes 集群
 1. 单击**云凭证**。
 1. 单击**创建**。
 1. 单击 **VMware vSphere**。
-1. 输入你的 vSphere 凭证。如需帮助，请参见[节点模板配置参考](../../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere.md)中的**账号访问**。
+1. 输入你的 vSphere 凭证。如需帮助，请参见[节点模板配置参考](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere.md)中的**账号访问**。
 1. 单击**创建**。
 
 **结果**：已创建用于在集群中配置节点的云凭证。你可以在其他节点模板或集群中复用这些凭证。
 
 ### 2. 使用云凭证创建节点模板
 
-为 vSphere 创建[节点模板](../../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#节点模板)会允许 Rancher 在 vSphere 中配置新节点。其他集群可以复用节点模板。
+为 vSphere 创建[节点模板](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#节点模板)会允许 Rancher 在 vSphere 中配置新节点。其他集群可以复用节点模板。
 
 1. 点击 **☰ > 集群管理**。
 1. 单击 **RKE1 配置 > 节点模板**。
 1. 单击**创建**。
 1. 单击**添加模板**。
 1. 单击 **vSphere**。
-1. 填写 vSphere 的节点模板。有关填写表格的帮助，请参阅 vSphere 节点模板[配置参考](../../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere.md)。
+1. 填写 vSphere 的节点模板。有关填写表格的帮助，请参阅 vSphere 节点模板[配置参考](../../../../../reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/vsphere.md)。
 1. 单击**创建**。
 
 ### 3. 使用节点模板创建具有节点池的集群
@@ -86,9 +86,9 @@ title: 在 vSphere 中配置 Kubernetes 集群
 1. 单击 **VMware vSphere**。
 1. 输入**集群名称**并使用你的 vSphere 云凭证。点击**继续**。
 1. 使用**成员角色**为集群配置用户授权。点击**添加成员**添加可以访问集群的用户。使用**角色**下拉菜单为每个用户设置权限。
-1. 使用**集群选项**选择要安装的 Kubernetes 版本、要使用的网络提供商，以及是否启用项目网络隔离。要查看更多集群选项，请单击**显示高级选项**。如需获取配置集群的帮助，请参阅 [RKE 集群配置参考](../../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)。
-1. 如果你想稍后动态配置持久存储或其他基础设施，你需要修改集群 YAML 文件来启用 vSphere 云提供商。详情请参阅[本节](../../../../../../pages-for-subheaders/vsphere-cloud-provider.md)。
-1. 将一个或多个节点池添加到你的集群。每个节点池都使用节点模板来配置新节点。有关节点池的更多信息，包括为节点分配 Kubernetes 角色的最佳实践，请参阅[本节](../../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#节点池)。
+1. 使用**集群选项**选择要安装的 Kubernetes 版本、要使用的网络提供商，以及是否启用项目网络隔离。要查看更多集群选项，请单击**显示高级选项**。如需获取配置集群的帮助，请参阅 [RKE 集群配置参考](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)。
+1. 如果你想稍后动态配置持久存储或其他基础设施，你需要修改集群 YAML 文件来启用 vSphere 云提供商。有关更多信息，请参阅[树内 vSphere cloud provider 文档](../../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-in-tree-vsphere)和[树外 vSphere cloud provider 文档](../../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-out-of-tree-vsphere)。
+1. 将一个或多个节点池添加到你的集群。每个节点池都使用节点模板来配置新节点。有关节点池的更多信息，包括为节点分配 Kubernetes 角色的最佳实践，请参阅[本节](../../../../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#节点池)。
 1. 检查并确认你的选项。然后单击**创建**。
 
 **结果**：
@@ -107,6 +107,6 @@ title: 在 vSphere 中配置 Kubernetes 集群
 
 创建集群后，你可以通过 Rancher UI 访问集群。最佳实践建议你设置以下访问集群的备用方式：
 
-- **通过 kubectl CLI 访问你的集群**：按照[这些步骤](../../../../../advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#在工作站使用-kubectl-访问集群)在你的工作站上使用 kubectl 访问集群。在这种情况下，你将通过 Rancher Server 的身份验证代理进行身份验证，然后 Rancher 会让你连接到下游集群。此方法允许你在没有 Rancher UI 的情况下管理集群。
-- **通过 kubectl CLI 使用授权的集群端点访问你的集群**：按照[这些步骤](../../../../../advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#直接使用下游集群进行身份验证)直接使用 kubectl 访问集群，而无需通过 Rancher 进行身份验证。我们建议设置此替代方法来访问集群，以便在无法连接到 Rancher 时访问集群。
-- **配置存储**：有关如何使用 Rancher 在 vSphere 中配置存储的示例，请参阅[本节](../../../../../advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md)。要在 vSphere 中动态配置存储，你必须[启用](../../../../../../pages-for-subheaders/vsphere-cloud-provider.md) vSphere 云提供商。
\ No newline at end of file
+- **通过 kubectl CLI 访问你的集群**：按照[这些步骤](../../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#在工作站使用-kubectl-访问集群)在你的工作站上使用 kubectl 访问集群。在这种情况下，你将通过 Rancher Server 的身份验证代理进行身份验证，然后 Rancher 会让你连接到下游集群。此方法允许你在没有 Rancher UI 的情况下管理集群。
+- **通过 kubectl CLI 使用授权的集群端点访问你的集群**：按照[这些步骤](../../../../new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#直接使用下游集群进行身份验证)直接使用 kubectl 访问集群，而无需通过 Rancher 进行身份验证。我们建议设置此替代方法来访问集群，以便在无法连接到 Rancher 时访问集群。
+- **配置存储**：有关如何使用 Rancher 在 vSphere 中配置存储的示例，请参阅[本节](../../../../../pages-for-subheaders/provisioning-storage-examples.md)。要在 vSphere 中动态配置存储，你必须启用 vSphere 云提供商。有关更多信息，请参阅[树内 vSphere cloud provider 文档](../../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-in-tree-vsphere)和[树外 vSphere cloud provider 文档](../../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-out-of-tree-vsphere)。
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
similarity index 58%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
index 080abf220bc..aef1f3c08b4 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md
@@ -6,7 +6,7 @@ title: 将用户添加到集群
 
 :::tip
 
-如果你想为用户提供对集群内 _特定_ 项目的访问权限，请参见[添加项目成员](../../manage-projects/add-users-to-projects.md)。
+如果你想为用户提供对集群内 _特定_ 项目的访问权限，请参见[添加项目成员](../../../new-user-guides/add-users-to-projects.md)。
 
 :::
 
@@ -31,32 +31,32 @@ title: 将用户添加到集群
 
    如果配置了外部身份验证：
 
-   - 在你键入时，Rancher 会从你的[外部身份验证](../../../../pages-for-subheaders/about-authentication.md)源返回用户。
+   - 在你键入时，Rancher 会从你的[外部身份验证](../../../../pages-for-subheaders/authentication-config.md)源返回用户。
 
-		:::note 使用 AD 但找不到你的用户？
+      :::note 使用 AD 但找不到你的用户？
 
-		你的搜索属性配置可能存在问题。请参阅[配置 Active Directory 身份验证：步骤 5](../../authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md)。
+      你的搜索属性配置可能存在问题。请参阅[配置 Active Directory 身份验证：步骤 5](../../../new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-active-directory.md)。
 
-		:::
+      :::
 
    - 你可以在下拉菜单中添加组，而不是单个用户。下拉列表仅列出你（登录用户）所属的组。
 
-		:::note
+      :::note
 
-		如果你以本地用户身份登录，外部用户不会显示在你的搜索结果中。有关详细信息，请参阅[外部身份验证配置和主体用户](../../../../pages-for-subheaders/about-authentication.md#外部身份验证配置和用户主体)。
+      如果你以本地用户身份登录，外部用户不会显示在你的搜索结果中。有关详细信息，请参阅[外部身份验证配置和主体用户](../../../../pages-for-subheaders/authentication-config.md#外部身份验证配置和用户主体)。
 
-		:::
+      :::
 
 1. 分配用户或组的**集群**角色。
 
-   [什么是集群角色？](../../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md)
+   [什么是集群角色？](../../../new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md)
 
    :::tip
 
    对于自定义角色，你可以修改可分配的单个角色列表。
 
-   - 要将角色添加到列表中，请[添加自定义角色](../../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md)。
-   - 要从列表中删除角色，请[锁定/解锁角色](../../authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md)。
+   - 要将角色添加到列表中，请[添加自定义角色](../../../new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md)。
+   - 要从列表中删除角色，请[锁定/解锁角色](../../../new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/locked-roles.md)。
 
    :::
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/access-clusters/authorized-cluster-endpoint.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/add-a-pod-security-policy.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/add-a-pod-security-policy.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/assign-pod-security-policies.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/assign-pod-security-policies.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/assign-pod-security-policies.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/clean-cluster-nodes.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/clean-cluster-nodes.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/clone-cluster-configuration.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/clone-cluster-configuration.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
similarity index 95%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
index 8b77607fcf0..3603fef7a63 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md
@@ -8,7 +8,7 @@ title: 在 Rancher 中动态配置新存储
 
 新存储通常由 Amazon EBS 等云提供商提供。但是，新存储不一定要在云中。
 
-如果你有一个块存储池并且不想使用云提供商，你可以使用 Longhorn 为 Kubernetes 集群提供持久存储。详情请参见[本页面](../../../../../explanations/integrations-in-rancher/longhorn.md)。
+如果你有一个块存储池并且不想使用云提供商，你可以使用 Longhorn 为 Kubernetes 集群提供持久存储。详情请参见[本页面](../../../../../integrations-in-rancher/longhorn.md)。
 
 要为你的工作负载配置新存储，请执行以下步骤：
 
@@ -36,7 +36,7 @@ title: 在 Rancher 中动态配置新存储
 | 网络文件系统 | `nfs` |
 | hostPath | `host-path` |
 
-如果你的存储卷插件没有在上述列表中，你需要[使用功能开关来启用不受支持的存储驱动](../../../../../getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md)。
+如果你的存储卷插件没有在上述列表中，你需要[使用功能开关来启用不受支持的存储驱动](../../../../advanced-user-guides/enable-experimental-features/unsupported-storage-drivers.md)。
 
 ### 1. 添加一个存储类并将其配置为使用你的存储
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
similarity index 93%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
index 90aa0281ca6..baa09c39583 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md
@@ -25,9 +25,9 @@ title: 设置现有存储
 
 在 Rancher 中创建持久卷不会创建存储卷。它只创建映射到现有卷的 Kubernetes 资源。因此，在你可以将持久卷创建为 Kubernetes 资源之前，你必须先配置存储。
 
-设置持久存储设备的步骤会因你的基础设施而异。我们提供了使用 [vSphere](../provisioning-storage-examples/vsphere-storage.md)、[NFS](../provisioning-storage-examples/nfs-storage.md) 或 [Amazon EBS ](../provisioning-storage-examples/persistent-storage-in-amazon-ebs.md)设置存储的示例。
+设置持久存储设备的步骤会因你的基础设施而异。我们提供了使用 [vSphere](../../provisioning-storage-examples/vsphere-storage.md)、[NFS](../../provisioning-storage-examples/nfs-storage.md) 或 [Amazon EBS ](../../provisioning-storage-examples/persistent-storage-in-amazon-ebs.md)设置存储的示例。
 
-如果你有一个块存储池并且不想使用云提供商，你可以使用 Longhorn 为 Kubernetes 集群提供持久存储。详情请参见[本页面](../../../../../explanations/integrations-in-rancher/longhorn.md)。
+如果你有一个块存储池并且不想使用云提供商，你可以使用 Longhorn 为 Kubernetes 集群提供持久存储。详情请参见[本页面](../../../../../integrations-in-rancher/longhorn.md)。
 
 ### 2. 添加一个引用持久存储的 PersistentVolume
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
similarity index 98%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
index d656827b467..c35617e507a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md
@@ -228,7 +228,7 @@ title: 通过 AWS EC2 Auto Scaling 组使用 Cluster Autoscaler
    sudo docker run -d --privileged --restart=unless-stopped --net=host -v /etc/kubernetes:/etc/kubernetes -v /var/run:/var/run rancher/rancher-agent:<RANCHER_VERSION> --server https://<RANCHER_URL> --token <RANCHER_TOKEN> --ca-checksum <RANCHER_CA_CHECKCSUM> --address ${PUBLIC_IP} --internal-address ${PRIVATE_IP} ${K8S_ROLES}
    ```
 
-详情请参见 [AWS 上的 RKE 集群](../../../new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md) 和 [AWS 上的 Cluster Autoscaler](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/aws/README.md)。
+详情请参见 [AWS 上的 RKE 集群](../../../new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md) 和 [AWS 上的 Cluster Autoscaler](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/aws/README.md)。
 
 ### 3. 部署节点
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/nodes-and-node-pools.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/nodes-and-node-pools.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces.md
similarity index 98%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces.md
index cdf1ab5a57b..e7f5a8bbdb1 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces.md
@@ -45,7 +45,7 @@ Kubernetes 支持由同一个物理集群支持的多个虚拟集群。这些虚
 
 为了在 vanilla Kubernetes 集群中管理权限，集群管理员要为每个命名空间配置基于角色的访问策略。Rancher 在项目级别上分配用户权限，项目中的命名空间会自动继承项目的权限。
 
-有关创建和移动命名空间的更多信息，请参阅[命名空间](../manage-projects/manage-namespaces.md)。
+有关创建和移动命名空间的更多信息，请参阅[命名空间](../../new-user-guides/manage-namespaces.md)。
 
 ### 命名空间和 kubectl 的 RBAC 问题
 
@@ -53,7 +53,7 @@ Kubernetes 支持由同一个物理集群支持的多个虚拟集群。这些虚
 
 这意味着当具有项目范围权限的普通用户使用 `kubectl` 创建命名空间时，由于 `kubectl` 不需要将新命名空间限制在特定项目中，创建的命名空间可能无法使用。
 
-如果你的权限仅限于项目级别，则最好[通过 Rancher 创建命名空间](../manage-projects/manage-namespaces.md)，以确保你有权访问该命名空间。
+如果你的权限仅限于项目级别，则最好[通过 Rancher 创建命名空间](../../new-user-guides/manage-namespaces.md)，以确保你有权访问该命名空间。
 
 如果普通用户是项目所有者，则该用户将能够在该项目中创建命名空间。Rancher UI 将阻止该用户在他们有权访问的项目之外创建命名空间。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/nfs-storage.md
similarity index 96%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/nfs-storage.md
index cd65b8826a8..569a052d5fe 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/nfs-storage.md
@@ -6,7 +6,7 @@ title: NFS 存储
 
 :::note
 
-- 如果你已经拥有 NFS 共享，则无需配置新的 NFS 服务器即可在 Rancher 中使用 NFS 卷插件。这样的话，你可以跳过此过程的其余部分并直接[添加存储](../../../../../pages-for-subheaders/create-kubernetes-persistent-storage.md)。
+- 如果你已经拥有 NFS 共享，则无需配置新的 NFS 服务器即可在 Rancher 中使用 NFS 卷插件。这样的话，你可以跳过此过程的其余部分并直接[添加存储](../../../../pages-for-subheaders/create-kubernetes-persistent-storage.md)。
 
 - 此教程演示了如何使用 Ubuntu 设置 NFS 服务器。你也应该能够将这些说明用于其他 Linux 发行版（例如 Debian、RHEL、Arch Linux 等）。有关如何使用另一个 Linux 发行版创建 NFS 服务器的官方说明，请参阅发行版的文档。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
similarity index 76%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
index cd0dda69ab3..3955afea1f2 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md
@@ -12,4 +12,4 @@ title: 在 Amazon EBS 中创建持久存储
 
 **结果**：已创建持久存储。
 
-有关如何在 Rancher 中设置新创建的存储的详细信息，请参阅[设置现有存储](../manage-persistent-storage/set-up-existing-storage.md)。
\ No newline at end of file
+有关如何在 Rancher 中设置新创建的存储的详细信息，请参阅[设置现有存储](../../../new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md)。
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md
similarity index 82%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md
index 1a0824e4382..a5d85285ce3 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md
@@ -4,12 +4,12 @@ title: vSphere 存储
 
 要为有状态的工作负载提供 vSphere 存储，我们建议创建一个 vSphereVolume StorageClass。当工作负载通过 PersistentVolumeClaim 请求卷时，这种做法会动态调配 vSphere 存储。
 
-为了在 vSphere 中动态调配存储，必须[启用 vSphere 提供商](../../../../../pages-for-subheaders/vsphere-cloud-provider.md)。
+为了在 vSphere 中动态调配存储，必须启用 vSphere 提供商。有关更多信息，请参阅[树外 vSphere](../../../new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-out-of-tree-vsphere) 和[树内 vSphere](../../../new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-in-tree-vsphere)。
 
 
 ### 先决条件
 
-为了在 [Rancher Kubernetes Engine (RKE)](../../../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) 集群中配置 vSphere 卷，[vSphere cloud provider](https://rancher.com/docs/rke/latest/en/config-options/cloud-providers/vsphere) 必须在[集群选项](../../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)中显式启用。
+为了在 [Rancher Kubernetes Engine (RKE)](../../../../pages-for-subheaders/launch-kubernetes-with-rancher.md) 集群中配置 vSphere 卷，[vSphere cloud provider](https://rancher.com/docs/rke/latest/en/config-options/cloud-providers/vsphere) 必须在[集群选项](../../../../reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md)中显式启用。
 
 ### 创建一个 StorageClass
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/rotate-certificates.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/rotate-certificates.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/rotate-encryption-key.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/rotate-encryption-key.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-clusters/rotate-encryption-key.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-clusters/rotate-encryption-key.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-namespaces.md
similarity index 72%
rename from i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-namespaces.md
index 635c379eb63..1c8aeba0767 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/how-to-guides/new-user-guides/manage-namespaces.md
@@ -8,14 +8,14 @@ title: 命名空间
 
 可以直接分配给命名空间的资源包括：
 
-- [工作负载](../../../pages-for-subheaders/workloads-and-pods.md)
-- [负载均衡器/Ingress](../../../pages-for-subheaders/load-balancer-and-ingress-controller.md)
-- [服务发现记录](../../new-user-guides/kubernetes-resources-setup/create-services.md)
-- [持久卷声明](../../../pages-for-subheaders/create-kubernetes-persistent-storage.md)
-- [证书](../../new-user-guides/kubernetes-resources-setup/encrypt-http-communication.md)
-- [ConfigMap](../../new-user-guides/kubernetes-resources-setup/configmaps.md)
-- [镜像仓库](../../new-user-guides/kubernetes-resources-setup/kubernetes-and-docker-registries.md)
-- [密文](../../new-user-guides/kubernetes-resources-setup/secrets.md)
+- [工作负载](../../pages-for-subheaders/workloads-and-pods.md)
+- [负载均衡器/Ingress](../../pages-for-subheaders/load-balancer-and-ingress-controller.md)
+- [服务发现记录](kubernetes-resources-setup/create-services.md)
+- [持久卷声明](../../pages-for-subheaders/create-kubernetes-persistent-storage.md)
+- [证书](kubernetes-resources-setup/encrypt-http-communication.md)
+- [ConfigMap](kubernetes-resources-setup/configmaps.md)
+- [镜像仓库](kubernetes-resources-setup/kubernetes-and-docker-registries.md)
+- [密文](kubernetes-resources-setup/secrets.md)
 
 为了在 vanilla Kubernetes 集群中管理权限，集群管理员要为每个命名空间配置基于角色的访问策略。Rancher 在项目级别上分配用户权限，项目中的命名空间会自动继承项目的权限。
 
@@ -31,7 +31,7 @@ title: 命名空间
 
 :::tip
 
-使用可以分配给命名空间的项目资源（例如，[工作负载](../../new-user-guides/kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md)、[证书](../../new-user-guides/kubernetes-resources-setup/encrypt-http-communication.md)、[ConfigMap](../../new-user-guides/kubernetes-resources-setup/configmaps.md) 等）时，你可以动态创建命名空间。
+使用可以分配给命名空间的项目资源（例如，[工作负载](kubernetes-resources-setup/workloads-and-pods/deploy-workloads.md)、[证书](kubernetes-resources-setup/encrypt-http-communication.md)、[ConfigMap](kubernetes-resources-setup/configmaps.md) 等）时，你可以动态创建命名空间。
 
 :::
 
@@ -40,7 +40,7 @@ title: 命名空间
 1. 单击**集群 > 项目/命名空间**。
 1. 转到要添加命名空间的项目，并单击**创建命名空间**。或者，你也可以转到**不在项目内**以创建不与项目关联的命名空间。
 
-1. **可选**：如果你的项目具有有效的[资源配额](../../../pages-for-subheaders/manage-project-resource-quotas.md)，你可以覆盖默认资源**限制**（限制命名空间可以使用的资源）。
+1. **可选**：如果你的项目具有有效的[资源配额](../../pages-for-subheaders/manage-project-resource-quotas.md)，你可以覆盖默认资源**限制**（限制命名空间可以使用的资源）。
 
 1. 输入**名称**，然后单击**创建**。
 
@@ -60,7 +60,7 @@ title: 命名空间
    :::note 注意事项：
 
    - 不要移动 `System` 项目中的命名空间。移动命名空间可能会对集群网络产生不利影响。
-   - 你不能将命名空间移动到已配置[资源配额](../../../pages-for-subheaders/manage-project-resource-quotas.md)的项目中。
+   - 你不能将命名空间移动到已配置[资源配额](../../pages-for-subheaders/manage-project-resource-quotas.md)的项目中。
    - 如果你将命名空间从已设置配额的项目移动到未设置配额的项目，则会删除该命名空间的配额。
 
 1. 为新命名空间选择一个新项目，然后单击**移动**。你也可以选择**无**，从而将命名空间从所有项目中移除。
@@ -71,4 +71,4 @@ title: 命名空间
 
 你可以覆盖命名空间默认限制，从而为特定命名空间提供对更多（或更少）项目资源的访问权限：
 
-有关详细信息，请参阅[编辑命名空间资源配额](./manage-project-resource-quotas/override-default-limit-in-namespaces.md)。
\ No newline at end of file
+有关详细信息，请参阅[编辑命名空间资源配额](../advanced-user-guides/manage-projects/manage-project-resource-quotas/override-default-limit-in-namespaces.md)。
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/configuration-reference.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/cis-scans/configuration-reference.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/configuration-reference.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/cis-scans/configuration-reference.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/custom-benchmark.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/cis-scans/custom-benchmark.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/custom-benchmark.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/cis-scans/custom-benchmark.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/cis-scans/skipped-and-not-applicable-tests.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md
similarity index 84%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md
index 76157e0ece3..06811e40877 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md
@@ -12,7 +12,7 @@ title: 先决条件
 > **注意**：每项 Entitlement 都对一定数量的节点授予访问支持的权限。你可以后续根据需要购买更多许可证。
 
 ### 2. 创建 EKS 集群
-按照 [Rancher 文档](../../../../getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md)创建 EKS 集群。进行到[安装 Rancher Helm Chart](../../../../getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md#8-安装-rancher-helm-chart)（最后一步）时，**停止并返回此页面**。该集群需要满足以下要求：
+按照 [Rancher 文档](../../../getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md)创建 EKS 集群。进行到[安装 Rancher Helm Chart](../../../getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md#8-安装-rancher-helm-chart)（最后一步）时，**停止并返回此页面**。该集群需要满足以下要求：
 
 - EKS 1.22 版本。
 - 集群中的每个节点都可以访问包含 Rancher 及其相关镜像的镜像仓库。
@@ -22,7 +22,7 @@ title: 先决条件
 
 ### 3. 安装 Rancher
 
-除了在 [Rancher 文档](../../../../getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md#8-安装-rancher-helm-chart)中指定的 Rancher 安装选项外，你还需要启用其它指标。
+除了在 [Rancher 文档](../../../getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md#8-安装-rancher-helm-chart)中指定的 Rancher 安装选项外，你还需要启用其它指标。
 你可以通过 Helm CLI 使用以下选项来完成：
 
 ```bash
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/common-issues.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
similarity index 97%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
index 384eb15402a..4bac0a6c539 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md
@@ -41,7 +41,7 @@ kubectl create ns cattle-csp-adapter-system
 
 ### 3. 创建证书密文
 
-Adapter 需要访问 Rancher 用来与 Rancher Server 通信的根 CA。有关 Rancher 支持的证书选项的更多信息，请参阅 [Chart 选项页面](../../../../reference-guides/installation-references/helm-chart-options.md)。
+Adapter 需要访问 Rancher 用来与 Rancher Server 通信的根 CA。有关 Rancher 支持的证书选项的更多信息，请参阅 [Chart 选项页面](../../../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md)。
 
 如果你的 Rancher 使用由公认的证书颁发机构（例如 Let's Encrypt）签发的证书，你可以跳到[步骤 4](#4-安装-chart)。
 
@@ -80,7 +80,7 @@ helm repo add rancher-charts https://charts.rancher.io
 > **注意**：请务必严格按照以下说明进行操作。尤其需要注意安装 1.0.1 版本 Adapter 的命令（使用 `--set image.tag=v1.0.1`），这是确保节点数量准确的关键。
 
 <Tabs>
-<TabItem value="Let's Encrypt/公有 CA">
+<TabItem value="Let's Encrypt/可信的 CA">
 
 ```bash
 helm install rancher-csp-adapter rancher-charts/rancher-csp-adapter --namespace cattle-csp-adapter-system --set aws.enabled=true --set aws.roleName=$MY_ROLE_NAME --set-string aws.accountNumber=$MY_ACC_NUM --set image.tag=v1.0.1
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/uninstall-adapter.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/supportconfig.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/cloud-marketplace/supportconfig.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/cloud-marketplace/supportconfig.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/cloud-marketplace/supportconfig.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/fleet-gitops-at-scale/architecture.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/fleet-gitops-at-scale/architecture.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/harvester.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/harvester.md
similarity index 93%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/harvester.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/harvester.md
index 6d1931f5331..2941b8bb7b5 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/harvester.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/harvester.md
@@ -12,7 +12,7 @@ Harvester 已 GA。有关所有更新，请参阅 [Harvester 发行说明](https
 ---
 ### 功能开关
 
-你可以使用 Harvester 的功能开关来管理 Harvester 在 Rancher 虚拟化管理页面的访问，用户可以在该页面直接导航到 Harvester 集群并访问 Harvester UI。Harvester 的功能开关是默认启用的。如需了解 Rancher 中功能开关的更多详细信息，请单击[此处](../../pages-for-subheaders/enable-experimental-features.md)。
+你可以使用 Harvester 的功能开关来管理 Harvester 在 Rancher 虚拟化管理页面的访问，用户可以在该页面直接导航到 Harvester 集群并访问 Harvester UI。Harvester 的功能开关是默认启用的。如需了解 Rancher 中功能开关的更多详细信息，请单击[此处](../pages-for-subheaders/enable-experimental-features.md)。
 
 要导航到 Harvester 集群，请单击 **☰ > 虚拟化管理**。在 **Harvester 集群**页面中，单击集群以转到该 Harvester 集群的视图。
 
@@ -30,7 +30,7 @@ Harvester 已 GA。有关所有更新，请参阅 [Harvester 发行说明](https
 
 Harvester 允许通过 Harvester UI 上传和显示 `.ISO` 镜像，但 Rancher UI 不支持。这是因为 `.ISO` 镜像通常需要额外的设置，这会干扰干净的部署（即无需用户干预），并且它们通常不用于云环境。
 
-如需了解 Rancher 中主机驱动的更多详细信息，请单击[此处](../../pages-for-subheaders/about-provisioning-drivers.md#主机驱动)。
+如需了解 Rancher 中主机驱动的更多详细信息，请单击[此处](../pages-for-subheaders/about-provisioning-drivers.md#主机驱动)。
 
 ### 限制
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/istio/configuration-options/pod-security-policies.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/istio/configuration-options/pod-security-policies.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/istio/configuration-options/project-network-isolation.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/istio/configuration-options/project-network-isolation.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/istio/cpu-and-memory-allocations.md
similarity index 93%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/istio/cpu-and-memory-allocations.md
index ebc8fe57ac0..9166ca58f50 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/istio/cpu-and-memory-allocations.md
@@ -41,7 +41,7 @@ Kubernetes 中的资源请求指的是，除非该节点至少具有指定数量
 1. 在左侧导航栏中，点击**应用 & 应用市场**。
 1. 点击**已安装的应用**。
 1. 转到 `istio-system` 命名空间。在某个 Istio 工作负载中（例如 `rancher-istio`），点击**⋮ > 编辑/升级**。
-1. 点击**升级**，然后通过更改 values.yaml 或添加[覆盖文件](../../../pages-for-subheaders/configuration-options.md#覆盖文件)来编辑基本组件。有关编辑覆盖文件的更多信息，请参阅[本节](cpu-and-memory-allocations.md#编辑覆盖文件)。
+1. 点击**升级**，然后通过更改 values.yaml 或添加[覆盖文件](../../pages-for-subheaders/configuration-options.md#覆盖文件)来编辑基本组件。有关编辑覆盖文件的更多信息，请参阅[本节](cpu-and-memory-allocations.md#编辑覆盖文件)。
 1. 更改 CPU 或内存分配、调度各个组件的节点，或节点容忍度。
 1. 点击**升级**。然后，更改就能启用。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/disable-istio.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/istio/disable-istio.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/disable-istio.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/istio/disable-istio.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/rbac-for-istio.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/istio/rbac-for-istio.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/istio/rbac-for-istio.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/istio/rbac-for-istio.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/logging-architecture.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/logging-architecture.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/logging-architecture.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/logging-architecture.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/logging-helm-chart-options.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/logging-helm-chart-options.md
similarity index 97%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/logging-helm-chart-options.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/logging-helm-chart-options.md
index e38569acb2d..24d6a307df5 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/logging-helm-chart-options.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/logging-helm-chart-options.md
@@ -42,7 +42,7 @@ Logging v2 已在 RHEL/CentOS 7 和 8 上使用 SELinux 进行了测试。
 
 [安全增强型 Linux (SELinux)](https://en.wikipedia.org/wiki/Security-Enhanced_Linux) 是对 Linux 的安全增强。被政府机构使用之后，SELinux 已成为行业标准，并在 CentOS 7 和 8 上默认启用。
 
-要配合使用 Logging V2 与 SELinux，我们建议你根据[此页面](../../../pages-for-subheaders/selinux-rpm.md#安装-rancher-selinux-rpm)的安装说明安装 `rancher-selinux` RPM。
+要配合使用 Logging V2 与 SELinux，我们建议你根据[此页面](../../pages-for-subheaders/selinux-rpm.md#安装-rancher-selinux-rpm)的安装说明安装 `rancher-selinux` RPM。
 
 然后，在安装 Logging 应用程序时，在 `values.yaml` 中将 `global.seLinux.enabled` 更改为 `true`，使 Chart 支持 SELinux。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md
similarity index 99%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md
index 1d501f6ab2b..2fcd5e6cdd0 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md
@@ -7,7 +7,7 @@ Rancher 2.5 彻底修改了 Logging 功能。我们现在使用了 Banzai Cloud
 
 ## 安装
 
-要在 Rancher 2.5+ 中安装 Logging，请参阅[安装说明](../../../pages-for-subheaders/logging.md#启用-logging)。
+要在 Rancher 2.5+ 中安装 Logging，请参阅[安装说明](../../pages-for-subheaders/logging.md#启用-logging)。
 
 ### 名词解释
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/rbac-for-logging.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/rbac-for-logging.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/rbac-for-logging.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/rbac-for-logging.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/taints-and-tolerations.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/taints-and-tolerations.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/logging/taints-and-tolerations.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/logging/taints-and-tolerations.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/longhorn.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/longhorn.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/longhorn.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/longhorn.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md
similarity index 89%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md
index 617061cfe30..0055a611361 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md
@@ -11,11 +11,11 @@ title: 内置仪表板
 
 ### 自定义 Grafana
 
-要查看和自定义用于支持 Grafana 仪表板的 PromQL 查询，请参阅[此页面](../../../how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md)。
+要查看和自定义用于支持 Grafana 仪表板的 PromQL 查询，请参阅[此页面](../../how-to-guides/advanced-user-guides/monitoring-alerting-guides/customize-grafana-dashboard.md)。
 
 ### 持久化 Grafana 仪表板
 
-要创建持久化 Grafana 仪表板，请参阅[此页面](../../../how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md)。
+要创建持久化 Grafana 仪表板，请参阅[此页面](../../how-to-guides/advanced-user-guides/monitoring-alerting-guides/create-persistent-grafana-dashboard.md)。
 
 ### 访问 Grafana
 
@@ -51,7 +51,7 @@ Alertmanager UI 可让你查看最近触发的告警。
 
 **结果**：在新选项卡中打开 Alertmanager UI。如需配置帮助，请参阅[官方 Alertmanager 文档](https://prometheus.io/docs/alerting/latest/alertmanager/)。
 
-有关在 Rancher 中配置 Alertmanager 的更多信息，请参阅[此页面](../../../how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md)。
+有关在 Rancher 中配置 Alertmanager 的更多信息，请参阅[此页面](../../how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/alertmanager.md)。
 
 <figcaption>Alertmanager UI</figcaption>
 
@@ -111,4 +111,4 @@ Alertmanager UI 可让你查看最近触发的告警。
 
 ![PrometheusRules UI](/img/prometheus-rules-ui.png)
 
-有关在 Rancher 中配置 PrometheusRule 的更多信息，请参阅[此页面](../../../how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md)。
\ No newline at end of file
+有关在 Rancher 中配置 PrometheusRule 的更多信息，请参阅[此页面](../../how-to-guides/advanced-user-guides/monitoring-v2-configuration-guides/advanced-configuration/prometheusrules.md)。
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md
similarity index 99%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md
index ef4737bffaa..6a2ed1ebb4d 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md
@@ -130,7 +130,7 @@ Alertmanager 负责协调告警的发送位置。它允许你根据标签对告
 
 你可以编辑 Rancher UI 中的表单来设置一个接收器资源，其中包含 Alertmanager 将告警发送到你的通知系统所需的所有信息。
 
-通过在 Alertmanager 或接收器配置中编辑自定义 YAML，你还可以将告警发送到多个通知系统。有关详细信息，请参阅[接收器配置](../../../reference-guides/monitoring-v2-configuration/receivers.md#配置多个接收器)。
+通过在 Alertmanager 或接收器配置中编辑自定义 YAML，你还可以将告警发送到多个通知系统。有关详细信息，请参阅[接收器配置](../../reference-guides/monitoring-v2-configuration/receivers.md#配置多个接收器)。
 
 ## 4. Monitoring V2 特定组件
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/monitoring-and-alerting/promql-expressions.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/windows-support.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/monitoring-and-alerting/windows-support.md
similarity index 97%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/windows-support.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/monitoring-and-alerting/windows-support.md
index 497c6578e8c..1dd6ac4e171 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/monitoring-and-alerting/windows-support.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/monitoring-and-alerting/windows-support.md
@@ -31,7 +31,7 @@ Monitoring V2 for Windows 只能从最低是 `wins` v0.1.0 的 Windows 主机中
    ```yaml
    # 通过先前已列入白名单的进程路径
    # 来引导 win-upgrader 安装，这是因为正常安装路径
-   # c:\\etc\\rancher\\wins\\wins-upgrade.exe 通常不会被列入白名单。
+   # c:\etc\rancher\wins\wins-upgrade.exe 通常不会被列入白名单。
    # 因此，我们使用 Monitoring V1 之前所用的
    # 已列入白名单的进程路径。
    masquerade:
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/neuvector.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/neuvector.md
similarity index 98%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/neuvector.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/neuvector.md
index d70f719349f..d9d2187f40f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/neuvector.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/neuvector.md
@@ -7,7 +7,7 @@ import TabItem from '@theme/TabItem';
 
 ### Rancher 中的 NeuVector 集成
 
-[NeuVector 5.x](https://open-docs.neuvector.com/) 是一个开源的，以容器为中心的安全应用程序，Rancher 2.6.5 现已集成 NeuVector。NeuVector 在运行时为关键应用程序和数据提供实时的合规、可见和保护功能。NeuVector 提供具有 CIS Benchmark 和漏洞扫描的防火墙、容器进程/文件系统监控和安全审计。有关 Rancher 安全性的更多信息，请参阅[安全文档](../../pages-for-subheaders/rancher-security.md)。
+[NeuVector 5.x](https://open-docs.neuvector.com/) 是一个开源的，以容器为中心的安全应用程序，Rancher 2.6.5 现已集成 NeuVector。NeuVector 在运行时为关键应用程序和数据提供实时的合规、可见和保护功能。NeuVector 提供具有 CIS Benchmark 和漏洞扫描的防火墙、容器进程/文件系统监控和安全审计。有关 Rancher 安全性的更多信息，请参阅[安全文档](../pages-for-subheaders/rancher-security.md)。
 
 NeuVector 可以通过 Helm Chart 启用。你可以在**应用 & 应用市场**或 Rancher UI 中的**集群工具**中安装该 Chart。安装 Helm Chart 后，用户可以轻松地[在 Rancher 中部署和管理 NeuVector 集群](https://open-docs.neuvector.com/deploying/rancher#deploy-and-manage-neuvector-through-rancher-apps-marketplace)。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/opa-gatekeeper.md b/i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/opa-gatekeeper.md
similarity index 100%
rename from i18n/zh/docusaurus-plugin-content-docs/current/explanations/integrations-in-rancher/opa-gatekeeper.md
rename to i18n/zh/docusaurus-plugin-content-docs/current/integrations-in-rancher/opa-gatekeeper.md
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/horizontal-pod-autoscaler.md b/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/horizontal-pod-autoscaler.md
deleted file mode 100644
index 84e42dedafd..00000000000
--- a/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/horizontal-pod-autoscaler.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-title: Horizontal Pod Autoscaler
-description: 了解 Pod 水平自动扩缩 (HPA)。如何管理 HPA 以及如何使用服务部署来进行测试
----
-
-[Horizontal Pod Autoscaler（HPA）](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)是一项 Kubernetes 功能，用于将集群配置为自动扩缩其运行的服务。
-
-Rancher 提供了一些附加功能来帮助管理 HPA，具体取决于 Rancher 的版本。
-
-你可以使用 Rancher UI 创建、管理和删除 HPA。仅在 `autoscaling/v2beta2` API 中支持 HPA。
-
-## 管理 HPA
-
-管理 HPA 的方式因你的 Kubernetes API 版本而异：
-
-- **Kubernetes API 版本 autoscaling/V2beta1**：允许根据应用程序的 CPU 和内存利用率自动扩缩 pod。
-- **Kubernetes API 版本 autoscaling/V2beta2**：允许根据 CPU 和内存利用率以及自定义指标自动扩缩 pod。
-
-你可以使用 Rancher UI 创建、管理和删除 HPA。在 Rancher UI 中，你可以将 HPA 配置为根据 CPU 和内存利用率进行扩缩。有关详细信息，请参阅[使用 Rancher UI 管理 HPA](k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-rancher-ui)。如需根据自定义指标进行 HPA，你仍然需要使用 `kubectl`。有关详细信息，请参阅[配置 HPA 以使用 Prometheus 自定义指标进行扩缩](k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-kubectl.md#配置-hpa-以使用-prometheus-自定义指标进行扩缩)。
-
-在 Rancher 2.0.7 及更高版本中创建的集群自动满足使用 HPA 的所有要求（metrics-server 和 Kubernetes 集群配置）。
-## 使用服务部署测试 HPA
-
-你可以转到你的项目并单击**资源 > HPA**来查看​​ HPA 当前的副本数。有关详细信息，请参阅[获取 HPA 指标和状态](k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-rancher-ui/)。
-
-你还可以使用 `kubectl` 来获取你使用负载测试工具测试的 HPA 的状态。有关详细信息，请参阅[使用 kubectl 测试 HPA](k8s-in-rancher/horizontal-pod-autoscaler/testing-hpa/)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/hpa-background/hpa-background.md b/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/hpa-background/hpa-background.md
deleted file mode 100644
index 6db5977ae42..00000000000
--- a/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/hpa-background/hpa-background.md
+++ /dev/null
@@ -1,39 +0,0 @@
----
-title: Horizontal Pod Autoscaler 介绍
----
-
-[Horizontal Pod Autoscaler（HPA）](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)是一项 Kubernetes 功能，用于将集群配置为自动扩缩其运行的服务。本节介绍 HPA 如何与 Kubernetes 一起工作。
-
-## 为什么要使用 Horizo​​ntal Pod Autoscaler？
-
-你可以使用 HPA 来自动扩缩 ReplicationController、Deployment 或 ReplicaSet 中的 pod 数量。HPA 会自动扩缩正在运行的 pod 数量以实现最高效率。影响 pod 数量的因素包括：
-
-- 允许运行的最小和最大 pod 数，由用户定义。
-- 资源指标中报告的 CPU/内存使用情况。
-- 第三方指标应用程序（如 Prometheus、Datadog 等）提供的自定义指标。
-
-HPA 通过以下方式改进你的服务：
-
-- 释放硬件资源，避免资源被过多的 pod 浪费。
-- 按需提高/降低性能以达到服务级别协议。
-
-## HPA 的工作原理
-
-![HPA 架构](/img/horizontal-pod-autoscaler.jpg)
-
-HPA 实现为一个控制循环，其周期由以下 `kube-controller-manager` 标志控制：
-
-| 标志 | 默认 | 描述 |
----------|----------|----------|
-| `--horizontal-pod-autoscaler-sync-period` | `30s` | HPA 在 deployment 中审核资源/自定义指标的频率。 |
-| `--horizontal-pod-autoscaler-downscale-delay` | `5m0s` | 完成缩减操作后，HPA 必须等待多长时间才能启动另一个缩减操作。 |
-| `--horizontal-pod-autoscaler-upscale-delay` | `3m0s` | 完成扩展操作后，HPA 必须等待多长时间才能启动另一个扩展操作。 |
-
-
-有关 HPA 的完整文档，请参阅 [Kubernetes 文档](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/)。
-
-## Horizo​​ntal Pod Autoscaler API 对象
-
-HPA 是 Kubernetes `autoscaling` API 组中的 API 资源。当前的稳定版本是 `autoscaling/v1`，它只支持对 CPU 自动扩缩。要获得内存和自定义指标的扩缩支持，请改用 beta 版本 `autoscaling/v2beta1`。
-
-有关 HPA API 对象的更多信息，请参阅 [HPA GitHub 自述文件](https://git.k8s.io/community/contributors/design-proposals/autoscaling/horizontal-pod-autoscaler.md#horizontalpodautoscaler-object)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-kubectl/manage-hpa-with-kubectl.md b/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-kubectl/manage-hpa-with-kubectl.md
deleted file mode 100644
index daf7fe82599..00000000000
--- a/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-kubectl/manage-hpa-with-kubectl.md
+++ /dev/null
@@ -1,204 +0,0 @@
----
-title: 使用 kubectl 管理 HPA
----
-
-本文介绍如何使用 `kubectl` 管理 HPA。本文对以下操作进行了说明：
-
-- 创建 HPA
-- 获取 HPA 的信息
-- 删除 HPA
-- 配置 HPA 以根据 CPU 或内存利用率进行扩缩
-- 如果你使用 Prometheus 等第三方工具的指标，配置 HPA 以使用自定义指标进行扩缩
-
-
-你可以在 Rancher UI 中创建、查看和删除 HPA。你还可以根据 Rancher UI 中的 CPU/内存使用情况进行扩缩。有关详细信息，请参阅[使用 Rancher UI 管理 HPA](k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-rancher-ui)。如果要使用 CPU/内存以外的指标来扩缩 HPA，你需要使用 `kubectl`。
-
-##### 管理 HPA 的基本 kubectl 命令
-
-如果你有 HPA 清单文件，则可以使用 `kubectl` 来创建、管理和删除 HPA：
-
-- 创建 HPA
-
-   - 有清单：`kubectl create -f <HPA_MANIFEST>`
-
-   - 没有清单（仅支持 CPU）：`kubectl autoscale deployment hello-world --min=2 --max=5 --cpu-percent=50`
-
-- 获取 HPA 信息
-
-   - 基本：`kubectl get hpa hello-world`
-
-   - 详细描述：`kubectl describe hpa hello-world`
-
-- 删除 HPA
-
-   - `kubectl delete hpa hello-world`
-
-##### HPA 清单定义示例
-
-HPA 清单是用于使用 `kubectl` 管理 HPA 的配置文件。
-
-以下代码片段在 HPA 清单中使用了不同的指令。请参阅示例下方的列表以了解每个指令的用途。
-
-```yml
-apiVersion: autoscaling/v2beta1
-kind: HorizontalPodAutoscaler
-metadata:
-  name: hello-world
-spec:
-  scaleTargetRef:
-    apiVersion: extensions/v1beta1
-    kind: Deployment
-    name: hello-world
-  minReplicas: 1
-  maxReplicas: 10
-  metrics:
-  - type: Resource
-    resource:
-      name: cpu
-      targetAverageUtilization: 50
-  - type: Resource
-    resource:
-      name: memory
-      targetAverageValue: 100Mi
-```
-
-
-| 指令 | 描述 |
----------|----------|
-| `apiVersion: autoscaling/v2beta1` | 正在使用的 Kubernetes `autoscaling` API 组的版本。此示例清单使用 beta 版本，因此启用了按 CPU./内存进行扩缩。 |
-| `name: hello-world` | 表示 HPA 在为 `hello-word` deployment 执行自动扩缩。 |
-| `minReplicas: 1` | 表示运行的最小副本数不能低于 1。 |
-| `maxReplicas: 10` | 指示 deployment 中的最大副本数不能超过 10。 |
-| `targetAverageUtilization: 50` | 表示当平均运行的 pod 使用超过请求 CPU 的 50% 时，deployment 将扩展 pod。 |
-| `targetAverageValue: 100Mi` | 表示当平均运行的 pod 使用超过 100Mi 的内存时，deployment 将扩展 pod。 |
-<br/>
-
-##### 使用资源指标（CPU 和内存）配置 HPA 以进行扩缩
-
-在 Rancher 2.0.7 及更高版本中创建的集群满足使用 Horizontal Pod Autoscaler 的所有要求（metrics-server 和 Kubernetes 集群配置）。
-
-运行以下命令以检查你的安装中是否有可用的指标：
-
-```
-$ kubectl top nodes
-NAME                              CPU(cores)   CPU%      MEMORY(bytes)   MEMORY%
-node-controlplane   196m         9%        1623Mi          42%
-node-etcd           80m          4%        1090Mi          28%
-node-worker         64m          3%        1146Mi          29%
-$ kubectl -n kube-system top pods
-NAME                                   CPU(cores)   MEMORY(bytes)
-canal-pgldr                            18m          46Mi
-canal-vhkgr                            20m          45Mi
-canal-x5q5v                            17m          37Mi
-canal-xknnz                            20m          37Mi
-kube-dns-7588d5b5f5-298j2              0m           22Mi
-kube-dns-autoscaler-5db9bbb766-t24hw   0m           5Mi
-metrics-server-97bc649d5-jxrlt         0m           12Mi
-$ kubectl -n kube-system logs -l k8s-app=metrics-server
-I1002 12:55:32.172841       1 heapster.go:71] /metrics-server --source=kubernetes.summary_api:https://kubernetes.default.svc?kubeletHttps=true&kubeletPort=10250&useServiceAccount=true&insecure=true
-I1002 12:55:32.172994       1 heapster.go:72] Metrics Server version v0.2.1
-I1002 12:55:32.173378       1 configs.go:61] Using Kubernetes client with master "https://kubernetes.default.svc" and version
-I1002 12:55:32.173401       1 configs.go:62] Using kubelet port 10250
-I1002 12:55:32.173946       1 heapster.go:128] Starting with Metric Sink
-I1002 12:55:32.592703       1 serving.go:308] Generated self-signed cert (apiserver.local.config/certificates/apiserver.crt, apiserver.local.config/certificates/apiserver.key)
-I1002 12:55:32.925630       1 heapster.go:101] Starting Heapster API server...
-[restful] 2018/10/02 12:55:32 log.go:33: [restful/swagger] listing is available at https:///swaggerapi
-[restful] 2018/10/02 12:55:32 log.go:33: [restful/swagger] https:///swaggerui/ is mapped to folder /swagger-ui/
-I1002 12:55:32.928597       1 serve.go:85] Serving securely on 0.0.0.0:443
-```
-
-
-##### 配置 HPA 以使用 Prometheus 自定义指标进行扩缩
-
-你可以将 HPA 配置为根据第三方软件提供的自定义指标进行自动扩缩。使用第三方软件进行自动扩缩的最常见用例是使用应用程序级别的指标（即每秒 HTTP 请求数）。HPA 使用 `custom.metrics.k8s.io` API 来使用这些指标。通过为指标收集解决方案部署自定义指标适配器，你可以启用此 API。
-
-对于这个例子，我们将使用 [Prometheus](https://prometheus.io/)。我们假设：
-
-- Prometheus 部署在集群中。
-- Prometheus 配置正确，并从 pod、节点、命名空间等收集合适的指标。
-- Prometheus 暴露在以下 URL 和端口：`http://prometheus.mycompany.io:80`
-
-Prometheus 可用于 Rancher 2.0 应用商店中的 Deployment。如果它还没有运行在你的集群中，请在 Rancher 应用商店中部署它。
-
-为了让 HPA 使用来自 Prometheus 的自定义指标，[k8s-prometheus-adapter](https://github.com/DirectXMan12/k8s-prometheus-adapter) 包需要在你集群的 `kube-system` 命名空间中。要安装 `k8s-prometheus-adapter`，使用 [banzai-charts](https://github.com/banzaicloud/banzai-charts) 提供的 Helm Chart。
-
-1. 在集群中初始化 Helm。
-```
-# kubectl -n kube-system create serviceaccount tiller
-kubectl create clusterrolebinding tiller --clusterrole cluster-admin --serviceaccount=kube-system:tiller
-helm init --service-account tiller
-```
-
-1. 从 GitHub 克隆 `banzai-charts` 仓库：
-```
-# git clone https://github.com/banzaicloud/banzai-charts
-```
-
-1. 安装 `prometheus-adapter` Chart，指定 Prometheus URL 和端口号：
-```
-# helm install --name prometheus-adapter banzai-charts/prometheus-adapter --set prometheus.url="http://prometheus.mycompany.io",prometheus.port="80" --namespace kube-system
-```
-
-1. 检查 `prometheus-adapter` 是否正常运行。检查服务 pod 并在 `kube-system` 命名空间中登录。
-
-1. 检查服务 pod 是否处于 `Running` 状态。输入以下命令：
-   ```
-       # kubectl get pods -n kube-system
-       ```
-   在输出结果中查找 `Running` 状态。
-   ```
-       NAME                                  READY     STATUS    RESTARTS   AGE
-       ...
-       prometheus-adapter-prometheus-adapter-568674d97f-hbzfx   1/1       Running   0          7h
-       ...
-       ```
-1. 通过输入以下命令检查服务日志，确保服务正常运行：
-   ```
-       # kubectl logs prometheus-adapter-prometheus-adapter-568674d97f-hbzfx -n kube-system
-       ```
-   然后查看日志输出以确认服务正在运行。
-
-    <details id="prometheus-logs">
-      <summary>Prometheus Adaptor 日志</summary>
-
-    ...
-    I0724 10:18:45.696679       1 round_trippers.go:436] GET https://10.43.0.1:443/api/v1/namespaces/default/pods?labelSelector=app%3Dhello-world 200 OK in 2 milliseconds
-    I0724 10:18:45.696695       1 round_trippers.go:442] Response Headers:
-    I0724 10:18:45.696699       1 round_trippers.go:445]     Date: Tue, 24 Jul 2018 10:18:45 GMT
-    I0724 10:18:45.696703       1 round_trippers.go:445]     Content-Type: application/json
-    I0724 10:18:45.696706       1 round_trippers.go:445]     Content-Length: 2581
-    I0724 10:18:45.696766       1 request.go:836] Response Body: {"kind":"PodList","apiVersion":"v1","metadata":{"selfLink":"/api/v1/namespaces/default/pods","resourceVersion":"6237"},"items":[{"metadata":{"name":"hello-world-54764dfbf8-q6l82","generateName":"hello-world-54764dfbf8-","namespace":"default","selfLink":"/api/v1/namespaces/default/pods/hello-world-54764dfbf8-q6l82","uid":"484cb929-8f29-11e8-99d2-067cac34e79c","resourceVersion":"4066","creationTimestamp":"2018-07-24T10:06:50Z","labels":{"app":"hello-world","pod-template-hash":"1032089694"},"annotations":{"cni.projectcalico.org/podIP":"10.42.0.7/32"},"ownerReferences":[{"apiVersion":"extensions/v1beta1","kind":"ReplicaSet","name":"hello-world-54764dfbf8","uid":"4849b9b1-8f29-11e8-99d2-067cac34e79c","controller":true,"blockOwnerDeletion":true}]},"spec":{"volumes":[{"name":"default-token-ncvts","secret":{"secretName":"default-token-ncvts","defaultMode":420}}],"containers":[{"name":"hello-world","image":"rancher/hello-world","ports":[{"containerPort":80,"protocol":"TCP"}],"resources":{"requests":{"cpu":"500m","memory":"64Mi"}},"volumeMounts":[{"name":"default-token-ncvts","readOnly":true,"mountPath":"/var/run/secrets/kubernetes.io/serviceaccount"}],"terminationMessagePath":"/dev/termination-log","terminationMessagePolicy":"File","imagePullPolicy":"Always"}],"restartPolicy":"Always","terminationGracePeriodSeconds":30,"dnsPolicy":"ClusterFirst","serviceAccountName":"default","serviceAccount":"default","nodeName":"34.220.18.140","securityContext":{},"schedulerName":"default-scheduler","tolerations":[{"key":"node.kubernetes.io/not-ready","operator":"Exists","effect":"NoExecute","tolerationSeconds":300},{"key":"node.kubernetes.io/unreachable","operator":"Exists","effect":"NoExecute","tolerationSeconds":300}]},"status":{"phase":"Running","conditions":[{"type":"Initialized","status":"True","lastProbeTime":null,"lastTransitionTime":"2018-07-24T10:06:50Z"},{"type":"Ready","status":"True","lastProbeTime":null,"lastTransitionTime":"2018-07-24T10:06:54Z"},{"type":"PodScheduled","status":"True","lastProbeTime":null,"lastTransitionTime":"2018-07-24T10:06:50Z"}],"hostIP":"34.220.18.140","podIP":"10.42.0.7","startTime":"2018-07-24T10:06:50Z","containerStatuses":[{"name":"hello-world","state":{"running":{"startedAt":"2018-07-24T10:06:54Z"}},"lastState":{},"ready":true,"restartCount":0,"image":"rancher/hello-world:latest","imageID":"docker-pullable://rancher/hello-world@sha256:4b1559cb4b57ca36fa2b313a3c7dde774801aa3a2047930d94e11a45168bc053","containerID":"docker://cce4df5fc0408f03d4adf82c90de222f64c302bf7a04be1c82d584ec31530773"}],"qosClass":"Burstable"}}]}
-    I0724 10:18:45.699525       1 api.go:74] GET http://prometheus-server.prometheus.34.220.18.140.xip.io/api/v1/query?query=sum%28rate%28container_fs_read_seconds_total%7Bpod_name%3D%22hello-world-54764dfbf8-q6l82%22%2Ccontainer_name%21%3D%22POD%22%2Cnamespace%3D%22default%22%7D%5B5m%5D%29%29+by+%28pod_name%29&time=1532427525.697 200 OK
-    I0724 10:18:45.699620       1 api.go:93] Response Body: {"status":"success","data":{"resultType":"vector","result":[{"metric":{"pod_name":"hello-world-54764dfbf8-q6l82"},"value":[1532427525.697,"0"]}]}}
-    I0724 10:18:45.699939       1 wrap.go:42] GET /apis/custom.metrics.k8s.io/v1beta1/namespaces/default/pods/%2A/fs_read?labelSelector=app%3Dhello-world: (12.431262ms) 200 [[kube-controller-manager/v1.10.1 (linux/amd64) kubernetes/d4ab475/system:serviceaccount:kube-system:horizontal-pod-autoscaler] 10.42.0.0:24268]
-    I0724 10:18:51.727845       1 request.go:836] Request Body: {"kind":"SubjectAccessReview","apiVersion":"authorization.k8s.io/v1beta1","metadata":{"creationTimestamp":null},"spec":{"nonResourceAttributes":{"path":"/","verb":"get"},"user":"system:anonymous","group":["system:unauthenticated"]},"status":{"allowed":false}}
-    ...
-    </details>
-
-
-
-1. 检查是否可以从 kubectl 访问 metrics API。
-
-- 如果你直接访问集群，请在 kubectl 配置中输入你的服务器 URL，格式是 `https://<Kubernetes_URL>:6443`：
-   ```
-   # kubectl get --raw /apis/custom.metrics.k8s.io/v1beta1
-   ```
-   如果 API 可访问，你应该会看到类似以下内容的输出：
-
-<details id="custom-metrics-api-response">
-      <summary>API 响应</summary>
-
-   {"kind":"APIResourceList","apiVersion":"v1","groupVersion":"custom.metrics.k8s.io/v1beta1","resources":[{"name":"pods/fs_usage_bytes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/memory_rss","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/spec_cpu_period","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/cpu_cfs_throttled","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_io_time","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_read","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_sector_writes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/cpu_user","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/last_seen","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/tasks_state","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/spec_cpu_quota","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/start_time_seconds","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_limit_bytes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_write","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/memory_cache","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/memory_usage_bytes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/cpu_cfs_periods","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/cpu_cfs_throttled_periods","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_reads_merged","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/memory_working_set_bytes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/network_udp_usage","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_inodes_free","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_inodes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_io_time_weighted","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/memory_failures","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/memory_swap","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/spec_cpu_shares","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/spec_memory_swap_limit_bytes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/cpu_usage","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_io_current","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_writes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/memory_failcnt","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_reads","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_writes_bytes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_writes_merged","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/network_tcp_usage","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/memory_max_usage_bytes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/spec_memory_limit_bytes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/spec_memory_reservation_limit_bytes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/cpu_load_average_10s","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/cpu_system","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_reads_bytes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_sector_reads","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]}]}
-   </details>
-
-- 如果你通过 Rancher 访问集群，请在 kubectl 配置中输入你的服务器 URL，格式是 `https://<RANCHER_URL>/k8s/clusters/<CLUSTER_ID>`。将 `/k8s/clusters/<CLUSTER_ID>` 后缀添加到 API 路径：
-   ```
-   # kubectl get --raw /k8s/clusters/<CLUSTER_ID>/apis/custom.metrics.k8s.io/v1beta1
-   ```
-   如果 API 可访问，你应该会看到类似以下内容的输出：
-
-<details id="custom-metrics-api-response-rancher">
-      <summary>API 响应</summary>
-
-   {"kind":"APIResourceList","apiVersion":"v1","groupVersion":"custom.metrics.k8s.io/v1beta1","resources":[{"name":"pods/fs_usage_bytes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/memory_rss","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/spec_cpu_period","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/cpu_cfs_throttled","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_io_time","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_read","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_sector_writes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/cpu_user","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/last_seen","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/tasks_state","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/spec_cpu_quota","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/start_time_seconds","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_limit_bytes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_write","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/memory_cache","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/memory_usage_bytes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/cpu_cfs_periods","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/cpu_cfs_throttled_periods","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_reads_merged","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/memory_working_set_bytes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/network_udp_usage","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_inodes_free","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_inodes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_io_time_weighted","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/memory_failures","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/memory_swap","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/spec_cpu_shares","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/spec_memory_swap_limit_bytes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/cpu_usage","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_io_current","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_writes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/memory_failcnt","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_reads","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_writes_bytes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_writes_merged","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/network_tcp_usage","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/memory_max_usage_bytes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/spec_memory_limit_bytes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/spec_memory_reservation_limit_bytes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/cpu_load_average_10s","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/cpu_system","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_reads_bytes","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]},{"name":"pods/fs_sector_reads","singularName":"","namespaced":true,"kind":"MetricValueList","verbs":["get"]}]}
-   </details>
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-rancher-ui/manage-hpa-with-rancher-ui.md b/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-rancher-ui/manage-hpa-with-rancher-ui.md
deleted file mode 100644
index 9ef4841e3f7..00000000000
--- a/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-rancher-ui/manage-hpa-with-rancher-ui.md
+++ /dev/null
@@ -1,51 +0,0 @@
----
-title: 使用 Rancher UI 管理 HPA
----
-
-Rancher UI 支持创建、管理和删除 HPA。你可以将 CPU 或内存使用情况配置为用于 HPA 扩缩的指标。
-
-如果你想使用 CPU/内存之外的其他指标创建 HPA，请参阅[配置 HPA 以使用 Prometheus 的自定义指标进行扩缩](k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-kubectl.md#配置-hpa-以使用-prometheus-自定义指标进行扩缩)。
-
-## 创建 HPA
-
-1. 在左上角，单击 **☰ > 集群管理**。
-1. 转到要创建 HPA 的集群，然后单击 **Explore**。
-1. 在左侧导航栏中，单击**服务发现 > Horizo​​ntalPodAutoscalers**。
-1. 单击**创建**。
-1. 为 HPA 选择 **命名空间**。
-1. 输入 HPA 的**名称**。
-1. 选择**目标引用**作为 HPA 的扩缩目标。
-1. 为 HPA 指定**最小副本数**和**最大副本数**。
-1. 配置 HPA 的指标。你可以将内存或 CPU 使用率作为让 HPA 扩缩服务的指标。在**数量**字段中，输入让 HPA 扩缩服务的工作负载内存/CPU 使用率的百分比。要配置其他 HPA 指标，包括 Prometheus 提供的指标，你需要[使用 kubectl 管理 HPA](k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-kubectl.md#配置-hpa-以使用-prometheus-自定义指标进行扩缩)。
-
-1. 单击**创建**以创建HPA。
-
-:::note 结果：
-
-HPA 已被部署到选定的命名空间。你可以在项目的**资源 > HPA** 视图中查看 HPA 的状态。
-
-:::
-
-## 获取 HPA 指标和状态
-
-1. 在左上角，单击 **☰ > 集群管理**。
-1. 转到具有 HPA 的集群并单击 **Explore**。
-1. 在左侧导航栏中，单击**服务发现 > Horizo​​ntalPodAutoscalers**。**Horizo​​ntalPodAutoscalers** 页面显示当前副本的数量。
-
-有关特定 HPA 的更详细指标和状态，请单击 HPA 的名称。你会转到 HPA 的详情页面。
-
-
-## 删除 HPA
-
-1. 在左上角，单击 **☰ > 集群管理**。
-1. 转到要删除的 HPA 的集群，然后单击 **Explore**。
-1. 在左侧导航栏中，单击**服务发现 > Horizo​​ntalPodAutoscalers**。
-1. 单击**资源 > HPA**。
-1. 找到要删除的 HPA，然后单击 **⋮ > 删除**。
-1. 单击**删除**以进行确认。
-
-:::note 结果：
-
-HPA 已从当前集群中删除。
-
-:::
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/testing-hpa/testing-hpa.md b/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/testing-hpa/testing-hpa.md
deleted file mode 100644
index 10cbd1bdf14..00000000000
--- a/i18n/zh/docusaurus-plugin-content-docs/current/k8s-in-rancher/horizontal-pod-autoscaler/testing-hpa/testing-hpa.md
+++ /dev/null
@@ -1,531 +0,0 @@
----
-title: 使用 kubectl 测试 HPA
----
-
-本文介绍如何在使用负载测试工具扩缩 HPA 后检查 HPA 的状态。有关使用 Rancher UI（最低版本 2.3.x）检查状态的信息，请参阅[使用 Rancher UI 管理 HPA](k8s-in-rancher/horizontal-pod-autoscaler/manage-hpa-with-kubectl/)。
-
-要让 HPA 正常工作，服务部署应该具有容器的资源请求定义。按照以下 hello-world 示例测试 HPA 是否正常工作。
-
-1. 将 `kubectl` 连接到你的 Kubernetes 集群。
-
-1. 复制下方的 `hello-world` 部署清单。
-
-<details id="hello-world">
-     <summary>Hello World 清单</summary>
-
-   ```
-   apiVersion: apps/v1beta2
-   kind: Deployment
-   metadata:
-     labels:
-       app: hello-world
-     name: hello-world
-     namespace: default
-   spec:
-     replicas: 1
-     selector:
-       matchLabels:
-         app: hello-world
-     strategy:
-       rollingUpdate:
-         maxSurge: 1
-         maxUnavailable: 0
-       type: RollingUpdate
-     template:
-       metadata:
-         labels:
-           app: hello-world
-       spec:
-         containers:
-         - image: rancher/hello-world
-           imagePullPolicy: Always
-           name: hello-world
-           resources:
-             requests:
-               cpu: 500m
-               memory: 64Mi
-           ports:
-           - containerPort: 80
-             protocol: TCP
-         restartPolicy: Always
-   ---
-   apiVersion: v1
-   kind: Service
-   metadata:
-     name: hello-world
-     namespace: default
-   spec:
-     ports:
-     - port: 80
-       protocol: TCP
-       targetPort: 80
-     selector:
-       app: hello-world
-   ```
-
-</details>
-
-1. 将其部署到您的集群。
-
-   ```
-   # kubectl create -f <HELLO_WORLD_MANIFEST>
-   ```
-
-1. 根据你使用的指标类型复制以下其中一个 HPA：
-
-<details id="service-deployment-resource-metrics">
-     <summary>Hello World HPA：资源指标</summary>
-
-   ```
-   apiVersion: autoscaling/v2beta1
-   kind: HorizontalPodAutoscaler
-   metadata:
-     name: hello-world
-     namespace: default
-   spec:
-     scaleTargetRef:
-       apiVersion: extensions/v1beta1
-       kind: Deployment
-       name: hello-world
-     minReplicas: 1
-     maxReplicas: 10
-     metrics:
-     - type: Resource
-       resource:
-         name: cpu
-         targetAverageUtilization: 50
-     - type: Resource
-       resource:
-         name: memory
-         targetAverageValue: 1000Mi
-   ```
-
-</details>
-   <details id="service-deployment-custom-metrics">
-     <summary>Hello World HPA：自定义指标</summary>
-
-   ```
-   apiVersion: autoscaling/v2beta1
-   kind: HorizontalPodAutoscaler
-   metadata:
-     name: hello-world
-     namespace: default
-   spec:
-     scaleTargetRef:
-       apiVersion: extensions/v1beta1
-       kind: Deployment
-       name: hello-world
-     minReplicas: 1
-     maxReplicas: 10
-     metrics:
-     - type: Resource
-       resource:
-         name: cpu
-         targetAverageUtilization: 50
-     - type: Resource
-       resource:
-         name: memory
-         targetAverageValue: 100Mi
-     - type: Pods
-       pods:
-         metricName: cpu_system
-         targetAverageValue: 20m
-   ```
-
-</details>
-
-1. 查看 HPA 信息和描述。确认显示的指标数据。
-
-<details id="hpa-info-resource-metrics">
-     <summary>资源指标</summary>
-
-   1. 输入以下命令：
-      ```
-      # kubectl get hpa
-      NAME          REFERENCE                TARGETS                     MINPODS   MAXPODS   REPLICAS   AGE
-      hello-world   Deployment/hello-world   1253376 / 100Mi, 0% / 50%   1         10        1          6m
-      # kubectl describe hpa
-      Name:                                                  hello-world
-      Namespace:                                             default
-      Labels:                                                <none>
-      Annotations:                                           <none>
-      CreationTimestamp:                                     Mon, 23 Jul 2018 20:21:16 +0200
-      Reference:                                             Deployment/hello-world
-      Metrics:                                               ( current / target )
-        resource memory on pods:                             1253376 / 100Mi
-        resource cpu on pods  (as a percentage of request):  0% (0) / 50%
-      Min replicas:                                          1
-      Max replicas:                                          10
-      Conditions:
-        Type            Status  Reason              Message
-        ----            ------  ------              -------
-        AbleToScale     True    ReadyForNewScale    the last scale time was sufficiently old as to warrant a new scale
-        ScalingActive   True    ValidMetricFound    the HPA was able to successfully calculate a replica count from memory resource
-        ScalingLimited  False   DesiredWithinRange  the desired count is within the acceptable range
-      Events:           <none>
-      ```
-
-</details>
-   <details id="hpa-info-custom-metrics">
-     <summary>自定义指标</summary>
-
-   1. 输入以下命令：
-      ```
-      # kubectl describe hpa
-      ```
-      你应该会看到以下输出：
-      ```
-      Name:                                                  hello-world
-      Namespace:                                             default
-      Labels:                                                <none>
-      Annotations:                                           <none>
-      CreationTimestamp:                                     Tue, 24 Jul 2018 18:36:28 +0200
-      Reference:                                             Deployment/hello-world
-      Metrics:                                               ( current / target )
-        resource memory on pods:                             3514368 / 100Mi
-        "cpu_system" on pods:                                0 / 20m
-        resource cpu on pods  (as a percentage of request):  0% (0) / 50%
-      Min replicas:                                          1
-      Max replicas:                                          10
-      Conditions:
-        Type            Status  Reason              Message
-        ----            ------  ------              -------
-        AbleToScale     True    ReadyForNewScale    the last scale time was sufficiently old as to warrant a new scale
-        ScalingActive   True    ValidMetricFound    the HPA was able to successfully calculate a replica count from memory resource
-        ScalingLimited  False   DesiredWithinRange  the desired count is within the acceptable range
-      Events:           <none>
-      ```
-
-</details>
-
-1. 为服务生成负载，从而测试你的 pod 是否按预期进行了自动扩缩。你可以使用任何负载测试工具（Hey、Gatling 等），我们使用的是 [Hey](https://github.com/rakyll/hey)。
-
-1. 测试 pod 自动扩缩是否按预期工作。<br/><br/>
-   **使用资源指标测试自动扩缩：**
-
-<details id="observe-upscale-2-pods-cpu">
-     <summary>扩展到两个 Pod：CPU 用量达到目标</summary>
-
-   使用你的负载测试工具根据 CPU 使用情况扩展到两个 Pod。
-
-   1. 查看你的 HPA。
-      ```
-      # kubectl describe hpa
-      ```
-      你应该会看到类似以下的输出：
-      ```
-      Name:                                                  hello-world
-      Namespace:                                             default
-      Labels:                                                <none>
-      Annotations:                                           <none>
-      CreationTimestamp:                                     Mon, 23 Jul 2018 22:22:04 +0200
-      Reference:                                             Deployment/hello-world
-      Metrics:                                               ( current / target )
-        resource memory on pods:                             10928128 / 100Mi
-        resource cpu on pods  (as a percentage of request):  56% (280m) / 50%
-      Min replicas:                                          1
-      Max replicas:                                          10
-      Conditions:
-        Type            Status  Reason              Message
-        ----            ------  ------              -------
-        AbleToScale     True    SucceededRescale    the HPA controller was able to update the target scale to 2
-        ScalingActive   True    ValidMetricFound    the HPA was able to successfully calculate a replica count from cpu resource utilization (percentage of request)
-        ScalingLimited  False   DesiredWithinRange  the desired count is within the acceptable range
-      Events:
-        Type    Reason             Age   From                       Message
-        ----    ------             ----  ----                       -------
-        Normal  SuccessfulRescale  13s   horizontal-pod-autoscaler  New size: 2; reason: cpu resource utilization (percentage of request) above target
-      ```
-   1. 输入以下命令，确认你已扩展到两个 pod：
-      ```
-         # kubectl get pods
-      ```
-      你应该会看到类似以下的输出：
-      ```
-         NAME                                                     READY     STATUS    RESTARTS   AGE
-         hello-world-54764dfbf8-k8ph2                             1/1       Running   0          1m
-         hello-world-54764dfbf8-q6l4v                             1/1       Running   0          3h
-      ```
-
-</details>
-   <details id="observe-upscale-3-pods-cpu-cooldown">
-     <summary>扩展到三个 Pod：CPU 用量达到目标</summary>
-
-   使用你的负载测试工具根据 CPU 用量扩展到三个 Pod，并将 `horizo​​ntal-pod-autoscaler-upscale-delay` 设置为 3 分钟。
-
-   1. 输入以下命令：
-      ```
-      # kubectl describe hpa
-      ```
-      你应该会看到类似以下的输出：
-      ```
-         Name:                                                  hello-world
-         Namespace:                                             default
-         Labels:                                                <none>
-         Annotations:                                           <none>
-         CreationTimestamp:                                     Mon, 23 Jul 2018 22:22:04 +0200
-         Reference:                                             Deployment/hello-world
-         Metrics:                                               ( current / target )
-           resource memory on pods:                             9424896 / 100Mi
-           resource cpu on pods  (as a percentage of request):  66% (333m) / 50%
-         Min replicas:                                          1
-         Max replicas:                                          10
-         Conditions:
-           Type            Status  Reason              Message
-           ----            ------  ------              -------
-           AbleToScale     True    SucceededRescale    the HPA controller was able to update the target scale to 3
-           ScalingActive   True    ValidMetricFound    the HPA was able to successfully calculate a replica count from cpu resource utilization (percentage of request)
-           ScalingLimited  False   DesiredWithinRange  the desired count is within the acceptable range
-         Events:
-           Type    Reason             Age   From                       Message
-           ----    ------             ----  ----                       -------
-           Normal  SuccessfulRescale  4m    horizontal-pod-autoscaler  New size: 2; reason: cpu resource utilization (percentage of request) above target
-           Normal  SuccessfulRescale  16s   horizontal-pod-autoscaler  New size: 3; reason: cpu resource utilization (percentage of request) above target
-      ```
-   2. 输入以下命令，确认三个 pod 正在运行：
-      ```
-      # kubectl get pods
-      ```
-      你应该会看到类似以下的输出：
-      ```
-       NAME                                                     READY     STATUS    RESTARTS   AGE
-       hello-world-54764dfbf8-f46kh                             0/1       Running   0          1m
-       hello-world-54764dfbf8-k8ph2                             1/1       Running   0          5m
-       hello-world-54764dfbf8-q6l4v                             1/1       Running   0          3h
-      ```
-
-</details>
-   <details id="observe-downscale-1-pod">
-     <summary>缩减到 1 个 Pod：所有指标均低于目标</summary>
-
-   当 `horizontal-pod-autoscaler-downscale-delay` 的所有指标均低于目标（默认为 5 分钟）时，使用你的负载测试工具缩减到 1 个 pod。
-
-   1. 输入以下命令：
-   ```
-   # kubectl describe hpa
-   ```
-   你应该会看到类似以下的输出：
-   ```
-       Name:                                                  hello-world
-       Namespace:                                             default
-       Labels:                                                <none>
-       Annotations:                                           <none>
-       CreationTimestamp:                                     Mon, 23 Jul 2018 22:22:04 +0200
-       Reference:                                             Deployment/hello-world
-       Metrics:                                               ( current / target )
-         resource memory on pods:                             10070016 / 100Mi
-         resource cpu on pods  (as a percentage of request):  0% (0) / 50%
-       Min replicas:                                          1
-       Max replicas:                                          10
-       Conditions:
-         Type            Status  Reason              Message
-         ----            ------  ------              -------
-         AbleToScale     True    SucceededRescale    the HPA controller was able to update the target scale to 1
-         ScalingActive   True    ValidMetricFound    the HPA was able to successfully calculate a replica count from memory resource
-         ScalingLimited  False   DesiredWithinRange  the desired count is within the acceptable range
-       Events:
-         Type    Reason             Age   From                       Message
-         ----    ------             ----  ----                       -------
-         Normal  SuccessfulRescale  10m   horizontal-pod-autoscaler  New size: 2; reason: cpu resource utilization (percentage of request) above target
-         Normal  SuccessfulRescale  6m    horizontal-pod-autoscaler  New size: 3; reason: cpu resource utilization (percentage of request) above target
-         Normal  SuccessfulRescale  1s    horizontal-pod-autoscaler  New size: 1; reason: All metrics below target
-   ```
-
-</details>
-
-   **使用自定义指标测试自动缩放：**
-
-<details id="custom-observe-upscale-2-pods-cpu">
-     <summary>扩展到两个 Pod：CPU 用量达到目标</summary>
-
-   使用负载测试工具根据 CPU 用量扩展到两个 Pod。
-
-   1. 输入以下命令：
-      ```
-      # kubectl describe hpa
-       ```
-       你应该会看到类似以下的输出：
-       ```
-         Name:                                                  hello-world
-         Namespace:                                             default
-         Labels:                                                <none>
-         Annotations:                                           <none>
-         CreationTimestamp:                                     Tue, 24 Jul 2018 18:01:11 +0200
-         Reference:                                             Deployment/hello-world
-         Metrics:                                               ( current / target )
-           resource memory on pods:                             8159232 / 100Mi
-           "cpu_system" on pods:                                7m / 20m
-           resource cpu on pods  (as a percentage of request):  64% (321m) / 50%
-         Min replicas:                                          1
-         Max replicas:                                          10
-         Conditions:
-           Type            Status  Reason              Message
-           ----            ------  ------              -------
-           AbleToScale     True    SucceededRescale    the HPA controller was able to update the target scale to 2
-           ScalingActive   True    ValidMetricFound    the HPA was able to successfully calculate a replica count from cpu resource utilization (percentage of request)
-           ScalingLimited  False   DesiredWithinRange  the desired count is within the acceptable range
-         Events:
-           Type    Reason             Age   From                       Message
-           ----    ------             ----  ----                       -------
-           Normal  SuccessfulRescale  16s   horizontal-pod-autoscaler  New size: 2; reason: cpu resource utilization (percentage of request) above target
-       ```
-   1. 输入以下命令，确认两个 pod 正在运行：
-      ```
-      # kubectl get pods
-       ```
-       你应该会看到类似以下的输出：
-       ```
-             NAME                           READY     STATUS    RESTARTS   AGE
-             hello-world-54764dfbf8-5pfdr   1/1       Running   0          3s
-             hello-world-54764dfbf8-q6l82   1/1       Running   0          6h
-       ```
-
-</details>
-   <details id="observe-upscale-3-pods-cpu-cooldown-2">
-    <summary>扩展到三个 Pod：CPU 用量达到目标</summary>
-
-   当 cpu_system 用量达到目标时，使用你的负载测试工具扩展到三个 Pod。
-
-   1. 输入以下命令：
-      ```
-      # kubectl describe hpa
-      ```
-      你应该会看到类似以下的输出：
-      ```
-         Name:                                                  hello-world
-         Namespace:                                             default
-         Labels:                                                <none>
-         Annotations:                                           <none>
-         CreationTimestamp:                                     Tue, 24 Jul 2018 18:01:11 +0200
-         Reference:                                             Deployment/hello-world
-         Metrics:                                               ( current / target )
-           resource memory on pods:                             8374272 / 100Mi
-           "cpu_system" on pods:                                27m / 20m
-           resource cpu on pods  (as a percentage of request):  71% (357m) / 50%
-         Min replicas:                                          1
-         Max replicas:                                          10
-         Conditions:
-           Type            Status  Reason              Message
-           ----            ------  ------              -------
-           AbleToScale     True    SucceededRescale    the HPA controller was able to update the target scale to 3
-           ScalingActive   True    ValidMetricFound    the HPA was able to successfully calculate a replica count from cpu resource utilization (percentage of request)
-           ScalingLimited  False   DesiredWithinRange  the desired count is within the acceptable range
-         Events:
-           Type    Reason             Age   From                       Message
-           ----    ------             ----  ----                       -------
-           Normal  SuccessfulRescale  3m    horizontal-pod-autoscaler  New size: 2; reason: cpu resource utilization (percentage of request) above target
-           Normal  SuccessfulRescale  3s    horizontal-pod-autoscaler  New size: 3; reason: pods metric cpu_system above target
-      ```
-   1. 输入以下命令，确认三个 pod 正在运行：
-      ```
-      # kubectl get pods
-      ```
-      你应该会看到类似以下的输出：
-      ```
-         # kubectl get pods
-         NAME                           READY     STATUS    RESTARTS   AGE
-         hello-world-54764dfbf8-5pfdr   1/1       Running   0          3m
-         hello-world-54764dfbf8-m2hrl   1/1       Running   0          1s
-         hello-world-54764dfbf8-q6l82   1/1       Running   0          6h
-      ```
-
-</details>
-   <details id="observe-upscale-4-pods">
-     <summary>扩展到四个 Pod：CPU 用量达到目标</summary>
-
-   使用负载测试工具根据 CPU 用量扩展到四个 Pod。`horizontal-pod-autoscaler-upscale-delay` 默认设置为 3 分钟。
-
-   1. 输入以下命令：
-      ```
-      # kubectl describe hpa
-      ```
-      你应该会看到类似以下的输出：
-      ```
-      Name:                                                  hello-world
-      Namespace:                                             default
-      Labels:                                                <none>
-      Annotations:                                           <none>
-      CreationTimestamp:                                     Tue, 24 Jul 2018 18:01:11 +0200
-      Reference:                                             Deployment/hello-world
-      Metrics:                                               ( current / target )
-      resource memory on pods:                             8374272 / 100Mi
-      "cpu_system" on pods:                                27m / 20m
-      resource cpu on pods  (as a percentage of request):  71% (357m) / 50%
-      Min replicas:                                          1
-      Max replicas:                                          10
-      Conditions:
-      Type            Status  Reason              Message
-      ----            ------  ------              -------
-      AbleToScale     True    SucceededRescale    the HPA controller was able to update the target scale to 3
-      ScalingActive   True    ValidMetricFound    the HPA was able to successfully calculate a replica count from cpu resource utilization (percentage of request)
-      ScalingLimited  False   DesiredWithinRange  the desired count is within the acceptable range
-      Events:
-      Type    Reason             Age   From                       Message
-      ----    ------             ----  ----                       -------
-      Normal  SuccessfulRescale  5m    horizontal-pod-autoscaler  New size: 2; reason: cpu resource utilization (percentage of request) above target
-      Normal  SuccessfulRescale  3m    horizontal-pod-autoscaler  New size: 3; reason: pods metric cpu_system above target
-      Normal  SuccessfulRescale  4s    horizontal-pod-autoscaler  New size: 4; reason: cpu resource utilization (percentage of request) above target
-      ```
-
-   1. 输入以下命令，确认四个 pod 正在运行：
-      ```
-      # kubectl get pods
-      ```
-      你应该会看到类似以下的输出：
-      ```
-        NAME                           READY     STATUS    RESTARTS   AGE
-        hello-world-54764dfbf8-2p9xb   1/1       Running   0          5m
-        hello-world-54764dfbf8-5pfdr   1/1       Running   0          2m
-        hello-world-54764dfbf8-m2hrl   1/1       Running   0          1s
-        hello-world-54764dfbf8-q6l82   1/1       Running   0          6h
-      ```
-
-</details>
-   <details id="custom-metrics-observe-downscale-1-pod">
-     <summary>缩减到 1 个 Pod：所有指标均低于目标</summary>
-
-   当 `horizontal-pod-autoscaler-downscale-delay` 的所有指标均低于目标时，使用你的负载测试工具缩减到 1 个 pod。
-
-   1. 输入以下命令：
-      ```
-      # kubectl describe hpa
-      ```
-      你应该会看到类似以下的输出：
-      ```
-          Name:                                                  hello-world
-          Namespace:                                             default
-          Labels:                                                <none>
-          Annotations:                                           <none>
-          CreationTimestamp:                                     Tue, 24 Jul 2018 18:01:11 +0200
-          Reference:                                             Deployment/hello-world
-          Metrics:                                               ( current / target )
-            resource memory on pods:                             8101888 / 100Mi
-            "cpu_system" on pods:                                8m / 20m
-            resource cpu on pods  (as a percentage of request):  0% (0) / 50%
-          Min replicas:                                          1
-          Max replicas:                                          10
-          Conditions:
-            Type            Status  Reason              Message
-            ----            ------  ------              -------
-            AbleToScale     True    SucceededRescale    the HPA controller was able to update the target scale to 1
-            ScalingActive   True    ValidMetricFound    the HPA was able to successfully calculate a replica count from memory resource
-            ScalingLimited  False   DesiredWithinRange  the desired count is within the acceptable range
-          Events:
-            Type    Reason             Age   From                       Message
-            ----    ------             ----  ----                       -------
-            Normal  SuccessfulRescale  10m    horizontal-pod-autoscaler  New size: 2; reason: cpu resource utilization (percentage of request) above target
-            Normal  SuccessfulRescale  8m    horizontal-pod-autoscaler  New size: 3; reason: pods metric cpu_system above target
-            Normal  SuccessfulRescale  5m    horizontal-pod-autoscaler  New size: 4; reason: cpu resource utilization (percentage of request) above target
-            Normal   SuccessfulRescale             13s               horizontal-pod-autoscaler  New size: 1; reason: All metrics below target
-      ```
-   1. 输入以下命令，确认单个 pod 正在运行：
-      ```
-          # kubectl get pods
-      ```
-      你应该会看到类似以下的输出：
-      ```
-          NAME                           READY     STATUS    RESTARTS   AGE
-          hello-world-54764dfbf8-q6l82   1/1       Running   0          6h
-      ```
-
-</details>
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-authentication.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-authentication.md
deleted file mode 100644
index 3881404b5ec..00000000000
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-authentication.md
+++ /dev/null
@@ -1,104 +0,0 @@
----
-title: 身份验证
----
-
-Rancher 向 Kubernetes 添加的关键功能之一，就是集中式用户身份验证。此功能允许你的用户使用一组凭证对你的所有 Kubernetes 集群进行身份验证。
-
-这种集中式的用户身份验证是使用 Rancher 身份验证代理完成的，该代理与 Rancher 的其他组件一起安装。这个代理验证你的用户，并使用一个 ServiceAccount 将用户请求转发到你的 Kubernetes 集群。
-
-## 外部验证与本地验证
-
-Rancher 身份验证代理支持与以下外部身份验证服务集成：
-
-| 验证服务 |
-| ------------------------------------------------------------------------------------------------ |
-| [Microsoft Active Directory](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md) |
-| [GitHub](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md) |
-| [Microsoft Azure AD](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md) |
-| [FreeIPA](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md) |
-| [OpenLDAP](configure-openldap.md) |
-| [Microsoft AD FS](configure-microsoft-ad-federation-service-saml.md) |
-| [PingIdentity](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md) |
-| [Keycloak (OIDC)](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-oidc.md) |
-| [Keycloak (SAML)](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-saml.md) |
-| [Okta](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md) |
-| [Google OAuth](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md) |
-| [Shibboleth](configure-shibboleth-saml.md) |
-
-<br/>
-
-同时，Rancher 也提供了[本地验证](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md)。
-
-大多数情况下，应该使用外部身份验证服务，而不是本地身份验证，因为外部身份验证允许对用户进行集中管理。但是你可能需要一些本地身份验证用户，以便在特定的情况下（例如在外部身份验证系统不可用或正在进行维护时）管理 Rancher。
-
-## 用户和组
-
-Rancher 依赖用户和组来决定允许登录到 Rancher 的用户，以及他们可以访问哪些资源。使用外部系统进行身份验证时，将由外部系统提供用户和组。这些用户和组被赋予集群、项目、多集群应用、全局 DNS 提供商等资源的特定角色。当你将访问权限授予某个组时，身份验证提供程序中属于该组的所有用户都将能够使用你指定的权限访问该资源。有关角色和权限的更多信息，请参见 [RBAC](manage-role-based-access-control-rbac.md)。
-
-:::note
-
-本地认证不支持创建或管理用户组。
-
-:::
-
-详情请参见[用户和组](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md)。
-
-## Rancher 授权范围
-
-将 Rancher 配置成允许使用外部验证提供程序登录后，你需要配置允许登录和使用 Rancher 的用户。可用选项如下：
-
-| 访问级别 | 描述 |
-|----------------------------------------------|-------------|
-| 允许任何有效用户 | 授权服务中的 _任何_ 用户都可以访问Rancher。通常不建议使用此设置。 |
-| 允许集群和项目成员，以及授权的用户和组织 | 认证服务中的任何用户，以及添加为**集群成员**或**项目成员**的任何组都可以登录到 Rancher。此外，添加到**授权用户和组织**列表中的身份验证服务中的任何用户和组都能登录到 Rancher。 |
-| 仅允许授权用户和组织 | 只有添加到**授权用户和组织**的身份验证服务中的用户和组能登录 Rancher。 |
-
-要在授权服务中为用户设置 Rancher 访问级别，请执行以下步骤：
-
-1. 在左上角，单击 **☰ > 用户 & 认证**。
-1. 单击左侧导航栏的**认证**。
-1. 设置好认证提供程序的配置后，使用 **Site Access** 选项来配置用户的授权范围。上表说明了每个选项的访问级别。
-1. 可选：如果你选择**允许任何有效用户**以外的选项，你可以通过在显示的文本字段中搜索用户，将用户添加到**授权用户和组织**的列表中。
-1. 单击**保存**。
-
-**结果**：Rancher 访问配置已应用。
-
-:::note SAML 身份提供商注意事项
-
-- SAML 协议不支持搜索或查找用户或组。因此，将用户或组添加到 Rancher 时不会对其进行验证。
-- 添加用户时，必须正确输入确切的用户 ID（即 `UID` 字段）。键入用户 ID 时，将不会搜索可能匹配的其他用户 ID。
-- 添加组时，必须从文本框旁边的下拉列表中选择组。Rancher 假定来自文本框的任何输入都是用户。
-- 用户组下拉列表仅显示你所属的用户组。如果你不是某个组的成员，你将无法添加该组。
-
-:::
-
-## 外部身份验证配置和用户主体
-
-配置外部认证需要：
-
-- 分配了管理员角色的本地用户，以下称为 _本地主体_。
-- 可以使用外部认证服务进行认证的外部用户，以下称为 _外部主体_。
-
-外部身份验证的配置将影响 Rancher 中主体用户的管理方式。按照下面的列表来更好地理解这些影响。
-
-1. 作为本地主体登录到 Rancher 并完成外部身份验证的配置。
-
-   ![Sign In](/img/sign-in.png)
-
-2. Rancher 将外部主体与本地主体相关联。这两个用户共享本地主体的用户 ID。
-
-   ![Principal ID Sharing](/img/principal-ID.png)
-
-3. 完成配置后，Rancher 将自动退出本地主体。
-
-   ![Sign Out Local Principal](/img/sign-out-local.png)
-
-4. 然后，Rancher 会自动将你作为外部主体重新登录。
-
-   ![Sign In External Principal](/img/sign-in-external.png)
-
-5. 由于外部主体与本地主体共享一个 ID，因此**用户**页面不会再单独显示外部主体的对象。
-
-   ![Sign In External Principal](/img/users-page.png)
-
-6. 外部主体和本地主体共享相同的访问权限。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-provisioning-drivers.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-provisioning-drivers.md
index a263147c26d..fe6915aeaf4 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-provisioning-drivers.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-provisioning-drivers.md
@@ -37,11 +37,11 @@ Rancher 中有两种类型的驱动：
 
 Rancher 支持几家主要的云提供商，但默认情况下，这些主机驱动处于 active 状态并可供部署：
 
-* [Amazon EC2](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md)
-* [Azure](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md)
-* [Digital Ocean](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md)
+* [Amazon EC2](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md)
+* [Azure](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-azure-cluster.md)
+* [Digital Ocean](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-a-digitalocean-cluster.md)
 * [vSphere](vsphere.md)
 
 还有其他几个默认禁用的主机驱动，但打包在 Rancher 中：
 
-* [Harvester](../explanations/integrations-in-rancher/harvester.md#harvester-主机驱动) - 在 Rancher 2.6.1 中可用
+* [Harvester](../integrations-in-rancher/harvester.md#harvester-主机驱动) - 在 Rancher 2.6.1 中可用
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-rke1-templates.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-rke1-templates.md
index d5df2141850..c067136a114 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-rke1-templates.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-rke1-templates.md
@@ -14,7 +14,7 @@ RKE 模板有助于标准化这些配置。无论是使用 Rancher UI、Rancher
 
 如果集群是使用 RKE 模板创建的，则不能让集群使用另一个 RKE 模板。你只能将集群更新为同一模板的新版本。
 
-你可以[将现有集群的配置保存为 RKE 模板](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md#将现有集群转换为使用-rke-模板)。这样，只有模板更新后才能更改集群的设置。新模板还可用于启动新集群。
+你可以[将现有集群的配置保存为 RKE 模板](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md#将现有集群转换为使用-rke-模板)。这样，只有模板更新后才能更改集群的设置。新模板还可用于启动新集群。
 
 RKE 模板的核心功能允许 DevOps 和安全团队：
 
@@ -45,24 +45,24 @@ RKE 模板的[附加组件](#附加组件)的功能特别强大，因为它允
 
 Rancher 配置的集群支持 RKE 模板。模板可用于配置自定义集群或由基础设施提供商启动的集群。
 
-RKE 模板用于定义 Kubernetes 和 Rancher 设置。节点模板负责配置节点。有关如何将 RKE 模板与硬件结合使用的参考，请参阅 [RKE 模板和硬件](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md)。
+RKE 模板用于定义 Kubernetes 和 Rancher 设置。节点模板负责配置节点。有关如何将 RKE 模板与硬件结合使用的参考，请参阅 [RKE 模板和硬件](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md)。
 
 可以从头开始创建 RKE 模板来预先定义集群配置。它们可以用于启动新集群，也可以从现有的 RKE 集群导出模板。
 
-现有集群的设置可以[保存为 RKE 模板](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md#将现有集群转换为使用-rke-模板)。这会创建一个新模板并将集群设置绑定到该模板。这样，集群只有在[模板更新](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md#更新模板)的情况下才能[使用新版本的模板](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md#升级集群以使用新的模板修订版)进行升级。新模板也可以用来创建新集群。
+现有集群的设置可以[保存为 RKE 模板](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md#将现有集群转换为使用-rke-模板)。这会创建一个新模板并将集群设置绑定到该模板。这样，集群只有在[模板更新](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md#更新模板)的情况下才能[使用新版本的模板](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md#升级集群以使用新的模板修订版)进行升级。新模板也可以用来创建新集群。
 
 
 ## 示例场景
 如果一个组织同时拥有普通和高级 Rancher 用户，管理员可能希望为高级用户提供更多用于集群创建的选项，并限制普通用户的选项。
 
-这些[示例场景](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md)描述组织如何使用模板来标准化集群创建。
+这些[示例场景](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md)描述组织如何使用模板来标准化集群创建。
 
 示例场景包括：
 
-- **强制执行模板**：如果希望所有 Rancher 配置的新集群都具有某些设置，管理员可能想要[为每个用户强制执行一项或多项模板设置](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md#强制执行模板设置)。
-- **与不同的用户共享不同的模板**：管理员可以为[普通用户和高级用户提供不同的模板](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md#普通用户和高级用户模板)。这样，普通用户会有更多限制选项，而高级用户在创建集群时可以使用更多选项。
-- **更新模板设置**：如果组织的安全和 DevOps 团队决定将最佳实践嵌入到新集群所需的设置中，这些最佳实践可能会随着时间而改变。如果最佳实践发生变化，[可以将模板更新为新版本](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md#更新模板和集群)，这样，使用模板创建的集群可以[升级到模板的新版本](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md#升级集群以使用新的模板修订版)。
-- **共享模板的所有权**：当模板所有者不再想要维护模板或想要共享模板的所有权时，此方案描述了如何[共享模板所有权](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md#允许其他用户控制和共享模板)。
+- **强制执行模板**：如果希望所有 Rancher 配置的新集群都具有某些设置，管理员可能想要[为每个用户强制执行一项或多项模板设置](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md#强制执行模板设置)。
+- **与不同的用户共享不同的模板**：管理员可以为[普通用户和高级用户提供不同的模板](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md#普通用户和高级用户模板)。这样，普通用户会有更多限制选项，而高级用户在创建集群时可以使用更多选项。
+- **更新模板设置**：如果组织的安全和 DevOps 团队决定将最佳实践嵌入到新集群所需的设置中，这些最佳实践可能会随着时间而改变。如果最佳实践发生变化，[可以将模板更新为新版本](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md#更新模板和集群)，这样，使用模板创建的集群可以[升级到模板的新版本](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md#升级集群以使用新的模板修订版)。
+- **共享模板的所有权**：当模板所有者不再想要维护模板或想要共享模板的所有权时，此方案描述了如何[共享模板所有权](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/example-use-cases.md#允许其他用户控制和共享模板)。
 
 ## 模板管理
 
@@ -78,30 +78,30 @@ RKE 模板更新通过修订系统处理。如果要更改或更新模板，请
 
 本节中的文件解释了 RKE 模板管理的细节：
 
-- [获取创建模板的权限](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md)
-- [创建和修改模板](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md)
-- [强制执行模板设置](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md#强制新集群使用-rke-模板)
-- [覆盖模板设置](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md)
-- [与集群创建者共享模板](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md#与特定用户或组共享模板)
-- [共享模板的所有权](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md#共享模板所有权)
+- [获取创建模板的权限](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/creator-permissions.md)
+- [创建和修改模板](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/manage-rke1-templates.md)
+- [强制执行模板设置](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/enforce-templates.md#强制新集群使用-rke-模板)
+- [覆盖模板设置](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/override-template-settings.md)
+- [与集群创建者共享模板](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md#与特定用户或组共享模板)
+- [共享模板的所有权](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md#共享模板所有权)
 
 你可以参见此[模板的示例 YAML 文件](../reference-guides/rke1-template-example-yaml.md)作为参考。
 
 ## 应用模板
 
-你可以使用你自己创建的模板来[创建集群](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md#使用-rke-模板创建集群)，也可以使用[与你共享的模板](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md)来创建集群。
+你可以使用你自己创建的模板来[创建集群](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md#使用-rke-模板创建集群)，也可以使用[与你共享的模板](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/access-or-share-templates.md)来创建集群。
 
-如果 RKE 模板所有者创建了模板的新版本，你可以[将你的集群升级到该版本](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md#更新使用-rke-模板创建的集群)。
+如果 RKE 模板所有者创建了模板的新版本，你可以[将你的集群升级到该版本](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md#更新使用-rke-模板创建的集群)。
 
 可以从头开始创建 RKE 模板来预先定义集群配置。它们可以用于启动新集群，也可以从现有的 RKE 集群导出模板。
 
-你可以[将现有集群的配置保存为 RKE 模板](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md#将现有集群转换为使用-rke-模板)。这样，只有模板更新后才能更改集群的设置。
+你可以[将现有集群的配置保存为 RKE 模板](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/apply-templates.md#将现有集群转换为使用-rke-模板)。这样，只有模板更新后才能更改集群的设置。
 
 ## 标准化硬件
 
-RKE 模板的目的是标准化 Kubernetes 和 Rancher 设置。如果你还想标准化你的基础设施，一个选择是将 RKE 模板与[其他工具](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md)一起使用。
+RKE 模板的目的是标准化 Kubernetes 和 Rancher 设置。如果你还想标准化你的基础设施，一个选择是将 RKE 模板与[其他工具](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-rke1-templates/infrastructure.md)一起使用。
 
-另一种选择是使用包含节点池配置选项，但不强制执行配置的[集群模板](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md)。
+另一种选择是使用包含节点池配置选项，但不强制执行配置的[集群模板](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md)。
 
 ## YAML 定制
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-the-api.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-the-api.md
index c395bbe1596..cb097c11766 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-the-api.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/about-the-api.md
@@ -26,7 +26,7 @@ API 有自己的用户界面，你可以从 Web 浏览器访问它。这是查
 
 ## 身份验证
 
-API 请求必须包含身份验证信息。身份验证是通过 [API 密钥](../reference-guides/user-settings/api-keys.md)使用 HTTP 基本身份验证完成的。API 密钥可以创建新集群并通过 `/v3/clusters/` 访问多个集群。[集群和项目角色](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md)会应用于这些键，并限制账号可以查看的集群和项目以及可以执行的操作。
+API 请求必须包含身份验证信息。身份验证是通过 [API 密钥](../reference-guides/user-settings/api-keys.md)使用 HTTP 基本身份验证完成的。API 密钥可以创建新集群并通过 `/v3/clusters/` 访问多个集群。[集群和项目角色](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md)会应用于这些键，并限制账号可以查看的集群和项目以及可以执行的操作。
 
 默认情况下，某些集群级别的 API 令牌是使用无限期 TTL（`ttl=0`）生成的。换言之，除非你让令牌失效，否则 `ttl=0` 的 API 令牌永远不会过期。有关如何使 API 令牌失效的详细信息，请参阅 [API 令牌](../reference-guides/about-the-api/api-tokens.md)。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/access-clusters.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/access-clusters.md
index 1c0757a7d4d..48e93b6f447 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/access-clusters.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/access-clusters.md
@@ -4,11 +4,11 @@ title: 集群访问
 
 本节介绍可以用来访问 Rancher 管理的集群的工具。
 
-有关如何授予用户访问集群的权限的信息，请参阅[将用户添加到集群](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md)。
+有关如何授予用户访问集群的权限的信息，请参阅[将用户添加到集群](../how-to-guides/new-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md)。
 
 有关 RBAC 的更多信息，请参阅[本节](manage-role-based-access-control-rbac.md)。
 
-有关如何设置身份验证系统的信息，请参阅[本节](about-authentication.md)。
+有关如何设置身份验证系统的信息，请参阅[本节](authentication-config.md)。
 
 
 ### Rancher UI
@@ -19,8 +19,8 @@ Rancher 提供了一个直观的用户界面来让你与集群进行交互。UI
 
 你可以使用 Kubernetes 命令行工具 [kubectl](https://kubernetes.io/docs/reference/kubectl/overview/) 来管理你的集群。使用 kubectl 有两种选择：
 
-- **Rancher kubectl shell**：通过启动 Rancher UI 中可用的 kubectl shell 与集群交互。此选项不需要你进行任何配置操作。有关详细信息，请参阅[使用 kubectl Shell 访问集群](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md)。
-- **终端远程连接**：你也可以通过在本地桌面上安装 [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)，然后将集群的 kubeconfig 文件复制到本地 `~/.kube/config` 目录来与集群交互。有关更多信息，请参阅[使用 kubectl 和 kubeconfig 文件访问集群](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md)。
+- **Rancher kubectl shell**：通过启动 Rancher UI 中可用的 kubectl shell 与集群交互。此选项不需要你进行任何配置操作。有关详细信息，请参阅[使用 kubectl Shell 访问集群](../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md)。
+- **终端远程连接**：你也可以通过在本地桌面上安装 [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/)，然后将集群的 kubeconfig 文件复制到本地 `~/.kube/config` 目录来与集群交互。有关更多信息，请参阅[使用 kubectl 和 kubeconfig 文件访问集群](../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md)。
 
 ### Rancher CLI
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/advanced-options.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/advanced-options.md
deleted file mode 100644
index a613c06eb8b..00000000000
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/advanced-options.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 高级配置
----
-
-本节将介绍较不常用的用例的资源。
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/authentication-config.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/authentication-config.md
index ef89a141afe..8edb5acad0c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/authentication-config.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/authentication-config.md
@@ -1,18 +1,105 @@
 ---
 title: 身份验证配置
+weight: 10
 ---
 
-在以下教程中，你将学习如何：
-1. [管理用户和组](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/manage-users-and-groups.md)
-1. [创建本地用户](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/create-local-users.md)
-1. [配置 Google OAuth](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-google-oauth.md)
-1. [配置 Active Directory (AD)](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-active-directory.md)
-1. [配置 FreeIPA](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-freeipa.md)
-1. [配置 Azure AD](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-azure-ad.md)
-1. [配置 GitHub](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-github.md)
-1. [配置 Keycloak (OIDC)](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-oidc.md)
-1. [配置 Keycloak (SAML)](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-keycloak-saml.md)
-1. [配置 PingIdentity (SAML)](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-pingidentity.md)
-1. [配置 Okta (SAML)](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/authentication-config/configure-okta-saml.md)
-1. [配置 Shibboleth (SAML)](../pages-for-subheaders/configure-shibboleth-saml.md)
-1. [配置 Microsoft AD FS (SAML)](../pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md)
\ No newline at end of file
+Rancher 向 Kubernetes 添加的关键功能之一，就是集中式用户身份验证。此功能允许你的用户使用一组凭证对你的所有 Kubernetes 集群进行身份验证。
+
+这种集中式的用户身份验证是使用 Rancher 身份验证代理完成的，该代理与 Rancher 的其他组件一起安装。这个代理验证你的用户，并使用一个 ServiceAccount 将用户请求转发到你的 Kubernetes 集群。
+
+## 外部验证与本地验证
+
+Rancher 身份验证代理支持与以下外部身份验证服务集成：
+
+| 验证服务 |
+| ------------------------------------------------------------------------------------------------ |
+| [Microsoft Active Directory](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-active-directory.md) |
+| [GitHub](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-github.md) |
+| [Microsoft Azure AD](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-azure-ad.md) |
+| [FreeIPA](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-freeipa.md) |
+| [OpenLDAP](configure-openldap.md) |
+| [Microsoft AD FS](configure-microsoft-ad-federation-service-saml.md) |
+| [PingIdentity](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-pingidentity.md) |
+| [Keycloak (OIDC)](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-keycloak-oidc.md) |
+| [Keycloak (SAML)](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-keycloak-saml.md) |
+| [Okta](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-okta-saml.md) |
+| [Google OAuth](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/configure-google-oauth.md) |
+| [Shibboleth](configure-shibboleth-saml.md) |
+
+<br/>
+
+同时，Rancher 也提供了[本地验证](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/create-local-users.md)。
+
+大多数情况下，应该使用外部身份验证服务，而不是本地身份验证，因为外部身份验证允许对用户进行集中管理。但是你可能需要一些本地身份验证用户，以便在特定的情况下（例如在外部身份验证系统不可用或正在进行维护时）管理 Rancher。
+
+## 用户和组
+
+Rancher 依赖用户和组来决定允许登录到 Rancher 的用户，以及他们可以访问哪些资源。使用外部系统进行身份验证时，将由外部系统提供用户和组。这些用户和组被赋予集群、项目、多集群应用、全局 DNS 提供商等资源的特定角色。当你将访问权限授予某个组时，身份验证提供程序中属于该组的所有用户都将能够使用你指定的权限访问该资源。有关角色和权限的更多信息，请参见 [RBAC](manage-role-based-access-control-rbac.md)。
+
+:::note
+
+本地认证不支持创建或管理用户组。
+
+:::
+
+详情请参见[用户和组](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/authentication-config/manage-users-and-groups.md)。
+
+## Rancher 授权范围
+
+将 Rancher 配置成允许使用外部验证提供程序登录后，你需要配置允许登录和使用 Rancher 的用户。可用选项如下：
+
+| 访问级别 | 描述 |
+|----------------------------------------------|-------------|
+| 允许任何有效用户 | 授权服务中的 _任何_ 用户都可以访问Rancher。通常不建议使用此设置。 |
+| 允许集群和项目成员，以及授权的用户和组织 | 认证服务中的任何用户，以及添加为**集群成员**或**项目成员**的任何组都可以登录到 Rancher。此外，添加到**授权用户和组织**列表中的身份验证服务中的任何用户和组都能登录到 Rancher。 |
+| 仅允许授权用户和组织 | 只有添加到**授权用户和组织**的身份验证服务中的用户和组能登录 Rancher。 |
+
+要在授权服务中为用户设置 Rancher 访问级别，请执行以下步骤：
+
+1. 在左上角，单击 **☰ > 用户 & 认证**。
+1. 单击左侧导航栏的**认证**。
+1. 设置好认证提供程序的配置后，使用 **Site Access** 选项来配置用户的授权范围。上表说明了每个选项的访问级别。
+1. 可选：如果你选择**允许任何有效用户**以外的选项，你可以通过在显示的文本字段中搜索用户，将用户添加到**授权用户和组织**的列表中。
+1. 单击**保存**。
+
+**结果**：Rancher 访问配置已应用。
+
+:::note SAML 身份提供商注意事项
+
+- SAML 协议不支持搜索或查找用户或组。因此，将用户或组添加到 Rancher 时不会对其进行验证。
+- 添加用户时，必须正确输入确切的用户 ID（即 `UID` 字段）。键入用户 ID 时，将不会搜索可能匹配的其他用户 ID。
+- 添加组时，必须从文本框旁边的下拉列表中选择组。Rancher 假定来自文本框的任何输入都是用户。
+- 用户组下拉列表仅显示你所属的用户组。如果你不是某个组的成员，你将无法添加该组。
+
+:::
+
+## 外部身份验证配置和用户主体
+
+配置外部认证需要：
+
+- 分配了管理员角色的本地用户，以下称为 _本地主体_。
+- 可以使用外部认证服务进行认证的外部用户，以下称为 _外部主体_。
+
+外部身份验证的配置将影响 Rancher 中主体用户的管理方式。按照下面的列表来更好地理解这些影响。
+
+1. 作为本地主体登录到 Rancher 并完成外部身份验证的配置。
+
+   ![Sign In](/img/sign-in.png)
+
+2. Rancher 将外部主体与本地主体相关联。这两个用户共享本地主体的用户 ID。
+
+   ![Principal ID Sharing](/img/principal-ID.png)
+
+3. 完成配置后，Rancher 将自动退出本地主体。
+
+   ![Sign Out Local Principal](/img/sign-out-local.png)
+
+4. 然后，Rancher 会自动将你作为外部主体重新登录。
+
+   ![Sign In External Principal](/img/sign-in-external.png)
+
+5. 由于外部主体与本地主体共享一个 ID，因此**用户**页面不会再单独显示外部主体的对象。
+
+   ![Sign In External Principal](/img/users-page.png)
+
+6. 外部主体和本地主体共享相同的访问权限。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/authentication-permissions-and-global-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/authentication-permissions-and-global-configuration.md
index bbd507eb910..8d6758e8dcb 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/authentication-permissions-and-global-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/authentication-permissions-and-global-configuration.md
@@ -2,7 +2,7 @@
 title: 身份验证、权限和全局配置
 ---
 
-安装完成后，[系统管理员](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)需要配置 Rancher 来配置身份验证，安全，默认设定，安全策略，驱动和全局 DNS 条目。
+安装完成后，[系统管理员](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)需要配置 Rancher 来配置身份验证，安全，默认设定，安全策略，驱动和全局 DNS 条目。
 
 ## 首次登录
 
@@ -18,7 +18,7 @@ Rancher Server 的 URL 在设置后不可再更新。因此，你需要谨慎设
 
 Rancher 向 Kubernetes 添加的关键功能之一，就是集中式用户身份验证。此功能允许将本地用户连接到外部身份验证系统，使用该系统的用户和组进行身份验证。
 
-有关身份验证如何工作及如何设置外部身份认证系统，请参见[身份验证](about-authentication.md)。
+有关身份验证如何工作及如何设置外部身份认证系统，请参见[身份验证](authentication-config.md)。
 
 ## 授权
 
@@ -30,7 +30,7 @@ Rancher 通过 _用户_ 进行授权管理。用户的 _授权_ 或系统访问
 
 _Pod 安全策略（PSP）_ 是用来控制安全敏感相关 Pod 规范（例如 root 特权）的对象。如果某个 Pod 不满足 PSP 指定的条件，Kubernetes 将不允许它启动，并在 Rancher 中显示错误消息。
 
-有关如何创建和使用 PSP，请参见 [Pod 安全策略](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md)。
+有关如何创建和使用 PSP，请参见 [Pod 安全策略](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md)。
 
 ## 配置驱动
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/aws-cloud-marketplace.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/aws-cloud-marketplace.md
index 6b8b0aae19a..cacf3e209d1 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/aws-cloud-marketplace.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/aws-cloud-marketplace.md
@@ -12,11 +12,11 @@ Rancher 提供了与 AWS Marketplace 的集成，允许用户向 SUSE 购买支
 - Rancher 必须在启用其他指标的情况下进行部署。
 - Rancher 必须安装在 EKS 集群上。
 - 必须通过 AWS Marketplace 购买至少一项 Rancher 支持的 Entitlement。
-- 你可能需要额外的设置来支持代理/离线用例。有关详细信息，请参阅[先决条件](../explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md)。
+- 你可能需要额外的设置来支持代理/离线用例。有关详细信息，请参阅[先决条件](../integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md)。
 
 # 如何使用
-1. 完成[先决条件步骤](../explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md)。
-2. [安装 CSP Adapter](../explanations/integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md)。
+1. 完成[先决条件步骤](../integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/adapter-requirements.md)。
+2. [安装 CSP Adapter](../integrations-in-rancher/cloud-marketplace/aws-cloud-marketplace/install-adapter.md)。
 
 # 常见问题
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/cis-scans.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/cis-scans.md
index 9460440d625..37a9a5f998a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/cis-scans.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/cis-scans.md
@@ -97,11 +97,11 @@ EKS 和 GKE 集群扫描的配置文件基于这些集群类型特定的 CIS Ben
 
 ## RBAC
 
-有关权限的详细信息，请参阅[此页面](../explanations/integrations-in-rancher/cis-scans/rbac-for-cis-scans.md)。
+有关权限的详细信息，请参阅[此页面](../integrations-in-rancher/cis-scans/rbac-for-cis-scans.md)。
 
 ## 配置
 
-有关为扫描、配置文件和 Benchmark 版本配置自定义资源的更多信息，请参阅[此页面](../explanations/integrations-in-rancher/cis-scans/configuration-reference.md)。
+有关为扫描、配置文件和 Benchmark 版本配置自定义资源的更多信息，请参阅[此页面](../integrations-in-rancher/cis-scans/configuration-reference.md)。
 
 ## 操作指南
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/cluster-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/cluster-configuration.md
index ca40369352c..68908371deb 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/cluster-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/cluster-configuration.md
@@ -4,7 +4,7 @@ title: 集群配置
 
 使用 Rancher 配置 Kubernetes 集群后，你仍然可以编辑集群的选项和设置。
 
-有关编辑集群成员资格的信息，请转至[此页面](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md)。
+有关编辑集群成员资格的信息，请转至[此页面](../how-to-guides/new-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md)。
 
 ### 集群配置参考
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configuration-options.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configuration-options.md
index 7ad7a01034a..f98a4990ceb 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configuration-options.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configuration-options.md
@@ -24,16 +24,16 @@ Monitoring 应用设置了 `prometheus.prometheusSpec.ignoreNamespaceSelectors=f
 
 如果你想将 Prometheus 限制为特定的命名空间，请设置 `prometheus.prometheusSpec.ignoreNamespaceSelectors=true`。完成此操作后，你需要添加其他配置来继续监控你的资源。
 
-详情请参阅[本节](../explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md)。
+详情请参阅[本节](../integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md)。
 
 ### 在具有 Pod 安全策略的情况下启用 Istio
 
-详情请参阅[本节](../explanations/integrations-in-rancher/istio/configuration-options/pod-security-policies.md)。
+详情请参阅[本节](../integrations-in-rancher/istio/configuration-options/pod-security-policies.md)。
 
 ### 在 RKE2 集群上安装 Istio 的其他步骤
 
-详情请参阅[本节](../explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md)。
+详情请参阅[本节](../integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md)。
 
 ### 项目网络隔离的其他步骤
 
-详情请参阅[本节](../explanations/integrations-in-rancher/istio/configuration-options/project-network-isolation.md)。
\ No newline at end of file
+详情请参阅[本节](../integrations-in-rancher/istio/configuration-options/project-network-isolation.md)。
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md
index aba0270cad8..9cb1a64ca66 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-microsoft-ad-federation-service-saml.md
@@ -20,8 +20,8 @@ title: 配置 Microsoft AD FS (SAML)
 
 要让 Rancher Server 使用 Microsoft AD FS，你需要在 Active Directory 服务器上配置 AD FS，并将 Rancher 配置为使用 AD FS 服务器。如果需要获取在 Rancher 中设置 Microsoft AD FS 身份验证的指南，请参见：
 
-- [1. 在 Microsoft AD FS 中配置 Rancher](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md)
-- [2. 在 Rancher 中配置 Microsoft AD FS](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md)
+- [1. 在 Microsoft AD FS 中配置 Rancher](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md)
+- [2. 在 Rancher 中配置 Microsoft AD FS](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-microsoft-ad-federation-service-saml/configure-rancher-for-ms-adfs.md)
 
 :::note SAML 身份提供商注意事项
 
@@ -35,4 +35,4 @@ title: 配置 Microsoft AD FS (SAML)
 
 ### 后续操作
 
-[在 Microsoft AD FS 中配置 Rancher](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md)
+[在 Microsoft AD FS 中配置 Rancher](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-microsoft-ad-federation-service-saml/configure-ms-adfs-for-rancher.md)
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-openldap.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-openldap.md
index acea674859b..5b5e38019bf 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-openldap.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-openldap.md
@@ -14,9 +14,9 @@ title: 配置 OpenLDAP
 
 ## 在 Rancher 中配置 OpenLDAP
 
-配置 OpenLDAP 服务器，组和用户的设置。有关填写每个字段的帮助，请参见[配置参考](../reference-guides/configure-openldap/openldap-config-reference.md)。
+配置 OpenLDAP 服务器，组和用户的设置。有关填写每个字段的帮助，请参见[配置参考](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-openldap/openldap-config-reference.md)。
 
-> 在开始之前，请熟悉[外部身份验证配置和主体用户](about-authentication.md#外部身份验证配置和用户主体)的概念。
+> 在开始之前，请熟悉[外部身份验证配置和主体用户](authentication-config.md#外部身份验证配置和用户主体)的概念。
 
 1. 在左上角，单击 **☰ > 用户 & 认证**。
 1. 在左侧导航栏，单击**认证**。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-shibboleth-saml.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-shibboleth-saml.md
index 0502caa81c1..32c0a26a22d 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-shibboleth-saml.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/configure-shibboleth-saml.md
@@ -8,7 +8,7 @@ title: 配置 Shibboleth (SAML)
 
 如果你将 OpenLDAP 配置为 Shibboleth 的后端，SAML 断言会返回到 Rancher，其中包括用于引用组的用户属性。然后，通过身份验证的用户将能够访问其所在的组有权访问的 Rancher 资源。
 
-> 本节假定你已了解 Rancher，Shibboleth 和 OpenLDAP 是如何协同工作的。有关工作原理的详细说明，请参见[本页](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-authentication/configure-shibboleth-saml/about-group-permissions.md)。
+> 本节假定你已了解 Rancher，Shibboleth 和 OpenLDAP 是如何协同工作的。有关工作原理的详细说明，请参见[本页](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-shibboleth-saml/about-group-permissions.md)。
 
 
 # 在 Rancher 中设置 Shibboleth
@@ -87,9 +87,9 @@ SAML 协议不支持用户或用户组的搜索或查找。因此，如果你没
 
 ### 在 Rancher 中配置 OpenLDAP
 
-配置 OpenLDAP 服务器，组和用户的设置。有关填写每个字段的帮助，请参见[配置参考](../reference-guides/configure-openldap/openldap-config-reference.md)。请注意，嵌套组成员资格不适用于 Shibboleth。
+配置 OpenLDAP 服务器，组和用户的设置。有关填写每个字段的帮助，请参见[配置参考](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/configure-openldap/openldap-config-reference.md)。请注意，嵌套组成员资格不适用于 Shibboleth。
 
-> 在开始之前，请熟悉[外部身份验证配置和主体用户](about-authentication.md#外部身份验证配置和用户主体)的概念。
+> 在开始之前，请熟悉[外部身份验证配置和主体用户](authentication-config.md#外部身份验证配置和用户主体)的概念。
 
 1. 使用初始的本地 `admin` 账号登录到 Rancher UI。
 1. 在左上角，单击 **☰ > 用户 & 认证**。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/create-kubernetes-persistent-storage.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/create-kubernetes-persistent-storage.md
index 376ce1eef3c..91ddc280e7e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/create-kubernetes-persistent-storage.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/create-kubernetes-persistent-storage.md
@@ -4,15 +4,15 @@ description: "了解在 Kubernetes 中创建持久存储的两种方式：持久
 ---
 在部署需要保​​留数据的应用时，你需要创建持久存储。持久存储允许你在运行应用的 pod 之外存储应用数据。即使运行应用的 pod 发生故障，这种存储方式也能让你保留应用数据。
 
-本文假设你已了解 Kubernetes 的持久卷、持久卷声明和存储类的概念。如需更多信息，请参阅[存储的工作原理](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md)。
+本文假设你已了解 Kubernetes 的持久卷、持久卷声明和存储类的概念。如需更多信息，请参阅[存储的工作原理](../how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md)。
 
 ### 先决条件
 
-设置持久存储需要`管理卷`的[角色](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#项目角色参考)。
+设置持久存储需要`管理卷`的[角色](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#项目角色参考)。
 
 如果你要为云集群配置存储，则存储和集群主机必须使用相同的云提供商。
 
-要使用 Rancher 配置新存储，则必须启用云提供商。有关启用云提供商的详细信息，请参阅[此页面](set-up-cloud-providers.md)。
+要使用 Rancher 配置新存储，则必须启用云提供商。有关启用云提供商的详细信息，请参阅[此页面](../pages-for-subheaders/set-up-cloud-providers.md)。
 
 如果要将现有的持久存储连接到集群，则不需要启用云提供商。
 
@@ -25,7 +25,7 @@ description: "了解在 Kubernetes 中创建持久存储的两种方式：持久
 3. 添加引用 PV 的持久卷声明 (PVC)。
 4. 将 PVC 挂载为工作负载中的卷。
 
-有关详细信息和先决条件，请参阅[此页面](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md)。
+有关详细信息和先决条件，请参阅[此页面](../how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md)。
 
 ### 在 Rancher 中动态配置新存储
 
@@ -35,7 +35,7 @@ description: "了解在 Kubernetes 中创建持久存储的两种方式：持久
 2. 添加引用存储类的持久卷声明 (PVC)。
 3. 将 PVC 挂载为工作负载的卷。
 
-有关详细信息和先决条件，请参阅[此页面](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md)。
+有关详细信息和先决条件，请参阅[此页面](../how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md)。
 
 ### Longhorn 存储
 
@@ -45,19 +45,19 @@ Longhorn 是免费的开源软件。Longhorn 最初由 Rancher Labs 开发，现
 
 如果你有块存储池，Longhorn 可以帮助你为 Kubernetes 集群提供持久存储，而无需依赖云提供商。有关 Longhorn 功能的更多信息，请参阅[文档](https://longhorn.io/docs/latest/what-is-longhorn/)。
 
-Rancher v2.5 简化了在 Rancher 管理的集群上安装 Longhorn 的过程。详情请参见[本页面](../explanations/integrations-in-rancher/longhorn.md)。
+Rancher v2.5 简化了在 Rancher 管理的集群上安装 Longhorn 的过程。详情请参见[本页面](../integrations-in-rancher/longhorn.md)。
 
 ### 配置存储示例
 
-我们提供了如何使用 [NFS、](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md) [vSphere](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md) 和 [Amazon EBS](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md) 来配置存储的示例。
+我们提供了如何使用 [NFS、](../how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/nfs-storage.md) [vSphere](../how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md) 和 [Amazon EBS](../how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md) 来配置存储的示例。
 
 ### GlusterFS 卷
 
-在将数据存储在 GlusterFS 卷上的集群中，你可能会遇到重启 `kubelet` 后 pod 无法挂载卷的问题。有关避免此情况发生的详细信息，请参阅[此页面](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md)。
+在将数据存储在 GlusterFS 卷上的集群中，你可能会遇到重启 `kubelet` 后 pod 无法挂载卷的问题。有关避免此情况发生的详细信息，请参阅[此页面](../how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md)。
 
 ### iSCSI 卷
 
-在将数据存储在 iSCSI 卷上的 [Rancher 启动的 Kubernetes 集群](launch-kubernetes-with-rancher.md)中，你可能会遇到 kubelet 无法自动连接 iSCSI 卷的问题。有关解决此问题的详细信息，请参阅[此页面](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md)。
+在将数据存储在 iSCSI 卷上的 [Rancher 启动的 Kubernetes 集群](../pages-for-subheaders/launch-kubernetes-with-rancher.md)中，你可能会遇到 kubelet 无法自动连接 iSCSI 卷的问题。有关解决此问题的详细信息，请参阅[此页面](../how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md)。
 
 ### hostPath 卷
 在创建 hostPath 卷之前，你需要在集群配置中设置 [extra_bind](https://rancher.com/docs/rke/latest/en/config-options/services/services-extras/#extra-binds/)。这会将路径作为卷安装在你的 kubelet 中，可用于工作负载中的 hostPath 卷。
@@ -66,7 +66,7 @@ Rancher v2.5 简化了在 Rancher 管理的集群上安装 Longhorn 的过程。
 
 Kubernetes 正在逐渐不在树内维护云提供商。vSphere 有一个树外云提供商，可通过安装 vSphere 云提供商和云存储插件来使用。
 
-有关如何从树内 vSphere 云提供商迁移到树外，以及如何在迁移后管理现有虚拟机，请参阅[此页面](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere.md)。
+有关如何从树内 vSphere 云提供商迁移到树外，以及如何在迁移后管理现有虚拟机，请参阅[此页面](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-out-of-tree-vsphere.md)。
 
 ### 相关链接
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/custom-resource-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/custom-resource-configuration.md
index cb82f6284a9..602ae0bfb63 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/custom-resource-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/custom-resource-configuration.md
@@ -4,5 +4,5 @@ title: 自定义资源配置
 
 以下自定义资源定义（Custom Resource Definition，CRD）用于配置 Logging：
 
-- [Flow 和 ClusterFlow](../explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md)
-- [Output 和 ClusterOutput](../explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md)
\ No newline at end of file
+- [Flow 和 ClusterFlow](../integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md)
+- [Output 和 ClusterOutput](../integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md)
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/enable-experimental-features.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/enable-experimental-features.md
index a829e28fc8f..2fc41acbcf1 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/enable-experimental-features.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/enable-experimental-features.md
@@ -1,7 +1,7 @@
 ---
 title: 启用实验功能
 ---
-Rancher 包含一些默认关闭的实验功能。在某些情况下，例如当你认为使用[不支持的存储类型](../getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/unsupported-storage-drivers.md)的好处大于使用未经测试的功能的风险时，你可能想要启用实验功能。为了让你能够试用这些默认关闭的功能，我们引入了功能开关（feature flag）。
+Rancher 包含一些默认关闭的实验功能。在某些情况下，例如当你认为使用[不支持的存储类型](../how-to-guides/advanced-user-guides/enable-experimental-features/unsupported-storage-drivers.md)的好处大于使用未经测试的功能的风险时，你可能想要启用实验功能。为了让你能够试用这些默认关闭的功能，我们引入了功能开关（feature flag）。
 
 实验功能可以通过以下三种方式启用：
 
@@ -18,7 +18,7 @@ Rancher 包含一些默认关闭的实验功能。在某些情况下，例如当
 
 设置值是通过 API 设置的，而默认值是通过命令行设置。因此，如果你使用 API 或 UI 启用或禁用某个功能，命令行中设置的值将被覆盖。
 
-如果你安装 Rancher 后使用 Rancher API 将功能开关设置为 true，然后在使用命令升级 Rancher 时将功能开关设置为 false，在这种情况下，虽然默认值会是 false，但是该功能依然会被启用，因为它是通过 API 设置的。如果你随后使用 Rancher API 删除设置值（true）并将它设置为 NULL，则默认值（false）将生效。有关详细信息，请参阅[功能开关页面](../reference-guides/installation-references/feature-flags.md)。
+如果你安装 Rancher 后使用 Rancher API 将功能开关设置为 true，然后在使用命令升级 Rancher 时将功能开关设置为 false，在这种情况下，虽然默认值会是 false，但是该功能依然会被启用，因为它是通过 API 设置的。如果你随后使用 Rancher API 删除设置值（true）并将它设置为 NULL，则默认值（false）将生效。有关详细信息，请参阅[功能开关页面](../getting-started/installation-and-upgrade/installation-references/feature-flags.md)。
 
 # 启动 Rancher 时启用功能
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/fleet-gitops-at-scale.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/fleet-gitops-at-scale.md
index fcc32cc5723..e6770a85bca 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/fleet-gitops-at-scale.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/fleet-gitops-at-scale.md
@@ -9,7 +9,7 @@ Fleet 是一个独立于 Rancher 的项目，你可以使用 Helm 将它安装
 
 ## 架构
 
-有关 Fleet 工作原理的信息，请参阅[此处](../explanations/integrations-in-rancher/fleet-gitops-at-scale/architecture.md)。
+有关 Fleet 工作原理的信息，请参阅[此处](../integrations-in-rancher/fleet-gitops-at-scale/architecture.md)。
 
 ## 在 Rancher UI 中访问 Fleet
 
@@ -37,7 +37,7 @@ Fleet 预装在 Rancher 中，可以通过 Rancher UI 中的**持续交付**选
 
 ## Windows 支持
 
-有关对具有 Windows 节点的集群的支持，请参阅[此页面](../explanations/integrations-in-rancher/fleet-gitops-at-scale/windows-support.md)。
+有关对具有 Windows 节点的集群的支持，请参阅[此页面](../integrations-in-rancher/fleet-gitops-at-scale/windows-support.md)。
 
 ## GitHub 仓库
 
@@ -45,7 +45,7 @@ Fleet 预装在 Rancher 中，可以通过 Rancher UI 中的**持续交付**选
 
 ## 在代理后使用 Fleet
 
-有关在代理后使用 Fleet 的详细信息，请参阅[此页面](../explanations/integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md)。
+有关在代理后使用 Fleet 的详细信息，请参阅[此页面](../integrations-in-rancher/fleet-gitops-at-scale/use-fleet-behind-a-proxy.md)。
 
 ## Helm Chart 依赖
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/install-cluster-autoscaler.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/install-cluster-autoscaler.md
index 4b91b4743b0..49c280b4b32 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/install-cluster-autoscaler.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/install-cluster-autoscaler.md
@@ -21,4 +21,4 @@ Cluster Autoscaler 为不同的云提供商提供支持。有关详细信息，
 
 ### 在 Amazon 上设置 Cluster Autoscaler
 
-有关在 Amazon 上运行 Cluster Autoscaler 的详细信息，请参阅[此页面](../how-to-guides/advanced-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md)。
+有关在 Amazon 上运行 Cluster Autoscaler 的详细信息，请参阅[此页面](../how-to-guides/new-user-guides/manage-clusters/install-cluster-autoscaler/use-aws-ec2-auto-scaling-groups.md)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md
index fbf5f6f17b2..593d0e7cb2d 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md
@@ -75,7 +75,7 @@ Rancher 是使用 Kubernetes 的 [Helm](https://helm.sh/) 包管理器安装的
 
 ### 1. 添加 Helm Chart 仓库
 
-执行 `helm repo add` 命令，以添加包含安装 Rancher 的 Chart 的 Helm Chart 仓库。有关如何选择仓库，以及哪个仓库最适合你的用例，请参见[选择 Rancher 版本](../reference-guides/installation-references/helm-chart-options.md#helm-chart-仓库)。
+执行 `helm repo add` 命令，以添加包含安装 Rancher 的 Chart 的 Helm Chart 仓库。有关如何选择仓库，以及哪个仓库最适合你的用例，请参见[选择 Rancher 版本](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#helm-chart-仓库)。
 
 - Latest：建议用于试用最新功能
    ```
@@ -105,7 +105,7 @@ Rancher Management Server 默认需要 SSL/TLS 配置来保证访问的安全性
 
 :::note
 
-如果你想在外部终止 SSL/TLS，请参见[外部负载均衡器的 TLS 终止](../reference-guides/installation-references/helm-chart-options.md#外部-tls-终止)。
+如果你想在外部终止 SSL/TLS，请参见[外部负载均衡器的 TLS 终止](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#外部-tls-终止)。
 
 :::
 
@@ -130,7 +130,7 @@ v2.6.4 兼容 cert-manager 版本 1.6.2 和 1.7.1。推荐使用 v1.7.x，因为
 
 :::
 
-> 如果你使用自己的证书文件（`ingress.tls.source=secret`）或使用[外部负载均衡器的 TLS 终止](../reference-guides/installation-references/helm-chart-options.md#外部-tls-终止)，你可以跳过此步骤。
+> 如果你使用自己的证书文件（`ingress.tls.source=secret`）或使用[外部负载均衡器的 TLS 终止](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#外部-tls-终止)，你可以跳过此步骤。
 
 仅在使用 Rancher 生成的证书（`ingress.tls.source=rancher`）或 Let's Encrypt 颁发的证书（`ingress.tls.source=letsEncrypt`）时，才需要安装 cert-manager。
 
@@ -311,11 +311,11 @@ helm install rancher rancher-<CHART_REPO>/rancher \
 
 Rancher Chart 有许多选项，用于为你的具体环境自定义安装。以下是一些常见的高级方案：
 
-- [HTTP 代理](../reference-guides/installation-references/helm-chart-options.md#http-代理)
-- [私有容器镜像仓库](../reference-guides/installation-references/helm-chart-options.md#私有仓库和离线安装)
-- [外部负载均衡器上的 TLS 终止](../reference-guides/installation-references/helm-chart-options.md#外部-tls-终止)
+- [HTTP 代理](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#http-代理)
+- [私有容器镜像仓库](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#私有仓库和离线安装)
+- [外部负载均衡器上的 TLS 终止](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#外部-tls-终止)
 
-如需获取完整的选项列表，请参见 [Chart 选项](../reference-guides/installation-references/helm-chart-options.md)。
+如需获取完整的选项列表，请参见 [Chart 选项](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md)。
 
 
 ### 6. 验证 Rancher Server 是否部署成功
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/installation-and-upgrade.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/installation-and-upgrade.md
index e8840f47a82..af4d07ad8ca 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/installation-and-upgrade.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/installation-and-upgrade.md
@@ -14,7 +14,7 @@ description: 了解如何在开发和生产环境中安装 Rancher。了解单
 - **K3s（轻量级 Kubernetes）**：也是经过认证的 Kubernetes 发行版。它比 RKE 更新，更易用且更轻量，其所有组件都在一个小于 100 MB 的二进制文件中。
 - **RKE2**：一个完全合规的 Kubernetes 发行版，专注于安全和合规性。
 
-`restrictedAdmin` Helm Chart 选项在 **Rancher Server** 可用。如果该选项设置为 true，初始的 Rancher 用户访问本地 Kubernetes 集群会受到限制，以避免权限升级。详情请参见 [restricted-admin 角色](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md#受限管理员)。
+`restrictedAdmin` Helm Chart 选项在 **Rancher Server** 可用。如果该选项设置为 true，初始的 Rancher 用户访问本地 Kubernetes 集群会受到限制，以避免权限升级。详情请参见 [restricted-admin 角色](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md#受限管理员)。
 
 # 安装方式概述
 
@@ -73,11 +73,11 @@ Rancher backup operator 可将 Rancher 从单个 Docker 容器迁移到高可用
 
 ### 在 Kubernetes 上安装 Rancher 的更多选项
 
-参见 [Helm Chart 选项](../reference-guides/installation-references/helm-chart-options.md)以了解在 Kubernetes 集群上安装 Rancher 的其他配置，包括：
+参见 [Helm Chart 选项](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md)以了解在 Kubernetes 集群上安装 Rancher 的其他配置，包括：
 
-- [开启 API 审计日志来记录所有事务](../reference-guides/installation-references/helm-chart-options.md#api-审计日志)
-- [负载均衡器上的 TLS 终止](../reference-guides/installation-references/helm-chart-options.md#外部-tls-终止)
-- [自定义 Ingress](../reference-guides/installation-references/helm-chart-options.md#自定义-ingress)
+- [开启 API 审计日志来记录所有事务](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#api-审计日志)
+- [负载均衡器上的 TLS 终止](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#外部-tls-终止)
+- [自定义 Ingress](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md#自定义-ingress)
 
 在 Rancher 的安装指南中，我们推荐使用 K3s 或 RKE 来配置 Kubernetes 集群，然后再在这个集群中安装 Rancher。K3s 和 RKE 均提供许多配置选项，用于为你的具体环境自定义 Kubernetes 集群。有关选项和功能的完整列表，请参见：
 
@@ -89,5 +89,5 @@ Rancher backup operator 可将 Rancher 从单个 Docker 容器迁移到高可用
 参见 [Docker 安装选项](rancher-on-a-single-node-with-docker.md)了解其他配置，包括：
 
 - [开启 API 审计日志来记录所有事务](../reference-guides/single-node-rancher-in-docker/advanced-options.md#api-审计日志)
-- [外部负载均衡器](../getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md)
+- [外部负载均衡器](../how-to-guides/advanced-user-guides/configure-layer-7-nginx-load-balancer.md)
 - [持久化数据存储](../reference-guides/single-node-rancher-in-docker/advanced-options.md#持久化数据)
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/installation-references.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/installation-references.md
index d4b16242f33..e7a5b5ac802 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/installation-references.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/installation-references.md
@@ -2,4 +2,4 @@
 title: 安装参考
 ---
 
-有关其他安装资源，请参阅以下参考指南：[Rancher Helm Chart 选项](../reference-guides/installation-references/helm-chart-options.md)、[TLS 设置](../reference-guides/installation-references/tls-settings.md)和[功能开关](../reference-guides/installation-references/feature-flags.md)。
\ No newline at end of file
+有关其他安装资源，请参阅以下参考指南：[Rancher Helm Chart 选项](../getting-started/installation-and-upgrade/installation-references/helm-chart-options.md)、[TLS 设置](../getting-started/installation-and-upgrade/installation-references/tls-settings.md)和[功能开关](../getting-started/installation-and-upgrade/installation-references/feature-flags.md)。
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/installation-requirements.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/installation-requirements.md
index da330c6a02e..63b17877efd 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/installation-requirements.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/installation-requirements.md
@@ -33,13 +33,13 @@ description: 如果 Rancher 配置在 Docker 或 Kubernetes 中运行时，了
 
 如需获取在生产环境中运行 Rancher Server 的最佳实践列表，请参见[最佳实践](../reference-guides/best-practices/rancher-server/tips-for-running-rancher.md)。
 
-Rancher UI 在 Firefox 或 Chrome 中效果更佳。
+Rancher UI 在基于 Firefox 或 Chromium 的浏览器（Chrome、Edge、Opera、Brave 等）中效果最佳。
 
 # 操作系统和容器运行时要求
 
 Rancher 兼容当前所有的主流 Linux 发行版。
 
-运行 RKE Kubernetes 集群的节点需要安装 Docker。Kubernetes 安装不需要 Docker。
+运行 RKE Kubernetes 集群的节点需要安装 Docker。RKE2 或 K3s 集群不需要它。
 
 Rancher 需要安装在支持的 Kubernetes 版本上。如需了解你使用的 Rancher 版本支持哪些 Kubernetes 版本，请参见[支持维护条款](https://rancher.com/support-maintenance-terms/)。
 
@@ -49,25 +49,21 @@ Rancher 需要安装在支持的 Kubernetes 版本上。如需了解你使用的
 
 请安装 `ntp`（Network Time Protocol），以防止在客户端和服务器之间由于时间不同步造成的证书验证错误。
 
-某些 Linux 发行版的默认防火墙规则可能会阻止与 Helm 的通信。我们建议禁用 firewalld。如果使用的是 Kubernetes 1.19，1.20 或 1.21，则必须关闭 firewalld。
+某些 Linux 发行版的默认防火墙规则可能会阻止 Kubernetes 集群内的通信。从 Kubernetes v1.19 开始，你必须关闭 firewalld，因为它与 Kubernetes 网络插件冲突。
 
 如果你不太想这样做的话，你可以查看[相关问题](https://github.com/rancher/rancher/issues/28840)中的建议。某些用户已能成功[使用 ACCEPT 策略 为 Pod CIDR 创建一个独立的 firewalld 区域](https://github.com/rancher/rancher/issues/28840#issuecomment-787404822)。
 
-如果你需要在 ARM64 上使用 Rancher，请参见[在 ARM64（实验功能）上运行 Rancher](../getting-started/installation-and-upgrade/advanced-options/enable-experimental-features/rancher-on-arm64.md)。
+如果你需要在 ARM64 上使用 Rancher，请参见[在 ARM64（实验功能）上运行 Rancher](../how-to-guides/advanced-user-guides/enable-experimental-features/rancher-on-arm64.md)。
 
 ### RKE 要求
 
 容器运行时方面，RKE 可以兼容当前的所有 Docker 版本。
 
-请注意，必须应用以下 sysctl 设置：
-
-```
-net.bridge.bridge-nf-call-iptables=1
-```
+有关详细信息，请参阅[安装 Docker](../getting-started/installation-and-upgrade/installation-requirements/install-docker.md)。
 
 ### K3s 要求
 
-容器运行时方面，K3s 可以兼容当前的所有 Docker 版本。
+对于容器运行时，K3s 默认附带了自己的 containerd。你也可以将 K3s 配置为使用已安装的 Docker 运行时。有关在 Docker 中使用 K3s 的更多信息，请参阅 [K3s 文档](https://docs.k3s.io/advanced#using-docker-as-the-container-runtime)。
 
 Rancher 需要安装在支持的 Kubernetes 版本上。如需了解你使用的 Rancher 版本支持哪些 Kubernetes 版本，请参见[支持维护条款](https://rancher.com/support-maintenance-terms/)。如需指定 K3s 版本，请在运行 K3s 安装脚本时，使用 `INSTALL_K3S_VERSION` 环境变量。
 
@@ -75,18 +71,12 @@ Rancher 需要安装在支持的 Kubernetes 版本上。如需了解你使用的
 
 如果你使用 Alpine Linux 的 K3s 集群上安装 Rancher，请按照[这些步骤](https://rancher.com/docs/k3s/latest/en/advanced/#additional-preparation-for-alpine-linux-setup) 进行其他设置。
 
-
-
 ### RKE2 要求
 
+对于容器运行时，RKE2 附带了自己的 containerd。RKE2 安装不需要 Docker。
+
 如需了解 RKE2 通过了哪些操作系统版本的测试，请参见[支持和维护条款](https://rancher.com/support-maintenance-terms/)。
 
-RKE2 安装不需要 Docker。
-
-### 安装 Docker
-
-Docker 是 Helm Chart 安装所必须的。你可以参见 [Docker 官方文档](https://docs.docker.com/)中的步骤进行安装。Rancher 也提供使用单条命令安装 Docker 的[脚本](../getting-started/installation-and-upgrade/installation-requirements/install-docker.md)。
-
 # 硬件要求
 
 本节描述安装 Rancher Server 的节点的 CPU、内存和磁盘要求。
@@ -150,9 +140,9 @@ Docker 是 Helm Chart 安装所必须的。你可以参见 [Docker 官方文档]
 
 Ingress 需要部署为 DaemonSet 以确保负载均衡器能成功把流量转发到各个节点。
 
-如果是 RKE 和 K3s 安装，你不需要手动安装 Ingress，因为它是默认安装的。
+如果是 RKE，RKE2 和 K3s 安装，你不需要手动安装 Ingress，因为它是默认安装的。
 
-如果是托管 Kubernetes 集群（EKS、GKE、AKS）和 RKE2 Kubernetes 安装，你需要设置 Ingress。
+对于托管的 Kubernetes 集群（EKS、GKE、AKS），你需要设置 Ingress。
 
 - **Amazon EKS**：[在 Amazon EKS 上安装 Rancher 以及如何安装 Ingress 以访问 Rancher Server](../getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-amazon-eks.md)。
 - **AKS**：[使用 Azure Kubernetes 服务安装 Rancher 以及如何安装 Ingress 以访问 Rancher Server](../getting-started/installation-and-upgrade/install-upgrade-on-a-kubernetes-cluster/rancher-on-aks.md)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/integrations-in-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/integrations-in-rancher.md
deleted file mode 100644
index 51c76a870ce..00000000000
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/integrations-in-rancher.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: Rancher 中的集成
----
-
-Rancher 已经积累了多个产品和项目，而且已将它们集成到 Rancher UI 中。
-
-集成示例：[Harvester](../explanations/integrations-in-rancher/harvester.md) 和 [NeuVector](../explanations/integrations-in-rancher/neuvector.md)
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/introduction.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/introduction.md
deleted file mode 100644
index f6139d48160..00000000000
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/introduction.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: 介绍
----
-
-[概述](../getting-started/introduction/overview.md)部分将讨论 Rancher 的特性、功能以及它如何简化 Kubernetes 的运行。新的 Rancher Manager 文档采用了 Divio 文档结构，[Divio 文档介绍](../getting-started/introduction/what-are-divio-docs.md)将详细说明我们文档的外观和功能更新。
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/istio-setup-guide.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/istio-setup-guide.md
index 700ccac24e5..78347a5ceb0 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/istio-setup-guide.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/istio-setup-guide.md
@@ -10,7 +10,7 @@ title: 设置指南
 
 本指南假设你已经[安装 Rancher](installation-and-upgrade.md)，且已经[配置了一个单独的 Kubernetes 集群](kubernetes-clusters-in-rancher-setup.md)并要在该集群上安装 Istio。
 
-集群中的节点必须满足 [CPU 和内存要求](../explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md)。
+集群中的节点必须满足 [CPU 和内存要求](../integrations-in-rancher/istio/cpu-and-memory-allocations.md)。
 
 Istio 控制的工作负载和服务必须满足 [Istio 要求](https://istio.io/docs/setup/additional-setup/requirements/)。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/istio.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/istio.md
index c66978b4772..6a843913209 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/istio.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/istio.md
@@ -51,7 +51,7 @@ Jaeger 是用于跟踪分布式系统的工具。我们的 Istio 安装程序包
 
 ## 先决条件
 
-在启用 Istio 之前，建议你先确认你的 Rancher worker 节点是否有足够的 [CPU 和内存](../explanations/integrations-in-rancher/istio/cpu-and-memory-allocations.md)来运行 Istio 的所有组件。
+在启用 Istio 之前，建议你先确认你的 Rancher worker 节点是否有足够的 [CPU 和内存](../integrations-in-rancher/istio/cpu-and-memory-allocations.md)来运行 Istio 的所有组件。
 
 如果要在 RKE2 集群上安装 Istio，则需要执行一些额外的步骤。有关详细信息，请参阅[本节](#在-rke2-集群上安装-istio-的其他步骤)。
 
@@ -63,7 +63,7 @@ Jaeger 是用于跟踪分布式系统的工具。我们的 Istio 安装程序包
 
 ## 卸载 Istio
 
-要从集群、命名空间或工作负载中删除 Istio 组件，请参阅[卸载 Istio](../explanations/integrations-in-rancher/istio/disable-istio.md)。
+要从集群、命名空间或工作负载中删除 Istio 组件，请参阅[卸载 Istio](../integrations-in-rancher/istio/disable-istio.md)。
 
 ## 迁移旧 Istio 版本
 
@@ -75,7 +75,7 @@ Jaeger 是用于跟踪分布式系统的工具。我们的 Istio 安装程序包
 
 ## 访问可视化
 
-> 默认情况下，只有 cluster-admin 可以访问 Kiali。有关如何允许具有管理员、编辑或查看权限的角色访问它们的说明，请参阅[本节](../explanations/integrations-in-rancher/istio/rbac-for-istio.md)。
+> 默认情况下，只有 cluster-admin 可以访问 Kiali。有关如何允许具有管理员、编辑或查看权限的角色访问它们的说明，请参阅[本节](../integrations-in-rancher/istio/rbac-for-istio.md)。
 
 在集群中设置 Istio 后，你可以在 Rancher UI 中使用 Grafana、Prometheus 和 Kiali。
 
@@ -93,7 +93,7 @@ Jaeger 是用于跟踪分布式系统的工具。我们的 Istio 安装程序包
 1. 在左侧导航栏中，单击 **Istio**。
 1. 单击 **Kiali**。从这里，你可以访问**流量图**或**流量指标**选项卡，从而可视化网络指标。
 
-默认情况下，prometheus 会拾取所有命名空间，并将数据用于 Kiali 图。如果你想使用不同的配置进行 prometheus 数据抓取，请参阅[选择器/抓取配置](../explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md)。
+默认情况下，prometheus 会拾取所有命名空间，并将数据用于 Kiali 图。如果你想使用不同的配置进行 prometheus 数据抓取，请参阅[选择器/抓取配置](../integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md)。
 
 你的角色决定了你对可视化的访问。只有 `cluster-admin` 角色可以使用 Grafana 和 Prometheus。默认情况下，只有 `cluster-admin` 可以使用 Kiali UI，但是 `cluster-admin` 可以通过编辑 Istio values.yaml 来允许其他角色进行访问。
 
@@ -121,4 +121,4 @@ Istio 安装了一个服务网格，它使用 [Envoy](https://www.envoyproxy.io/
 
 ## 在 RKE2 集群上安装 Istio 的其他步骤
 
-要在 RKE2 集群上安装 Istio，请按照[步骤](../explanations/integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md)进行操作。
+要在 RKE2 集群上安装 Istio，请按照[步骤](../integrations-in-rancher/istio/configuration-options/install-istio-on-rke2-cluster.md)进行操作。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md
index 3d2a40ac62a..702c3542c7e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md
@@ -37,7 +37,7 @@ import ClusterCapabilitiesTable from '../shared-files/_cluster-capabilities-tabl
 
 如果你已经有一个想要添加到 RKE 集群的节点，你可以通过在节点上运行 Rancher Agent 容器将节点添加到集群中。
 
-有关详细信息，请参阅 [RKE 集群](launch-kubernetes-with-rancher.md)。
+有关详细信息，请参阅 [RKE 集群](../pages-for-subheaders/launch-kubernetes-with-rancher.md)。
 
 ### 在基础设施提供商中启动 Kubernetes 并配置节点
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-components.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-components.md
index 54884654bfd..17e72da03a3 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-components.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/kubernetes-components.md
@@ -2,7 +2,7 @@
 title: Kubernetes 组件
 ---
 
-本文列出的命令和步骤适用于 [Rancher 启动的 Kubernetes](launch-kubernetes-with-rancher.md) 集群上的核心 Kubernetes 组件。
+本文列出的命令和步骤适用于 [Rancher 启动的 Kubernetes](../pages-for-subheaders/launch-kubernetes-with-rancher.md) 集群上的核心 Kubernetes 组件。
 
 本文包括以下类别的故障排除提示：
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/launch-kubernetes-with-rancher.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/launch-kubernetes-with-rancher.md
index f1de80ad091..53b726e9fb2 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/launch-kubernetes-with-rancher.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/launch-kubernetes-with-rancher.md
@@ -30,7 +30,7 @@ Rancher 还可以创建节点池。在托管在云厂商的节点池上安装 Ku
 
 在这种情况下，你希望将 Kubernetes 安装到裸机服务器、本地虚拟机或云厂商中已存在的虚拟机上。使用此选项，你将在主机上运行 Rancher Agent Docker 容器。
 
-如果要重复使用之前的自定义集群中的节点，请在复用之前[清理节点](../how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md)。如果你重复使用尚未清理的节点，则集群配置可能会失败。
+如果要重复使用之前的自定义集群中的节点，请在复用之前[清理节点](../how-to-guides/new-user-guides/manage-clusters/clean-cluster-nodes.md)。如果你重复使用尚未清理的节点，则集群配置可能会失败。
 
 有关详细信息，请参阅[自定义节点](use-existing-nodes.md)。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/logging.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/logging.md
index 0d84b14401f..282b4d3f42f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/logging.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/logging.md
@@ -5,7 +5,7 @@ description: Rancher 集成了主流的日志服务。了解集成日志服务
 
 现在，Rancher 的日志管理由 [Banzai Cloud Logging operator](https://banzaicloud.com/docs/one-eye/logging-operator/) 提供支持，它取代了以前的内部解决方案。
 
-有关 Rancher 2.5 更改的概述，请参阅[本节](../explanations/integrations-in-rancher/logging/logging-architecture.md#rancher-2-5-变更)。有关迁移 Logging V1 的更多信息，请参阅[本页](../explanations/integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md)。
+有关 Rancher 2.5 更改的概述，请参阅[本节](../integrations-in-rancher/logging/logging-architecture.md#rancher-2-5-变更)。有关迁移 Logging V1 的更多信息，请参阅[本页](../integrations-in-rancher/logging/migrate-to-rancher-v2.5+-logging.md)。
 
 
 ## 启用 Logging
@@ -30,13 +30,13 @@ description: Rancher 集成了主流的日志服务。了解集成日志服务
 
 ## 架构
 
-有关 Logging 应用程序工作原理的更多信息，请参阅[本节](../explanations/integrations-in-rancher/logging/logging-architecture.md)。
+有关 Logging 应用程序工作原理的更多信息，请参阅[本节](../integrations-in-rancher/logging/logging-architecture.md)。
 
 
 
 ## RBAC
 
-Rancher Logging 有两个角色，分别是 `logging-admin` 和 `logging-view`。有关如何以及何时使用这些角色的更多信息，请参阅[此页面](../explanations/integrations-in-rancher/logging/rbac-for-logging.md)。
+Rancher Logging 有两个角色，分别是 `logging-admin` 和 `logging-view`。有关如何以及何时使用这些角色的更多信息，请参阅[此页面](../integrations-in-rancher/logging/rbac-for-logging.md)。
 
 ## 配置 Logging 自定义资源
 
@@ -48,39 +48,39 @@ Rancher Logging 有两个角色，分别是 `logging-admin` 和 `logging-view`
 
 ### Flows 和 ClusterFlows
 
-有关配置 `Flows` 和 `ClusterFlows` 的帮助，请参阅[此页面](../explanations/integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md)。
+有关配置 `Flows` 和 `ClusterFlows` 的帮助，请参阅[此页面](../integrations-in-rancher/logging/custom-resource-configuration/flows-and-clusterflows.md)。
 
 ### Outputs 和 ClusterOutputs
 
-有关配置 `Outputs` 和 `ClusterOutputs` 的帮助，请参阅[此页面](../explanations/integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md)。
+有关配置 `Outputs` 和 `ClusterOutputs` 的帮助，请参阅[此页面](../integrations-in-rancher/logging/custom-resource-configuration/outputs-and-clusteroutputs.md)。
 
 ## 配置 Logging Helm Chart
 
-有关在安装或升级 Logging 应用程序时可配置的选项，请参阅[此页面](../explanations/integrations-in-rancher/logging/logging-helm-chart-options.md)。
+有关在安装或升级 Logging 应用程序时可配置的选项，请参阅[此页面](../integrations-in-rancher/logging/logging-helm-chart-options.md)。
 
 ### Windows 支持
 
 Windows 集群支持 Logging，你可以收集 Windows 节点的日志。
 
-有关如何在 Windows 节点上启用或禁用 Logging 的详细信息，请参阅[本节](../explanations/integrations-in-rancher/logging/logging-helm-chart-options.md#启用/禁用-windows-节点-logging)。
+有关如何在 Windows 节点上启用或禁用 Logging 的详细信息，请参阅[本节](../integrations-in-rancher/logging/logging-helm-chart-options.md#启用/禁用-windows-节点-logging)。
 
 ### 使用自定义 Docker 根目录
 
-有关使用自定义 Docker 根目录的详细信息，请参阅[本节](../explanations/integrations-in-rancher/logging/logging-helm-chart-options.md#使用自定义-docker-根目录)。
+有关使用自定义 Docker 根目录的详细信息，请参阅[本节](../integrations-in-rancher/logging/logging-helm-chart-options.md#使用自定义-docker-根目录)。
 
 
 ### 处理污点和容忍度
 
-有关如何在 Logging 应用程序中使用污点和容忍度的信息，请参阅[此页面](../explanations/integrations-in-rancher/logging/taints-and-tolerations.md)。
+有关如何在 Logging 应用程序中使用污点和容忍度的信息，请参阅[此页面](../integrations-in-rancher/logging/taints-and-tolerations.md)。
 
 
 ### 在 SELinux 上使用 Logging V2
 
-有关在启用了 SELinux 的节点上使用 Logging 应用程序的信息，请参阅[本节](../explanations/integrations-in-rancher/logging/logging-helm-chart-options.md#启用-logging-应用程序以使用-selinux)。
+有关在启用了 SELinux 的节点上使用 Logging 应用程序的信息，请参阅[本节](../integrations-in-rancher/logging/logging-helm-chart-options.md#启用-logging-应用程序以使用-selinux)。
 
 ### 其他日志来源
 
-默认情况下，Rancher 会收集所有类型集群的 controlplane 组件和节点组件的日志。在某些情况下，也会收集其他日志。有关详细信息，请参阅[本节](../explanations/integrations-in-rancher/logging/logging-helm-chart-options.md#其他日志来源)。
+默认情况下，Rancher 会收集所有类型集群的 controlplane 组件和节点组件的日志。在某些情况下，也会收集其他日志。有关详细信息，请参阅[本节](../integrations-in-rancher/logging/logging-helm-chart-options.md#其他日志来源)。
 
 
 ## 故障排除
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-clusters.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-clusters.md
index a4d6335985f..b6449e497d1 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-clusters.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-clusters.md
@@ -18,7 +18,7 @@ title: 集群管理
 
 ## 在 Rancher 中管理集群
 
-将集群[配置到 Rancher](kubernetes-clusters-in-rancher-setup.md) 之后，[集群所有者](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#集群角色)需要管理这些集群。管理集群的选项如下：
+将集群[配置到 Rancher](kubernetes-clusters-in-rancher-setup.md) 之后，[集群所有者](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#集群角色)需要管理这些集群。管理集群的选项如下：
 
 import ClusterCapabilitiesTable from '../shared-files/_cluster-capabilities-table.md';
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-persistent-storage.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-persistent-storage.md
deleted file mode 100644
index 80c01b62562..00000000000
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-persistent-storage.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: 管理持久存储
----
-
-以下章节介绍了如何管理持久存储：
-
-- [持久存储的工作原理](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md)
-- [设置现有存储](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md)
-- [在 Rancher 中动态配置新存储](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md)
-- [使用外部 Ceph 驱动](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/use-external-ceph-driver.md)
-- [GlusterFS 卷](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-glusterfs-volumes.md)
-- [iSCSI 卷](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/install-iscsi-volumes.md)
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-project-resource-quotas.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-project-resource-quotas.md
index 2625e7d0fa6..880b4d1516c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-project-resource-quotas.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-project-resource-quotas.md
@@ -6,7 +6,7 @@ title: 项目资源配额
 
 本文介绍如何在现有项目中创建资源配额。
 
-你也可以在创建新项目时设置资源配额。有关详细信息，请参阅[创建新项目](../how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md#创建项目)。
+你也可以在创建新项目时设置资源配额。有关详细信息，请参阅[创建新项目](../how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces.md#创建项目)。
 
 Rancher 中的资源配额包含与 [Kubernetes 原生版本](https://kubernetes.io/docs/concepts/policy/resource-quotas/)相同的功能。Rancher 还扩展了资源配额的功能，从而让你将资源配额应用于项目。有关资源配额如何与 Rancher 中的项目一起使用的详细信息，请参阅[此页面](../how-to-guides/advanced-user-guides/manage-projects/manage-project-resource-quotas/about-project-resource-quotas.md)。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-projects.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-projects.md
index 54d6491e25b..e48191a3662 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-projects.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-projects.md
@@ -15,19 +15,19 @@ _项目_ 是 Rancher 中引入的对象，可帮助你更有组织地管理 Kube
 
 你可以使用项目执行以下操作：
 
-- [为用户分配一组命名空间的访问权限](../how-to-guides/advanced-user-guides/manage-projects/add-users-to-projects.md)
-- 为用户分配[项目中的特定角色](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#项目角色)。角色可以是所有者、成员、只读或[自定义](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md)
+- [为用户分配一组命名空间的访问权限](../how-to-guides/new-user-guides/add-users-to-projects.md)
+- 为用户分配[项目中的特定角色](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#项目角色)。角色可以是所有者、成员、只读或[自定义](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/custom-roles.md)
 - [设置资源配额](manage-project-resource-quotas.md)
-- [管理命名空间](../how-to-guides/advanced-user-guides/manage-projects/manage-namespaces.md)
+- [管理命名空间](../how-to-guides/new-user-guides/manage-namespaces.md)
 - [配置工具](../reference-guides/rancher-project-tools.md)
 - [为持续集成和 deployment 设置流水线](../how-to-guides/advanced-user-guides/manage-projects/ci-cd-pipelines.md)
 - [配置 Pod 安全策略](../how-to-guides/advanced-user-guides/manage-projects/manage-pod-security-policies.md)
 
 ### 授权
 
-非管理者用户只有在[管理员](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)、[集群所有者或成员](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#集群角色)或[项目所有者](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#项目角色)将非管理员用户添加到项目的**成员**选项卡后，才能获取项目的访问权限。
+非管理者用户只有在[管理员](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)、[集群所有者或成员](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#集群角色)或[项目所有者](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#项目角色)将非管理员用户添加到项目的**成员**选项卡后，才能获取项目的访问权限。
 
-创建项目的人自动成为[项目所有者](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#项目角色)。
+创建项目的人自动成为[项目所有者](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#项目角色)。
 
 ## 在项目之间切换
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-role-based-access-control-rbac.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-role-based-access-control-rbac.md
index a80737a6c1d..a4cf2425ecb 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-role-based-access-control-rbac.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/manage-role-based-access-control-rbac.md
@@ -2,7 +2,7 @@
 title: RBAC
 ---
 
-Rancher 通过 _用户_ 进行授权管理。如[身份验证](about-authentication.md)中所述，用户可以是本地用户，也可以是外部用户。
+Rancher 通过 _用户_ 进行授权管理。如[身份验证](authentication-config.md)中所述，用户可以是本地用户，也可以是外部用户。
 
 配置外部身份验证后，**用户**页面上显示的用户会发生变化。
 
@@ -14,11 +14,11 @@ Rancher 通过 _用户_ 进行授权管理。如[身份验证](about-authenticat
 
 一旦用户登录到 Rancher，他们的 _授权_，也就是他们在系统中的访问权限，将由 _全局权限_ 和 _集群和项目角色_ 决定。
 
-- [全局权限](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)：
+- [全局权限](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)：
 
    定义用户在任何特定集群之外的授权。
 
-- [集群和项目角色](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md)：
+- [集群和项目角色](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md)：
 
    定义用户在分配了角色的特定集群或项目中的授权。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/monitoring-and-alerting.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/monitoring-and-alerting.md
index ec62aa31931..e51afee6897 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/monitoring-and-alerting.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/monitoring-and-alerting.md
@@ -25,7 +25,7 @@ Monitoring 应用允许你：
 
 # Monitoring 的工作原理
 
-有关 monitoring 组件如何协同工作的说明，请参阅[此页面](../explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)。
+有关 monitoring 组件如何协同工作的说明，请参阅[此页面](../integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)。
 
 # 默认组件和部署
 
@@ -33,7 +33,7 @@ Monitoring 应用允许你：
 
 默认情况下，监控应用将 Grafana 仪表板（由 [kube-prometheus](https://github.com/prometheus-operator/kube-prometheus) 项目策划）部署到集群上。
 
-它还部署一个 Alertmanager UI 和一个 Prometheus UI。有关这些工具的更多信息，请参见[内置仪表板](../explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md)。
+它害部署一个 Alertmanager UI 和一个 Prometheus UI。有关这些工具的更多信息，请参见[内置仪表板](../integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md)。
 ### 默认指标 Exporter
 
 默认情况下，Rancher Monitoring 会部署 Exporter（例如 [node-exporter](https://github.com/prometheus/node_exporter) 和 [kube-state-metrics](https://github.com/kubernetes/kube-state-metrics)）。
@@ -42,15 +42,15 @@ Monitoring 应用允许你：
 
 ### 默认告警
 
-Monitoring 应用会默认部署一些告警。要查看默认告警，请转到 [Alertmanager UI](../explanations/integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md#alertmanager-ui) 并单击**展开所有组**。
+Monitoring 应用会默认部署一些告警。要查看默认告警，请转到 [Alertmanager UI](../integrations-in-rancher/monitoring-and-alerting/built-in-dashboards.md#alertmanager-ui) 并单击**展开所有组**。
 
 ### Rancher UI 中公开的组件
 
-有关 Rancher UI 中公开的监控组件列表，以及编辑它们的常见用例，请参阅[本节](../explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md#rancher-ui-中公开的组件)。
+有关 Rancher UI 中公开的监控组件列表，以及编辑它们的常见用例，请参阅[本节](../integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md#rancher-ui-中公开的组件)。
 
 # RBAC
 
-有关配置 monitoring 访问权限的信息，请参阅[此页面](../explanations/integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md)。
+有关配置 monitoring 访问权限的信息，请参阅[此页面](../integrations-in-rancher/monitoring-and-alerting/rbac-for-monitoring.md)。
 
 # 指南
 
@@ -66,7 +66,7 @@ Monitoring 应用会默认部署一些告警。要查看默认告警，请转到
 
 ### 在 Rancher 中配置 Monitoring 资源
 
-> 此处的配置参考假设你已经熟悉 monitoring 组件的协同工作方式。如需更多信息，请参阅 [monitoring 的工作原理](../explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)。
+> 此处的配置参考假设你已经熟悉 monitoring 组件的协同工作方式。如需更多信息，请参阅 [monitoring 的工作原理](../integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)。
 
 - [ServiceMonitor 和 PodMonitor](../reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md)
 - [接收器](../reference-guides/monitoring-v2-configuration/receivers.md)
@@ -85,7 +85,7 @@ Monitoring 应用会默认部署一些告警。要查看默认告警，请转到
 
 为了能够为 Windows 完全部署 Monitoring V2，你的所有 Windows 主机都必须至少具有 v0.1.0 的 [wins](https://github.com/rancher/wins) 版本。
 
-有关如何在现有 Windows 主机上升级 wins 版本的更多详细信息，请参阅 [Windows 集群对 Monitoring V2 的支持](../explanations/integrations-in-rancher/monitoring-and-alerting/windows-support.md)。
+有关如何在现有 Windows 主机上升级 wins 版本的更多详细信息，请参阅 [Windows 集群对 Monitoring V2 的支持](../integrations-in-rancher/monitoring-and-alerting/windows-support.md)。
 
 
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/nutanix.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/nutanix.md
index 6eed7214d09..b6bc5cad7a1 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/nutanix.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/nutanix.md
@@ -9,9 +9,9 @@ Rancher 可以在 AOS (AHV) 中配置节点并在其上安装 Kubernetes。在 A
 
 Nutanix 集群可能由多组具有不同属性（例如内存或 vCPU 数量）的 VM 组成。这种分组允许对每个 Kubernetes 角色的节点大小进行细粒度控制。
 
-- [创建 Nutanix 集群](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md#创建-nutanix-aos-集群)
-- [配置存储](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos)
+- [创建 Nutanix 集群](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md#创建-nutanix-aos-集群)
+- [配置存储](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos)
 
 # 创建 Nutanix 集群
 
-在[本节](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md)中，你将学习如何使用 Rancher 在 Nutanix AOS 中安装 [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes 集群。
\ No newline at end of file
+在[本节](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/nutanix/provision-kubernetes-clusters-in-aos.md)中，你将学习如何使用 Rancher 在 Nutanix AOS 中安装 [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes 集群。
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/other-cloud-providers.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/other-cloud-providers.md
deleted file mode 100644
index 0256a4f9585..00000000000
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/other-cloud-providers.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-title: 其他云提供商
----
-
-本文介绍了如何设置以下云提供商：
-
-- [Amazon 云提供商](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md)
-- [Azure 云提供商](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md)
-- [谷歌 GCE 云提供商](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md)
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/other-troubleshooting-tips.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/other-troubleshooting-tips.md
deleted file mode 100644
index 926b9f10081..00000000000
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/other-troubleshooting-tips.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-title: 其他故障排除提示
----
-
-- [Kubernetes 资源](../troubleshooting/other-troubleshooting-tips/kubernetes-resources.md)
-- [网络](../troubleshooting/other-troubleshooting-tips/networking.md)
-- [DNS](../troubleshooting/other-troubleshooting-tips/dns.md)
-- [Rancher HA](../troubleshooting/other-troubleshooting-tips/rancher-ha.md)
-- [注册集群](../troubleshooting/other-troubleshooting-tips/registered-clusters.md)
-- [Logging](../troubleshooting/other-troubleshooting-tips/logging.md)
-- [审计日志中的用户 ID 跟踪](../troubleshooting/other-troubleshooting-tips/user-id-tracking-in-audit-logs.md)
-- [轮换过期的 Webhook 证书](../troubleshooting/other-troubleshooting-tips/expired-webhook-certificate-rotation.md)
\ No newline at end of file
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/pipelines.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/pipelines.md
index d795a4669ab..c453abcf674 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/pipelines.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/pipelines.md
@@ -76,7 +76,7 @@ Rancher 的流水线提供简单的 CI/CD 体验，但不提供完整的功能
 
 如果你可以访问项目，则可以启用仓库来开始构建流水线。
 
-只有[管理员](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)、[集群所有者或成员](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#集群角色)或[项目所有者](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#项目角色)可以配置版本控制提供商和管理全局流水线的执行设置。
+只有[管理员](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/global-permissions.md)、[集群所有者或成员](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#集群角色)或[项目所有者](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-role-based-access-control-rbac/cluster-and-project-roles.md#项目角色)可以配置版本控制提供商和管理全局流水线的执行设置。
 
 项目成员只能配置仓库和流水线。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/provisioning-storage-examples.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/provisioning-storage-examples.md
index 1270c62f02f..e13500f2aaf 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/provisioning-storage-examples.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/provisioning-storage-examples.md
@@ -6,6 +6,6 @@ Rancher 通过各种卷插件来支持持久存储。但是，在使用这些插
 
 为了你的方便，Rancher 提供了配置主流存储的参考文档：
 
-- [NFS](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/nfs-storage.md)
-- [vSphere](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md)
-- [EBS](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md)
+- [NFS](../how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/nfs-storage.md)
+- [vSphere](../how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md)
+- [EBS](../how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/persistent-storage-in-amazon-ebs.md)
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/quick-start-guides.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/quick-start-guides.md
index fd0013e0777..46359aab1ad 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/quick-start-guides.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/quick-start-guides.md
@@ -1,7 +1,6 @@
 ---
 title: Rancher 部署快速入门指南
 ---
-
 :::caution
 
 本章节中提供的指南，旨在帮助你快速启动一个用于 Rancher 的沙盒，以评估 Rancher 是否能满足你的使用需求。快速入门指南不适用于生产环境。如果你需要获取生产环境的操作指导，请参见[安装](installation-and-upgrade.md)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-manager-architecture.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-manager-architecture.md
index ec62aa6ba0c..ad6a3ea462f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-manager-architecture.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-manager-architecture.md
@@ -6,7 +6,7 @@ title: 架构
 
 有关安装 Rancher 的不同方式的信息，请参见[安装选项概述](installation-and-upgrade.md#安装方式概述)。
 
-有关 Rancher API Server 的主要功能，请参见[概述](../getting-started/introduction/overview.md#rancher-api-server-的功能)。
+有关 Rancher API Server 的主要功能，请参见[概述](../getting-started/overview.md#rancher-api-server-的功能)。
 
 有关如何为 Rancher Server 设置底层基础架构，请参见[架构推荐](../reference-guides/rancher-manager-architecture/architecture-recommendations.md)。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-on-a-single-node-with-docker.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-on-a-single-node-with-docker.md
index cb07323f3d0..2fe58e12691 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-on-a-single-node-with-docker.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-on-a-single-node-with-docker.md
@@ -9,7 +9,7 @@ Rancher 可以通过运行单个 Docker 容器进行安装。
 
 :::note 想要使用外部负载均衡器？
 
-请参阅[使用外部负载均衡器的 Docker 安装](../getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/configure-layer-7-nginx-load-balancer.md)。
+请参阅[使用外部负载均衡器的 Docker 安装](../how-to-guides/advanced-user-guides/configure-layer-7-nginx-load-balancer.md)。
 
 :::
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-security.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-security.md
index fd22e649867..0fb0056135f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-security.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/rancher-security.md
@@ -26,7 +26,7 @@ title: 安全
 
 _2.6.5 的新功能_
 
-NeuVector 是一个开源的、以容器为中心的安全应用程序，现已集成到 Rancher 中。NeuVector 提供生产安全、DevOps 漏洞保护和容器防火墙等功能。请参阅 [Rancher 文档](../explanations/integrations-in-rancher/neuvector.md)和 [NeuVector 文档](https://open-docs.neuvector.com/)了解更多信息。
+NeuVector 是一个开源的、以容器为中心的安全应用程序，现已集成到 Rancher 中。NeuVector 提供生产安全、DevOps 漏洞保护和容器防火墙等功能。请参阅 [Rancher 文档](../integrations-in-rancher/neuvector.md)和 [NeuVector 文档](https://open-docs.neuvector.com/)了解更多信息。
 
 ### 在 Kubernetes 集群上运行 CIS 安全扫描
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/resources.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/resources.md
index 0eb6739e463..45aa544fa7e 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/resources.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/resources.md
@@ -19,7 +19,7 @@ title: 资源
 安装 Rancher 时，有如下几个可开启的高级选项：每个安装指南中都提供了对应的选项。了解选项详情：
 
 - [自定义 CA 证书](../getting-started/installation-and-upgrade/resources/custom-ca-root-certificates.md)
-- [API 审计日志](../getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md)
-- [TLS 设置](../reference-guides/installation-references/tls-settings.md)
-- [etcd 配置](../getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/tune-etcd-for-large-installs.md)
+- [API 审计日志](../how-to-guides/advanced-user-guides/enable-api-audit-log.md)
+- [TLS 设置](../getting-started/installation-and-upgrade/installation-references/tls-settings.md)
+- [etcd 配置](../how-to-guides/advanced-user-guides/tune-etcd-for-large-installs.md)
 - [离线安装 Local System Chart](../getting-started/installation-and-upgrade/resources/local-system-charts.md)
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/set-up-cloud-providers.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/set-up-cloud-providers.md
index 5aaaa15df8e..095b29facb6 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/set-up-cloud-providers.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/set-up-cloud-providers.md
@@ -1,6 +1,7 @@
 ---
 title: 设置 Cloud Provider
 ---
+
 _cloud provider_ 是 Kubernetes 中的一个模块，它提供了一个用于管理节点、负载均衡器和网络路由的接口。
 
 在 Rancher 中设置 cloud provider 时，如果你使用的云提供商支持自动化，Rancher Server 可以在启动 Kubernetes 定义时自动配置新节点、负载均衡器或持久存储设备。
@@ -18,19 +19,19 @@ _cloud provider_ 是 Kubernetes 中的一个模块，它提供了一个用于管
 
 ### 设置 Amazon 云提供商
 
-有关启用 Amazon 云提供商的详细信息，请参阅[此页面](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/amazon.md)。
+有关启用 Amazon 云提供商的详细信息，请参阅[此页面](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/amazon.md)。
 
 ### 设置 Azure 云提供商
 
-有关启用 Azure 云提供商的详细信息，请参阅[此页面](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/azure.md)。
+有关启用 Azure 云提供商的详细信息，请参阅[此页面](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/azure.md)。
 
 ### 设置 GCE 云提供商
 
-有关启用 Google Compute Engine 云提供商的详细信息，请参阅[此页面](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md)。
+有关启用 Google Compute Engine 云提供商的详细信息，请参阅[此页面](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/google-compute-engine.md)。
 
 ### 设置 vSphere 云提供商
 
-有关启用 vSphere 云提供商的详细信息，请参阅[此页面](vsphere-cloud-provider.md)。
+有关启用 vSphere 云提供商的详细信息，请参阅[树内 vSphere 配置](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-in-tree-vsphere.md)和[树外 vSphere 配置](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-out-of-tree-vsphere.md)。
 
 ### 设置自定义云提供商
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-existing-nodes.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-existing-nodes.md
index e6055ae6934..6730a5afe8f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-existing-nodes.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-existing-nodes.md
@@ -26,7 +26,7 @@ description: 要创建具有自定义节点的集群，你需要访问集群中
 - 本地虚拟机
 - 裸机服务器
 
-如果要重复使用之前的自定义集群中的节点，请在复用之前[清理节点](../how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md)。如果你重复使用尚未清理的节点，则集群配置可能会失败。
+如果要重复使用之前的自定义集群中的节点，请在复用之前[清理节点](../how-to-guides/new-user-guides/manage-clusters/clean-cluster-nodes.md)。如果你重复使用尚未清理的节点，则集群配置可能会失败。
 
 根据[安装要求](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/node-requirements-for-rancher-managed-clusters.md)和[生产就绪集群的检查清单](checklist-for-production-ready-clusters.md)配置主机。
 
@@ -66,7 +66,7 @@ description: 要创建具有自定义节点的集群，你需要访问集群中
 
 :::
 
-8. **可选**：点击[显示高级选项](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md)来指定注册节点时使用的 IP 地址，覆盖节点的主机名，或将[标签](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)或[污点](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/)添加到节点。
+8. **可选**：点击[显示高级选项](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/about-rancher-agents.md)来指定注册节点时使用的 IP 地址，覆盖节点的主机名，或将[标签](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/)或[污点](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/)添加到节点。
 
 9. 将屏幕上显示的命令复制到剪贴板。
 
@@ -134,5 +134,5 @@ Key=kubernetes.io/cluster/CLUSTERID, Value=shared
 
 创建集群后，你可以通过 Rancher UI 访问集群。最佳实践建议你设置以下访问集群的备用方式：
 
-- **通过 kubectl CLI 访问你的集群**：按照[这些步骤](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#在工作站使用-kubectl-访问集群)在你的工作站上使用 kubectl 访问集群。在这种情况下，你将通过 Rancher Server 的身份验证代理进行身份验证，然后 Rancher 会让你连接到下游集群。此方法允许你在没有 Rancher UI 的情况下管理集群。
-- **通过 kubectl CLI 使用授权的集群端点访问你的集群**：按照[这些步骤](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#直接使用下游集群进行身份验证)直接使用 kubectl 访问集群，而无需通过 Rancher 进行身份验证。我们建议设置此替代方法来访问集群，以便在无法连接到 Rancher 时访问集群。
+- **通过 kubectl CLI 访问你的集群**：按照[这些步骤](../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#在工作站使用-kubectl-访问集群)在你的工作站上使用 kubectl 访问集群。在这种情况下，你将通过 Rancher Server 的身份验证代理进行身份验证，然后 Rancher 会让你连接到下游集群。此方法允许你在没有 Rancher UI 的情况下管理集群。
+- **通过 kubectl CLI 使用授权的集群端点访问你的集群**：按照[这些步骤](../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#直接使用下游集群进行身份验证)直接使用 kubectl 访问集群，而无需通过 Rancher 进行身份验证。我们建议设置此替代方法来访问集群，以便在无法连接到 Rancher 时访问集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md
index a9133d78053..a71deb70574 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-new-nodes-in-an-infra-provider.md
@@ -125,7 +125,7 @@ Rancher 可以自动替换节点池中无法访问的节点。如果节点在指
 
 ### 主机驱动
 
-如果你找不到想要的主机驱动，你可以在 Rancher 的[内置主机驱动](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md#激活/停用主机驱动)中查看并激活它，也可以[添加自定义主机驱动](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md#添加自定义主机驱动)。
+如果你找不到想要的主机驱动，你可以在 Rancher 的[内置主机驱动](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md#激活/停用主机驱动)中查看并激活它，也可以[添加自定义主机驱动](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md#添加自定义主机驱动)。
 
 ## RKE2 集群
 
@@ -133,7 +133,7 @@ Rancher 2.6 支持直接使用 Rancher UI 配置 [RKE2](https://docs.rke2.io/) 
 
 :::note
 
-对于 RKE2 集群模板，请参阅[此页面](../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md#rke2-集群模板)了解更多信息。
+对于 RKE2 集群模板，请参阅[此页面](../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/manage-cluster-templates.md#rke2-集群模板)了解更多信息。
 
 :::
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-windows-clusters.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-windows-clusters.md
index 2ff3b0b6dce..e7c74abe144 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-windows-clusters.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/use-windows-clusters.md
@@ -79,7 +79,7 @@ Rancher 仅支持使用 Flannel 作为网络提供商的 Windows。
 
 有两个网络选项：[**Host Gateway (L2bridge)**](https://github.com/coreos/flannel/blob/master/Documentation/backends.md#host-gw) 和 [**VXLAN (Overlay)**](https://github.com/coreos/flannel/blob/master/Documentation/backends.md#vxlan)。默认选项是 **VXLAN (Overlay)** 模式。
 
-对于 **Host Gateway (L2bridge)** 网络，最好为所有节点使用相同的第 2 层网络。否则，你需要为它们配置路由规则。有关详细信息，请参阅[配置云托管 VM 路由的文档](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md#云托管虚拟机的路由配置)。如果你使用的是 Amazon EC2、Google GCE 或 Azure 虚拟机，你需要[禁用私有 IP 地址检查](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md#禁用私有-ip-地址检查)。
+对于 **Host Gateway (L2bridge)** 网络，最好为所有节点使用相同的第 2 层网络。否则，你需要为它们配置路由规则。有关详细信息，请参阅[配置云托管 VM 路由的文档](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/network-requirements-for-host-gateway.md#云托管虚拟机的路由配置)。如果你使用的是 Amazon EC2、Google GCE 或 Azure 虚拟机，你需要[禁用私有 IP 地址检查](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/network-requirements-for-host-gateway.md#禁用私有-ip-地址检查)。
 
 对于 **VXLAN (Overlay)** 网络，你必须安装 [KB4489899](https://support.microsoft.com/en-us/help/4489899) 修补程序。大多数云托管的 VM 已经具有此修补程序。
 
@@ -139,11 +139,11 @@ Windows 要求容器的版本必须与部署容器的 Windows Server 的版本
 
 ### 云提供商要求
 
-如果你在集群中设置了 Kubernetes 云提供商，则需要进行一些额外的操作。如果你想使用云提供商的功能，例如为集群自动配置存储、负载均衡器或其他基础设施，你可能需要设置云提供商。有关如何配置满足条件的云提供商集群节点，请参阅[此页面](set-up-cloud-providers.md)。
+如果你在集群中设置了 Kubernetes 云提供商，则需要进行一些额外的操作。如果你想使用云提供商的功能，例如为集群自动配置存储、负载均衡器或其他基础设施，你可能需要设置云提供商。有关如何配置满足条件的云提供商集群节点，请参阅[此页面](../pages-for-subheaders/set-up-cloud-providers.md)。
 
 如果你的云提供商是 GCE（Google Compute Engine），则必须执行以下操作：
 
-- 按照[步骤](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/other-cloud-providers/google-compute-engine.md) 在`cluster.yml` 中启用 GCE 云提供商。
+- 按照[步骤](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/google-compute-engine.md) 在`cluster.yml` 中启用 GCE 云提供商。
 - 在 Rancher 中配置集群时，在 Rancher UI 中选择**自定义云提供商**作为云提供商。
 
 ## 教程：如何创建支持 Windows 的集群
@@ -177,7 +177,7 @@ Windows 要求容器的版本必须与部署容器的 Windows Server 的版本
 | 节点 2 | Linux（推荐 Ubuntu Server 18.04） |
 | 节点 3 | Windows（Windows Server 核心版本 1809 或更高版本） |
 
-如果你的节点托管在**云提供商**上，并且你需要自动化支持（例如负载均衡器或持久存储设备），你的节点还需要满足额外的配置要求。详情请参见[选择云提供商](set-up-cloud-providers.md)。
+如果你的节点托管在**云提供商**上，并且你需要自动化支持（例如负载均衡器或持久存储设备），你的节点还需要满足额外的配置要求。详情请参见[选择云提供商](../pages-for-subheaders/set-up-cloud-providers.md)。
 
 ### 2. 在现有节点上创建集群
 
@@ -195,7 +195,7 @@ Windows 要求容器的版本必须与部署容器的 Windows Server 的版本
 
 :::note 重要提示：
 
-对于 <b>Host Gateway (L2bridge)</b> 网络，最好为所有节点使用相同的第 2 层网络。否则，你需要为它们配置路由规则。有关详细信息，请参阅[配置云托管 VM 路由的文档](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md#云托管虚拟机的路由配置)。如果你使用的是 Amazon EC2、Google GCE 或 Azure 虚拟机，你需要[禁用私有 IP 地址检查](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/network-requirements-for-host-gateway.md#禁用私有-ip-地址检查)。
+对于 <b>Host Gateway (L2bridge)</b> 网络，最好为所有节点使用相同的第 2 层网络。否则，你需要为它们配置路由规则。有关详细信息，请参阅[配置云托管 VM 路由的文档](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/network-requirements-for-host-gateway.md#云托管虚拟机的路由配置)。如果你使用的是 Amazon EC2、Google GCE 或 Azure 虚拟机，你需要[禁用私有 IP 地址检查](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/network-requirements-for-host-gateway.md#禁用私有-ip-地址检查)。
 
 :::
 
@@ -278,9 +278,9 @@ Linux Worker 节点上的污点
 
 创建集群后，你可以通过 Rancher UI 访问集群。最佳实践建议你设置以下访问集群的备用方式：
 
-- **通过 kubectl CLI 访问你的集群**：按照[这些步骤](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#在工作站使用-kubectl-访问集群)在你的工作站上使用 kubectl 访问集群。在这种情况下，你将通过 Rancher Server 的身份验证代理进行身份验证，然后 Rancher 会让你连接到下游集群。此方法允许你在没有 Rancher UI 的情况下管理集群。
-- **通过 kubectl CLI 使用授权的集群端点访问你的集群**：按照[这些步骤](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#直接使用下游集群进行身份验证)直接使用 kubectl 访问集群，而无需通过 Rancher Server 进行身份验证。我们建议设置此替代方法来访问集群，以便在无法连接到 Rancher 时访问集群。
+- **通过 kubectl CLI 访问你的集群**：按照[这些步骤](../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#在工作站使用-kubectl-访问集群)在你的工作站上使用 kubectl 访问集群。在这种情况下，你将通过 Rancher Server 的身份验证代理进行身份验证，然后 Rancher 会让你连接到下游集群。此方法允许你在没有 Rancher UI 的情况下管理集群。
+- **通过 kubectl CLI 使用授权的集群端点访问你的集群**：按照[这些步骤](../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md#直接使用下游集群进行身份验证)直接使用 kubectl 访问集群，而无需通过 Rancher Server 进行身份验证。我们建议设置此替代方法来访问集群，以便在无法连接到 Rancher 时访问集群。
 
 ## Azure 中存储类的配置
 
-如果你的节点使用 Azure VM，则可以使用 [Azure 文件](https://docs.microsoft.com/en-us/azure/aks/azure-files-dynamic-pv)作为集群的存储类（StorageClass）。详情请参见[此部分](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-windows-clusters/azure-storageclass-configuration.md)。
+如果你的节点使用 Azure VM，则可以使用 [Azure 文件](https://docs.microsoft.com/en-us/azure/aks/azure-files-dynamic-pv)作为集群的存储类（StorageClass）。详情请参见[此部分](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/use-windows-clusters/azure-storageclass-configuration.md)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/user-settings.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/user-settings.md
index ca3aa1f18df..5ed627b7b07 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/user-settings.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/user-settings.md
@@ -9,7 +9,7 @@ title: 用户设置
 可用的用户设置包括：
 
 - [API & 密钥](../reference-guides/user-settings/api-keys.md)：如果你想以编程方式与 Rancher 交互，你需要一个 API 密钥。你可以按照本节中的说明获取密钥。
-- [云凭证](../reference-guides/user-settings/manage-cloud-credentials.md)：管理[节点模板](use-new-nodes-in-an-infra-provider.md#节点模板)使用的云凭证，从而[为集群配置节点](launch-kubernetes-with-rancher.md)。
-- [节点模板](../reference-guides/user-settings/manage-node-templates.md)：管理 [Rancher 用来为集群配置节点](launch-kubernetes-with-rancher.md)的模板。
+- [云凭证](../reference-guides/user-settings/manage-cloud-credentials.md)：管理[节点模板](use-new-nodes-in-an-infra-provider.md#节点模板)使用的云凭证，从而[为集群配置节点](../pages-for-subheaders/launch-kubernetes-with-rancher.md)。
+- [节点模板](../reference-guides/user-settings/manage-node-templates.md)：管理 [Rancher 用来为集群配置节点](../pages-for-subheaders/launch-kubernetes-with-rancher.md)的模板。
 - [偏好设置](../reference-guides/user-settings/user-preferences.md)：设置 Rancher UI 的表面首选项。
 - 登出：结束你的用户会话。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/vsphere-cloud-provider.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/vsphere-cloud-provider.md
deleted file mode 100644
index 2924737967c..00000000000
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/vsphere-cloud-provider.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-title: 设置 vSphere 云提供商
----
-
-在本节中，你将了解如何在 vSphere 中为 Rancher 管理的 RKE Kubernetes 集群设置 vSphere 云提供商。
-
-# 树内云提供商
-
-要使用树内 vSphere 云提供商，你需要使用 RKE 配置选项。详情请参见[此页](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-in-tree-vsphere.md)。
-
-# 树外云提供商
-
-要设置树外 vSphere 云提供商，你需要从 Rancher 市场安装 Helm Chart。详情请参见[此页](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/set-up-cloud-providers/vsphere/configure-out-of-tree-vsphere.md)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/vsphere.md b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/vsphere.md
index 98c8357b304..d413fe0927c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/vsphere.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/pages-for-subheaders/vsphere.md
@@ -28,7 +28,7 @@ vSphere 集群可能由多组具有不同属性（例如内存或 vCPU 数量）
 
 vSphere 的节点模板已更新。当你使用 vSphere 凭证创建节点模板时，该模板会自动填充你在 vSphere 控制台中可以访问的相同的虚拟机配置选项。
 
-要填充的字段设置需要满足[先决条件](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md#先决条件)。
+要填充的字段设置需要满足[先决条件](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md#先决条件)。
 
 ### 更多支持的操作系统
 
@@ -42,14 +42,14 @@ vSphere 的节点模板已更新。当你使用 vSphere 凭证创建节点模板
 
 ## 创建 vSphere 集群
 
-在[本节](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md)中，你将学习如何使用 Rancher 在 vSphere 中安装 [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes 集群。
+在[本节](../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/vsphere/provision-kubernetes-clusters-in-vsphere.md)中，你将学习如何使用 Rancher 在 vSphere 中安装 [RKE](https://rancher.com/docs/rke/latest/en/) Kubernetes 集群。
 
 ## 配置存储
 
-有关如何使用 Rancher 在 vSphere 中配置存储的示例，请参阅[本节](../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/provisioning-storage-examples/vsphere-storage.md)。要在 vSphere 中动态配置存储，你必须[启用](vsphere-cloud-provider.md) vSphere 云提供商。
+有关如何使用 Rancher 在 vSphere 中配置存储的示例，请参阅[本节](../how-to-guides/new-user-guides/manage-clusters/provisioning-storage-examples/vsphere-storage.md)。要在 vSphere 中动态配置存储，你必须启用 vSphere 云提供商。请参阅[树内 vSphere 配置](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-in-tree-vsphere.md)和[树外 vSphere 配置](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-out-of-tree-vsphere.md)。
 
 ## 启用 vSphere 云提供商
 
 在 Rancher 中设置云提供商时，Rancher Server 可以自动为集群配置新的基础设施，包括新节点或持久存储设备。
 
-有关详细信息，请参阅[启用 vSphere 云提供商](vsphere-cloud-provider.md)。
+有关启用 vSphere 云提供商的详细信息，请参阅[树内 vSphere 配置](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-in-tree-vsphere.md)和[树外 vSphere 配置](../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/set-up-cloud-providers/configure-out-of-tree-vsphere.md)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/rancher-manager.md b/i18n/zh/docusaurus-plugin-content-docs/current/rancher-manager.md
index e7d453c593f..7df74298395 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/rancher-manager.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/rancher-manager.md
@@ -1,6 +1,7 @@
 ---
 slug: /
-title: "Rancher 2.6"
+title: "什么是 Rancher？"
+sidebar_label: 什么是 Rancher？
 description: "Rancher 在 Kubernetes 之上添加了新的功能，让你一站式管理上百个集群，统一 RBAC，开启监控和告警。了解更多。"
 ---
 Rancher 是一个 Kubernetes 管理工具，让你能在任何地方和任何提供商上部署和运行集群。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides.md
deleted file mode 100644
index 0144efd14a7..00000000000
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides.md
+++ /dev/null
@@ -1,13 +0,0 @@
----
-title: 参考指南
----
-
-**参考指南**是用户可以学习的产品或流程描述。参考指南是“信息导向”的，主要用于描述。
-
-本章节的文档可能包含一些操作步骤，但是描述操作步骤不是本章节的主要目的。
-
-使用参考指南的用户熟悉且了解如何使用 Rancher。当用户需要参考具体使用细节时，用户可以获取更详细的使用描述。
-
-Rancher 参考指南示例：
-1. [Rancher Manager 架构](./pages-for-subheaders/rancher-manager-architecture.md)
-2. [集群配置指南](./pages-for-subheaders/cluster-configuration.md)
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/backup-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/backup-configuration.md
index e4971a9ff48..bdc2b3545c0 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/backup-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/backup-configuration.md
@@ -23,24 +23,25 @@ title: 备份配置
 
 rancher-backup 通过调用 kube-apiserver 来收集资源。apiserver 返回的对象会被解密，所以即使启用了[静态加密](https://kubernetes.io/docs/tasks/administer-cluster/encrypt-data/)，备份收集的加密对象也会是明文。
 
-为避免以明文形式存储资源，你可以使用静态加密使用的同一个 encryptionConfig 文件，对备份中的特定资源进行加密。
+为避免以明文形式存储资源，你可以使用与静态加密相同的 `EncryptionConfiguration` 文件来加密备份中的特定资源。
 
 :::note 重要提示：
 
-`rancher-backup` operator 不会保存 encryptionConfig 文件，因此请自行保存该文件。
-执行还原时需要使用同一个 encryptionFile。
+rancher-backup Operator 不会保存 `EncryptionConfiguration`，因此在备份中加密对象时，你必须自行保存该文件。
+
+例如，[将 Rancher 迁移到新集群](../../how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/migrate-rancher-to-new-cluster.md)时，该文件可用于在新集群​​中重新创建 secret。
 
 :::
 
-Operator 将这个 encryptionConfig 用作 Kubernetes 密文，该密文必须在 operator 的命名空间中。Rancher 将 `rancher-backup` operator 安装到 `cattle-resources-system` 命名空间中。因此，请在该命名空间中创建这个 encryptionConfig 密文。
+Operator 将 `EncryptionConfiguration` 用作 `cattle-resources-system` 命名空间中的 Kubernetes Secret，在 Secret 数据中，它位于名为 `encryption-provider-config.yaml` 的 key 下面。
 
 对于 `EncryptionConfiguration`，你可以使用 [Kubernetes 文档中提供的示例](https://kubernetes.io/docs/tasks/administer-cluster/encrypt-data/#understanding-the-encryption-at-rest-configuration)。
 
-要创建密文，加密配置文件必须命名为 `encryption-provider-config.yaml`，而且必须使用 `--from-file` 标志来创建这个密文。
+为确保在 secret 中使用正确的密钥，加密配置文件必须命名为 `encryption-provider-config.yaml`。下面的命令使用 `--from-file` 标志来创建具有正确密钥名称的 Secret。
 
 将 `EncryptionConfiguration` 保存到名为 `encryption-provider-config.yaml` 的文件中，并运行以下命令：
 
-```
+```bash
 kubectl create secret generic encryptionconfig \
   --from-file=./encryption-provider-config.yaml \
   -n cattle-resources-system
@@ -119,10 +120,22 @@ metadata:
   name: creds
 type: Opaque
 data:
-  accessKey: <Enter your base64-encoded access key>
-  secretKey: <Enter your base64-encoded secret key>
+  accessKey: <base64-encoded access key>
+  secretKey: <base64-encoded secret key>
 ```
 
+:::note
+
+为避免编码问题，你可以使用以下命令创建 `credentialSecret`，更新 `accessKey` 和 `secretKey` 的值。
+
+```bash
+kubectl create secret generic s3-creds \
+  --from-literal=accessKey=<access key> \
+  --from-literal=secretKey=<secret key>
+```
+
+:::
+
 ### EC2 节点访问 S3 的 IAM 权限
 
 有两种方法可以设置 `rancher-backup` operator 来使用 S3 作为备份存储位置。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/storage-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/storage-configuration.md
index 7c39c78286c..e7442d4c61f 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/storage-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/backup-restore-configuration/storage-configuration.md
@@ -29,18 +29,18 @@ title: 备份存储位置配置
 
 如果你通过选择 StorageClass 选项来安装 `rancher-backup` Chart，将会创建一个持久卷说明（Persistent Volume Claim，PVC），而且 Kubernetes 会动态配置一个持久卷（Persistent Volume，PV），所有备份都会默认保存到该持久卷中。
 
-关于创建存储类的信息，请参见[本章节](../../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md)。
+关于创建存储类的信息，请参见[本章节](../../how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/dynamically-provision-new-storage.md)。
 
 :::note 重要提示：
 
 强烈建议使用回收策略为 "Retain" 的 StorageClass。否则，如果 `rancher-backup` Chart 创建的 PVC 在应用升级期间或意外被删除后，PV 也会被删除，也就是说所有保存在其中的备份都会被删除。
-如果没有这样的 StorageClass，则在设置 PV 之后，一定要将它的回收策略设置为 "Retain"，然后再将备份存储在其中。
+如果没有这样的 StorageClass 可用，在配置 PV 后，请确保先将其回收策略设置为 "Retain"，然后再存储备份。
 
 :::
 
 ### 使用现有的持久卷
 
-选择一个用于存储备份的现有持久卷。有关在 Rancher 中创建 PersistentVolumes 的更多信息，请参见[本节](../../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md#2-添加一个引用持久存储的-persistentvolume)。
+选择一个用于存储备份的现有持久卷。有关在 Rancher 中创建 PersistentVolumes 的更多信息，请参见[本节](../../how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/set-up-existing-storage.md#2-添加一个引用持久存储的-persistentvolume)。
 
 :::note 重要提示：
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md
index 49e3d5e7345..2ebbef30cb9 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/logging-best-practices.md
@@ -1,6 +1,7 @@
 ---
 title: Logging 最佳实践
 ---
+
 本指南介绍了集群级别日志和应用日志的最佳实践。
 
 - [集群级别日志](#集群级别日志)
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/monitoring-best-practices.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/monitoring-best-practices.md
index 7aced6c29e0..80c96e475f7 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/monitoring-best-practices.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-managed-clusters/monitoring-best-practices.md
@@ -96,7 +96,7 @@ Prometheus 不是用于长期存储指标的，它只用于短期存储。
 
 除了通过监控工作负载来检测性能、可用性或可扩展性之外，你还应该监控集群和运行在集群中的工作负载，来发现潜在的安全问题。一个好的做法是经常运行 [CIS 扫描](../../../pages-for-subheaders/cis-scan-guides.md)并发出告警，来检查集群是否按照安全最佳实践进行配置。
 
-对于工作负载，你可以看看 Kubernetes 和 Container 安全解决方案，比如 [Falco](https://falco.org/)，[Aqua Kubernetes Security](https://www.aquasec.com/solutions/kubernetes-container-security/)，[SysDig](https://sysdig.com/) 等。
+对于工作负载，你可以查看 Kubernetes 和 Container 安全解决方案，例如 [NeuVector](https://www.suse.com/products/neuvector/)、[Falco](https://falco.org/)、[Aqua Kubernetes Security](https://www.aquasec.com/solutions/kubernetes-container-security/) 和 [SysDig](https://sysdig.com/)。
 
 ## 设置告警
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-server/rancher-deployment-strategy.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-server/rancher-deployment-strategy.md
index a141627265c..945c798cfcd 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-server/rancher-deployment-strategy.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/best-practices/rancher-server/rancher-deployment-strategy.md
@@ -2,7 +2,7 @@
 title: Rancher 部署策略
 ---
 
-本文提供 Rancher Server 的两种部署策略，用于管理下游 Kubernetes 集群。每种策略都有优缺点。请按照你的实际情况选择最适合的部署策略：
+本文提供 Rancher 实例的两种部署策略，用于管理下游 Kubernetes 集群。每种策略都有优缺点。请按照你的实际情况选择最适合的部署策略：
 
 * [中心辐射型策略](#中心辐射型策略)
 * [区域型策略](#区域型策略)
@@ -10,35 +10,30 @@ title: Rancher 部署策略
 ## 中心辐射型策略
 ---
 
-在中心辐射型部署中，一个 Rancher controlplane 就可以管理遍布全球的 Kubernetes 集群。这个 controlplane 运行在高可用 Kubernetes 集群上，并且会受延迟影响。
-
-![](/img/bpg/hub-and-spoke.png)
+在中心辐射型部署中，一个 Rancher 实例就可以管理遍布全球的 Kubernetes 集群。Rancher 实例运行在高可用 Kubernetes 集群上，并且会受延迟影响。
 
 ### 优点
 
-* 环境中可以具有跨区域的节点和网络连接。
 * 可以通过一个 controlplane 界面查看所有区域和环境。
-* Kubernetes 不需要 Rancher 进行操作，并且可以容忍与 Rancher controlplane 断开连接。
+* Kubernetes 不需要 Rancher 进行操作，并且可以容忍与 Rancher 实例断开连接。
 
 ### 缺点
 
 * 受限于网络延迟。
-* 如果 controlplane 出现故障，在恢复之前不可以在全球范围内创建新服务。但是每个 Kubernetes 集群都可以继续单独管理。
+* 如果 Rancher 出现故障，在恢复之前不可以在全球范围内创建新服务。但是每个 Kubernetes 集群都可以继续单独管理。
 
 ## 区域型策略
 ---
-在区域型部署模型中，controlplane 部署在靠近计算节点的位置。
-
-![](/img/bpg/regional.png)
+在区域型部署模型中，Rancher 实例部署在靠近下游 Kubernetes 集群的位置。
 
 ### 优点
 
-* 如果某个区域的 controlplane 出现故障，其他区域内的 Rancher 功能仍然可以保持正常。
-* 网络延迟大大降低，提高 Rancher 的性能。
-* 可以在每个区域内独立升级 Rancher controlplane。
+* 如果某个区域的 Rancher 实例出现故障，其他区域内的 Rancher 功能仍然可以保持正常。
+* Rancher 和下游集群之间的网络延迟大大降低，提高了 Rancher 的性能。
+* 你可以在每个区域内独立升级 Rancher。
 
 ### 缺点
 
 * 管理多个 Rancher 安装的开销较大。
-* 需要在多个界面中查看全球所有的 Kubernetes 集群。
+* 需要在多个界面中查看不同区域的 Kubernetes 集群。
 * 在 Rancher 中部署多集群应用时，需要在每个 Rancher Server 中重复部署步骤。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cli-with-rancher/rancher-cli.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cli-with-rancher/rancher-cli.md
index 622cebe360c..2f25cf8eaab 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cli-with-rancher/rancher-cli.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cli-with-rancher/rancher-cli.md
@@ -32,7 +32,7 @@ $ ./rancher login https://<SERVER_URL> --token <BEARER_TOKEN>
 
 ### 项目选择
 
-在执行命令之前，你必须先选择一个 Rancher 项目来执行这些命令。要选择[项目](../../how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md)，请运行 `./rancher context switch` 命令。输入此命令后，会显示可用项目的列表。输入一个数字以选择项目。
+在执行命令之前，你必须先选择一个 Rancher 项目来执行这些命令。要选择[项目](../../how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces.md)，请运行 `./rancher context switch` 命令。输入此命令后，会显示可用项目的列表。输入一个数字以选择项目。
 
 **示例：`./rancher context switch` 输出**
 ```
@@ -63,13 +63,13 @@ INFO[0005] Saving config to /Users/markbishop/.ranchcli2.json
 | `apps, [app]` | 对商店应用（即单个 [Helm Chart](https://docs.helm.sh/developing_charts/)）或 Rancher Chart 执行操作。 |
 | `catalog` | 对[应用商店](../../pages-for-subheaders/helm-charts-in-rancher.md)执行操作。 |
 | `clusters, [cluster]` | 对[集群](../../pages-for-subheaders/kubernetes-clusters-in-rancher-setup.md)执行操作。 |
-| `context` | 在 Rancher [项目](../../how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md)之间切换。有关示例，请参阅[项目选择](#项目选择)。 |
-| `inspect [OPTIONS] [RESOURCEID RESOURCENAME]` | 显示 [Kubernetes 资源](https://kubernetes.io/docs/reference/kubectl/cheatsheet/#resource-types)或 Rancher 资源（即[项目](../../how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md)和[工作负载](../../pages-for-subheaders/workloads-and-pods.md)）的详细信息。按名称或 ID 指定资源。 |
+| `context` | 在 Rancher [项目](../../how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces.md)之间切换。有关示例，请参阅[项目选择](#项目选择)。 |
+| `inspect [OPTIONS] [RESOURCEID RESOURCENAME]` | 显示 [Kubernetes 资源](https://kubernetes.io/docs/reference/kubectl/cheatsheet/#resource-types)或 Rancher 资源（即[项目](../../how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces.md)和[工作负载](../../pages-for-subheaders/workloads-and-pods.md)）的详细信息。按名称或 ID 指定资源。 |
 | `kubectl` | 运行 [kubectl 命令](https://kubernetes.io/docs/reference/kubectl/overview/#operations)。 |
 | `login, [l]` | 登录 Rancher Server。有关示例，请参阅 [CLI 身份验证](#cli-身份验证)。 |
 | `namespaces, [namespace]` | 执行命名空间操作。 |
 | `nodes, [node]` | 执行节点空间操作。 |
-| `projects, [project]` | 执行[项目](../../how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md)操作。 |
+| `projects, [project]` | 执行[项目](../../how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces.md)操作。 |
 | `ps` | 显示项目中的[工作负载](../../pages-for-subheaders/workloads-and-pods.md)。 |
 | `settings, [setting]` | 显示 Rancher Server 的当前设置。 |
 | `ssh` | 使用 SSH 协议连接到你的某个集群节点。 |
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md
index d99eff8506b..22570540053 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/amazon-ec2.md
@@ -19,9 +19,9 @@ title: EC2 节点模板配置
 
 参阅下面的三个示例 JSON 策略：
 
-- [IAM 策略示例](../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md#iam-策略示例)
-- [带有 PassRole 的 IAM 策略示例](../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md#带有-passrole-的-iam-策略示例)（如果要使用 [Kubernetes 云提供商](../../../../pages-for-subheaders/set-up-cloud-providers.md)，或将 IAM 配置文件传递给实例，则需要）
-- [允许用户加密 EBS 卷的 IAM 策略示例](../../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md#允许加密-ebs-卷的-iam-策略示例)
+- [IAM 策略示例](../../../../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md#iam-策略示例)
+- [带有 PassRole 的 IAM 策略示例](../../../../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md#带有-passrole-的-iam-策略示例)（如果要使用 [Kubernetes 云提供商](../../../../pages-for-subheaders/set-up-cloud-providers.md)，或将 IAM 配置文件传递给实例，则需要）
+- [允许用户加密 EBS 卷的 IAM 策略示例](../../../../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/use-new-nodes-in-an-infra-provider/create-an-amazon-ec2-cluster.md#允许加密-ebs-卷的-iam-策略示例)
 
 ### 验证和配置节点
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md
index 7b995054096..daed786827c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/downstream-cluster-configuration/node-template-configuration/azure.md
@@ -10,6 +10,12 @@ title: Azure 节点模板配置
 - **Network** 配置集群中使用的网络。
 - **Instance** 自定义你的 VM 配置。
 
+:::note
+
+如果在与 VM 不同的资源组中使用 VNet，则 VNet 名称需要以资源组名称作为前缀。例如，`<resource group>:<vnet>`。
+
+:::
+
 [Docker daemon](https://docs.docker.com/engine/docker-overview/#the-docker-daemon) 配置选项包括：
 
 - **标签**：有关标签的信息，请参阅 [Docker 对象标签文档](https://docs.docker.com/config/labels-custom-metadata/)。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md
index 584a4b3473f..e49f3ba2b3a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/rke1-cluster-configuration.md
@@ -100,7 +100,7 @@ Rancher 与以下开箱即用的网络提供商兼容：
 
 集群级别的私有镜像仓库配置仅能用于配置集群。
 
-在 Rancher 中设置私有镜像仓库的主要方法有两种：通过[全局默认镜像仓库](../../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md)中的**设置**选项卡设置全局默认镜像仓库，以及在集群级别设置的高级选项中设置私有镜像仓库。全局默认镜像仓库可以用于离线设置，不需要凭证的镜像仓库。而集群级私有镜像仓库用于所有需要凭证的私有镜像仓库。
+在 Rancher 中设置私有镜像仓库的主要方法有两种：通过[全局默认镜像仓库](../../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/global-default-private-registry.md)中的**设置**选项卡设置全局默认镜像仓库，以及在集群级别设置的高级选项中设置私有镜像仓库。全局默认镜像仓库可以用于离线设置，不需要凭证的镜像仓库。而集群级私有镜像仓库用于所有需要凭证的私有镜像仓库。
 
 如果你的私有镜像仓库需要凭证，为了将凭证传递给 Rancher，你需要编辑每个需要从仓库中拉取镜像的集群的集群选项。
 
@@ -145,7 +145,7 @@ Rancher v2.6 引入了[为 RKE 集群配置 ECR 镜像仓库](https://rancher.co
 
 ### Pod 安全策略支持
 
-为集群启用 [pod 安全策略](../../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md)。启用此选项后，使用**默认 Pod 安全策略**下拉菜单选择一个策略。
+为集群启用 [pod 安全策略](../../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md)。启用此选项后，使用**默认 Pod 安全策略**下拉菜单选择一个策略。
 
 你必须有已配置的 Pod 安全策略才能使用此选项。
 
@@ -175,7 +175,7 @@ Rancher v2.6 引入了[为 RKE 集群配置 ECR 镜像仓库](https://rancher.co
 
 ### Agent 环境变量
 
-为 [rancher agent](../../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/launch-kubernetes-with-rancher/about-rancher-agents.md) 设置环境变量的选项。你可以使用键值对设置环境变量。如果 Rancher Agent 需要使用代理与 Rancher Server 通信，则可以使用 Agent 环境变量设置 `HTTP_PROXY`，`HTTPS_PROXY` 和 `NO_PROXY` 环境变量。
+为 [rancher agent](../../../how-to-guides/new-user-guides/launch-kubernetes-with-rancher/about-rancher-agents.md) 设置环境变量的选项。你可以使用键值对设置环境变量。如果 Rancher Agent 需要使用代理与 Rancher Server 通信，则可以使用 Agent 环境变量设置 `HTTP_PROXY`，`HTTPS_PROXY` 和 `NO_PROXY` 环境变量。
 
 ### 更新 ingress-nginx
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md
index 68c9079fb7a..d371b1432de 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/cluster-configuration/rancher-server-configuration/rke2-cluster-configuration.md
@@ -126,7 +126,7 @@ Rancher 与以下开箱即用的网络提供商兼容：
 
 #### 默认 Pod 安全策略
 
-为集群选择默认的 [pod 安全策略](../../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md)。请参阅 [RKE2 文档](https://docs.rke2.io/security/policies/)来了解每个可用策略的规范。
+为集群选择默认的 [pod 安全策略](../../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md)。请参阅 [RKE2 文档](https://docs.rke2.io/security/policies/)来了解每个可用策略的规范。
 
 #### Worker CIS 配置文件
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/helm-chart-options.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/helm-chart-options.md
index 146742546ef..2253eaa7df0 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/helm-chart-options.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/helm-chart-options.md
@@ -41,7 +41,7 @@ title: Helm Chart 选项
 
 [scrape_config](https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config) 指定一组目标以及抓取这些目标的参数。在一般情况下，一个抓取配置指定一个 job。
 
-Istio 就是一个可能用到这个配置的例子。有关详细信息，请参阅[本节](../../explanations/integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md)。
+Istio 就是一个可能用到这个配置的例子。有关详细信息，请参阅[本节](../../integrations-in-rancher/istio/configuration-options/selectors-and-scrape-configurations.md)。
 
 
 ## 配置打包在 Monitoring V2 中的应用
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/receivers.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/receivers.md
index aab015481bb..8ad9b052b54 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/receivers.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/receivers.md
@@ -9,7 +9,7 @@ import TabItem from '@theme/TabItem';
 
 :::note
 
-本节参考假设你已经熟悉 Monitoring 组件的协同工作方式。有关 Alertmanager 的详细信息，请参阅[本节](../../explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md#3-alertmanager-工作原理)。
+本节参考假设你已经熟悉 Monitoring 组件的协同工作方式。有关 Alertmanager 的详细信息，请参阅[本节](../../integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md#3-alertmanager-工作原理)。
 
 :::
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/routes.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/routes.md
index 7c41e0e15f0..6a6623c6856 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/routes.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/routes.md
@@ -13,7 +13,7 @@ import TabItem from '@theme/TabItem';
 
 :::note
 
-本节参考假设你已经熟悉 Monitoring 组件的协同工作方式。有关详细信息，请参阅[本节](../../explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)。
+本节参考假设你已经熟悉 Monitoring 组件的协同工作方式。有关详细信息，请参阅[本节](../../integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)。
 
 :::
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md
index a0262b9b636..e514d60a928 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/monitoring-v2-configuration/servicemonitors-and-podmonitors.md
@@ -10,7 +10,7 @@ ServiceMonitor 比 PodMonitor 更常用，推荐用于大多数用例。
 
 :::note
 
-本节参考假设你已经熟悉 Monitoring 组件的协同工作方式。有关 Alertmanager 的详细信息，请参阅[本节](../../explanations/integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)。
+本节参考假设你已经熟悉 Monitoring 组件的协同工作方式。有关 Alertmanager 的详细信息，请参阅[本节](../../integrations-in-rancher/monitoring-and-alerting/how-monitoring-works.md)。
 
 :::
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/configure-persistent-data.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/configure-persistent-data.md
index 2fed75b6df0..d8ea5061606 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/configure-persistent-data.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/pipelines/configure-persistent-data.md
@@ -7,7 +7,7 @@ import TabItem from '@theme/TabItem';
 
 默认情况下，流水线内部的 Docker 镜像仓库和 Minio 工作负载都使用临时卷。这是开箱即用的默认存储方式，能让测试变得更加便利。但如果运行 Docker 镜像仓库或 Minio 的节点出现故障，你将丢失构建镜像和构建日志。在大多数情况下，这不是太大的问题。如果你希望构建镜像和日志能够在节点故障中幸免于难，你可以让 Docker 镜像仓库和 Minio 使用持久卷。
 
-本节假设你了解持久存储在 Kubernetes 中的工作原理。如需更多信息，请参阅[存储的工作原理](../../how-to-guides/advanced-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md)。
+本节假设你了解持久存储在 Kubernetes 中的工作原理。如需更多信息，请参阅[存储的工作原理](../../how-to-guides/new-user-guides/manage-clusters/create-kubernetes-persistent-storage/manage-persistent-storage/about-persistent-storage.md)。
 
 :::note 先决条件（适用于 A 和 B）：
 
@@ -40,7 +40,7 @@ import TabItem from '@theme/TabItem';
    1. 单击**定义**。
 
    </TabItem>
-    <TabItem value="使用已有的持久卷">
+   <TabItem value="使用已有的持久卷">
 
    1. 输入卷声明的**名称**。
    1. 从下拉列表中选择**持久卷声明**。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-cluster-tools.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-cluster-tools.md
index a77cadb2276..7f1ed5206c7 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-cluster-tools.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-cluster-tools.md
@@ -39,7 +39,7 @@ Rancher v2.5 改进了与 Istio 的集成。
 如需更多信息，请参阅 [Istio 文档](../pages-for-subheaders/istio.md)。
 ## OPA Gatekeeper
 
-[OPA Gatekeeper](https://github.com/open-policy-agent/gatekeeper) 是一个开源项目，它对 OPA 和 Kubernetes 进行了集成，以通过许可控制器 Webhook 提供策略控制。有关如何在 Rancher 中启用 Gatekeeper 的详细信息，请参阅 [OPA Gatekeeper](../explanations/integrations-in-rancher/opa-gatekeeper.md)。
+[OPA Gatekeeper](https://github.com/open-policy-agent/gatekeeper) 是一个开源项目，它对 OPA 和 Kubernetes 进行了集成，以通过许可控制器 Webhook 提供策略控制。有关如何在 Rancher 中启用 Gatekeeper 的详细信息，请参阅 [OPA Gatekeeper](../integrations-in-rancher/opa-gatekeeper.md)。
 
 ## CIS 扫描
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-manager-architecture/architecture-recommendations.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-manager-architecture/architecture-recommendations.md
index ab24429cd71..a7a69a0e642 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-manager-architecture/architecture-recommendations.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-manager-architecture/architecture-recommendations.md
@@ -101,6 +101,6 @@ RKE 每个角色至少需要一个节点，但并不强制每个节点只能有
 
 如果你使用[授权集群端点（ACE）](../../pages-for-subheaders/rancher-manager-architecture.md#4-授权集群端点)，我们建议你创建一个指向负载均衡器的 FQDN，这个负载均衡器把流量转到所有角色为 `controlplane` 的节点。
 
-如果你在负载均衡器上使用了私有 CA 签发的证书，你需要提供 CA 证书，这个证书会包含在生成的 kubeconfig 文件中，以校验证书链。详情请参见 [kubeconfig 文件](../../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md)和 [API 密钥](../user-settings/api-keys.md#创建-api-密钥)的相关文档。
+如果你在负载均衡器上使用了私有 CA 签发的证书，你需要提供 CA 证书，这个证书会包含在生成的 kubeconfig 文件中，以校验证书链。详情请参见 [kubeconfig 文件](../../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md)和 [API 密钥](../user-settings/api-keys.md#创建-api-密钥)的相关文档。
 
 在 Rancher 2.6.3 中，注册的 RKE2 和 K3s 集群可以使用 ACE 支持。点击[这里](../../how-to-guides/new-user-guides/kubernetes-clusters-in-rancher-setup/register-existing-clusters.md#对-rke2-和-k3s-集群的授权集群端点支持)了解在下游集群中开启 ACE 的步骤。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-manager-architecture/communicating-with-downstream-user-clusters.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-manager-architecture/communicating-with-downstream-user-clusters.md
index e83d49737ea..76f4a68dfaf 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-manager-architecture/communicating-with-downstream-user-clusters.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-manager-architecture/communicating-with-downstream-user-clusters.md
@@ -26,7 +26,7 @@ Pod。Bob 通过 Rancher 的认证代理进行身份验证。
 
 Rancher 使用 [ServiceAccount](https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/) 与 Kubernetes 集群通信，该 ServiceAccount 为在 Pod 中运行的进程提供身份。
 
-默认情况下，Rancher 生成一个 [kubeconfig 文件](../../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md)，文件包含凭证信息，用于为 Rancher Server 连接下游集群的 Kubernetes API Server 的代理。kubeconfig 文件 (`kube_config_rancher-cluster.yml`) 包含对集群的完全访问权限。
+默认情况下，Rancher 生成一个 [kubeconfig 文件](../../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md)，文件包含凭证信息，用于为 Rancher Server 连接下游集群的 Kubernetes API Server 的代理。kubeconfig 文件 (`kube_config_rancher-cluster.yml`) 包含对集群的完全访问权限。
 
 ### 2. Cluster Controller 和 Cluster Agent
 
@@ -73,7 +73,7 @@ Cluster Agent，也叫做 `cattle-cluster-agent`，是运行在下游集群中
 
 为下游集群启用授权集群端点后，Rancher 会在 kubeconfig 文件中额外生成一段 Kubernetes 上下文，用于直连到集群。该文件具有 `kubectl` 和 `helm`的凭证。
 
-如果 Rancher 出现问题，你需要使用此 kubeconfig 文件中定义的上下文来访问集群。因此，我们建议你导出 kubeconfig 文件，以便在 Rancher 出现问题时，仍能使用文件中的凭证访问集群。详情请参见使用 [kubectl 和 kubeconfig 文件](../../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md)访问集群的章节。
+如果 Rancher 出现问题，你需要使用此 kubeconfig 文件中定义的上下文来访问集群。因此，我们建议你导出 kubeconfig 文件，以便在 Rancher 出现问题时，仍能使用文件中的凭证访问集群。详情请参见使用 [kubectl 和 kubeconfig 文件](../../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md)访问集群的章节。
 
 # 重要文件
 
@@ -85,7 +85,7 @@ Cluster Agent，也叫做 `cattle-cluster-agent`，是运行在下游集群中
 
 > **注意**：后两个文件名中的 `rancher-cluster` 部分取决于你命名 RKE 集群配置文件的方式。
 
-有关在没有 Rancher 认证代理和其他配置选项的情况下连接到集群的更多信息，请参见 [kubeconfig 文件](../../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md)。
+有关在没有 Rancher 认证代理和其他配置选项的情况下连接到集群的更多信息，请参见 [kubeconfig 文件](../../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md)。
 
 # 配置 Kubernetes 集群的工具
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-hardening-guide-with-cis-v1.6-benchmark.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-hardening-guide-with-cis-v1.6-benchmark.md
index 36b80c7e030..8dd4c881420 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-hardening-guide-with-cis-v1.6-benchmark.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rancher-security/rancher-v2.6-hardening-guides/rke1-hardening-guide-with-cis-v1.6-benchmark.md
@@ -28,7 +28,7 @@ title: 使用 CIS 1.6 Benchmark 的 RKE 强化指南
 #### 已知问题
 
 - 如果注册自定义节点时仅提供公共 IP，CIS 1.6 强化设置中用于 Pod 的 Rancher **exec shell** 和 **view logs** 将**不起作用**。此功能要求在注册自定义节点时提供私有 IP。
-- 如果把 `default_pod_security_policy_template_id:` 设置为 `restricted` 或 `restricted-noroot`，根据 Rancher 提供的 [Pod 安全策略 (PSP)](../../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md)，Rancher 会在默认 ServiceAccount 上创建 **RoleBindings** 和 **ClusterRoleBindings**。CIS 1.6 检查 5.1.5 时会要求默认 ServiceAccount 除了默认值之外没有绑定到其他角色或集群角色。此外，你还需要配置默认 ServiceAccount，使其不提供 ServiceAccount 令牌并且没有显式分配任何权限。
+- 如果把 `default_pod_security_policy_template_id:` 设置为 `restricted` 或 `restricted-noroot`，根据 Rancher 提供的 [Pod 安全策略 (PSP)](../../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/create-pod-security-policies.md)，Rancher 会在默认 ServiceAccount 上创建 **RoleBindings** 和 **ClusterRoleBindings**。CIS 1.6 检查 5.1.5 时会要求默认 ServiceAccount 除了默认值之外没有绑定到其他角色或集群角色。此外，你还需要配置默认 ServiceAccount，使其不提供 ServiceAccount 令牌并且没有显式分配任何权限。
 
 ### 配置内核运行时参数
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rke1-template-example-yaml.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rke1-template-example-yaml.md
index b59e4ea724e..5efdc493a95 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rke1-template-example-yaml.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/rke1-template-example-yaml.md
@@ -38,7 +38,7 @@ rancher_kubernetes_engine_config: # Your RKE template config goes here.
     strategy: x509
   ignore_docker_version: true
 #
-# # 目前仅支持 Nginx Ingress 提供商。
+# # 目前仅支持 Nginx ingress provider
 # # 要禁用 Ingress controller，设置 `provider: none`
 # # 要在指定节点上禁用 Ingress，使用 node_selector，例如：
 #    provider: nginx
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/single-node-rancher-in-docker/advanced-options.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/single-node-rancher-in-docker/advanced-options.md
index 0635141b340..b3dfd46707c 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/single-node-rancher-in-docker/advanced-options.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/single-node-rancher-in-docker/advanced-options.md
@@ -33,7 +33,7 @@ API 审计日志记录了通过 Rancher Server 进行的所有用户和系统事
 
 默认情况下，API 审计日志会写入到 Rancher 容器内的 `/var/log/auditlog`。你可将此目录共享为卷，并设置 `AUDIT_LEVEL` 以启用日志。
 
-有关更多信息和选项，请参见 [API 审计日志](../../getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md)。
+有关更多信息和选项，请参见 [API 审计日志](../../how-to-guides/advanced-user-guides/enable-api-audit-log.md)。
 
 特权访问是[必须](../../pages-for-subheaders/rancher-on-a-single-node-with-docker.md#rancher-特权访问)的。
 
@@ -60,7 +60,7 @@ docker run -d --restart=unless-stopped \
 
 特权访问是[必须](../../pages-for-subheaders/rancher-on-a-single-node-with-docker.md#rancher-特权访问)的。
 
-参见 [TLS 设置](../installation-references/tls-settings.md)了解更多信息和选项。
+参见 [TLS 设置](../../getting-started/installation-and-upgrade/installation-references/tls-settings.md)了解更多信息和选项。
 
 ### 离线环境
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/system-tools.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/system-tools.md
index 93cbf931bc3..a56f8684bd8 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/system-tools.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/system-tools.md
@@ -7,6 +7,7 @@ title: 系统工具
 系统工具（System Tools）自 2022 年 6 月起已弃用。
 
 :::
+
 # 日志
 
 请使用 [logs-collector](https://github.com/rancherlabs/support-tools/tree/master/collection/rancher/v2.x/logs-collector) 来收集你的集群日志。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/manage-cloud-credentials.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/manage-cloud-credentials.md
index d569ae2b861..b4f7f71c543 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/manage-cloud-credentials.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/manage-cloud-credentials.md
@@ -20,7 +20,7 @@ title: 管理云凭证
 1. 点击 **☰ > 集群管理**。
 1. 单击**云凭证**。
 1. 单击**创建**。
-1. 单击云凭证类型。下拉列表中的选项取决于 Rancher 中的 `active` [主机驱动](../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md)。
+1. 单击云凭证类型。下拉列表中的选项取决于 Rancher 中的 `active` [主机驱动](../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md)。
 1. 输入云凭证的名称。
 1. 根据所选的云凭证类型输入所需的值，从而向基础设施提供商进行身份验证。
 1. 单击**创建**。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/manage-node-templates.md b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/manage-node-templates.md
index 269e1b87016..c52d4f6fd00 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/manage-node-templates.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/reference-guides/user-settings/manage-node-templates.md
@@ -26,7 +26,7 @@ title: 管理节点模板
 
    :::note
 
-   默认的 `active` [主机驱动](../../how-to-guides/advanced-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md)和任何标记了 `password` 字段的主机驱动都需要使用[云凭证](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#云凭证)。
+   默认的 `active` [主机驱动](../../how-to-guides/new-user-guides/authentication-permissions-and-global-configuration/about-provisioning-drivers/manage-node-drivers.md)和任何标记了 `password` 字段的主机驱动都需要使用[云凭证](../../pages-for-subheaders/use-new-nodes-in-an-infra-provider.md#云凭证)。
 
    :::
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/shared-files/_cluster-capabilities-table.md b/i18n/zh/docusaurus-plugin-content-docs/current/shared-files/_cluster-capabilities-table.md
index 6688033b21d..1dac148eb45 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/shared-files/_cluster-capabilities-table.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/shared-files/_cluster-capabilities-table.md
@@ -1,19 +1,19 @@
 | 操作 | Rancher 启动的 Kubernetes 集群 | EKS、GKE 和 AKS 集群<sup>1</sup> | 其他托管的 Kubernetes 集群 | 非 EKS 或 GKE 注册集群 |
 | --- | --- | ---| ---|----|
-| [使用 kubectl 和 kubeconfig 文件来访问集群](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md) | ✓ | ✓ | ✓ | ✓ |
-| [管理集群成员](../how-to-guides/advanced-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md) | ✓ | ✓ | ✓ | ✓ |
+| [使用 kubectl 和 kubeconfig 文件来访问集群](../how-to-guides/new-user-guides/manage-clusters/access-clusters/use-kubectl-and-kubeconfig.md) | ✓ | ✓ | ✓ | ✓ |
+| [管理集群成员](../how-to-guides/new-user-guides/manage-clusters/access-clusters/add-users-to-clusters.md) | ✓ | ✓ | ✓ | ✓ |
 | [编辑和升级集群](../pages-for-subheaders/cluster-configuration.md) | ✓ | ✓ | ✓ | ✓<sup>2</sup> |
-| [管理节点](../how-to-guides/advanced-user-guides/manage-clusters/nodes-and-node-pools.md) | ✓ | ✓ | ✓ | ✓<sup>3</sup> |
+| [管理节点](../how-to-guides/new-user-guides/manage-clusters/nodes-and-node-pools.md) | ✓ | ✓ | ✓ | ✓<sup>3</sup> |
 | [管理持久卷和存储类](../pages-for-subheaders/create-kubernetes-persistent-storage.md) | ✓ | ✓ | ✓ | ✓ |
-| [管理项目、命名空间和工作负载](../how-to-guides/advanced-user-guides/manage-clusters/projects-and-namespaces.md) | ✓ | ✓ | ✓ | ✓ |
+| [管理项目、命名空间和工作负载](../how-to-guides/new-user-guides/manage-clusters/projects-and-namespaces.md) | ✓ | ✓ | ✓ | ✓ |
 | [使用应用目录](../pages-for-subheaders/helm-charts-in-rancher.md) | ✓ | ✓ | ✓ | ✓ |
 | 配置工具（[Alerts、Notifiers、Monitoring](../pages-for-subheaders/monitoring-and-alerting.md)、[Logging](../pages-for-subheaders/logging.md) 和 [Istio](../pages-for-subheaders/istio.md)） | ✓ | ✓ | ✓ | ✓ |
 | [运行安全扫描](../pages-for-subheaders/cis-scan-guides.md) | ✓ | ✓ | ✓ | ✓ |
-| [使用现有配置来创建其他集群](../how-to-guides/advanced-user-guides/manage-clusters/clone-cluster-configuration.md) | ✓ | ✓ | ✓ | |
-| [轮换证书](../how-to-guides/advanced-user-guides/manage-clusters/rotate-certificates.md) | ✓ | ✓ |  | |
+| [使用现有配置来创建其他集群](../how-to-guides/new-user-guides/manage-clusters/clone-cluster-configuration.md) | ✓ | ✓ | ✓ | |
+| [轮换证书](../how-to-guides/new-user-guides/manage-clusters/rotate-certificates.md) | ✓ | ✓ |  | |
 | [备份](../how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/back-up-rancher-launched-kubernetes-clusters.md)和[恢复](../how-to-guides/new-user-guides/backup-restore-and-disaster-recovery/restore-rancher-launched-kubernetes-clusters-from-backup.md) Rancher 启动的集群 | ✓ | ✓ |  | ✓<sup>4</sup> |
-| [在 Rancher 无法访问集群时清理 Kubernetes 组件](../how-to-guides/advanced-user-guides/manage-clusters/clean-cluster-nodes.md) | ✓ | | | |
-| [配置 Pod 安全策略](../how-to-guides/advanced-user-guides/manage-clusters/add-a-pod-security-policy.md) | ✓ | ✓ |   |
+| [在 Rancher 无法访问集群时清理 Kubernetes 组件](../how-to-guides/new-user-guides/manage-clusters/clean-cluster-nodes.md) | ✓ | | | |
+| [配置 Pod 安全策略](../how-to-guides/new-user-guides/manage-clusters/add-a-pod-security-policy.md) | ✓ | ✓ |   |
 
 1. 注册的 GKE 和 EKS 集群与从 Rancher UI 创建的 GKE 和 EKS 集群的可用选项一致。不同之处是，从 Rancher UI 中删除已注册的集群后，集群不会被销毁。
 
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting.md b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting.md
deleted file mode 100644
index e94dc715b60..00000000000
--- a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting.md
+++ /dev/null
@@ -1,44 +0,0 @@
----
-title: 故障排除
----
-
-本文用于帮助你解决使用 Rancher 时遇到的问题。
-
-- [Kubernetes 组件](pages-for-subheaders/kubernetes-components.md)
-
-   对以下核心 Kubernetes 集群组件进行故障排除：
-   * `etcd`
-   * `kube-apiserver`
-   * `kube-controller-manager`
-   * `kube-scheduler`
-   * `kubelet`
-   * `kube-proxy`
-   * `nginx-proxy`
-
-- [Kubernetes resources](troubleshooting/other-troubleshooting-tips/kubernetes-resources.md)
-
-   本节介绍了对节点、Ingress Controller 和 Rancher Agent 等 Kubernetes 资源进行故障排除的选项。
-
-- [网络](troubleshooting/other-troubleshooting-tips/networking.md)
-
-   介绍了解决网络问题的步骤。
-
-- [DNS](troubleshooting/other-troubleshooting-tips/dns.md)
-
-   解决集群的名称解析问题。
-
-- [对安装在 Kubernetes 上的 Rancher 进行故障排除](troubleshooting/other-troubleshooting-tips/rancher-ha.md)
-
-   解决[安装在 Kubernetes 上的 Rancher Server](pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md) 的问题。
-
-- [Logging](troubleshooting/other-troubleshooting-tips/logging.md)
-
-   了解可以配置哪些日志级别，以及如何配置日志级别。
-
-- [审计日志中的用户 ID 跟踪](troubleshooting/other-troubleshooting-tips/user-id-tracking-in-audit-logs.md)
-
-   了解 Rancher 管理员如何通过外部身份提供程序用户名从 Rancher 审计日志和 Kubernetes 审计日志中跟踪事件。
-
-- [过期的 Webhook 证书](troubleshooting/other-troubleshooting-tips/expired-webhook-certificate-rotation.md)
-
-   了解如何在每年到期后轮换 Rancher webhook 证书密钥。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/general-troubleshooting.md b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/general-troubleshooting.md
new file mode 100644
index 00000000000..01d4356c9ca
--- /dev/null
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/general-troubleshooting.md
@@ -0,0 +1,44 @@
+---
+title: 一般故障排除
+---
+
+本文用于帮助你解决使用 Rancher 时遇到的问题。
+
+- [Kubernetes 组件](../pages-for-subheaders/kubernetes-components.md)
+
+   对以下核心 Kubernetes 集群组件进行故障排除：
+   * `etcd`
+   * `kube-apiserver`
+   * `kube-controller-manager`
+   * `kube-scheduler`
+   * `kubelet`
+   * `kube-proxy`
+   * `nginx-proxy`
+
+- [Kubernetes resources](other-troubleshooting-tips/kubernetes-resources.md)
+
+   本节介绍了对节点、Ingress Controller 和 Rancher Agent 等 Kubernetes 资源进行故障排除的选项。
+
+- [网络](other-troubleshooting-tips/networking.md)
+
+   介绍了解决网络问题的步骤。
+
+- [DNS](other-troubleshooting-tips/dns.md)
+
+   解决集群的名称解析问题。
+
+- [对安装在 Kubernetes 上的 Rancher 进行故障排除](other-troubleshooting-tips/rancher-ha.md)
+
+   解决[安装在 Kubernetes 上的 Rancher Server](../pages-for-subheaders/install-upgrade-on-a-kubernetes-cluster.md) 的问题。
+
+- [Logging](other-troubleshooting-tips/logging.md)
+
+   了解可以配置哪些日志级别，以及如何配置日志级别。
+
+- [审计日志中的用户 ID 跟踪](other-troubleshooting-tips/user-id-tracking-in-audit-logs.md)
+
+   了解 Rancher 管理员如何通过外部身份提供程序用户名从 Rancher 审计日志和 Kubernetes 审计日志中跟踪事件。
+
+- [过期的 Webhook 证书](other-troubleshooting-tips/expired-webhook-certificate-rotation.md)
+
+   了解如何在每年到期后轮换 Rancher webhook 证书密钥。
diff --git a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/user-id-tracking-in-audit-logs.md b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/user-id-tracking-in-audit-logs.md
index a63c4c406c4..f9d0f8c567a 100644
--- a/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/user-id-tracking-in-audit-logs.md
+++ b/i18n/zh/docusaurus-plugin-content-docs/current/troubleshooting/other-troubleshooting-tips/user-id-tracking-in-audit-logs.md
@@ -5,7 +5,7 @@ title: 审计日志中的用户 ID 跟踪
 Rancher 使用以下审计日志来跟踪本地和下游集群中发生的事件：
 
 * [Kubernetes 审计日志](https://rancher.com/docs/rke/latest/en/config-options/audit-log/)
-* [Rancher API 审核日志](../../getting-started/installation-and-upgrade/advanced-options/advanced-use-cases/enable-api-audit-log.md)
+* [Rancher API 审核日志](../../how-to-guides/advanced-user-guides/enable-api-audit-log)
 
 Rancher 2.6 增强了审计日志，在 Rancher 和下游 Kubernetes 审计日志中都包含了外部身份提供程序名称（即外部身份提供程序中用户的通用名称）。