moving CLI, faqs, and user settings around

content/rancher/v2.x/en/cli/_index.md

@@ -1,6 +1,8 @@
 ---
 title: Rancher CLI
-weight: 1
+weight: 6000
+aliases:
+  - /rancher/v2.x/en/concepts/cli-configuration/
 ---
 
 Rancher CLI (Command Line Interface) is a unified tool that you can use to interact with Rancher. With this tool, you can operate Rancher using a command line rather than the GUI.
@@ -14,7 +16,7 @@ The binary can be downloaded directly from the UI. The link can be found in the
 After you download the Rancher CLI, you need to make a few configurations. Rancher CLI requires:
 
 - Your [Rancher Server URL]({{< baseurl >}}/rancher/v2.x/en/tasks/global-configuration/server-url), which is used to connect to Rancher Server.
-- An API Bearer Token, which is used to authenticate with Rancher. For more information about obtaining a Bearer Token, see [Creating an API Key]({{< baseurl >}}/rancher/v2.x/en/tasks/user-settings/api-keys/).
+- An API Bearer Token, which is used to authenticate with Rancher. For more information about obtaining a Bearer Token, see [Creating an API Key]({{< baseurl >}}/rancher/v2.x/en/user-settings/api-keys/).
 
 ### CLI Authentication
 

content/rancher/v2.x/en/concepts/api-keys/_index.md

@@ -1,14 +0,0 @@
----
-title: API Keys
-weight: 2400
----
-
-Some users may want to access their Rancher clusters and projects through the Rancher API. Before you can access Rancher through the API, you must generate API keys so that you can authenticate with Rancher externally.
-
-Before you can use the Rancher CLI or write a program that calls the Rancher API, you must obtain API keys using the Rancher UI.
-
-### API Keys and User Authentication
-
-After logging into Rancher, you can generate API keys for accessing Rancher externally using your user settings. If you need to revoke access to the Rancher API, you can delete the API key.
-
-For instructions on how to create an API key, see [Creating an API Key]({{< baseurl >}}/rancher/v2.x/en/tasks/user-settings/api-keys/).

content/rancher/v2.x/en/contributing/_index.md

@@ -1,6 +1,8 @@
 ---
-  title: Contributing to Rancher
+title: Contributing to Rancher
-  weight: 5001
+weight: 9000
+aliases:
+  - /rancher/v2.x/en/faq/contributing/
 ---
 
 ### Repositories

content/rancher/v2.x/en/faq/_index.md

@@ -1,6 +1,6 @@
 ---
 title: FAQ
-weight: 5000
+weight: 8000
 aliases:
   - /rancher/v2.x/en/about/
 ---

content/rancher/v2.x/en/faq/technical/_index.md

@@ -1,6 +1,6 @@
 ---
   title: Technical
-  weight: 5000
+  weight: 8005
 ---
 
 ### How can I reset the admin password?

content/rancher/v2.x/en/user-settings/_index.md

@@ -1,13 +1,15 @@
 ---
 title: User Settings
-weight: 3725
+weight: 7000
+aliases:
+  - /rancher/v2.x/en/tasks/user-settings/
 ---
 
 Within Rancher, each user has a number of settings associated with their login: personal preferences, API keys, etc. You can configure these settings by choosing from the **User Settings** menu. You can open this menu by clicking your avatar, located within the main menu.
 
 The available user settings are:
 
-- [API & Keys]({{< baseurl >}}/rancher/v2.x/en/tasks/user-settings/api-keys/)
+- [API & Keys]({{< baseurl >}}/rancher/v2.x/en/user-settings/api-keys/)
 
 <!-- - Node Templates
 

content/rancher/v2.x/en/user-settings/api-keys/_index.md

@@ -1,8 +1,20 @@
 ---
 title: Creating an API Key
-weight: 3726
+weight: 7005
+aliases:
+  - /rancher/v2.x/en/concepts/api-keys/
+  - /rancher/v2.x/en/tasks/user-settings/api-keys/
 ---
 
+Some users may want to access their Rancher clusters and projects through the Rancher API. Before you can access Rancher through the API, you must generate API keys so that you can authenticate with Rancher externally.
+
+Before you can use the Rancher CLI or write a program that calls the Rancher API, you must obtain API keys using the Rancher UI.
+
+### API Keys and User Authentication
+
+After logging into Rancher, you can generate API keys for accessing Rancher externally using your user settings. If you need to revoke access to the Rancher API, you can delete the API key.
+
+### Creating an API Key
 Create a Rancher API key so that other applications can make requests to the Rancher API. You can create API keys using the Rancher UI.
 
 1. From any Rancher view, select **User Avatar** > **API & Keys** from the menu on the upper-right.

content/rancher/v2.x/en/user-settings/node-templates/_index.md

@@ -0,0 +1,5 @@
+---
+title: Managing Node Templates
+weight: 7010
+draft: true
+---

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

@@ -1,5 +1,5 @@
 ---
 title: User Preferences
-weight: 3728
+weight: 7010
 draft: true
 ---