Merge pull request #3341 from rancher/master

Merge master to staging

content/rancher/v2.5/en/monitoring-alerting/migrating/_index.md

@@ -46,6 +46,15 @@ Before you can install Monitoring V2, Monitoring V1 needs to be uninstalled comp
 * Disable the cluster monitoring installation under Cluster -> Tools -> Monitoring
 * Ensure that the cluster-monitoring app and the monitoring-operator app in the System project have been removed and are not recreated after a few minutes
 
+#### RKE Template Clusters
+
+To prevent v1 monitoring from being re-enabled, disable monitoring and in future RKE template revisions via modification of the RKE template yaml:
+
+```yaml
+enable_cluster_alerting: false
+enable_cluster_monitoring: false
+```
+
 #### Migrating Grafana Dashboards
 
 You can migrate any dashboard added to Grafana in Monitoring V1 to Monitoring V2. In Monitoring V1 you can export an existing dashboard like this:

content/rancher/v2.5/en/user-settings/preferences/_index.md

@@ -5,6 +5,10 @@ weight: 7012
 
 Each user can choose preferences to personalize their Rancher experience. To change preference settings, open the **User Settings** menu and then select **Preferences**.
 
+The preferences available will differ depending on whether the **User Settings** menu was accessed while on the Cluster Manager UI or the Cluster Explorer UI.
+
+{{% tabs %}}
+{{% tab "Cluster Manager" %}}
 ## Theme
 
 Choose your background color for the Rancher UI. If you choose **Auto**, the background color changes from light to dark at 6 PM, and then changes back at 6 AM.
@@ -16,3 +20,44 @@ This section displays the **Name** (your display name) and **Username** (your lo
 ## Table Row per Page
 
 On pages that display system objects like clusters or deployments in a table, you can set the number of objects that display on the page before you must paginate. The default setting is `50`.
+
+{{% /tab %}}
+{{% tab "Cluster Explorer" %}}
+## Theme
+
+Choose your background color for the Rancher UI. If you choose **Auto**, the background color changes from light to dark at 6 PM, and then changes back at 6 AM.
+
+## Login Landing Page
+
+Choose the default page to display after logging in.
+
+## Date Format
+
+Choose your preferred format to display dates. By default, dates are displayed in the form `Wed, Jun 9 2021`.
+
+## Time Format
+
+Choose your preferred format to display time. By default, the 12-hour format is used.
+
+## Table Row per Page
+
+On pages that display system objects like clusters or deployments in a table, you can set the number of objects that display on the page before you must paginate. The default setting is `50`.
+
+## YAML Editor Key Mapping
+
+Choose the editor used when editing YAML configurations. When Emacs or Vim is chosen, the editor's shortcut commands can also be used.
+
+## Enable Developer Tools & Features
+
+Enables developer tools and features to be used.
+
+## Hide All Type Description Boxes
+
+Hides all description boxes.
+
+## Helm Charts
+
+When deploying applications from the "Apps & Marketplace", choose whether to show only released versions of the Helm chart or to include prerelease versions as well.
+
+{{% /tab %}}
+{{% /tabs %}}

content/rke/latest/en/config-options/private-registries/_index.md

@@ -15,7 +15,18 @@ private_registries:
       password: mypassword
 ```
 
-> **Note:** If you are using a Docker Hub registry, you can omit the `url` or set it to `docker.io`.
+If you are using a Docker Hub registry, you can omit the `url` or set it to `docker.io`.
+
+> **Note:** Although the directive is named `url`, there is no need to prefix the host or IP address with `https://`.
+
+Valid `url` examples include:
+
+```yaml
+url: registry.com
+url: registry.com:5555
+url: 1.1.1.1
+url: 1.1.1.1:5555/artifactory
+```
 
 ### Default Registry