Merge branch 'alpha-8' into alpha-8-orgs-move

assets/styles/layouts/_inline-icons.scss

@@ -19,7 +19,7 @@
       width: 20px;
       height: 20px;
       padding-left: .28rem;
-      line-height: 1.35rem;
+      line-height: 1.25rem;
     }
   }
 

content/v2.0/users/tokens/create-token.md

@@ -1,7 +1,7 @@
 ---
 title: Create a token
 seotitle: Create an authentication token in InfluxDB
-description: Create an authentication token in InfluxDB using the InfluxDB UI or the influx CLI.
+description: Create an authentication token in InfluxDB using the InfluxDB UI or the `influx` CLI.
 menu:
   v2_0:
     name: Create a token
@@ -10,20 +10,37 @@ weight: 201
 draft: true
 ---
 
-**To view tokens**:
+Create authentication tokens using the InfluxDB user interface (UI) or the `influx`
+command line interface (CLI).
 
-1. Click the **Influx** tab in the navigation bar.
+## Create a token in the InfluxDB UI
 
-    {{< nav-icon "admin" >}}
+1. Click the **Settings** icon in the navigation bar.
 
-2. In the right panel labeled **My Settings**, click **Tokens**. All of your account's tokens appear.
-3. Click on a token name from the list to view the token and a summary of access permissions.
+    {{< nav-icon "settings" >}}
 
+2. Click **Tokens**.
+3. _Full instructions coming soon._
 
-**To copy a token**:
+## Create a token using the influx CLI
 
-* From the token detail view, click **Copy**.
+Use the [`influx auth create` command](/v2.0/reference/cli/influx/auth/create) to create a token.
+Include flags with the command to grant specific permissions to the token.
+See the [available flags](/v2.0/reference/cli/influx/auth/create#flags).
 
-**To delete a token**:
+```sh
+# Pattern
+influx auth create -o <org-name> [permission-flags]
 
-* Hover over the name of a token in the list, then click **Delete**.
+# Example
+influx auth create -o my-org \
+  --read-buckets 03a2bbf46309a000 03ace3a87c269000 \
+  --read-dashboards \
+  --read-tasks \
+  --read-telegrafs \
+  --read-user
+```
+
+Filtering options such as filtering by authorization ID, username, or user ID are available.
+See the [`influx auth find` documentation](/v2.0/reference/cli/influx/auth/find)
+for information about other available flags.

content/v2.0/users/tokens/delete-token.md

@@ -0,0 +1,38 @@
+---
+title: Delete a token
+seotitle: Delete an authentication token from InfluxDB
+description: Delete an authentication token from InfluxDB using the InfluxDB UI or the `influx` CLI.
+menu:
+  v2_0:
+    name: Delete a token
+    parent: Manage tokens
+weight: 204
+---
+
+Delete authentication tokens from the InfluxDB user interface (UI) or the `influx` command line interface (CLI).
+Once deleted, all users and external integrations using the token will no longer
+have access to your InfluxDB instance.
+
+## Delete tokens in the InfluxDB UI
+
+1. Click the **Settings** icon in the navigation bar.
+
+    {{< nav-icon "settings" >}}
+
+2. Click **Tokens**. All of your account's tokens appear.
+3. Hover over the token you want to delete and click **Delete** and **Confirm**.
+
+## Delete tokens using the influx CLI
+
+Use the [`influx auth delete` command](/v2.0/reference/cli/influx/auth/delete)
+to delete a token.
+
+_This command requires an auth ID, which is available in the output of `influx auth find`._
+
+```sh
+# Pattern
+influx auth delete -i <auth-id>
+
+# Example
+influx auth delete -i 03a2bee5a9c9a000
+```

content/v2.0/users/tokens/view-tokens.md

@@ -1,7 +1,7 @@
 ---
 title: View tokens
 seotitle: View authentication tokens in InfluxDB
-description: View authentication tokens in InfluxDB using the InfluxDB UI or the influx CLI.
+description: View authentication tokens in InfluxDB using the InfluxDB UI or the `influx` CLI.
 menu:
   v2_0:
     name: View tokens
@@ -9,16 +9,16 @@ menu:
 weight: 202
 ---
 
-Use the InfluxDB user interface (UI) or the `influx` command line interface (CLI)
-to view tokens.
+View authentication tokens using the InfluxDB user interface (UI) or the `influx`
+command line interface (CLI).
 
 ## View tokens in the InfluxDB UI
 
-1. Click the **Influx** icon in the navigation bar.
+1. Click the **Settings** icon in the navigation bar.
 
-    {{< nav-icon "admin" >}}
+    {{< nav-icon "settings" >}}
 
-2. In the right panel labeled **My Settings**, click **Tokens**. All of your account's tokens appear.
+2. Click **Tokens**. All of your account's tokens appear.
 3. Click on a token name from the list to view the token and a summary of access permissions.
 
 ## View tokens using the influx CLI

content/v2.0/visualize-data/labels.md

@@ -12,15 +12,19 @@ weight: 101
 ---
 
 Labels are a way to add visual metadata to dashboards, tasks, and other items in the InfluxDB UI.
-To manage labels, click the **Configuration** icon in the navigation bar and select **Labels**.
+To manage labels:
 
-{{< img-hd src="/img/2-0-labels-nav-link.png" title="Labels configuration" />}}
+1. Click the **Settings** icon in the navigation bar.
+
+    {{< nav-icon "settings" >}}
+
+2. Click **Labels**.
 
 #### Create a label
 1. Click **+ Create Label**.
 2. Enter a **Name** for the label.
-3. Select a **Color** for the lable.
-4. Enter a description for the label _(Optional)_.
+3. Enter a description for the label _(Optional)_.
+4. Select a **Color** for the label.
 5. Click **Create label**.
 
 #### Edit a label
@@ -35,8 +39,7 @@ To manage labels, click the **Configuration** icon in the navigation bar and sel
 
 ### Add labels to dashboards and tasks
 1. In the list view of dashboards or tasks, hover over the item to which you would like to add a label.
-2. Click the {{< icon "add-label" >}} icon that appears to the right of the name.
-   The **Manage Labels** overlay will appear.
+2. Click the {{< icon "add-label" >}} icon that appears below the name.
+   The **Add Labels** overlay will appear.
 3. Type the name of the label you would like to add to filter the list of available labels.
-   Click the label you would like to add. More than one label can be added.
-4. Click **Save Changes**.
+   Click the label you would like to add.

layouts/shortcodes/icon.html

@@ -1,4 +1,4 @@
-{{ $icon :=  .Get 0 | default "nav-admin" }}
+{{ $icon :=  .Get 0 | default "influx" }}
 
 {{ if or (eq $icon "nav-admin") (eq $icon "influx") (eq $icon "influx-icon") }}
 <span class="inline icon-ui-influx-icon middle"></span>

layouts/shortcodes/nav-icon.html

@@ -1,7 +1,7 @@
-{{ $navIcon := lower (.Get 0) | default "admin" }}
-{{ if eq $navIcon "admin" }}
+{{ $navIcon := lower (.Get 0) | default "influx" }}
+{{ if or (eq $navIcon "admin") (eq $navIcon "influx") }}
   {{ .Scratch.Set "icon" "influx-icon" }}
-  {{ .Scratch.Set "title" "admin" }}
+  {{ .Scratch.Set "title" "username (org-name)" }}
 {{ else if or (eq $navIcon "data-explorer") (eq $navIcon "data explorer") }}
   {{ .Scratch.Set "icon" "data-explorer" }}
   {{ .Scratch.Set "title" "Data Explorer" }}