diff --git a/content/chronograf/v1.6/about_the_project/release-notes-changelog.md b/content/chronograf/v1.6/about_the_project/release-notes-changelog.md
index aae0232a0..fe6391a70 100644
--- a/content/chronograf/v1.6/about_the_project/release-notes-changelog.md
+++ b/content/chronograf/v1.6/about_the_project/release-notes-changelog.md
@@ -615,9 +615,9 @@ menu:
 ### UI improvements
 
   * When dashboard time range is changed, reset graphs that are zoomed in
-  * [Bar graph](/chronograf/v1.6/troubleshooting/frequently-asked-questions/#bar) option added to dashboard
+  * [Bar graph](/chronograf/v1.6/guides/visualization-types/#bar-graph) option added to dashboard
   * Redesign source management table to be more intuitive
-  * Redesign [Line + Single Stat](/chronograf/v1.6/troubleshooting/frequently-asked-questions/#line-stat) cells to appear more like a sparkline, and improve legibility
+  * Redesign [Line + Single Stat](/chronograf/v1.6/guides/visualization-types/#line-graph-single-stat) cells to appear more like a sparkline, and improve legibility
 
 
 ## v1.3.2.0 [2017-06-05]
@@ -633,7 +633,7 @@ menu:
 
 ### Features
 
-  * Add UI to the Data Explorer for [writing data to InfluxDB](/chronograf/v1.6/guides/transition-web-admin-interface/#writing-data)
+  * Add UI to the Data Explorer for [writing data to InfluxDB](/chronograf/v1.6/administration/transition-web-admin-interface/#writing-data)
 
 ### UI improvements
 
@@ -653,18 +653,18 @@ In versions 1.3.1+, installing a new version of Chronograf automatically clears
 
 ### Bug fixes
 
-  * Fix infinite spinner when `/chronograf` is a [basepath](/chronograf/v1.6/administration/configuration/#p-basepath)
+  * Fix infinite spinner when `/chronograf` is a [basepath](/chronograf/v1.6/administration/config-options/#basepath-p)
   * Remove the query templates dropdown from dashboard cell editor mode
   * Fix the backwards sort arrows in table column headers
   * Make the logout button consistent with design
   * Fix the loading spinner on graphs
   * Filter out any template variable values that are empty, whitespace, or duplicates
-  * Allow users to click the add query button after selecting singleStat as the [visualization type](/chronograf/v1.6/troubleshooting/frequently-asked-questions/#what-visualization-types-does-chronograf-support)
+  * Allow users to click the add query button after selecting singleStat as the visualization type
   * Add a query for windows uptime - thank you, @brianbaker!
 
 ### Features
 
-  * Add log [event handler](/chronograf/v1.6/troubleshooting/frequently-asked-questions/#what-kapacitor-event-handlers-are-supported-in-chronograf) - thank you, @mpchadwick!
+  * Add log [event handler](/chronograf/v1.6/guides/configuring-alert-endpoints/) - thank you, @mpchadwick!
   * Update Go (golang) vendoring to dep and committed vendor directory
   * Add autocomplete functionality to [template variable](/chronograf/v1.6/guides/dashboard-template-variables/) dropdowns
 
@@ -682,18 +682,18 @@ In versions 1.3.1+, installing a new version of Chronograf automatically clears
 
 ### Bug fixes
 
-  * Fix the link to home when using the [`--basepath` option](/chronograf/v1.6/administration/configuration/#p-basepath)
+  * Fix the link to home when using the [`--basepath` option](/chronograf/v1.6/administration/config-options/#basepath-p)
   * Remove the notification to login on the login page
   * Support queries that perform math on functions
   * Prevent the creation of blank template variables
   * Ensure thresholds for Kapacitor Rule Alerts appear on page load
   * Update the Kapacitor configuration page when the configuration changes
-  * Fix Authentication when using Chronograf with a set [basepath](/chronograf/v1.6/administration/configuration/#p-basepath)
+  * Fix Authentication when using Chronograf with a set [basepath](/chronograf/v1.6/administration/config-options/#basepath-p)
   * Show red indicator on Hosts Page for an offline host
   * Support escaping from presentation mode in Safari
   * Re-implement level colors on the alerts page
   * Fix router bug introduced by upgrading to react-router v3.0
-  * Show legend on [Line+Stat](/chronograf/v1.6/troubleshooting/frequently-asked-questions/#line-stat) visualization type
+  * Show legend on [Line+Stat](/chronograf/v1.6/guides/visualization-types/#line-graph-single-stat) visualization type
   * Prevent queries with `:dashboardTime:` from breaking the query builder
 
 ### Features
diff --git a/content/chronograf/v1.6/administration/managing-influxdb-users.md b/content/chronograf/v1.6/administration/managing-influxdb-users.md
index 097aa534b..b0bc1f55a 100644
--- a/content/chronograf/v1.6/administration/managing-influxdb-users.md
+++ b/content/chronograf/v1.6/administration/managing-influxdb-users.md
@@ -77,7 +77,7 @@ A successful `CREATE USER` query returns a blank result:
 
 ### Step 4: Edit the InfluxDB source in Chronograf.
 
-If you've already [connected your database to Chronograf](/chronograf/v1.6/introduction/getting-started/#3-connect-to-chronograf), update the connection configuration in Chronograf with your new username and password.
+If you've already [connected your database to Chronograf](/chronograf/v1.6/administration/creating-connections/), update the connection configuration in Chronograf with your new username and password.
 Edit existing InfluxDB database sources by navigating to the Chronograf configuration page and clicking on the name of the source.
 
 ## InfluxDB OSS User Management
diff --git a/content/chronograf/v1.6/guides/configuring-alert-endpoints.md b/content/chronograf/v1.6/guides/configuring-alert-endpoints.md
index 10b530115..1ad80bd93 100644
--- a/content/chronograf/v1.6/guides/configuring-alert-endpoints.md
+++ b/content/chronograf/v1.6/guides/configuring-alert-endpoints.md
@@ -38,7 +38,7 @@ Chronograf supports the following event handlers:
 * TCP
 * VictorOps
 
-To configure a Kapacitor event handler in Chronograf, [install Kapacitor](/chronograf/v1.6/introduction/getting-started/#kapacitor-setup) and [connect it to Chronograf](/chronograf/v1.6/introduction/getting-started/#4-connect-chronograf-to-kapacitor).
+To configure a Kapacitor event handler in Chronograf, [install Kapacitor](/{{< latest "kapacitor" >}}/introduction/installation/) and [connect it to Chronograf](/chronograf/v1.6/administration/creating-connections/#managing-kapacitor-connections-using-the-chronograf-ui).
 The **Configure Kapacitor** page includes the event handler configuration options.
 
 
@@ -46,7 +46,7 @@ The **Configure Kapacitor** page includes the event handler configuration option
 
 Alert endpoint configurations appear on the Chronograf Configure Kapacitor page.
 You must have a connected Kapacitor instance to access the configurations.
-For more information, see [Kapacitor installation instructions](/chronograf/v1.6/introduction/getting-started/#kapacitor-setup) and how to [connect a Kapacitor instance](/chronograf/v1.6/introduction/getting-started/#4-connect-chronograf-to-kapacitor) to Chronograf.
+For more information, see [Kapacitor installation instructions](/{{< latest "kapacitor" >}}/introduction/installation/) and how to [connect a Kapacitor instance](/chronograf/v1.6/administration/creating-connections/#managing-kapacitor-connections-using-the-chronograf-ui) to Chronograf.
 
 Note that the configuration options in the **Configure alert endpoints** section are not all-inclusive.
 Some event handlers allow users to customize event handler configurations per [alert rule](/chronograf/v1.6/guides/create-a-kapacitor-alert/).
diff --git a/content/chronograf/v1.6/guides/create-a-dashboard.md b/content/chronograf/v1.6/guides/create-a-dashboard.md
index 39949eee4..7e601d2f8 100644
--- a/content/chronograf/v1.6/guides/create-a-dashboard.md
+++ b/content/chronograf/v1.6/guides/create-a-dashboard.md
@@ -76,8 +76,7 @@ Click **Save** (the green checkmark icon) to save your cell.
 * **Pan** over your cell data by pressing the shift key and clicking and dragging your mouse over the graph
 * **Reset** your cell by double-clicking your mouse in the cell window
 
-> Note:
-These tips only apply to the line, stacked, step-plot, and line+stat [visualization types](/chronograf/v1.6/troubleshooting/frequently-asked-questions/#what-visualization-types-does-chronograf-support).
+> Note: These tips only apply to the line, stacked, step-plot, and line+stat visualization types.
 
 #### Configure dashboard-wide settings:
 * You can change the dashboard's *auto-refresh interval* at the top of the page - the default interval selected is **Every 15 seconds**.
diff --git a/content/chronograf/v1.6/guides/create-alert-rules.md b/content/chronograf/v1.6/guides/create-alert-rules.md
index 2a996ec25..e8843bc10 100644
--- a/content/chronograf/v1.6/guides/create-alert-rules.md
+++ b/content/chronograf/v1.6/guides/create-alert-rules.md
@@ -30,7 +30,7 @@ This guide walks through creating a Chronograf alert rule that sends an alert me
 
 * Downloaded and install the entire TICKstack (Telegraf, InfluxDB, Chronograf, and Kapacitor).
 * Configure Telegraf to collect data using the InfluxDB [system statistics](https://github.com/influxdata/telegraf/tree/master/plugins/inputs/system) input plugin and write data to your InfluxDB instance.
-* [Create a Kapacitor connection in Chronograf](/chronograf/v1.6/introduction/getting-started/#4-connect-chronograf-to-kapacitor).
+* [Create a Kapacitor connection in Chronograf](/chronograf/v1.6/administration/creating-connections/#managing-kapacitor-connections-using-the-chronograf-ui).
 * Slack is available and configured as an event handler in Chronograf. See [Configuring Chronograf alert endpoints](/chronograf/v1.6/guides/configuring-alert-endpoints/) for detailed configuration instructions.
 
 ## Configuring Chronograf alert rules
diff --git a/content/chronograf/v1.6/guides/monitoring-influxenterprise-clusters.md b/content/chronograf/v1.6/guides/monitoring-influxenterprise-clusters.md
index a36d25602..4a928523e 100644
--- a/content/chronograf/v1.6/guides/monitoring-influxenterprise-clusters.md
+++ b/content/chronograf/v1.6/guides/monitoring-influxenterprise-clusters.md
@@ -23,7 +23,7 @@ See the InfluxDB Enterprise documentation for
 This guide uses an InfluxData Enterprise cluster with three meta nodes and three data nodes; the steps are also applicable to other cluster configurations.
 
 InfluxData recommends using a separate server to store your monitoring data.
-It is possible to store the monitoring data in your cluster and [connect the cluster to Chronograf](/chronograf/v1.6/troubleshooting/frequently-asked-questions/#how-do-i-connect-chronograf-to-an-influxenterprise-cluster), but, in general, your monitoring data should live on a separate server.
+It is possible to store the monitoring data in your cluster and [connect the cluster to Chronograf](/chronograf/v1.6/troubleshooting/frequently-asked-questions/#how-do-i-connect-chronograf-to-an-influxdb-enterprise-cluster), but, in general, your monitoring data should live on a separate server.
 
 You're working on an Ubuntu installation.
 Chronograf and the other components of the TICK stack are supported on several operating systems and hardware architectures. Check out the [downloads page](https://portal.influxdata.com/downloads) for links to the binaries of your choice.
diff --git a/content/chronograf/v1.7/about_the_project/release-notes-changelog.md b/content/chronograf/v1.7/about_the_project/release-notes-changelog.md
index 42d8f438e..818fd9d2c 100644
--- a/content/chronograf/v1.7/about_the_project/release-notes-changelog.md
+++ b/content/chronograf/v1.7/about_the_project/release-notes-changelog.md
@@ -874,7 +874,7 @@ In versions 1.3.1+, installing a new version of Chronograf automatically clears
 
 ### Bug fixes
 
-  * Fix infinite spinner when `/chronograf` is a [basepath](/chronograf/v1.7/administration/config-options/#p-basepath)
+  * Fix infinite spinner when `/chronograf` is a [basepath](/chronograf/v1.7/administration/config-options/#basepath-p)
   * Remove the query templates dropdown from dashboard cell editor mode
   * Fix the backwards sort arrows in table column headers
   * Make the logout button consistent with design
@@ -903,13 +903,13 @@ In versions 1.3.1+, installing a new version of Chronograf automatically clears
 
 ### Bug fixes
 
-  * Fix the link to home when using the [`--basepath` option](/chronograf/v1.7/administration/config-options/#p-basepath)
+  * Fix the link to home when using the [`--basepath` option](/chronograf/v1.7/administration/config-options/#basepath-p)
   * Remove the notification to login on the login page
   * Support queries that perform math on functions
   * Prevent the creation of blank template variables
   * Ensure thresholds for Kapacitor Rule Alerts appear on page load
   * Update the Kapacitor configuration page when the configuration changes
-  * Fix Authentication when using Chronograf with a set [basepath](/chronograf/v1.7/administration/config-options/#p-basepath)
+  * Fix Authentication when using Chronograf with a set [basepath](/chronograf/v1.7/administration/config-options/#basepath-p)
   * Show red indicator on Hosts Page for an offline host
   * Support escaping from presentation mode in Safari
   * Re-implement level colors on the alerts page
diff --git a/content/chronograf/v1.7/administration/config-options.md b/content/chronograf/v1.7/administration/config-options.md
index 36bcddab6..7885e7c8c 100644
--- a/content/chronograf/v1.7/administration/config-options.md
+++ b/content/chronograf/v1.7/administration/config-options.md
@@ -119,7 +119,7 @@ $ chronograf -v
 ## InfluxDB connection options
 
 > InfluxDB connection details specified via command line when starting Chronograf do not persist when Chronograf is shut down.
-> To persist connection details, [include them in a `.src` file](/chronograf/v1.7/administration/creating-connections/#managing-influxdb-connections-using-src-files) located in your [`--resources-path`](#resources-path).
+> To persist connection details, [include them in a `.src` file](/chronograf/v1.7/administration/creating-connections/#manage-influxdb-connections-using-src-files) located in your [`--resources-path`](#resources-path).
 
 ### `--influxdb-url=`
 
@@ -144,7 +144,7 @@ Environment variable: `$INFLUXDB_PASSWORD`
 ## Kapacitor connection options
 
 > Kapacitor connection details specified via command line when starting Chronograf do not persist when Chronograf is shut down.
-> To persist connection details, [include them in a `.kap` file](/chronograf/v1.7/administration/creating-connections/#managing-kapacitor-connections-using-kap-files) located in your [`--resources-path`](#resources-path).
+> To persist connection details, [include them in a `.kap` file](/chronograf/v1.7/administration/creating-connections/#manage-kapacitor-connections-using-kap-files) located in your [`--resources-path`](#resources-path).
 
 ### `--kapacitor-url=`
 
@@ -345,7 +345,7 @@ Lists are comma-separated.
 
 ### Generic OAuth 2.0 authentication options
 
-See [Configuring Generic authentication](/chronograf/v1.7/administration/managing-security/#configure-generic-authentication) for more information.
+See [Configuring Generic authentication](/chronograf/v1.7/administration/managing-security/#configure-chronograf-to-use-any-oauth-2-0-provider) for more information.
 
 #### `--generic-name=`
 
diff --git a/content/chronograf/v1.7/administration/creating-connections.md b/content/chronograf/v1.7/administration/creating-connections.md
index b84874b82..2c3780423 100644
--- a/content/chronograf/v1.7/administration/creating-connections.md
+++ b/content/chronograf/v1.7/administration/creating-connections.md
@@ -166,7 +166,7 @@ To use Kapacitor in Chronograf, create Kapacitor connections and configure alert
 To create a Kapacitor connection using the Chronograf UI:
 
 1. Open Chronograf and click **Configuration** (wrench icon) in the navigation menu.
-2. Next to an existing [InfluxDB connection](#managing-influxdb-connections-using-the-chronograf-ui), click **Add Kapacitor Connection** if there are no existing Kapacitor connections or select **Add Kapacitor Connection** in the **Kapacitor Connection** dropdown list.
+2. Next to an existing [InfluxDB connection](#manage-influxdb-connections-using-the-chronograf-ui), click **Add Kapacitor Connection** if there are no existing Kapacitor connections or select **Add Kapacitor Connection** in the **Kapacitor Connection** dropdown list.
   ![Add a new Kapacitor connection in Chronograf](/img/chronograf/1-6-connection-kapacitor.png)
 
 3. In the **Connection Details** section, enter values for the following fields:
diff --git a/content/chronograf/v1.7/administration/prebuilt-dashboards.md b/content/chronograf/v1.7/administration/prebuilt-dashboards.md
index a1a9abc2d..eefd25fc3 100644
--- a/content/chronograf/v1.7/administration/prebuilt-dashboards.md
+++ b/content/chronograf/v1.7/administration/prebuilt-dashboards.md
@@ -9,7 +9,7 @@ menu:
 ---
 Chronograf lets you import a variety of prebuilt dashboards that visualize metrics collect by specific [Telegraf input plugins](/{{< latest "telegraf" >}}/plugins). The following Telegraf-related dashboards templates are available.
 
-For details on how to import dashboards while adding a connection in Chronograf, see [Creating connections](/chronograf/v1.7/administration/creating-connections//#managing-influxdb-connections-using-the-chronograf-ui).
+For details on how to import dashboards while adding a connection in Chronograf, see [Creating connections](/chronograf/v1.7/administration/creating-connections/#manage-influxdb-connections-using-the-chronograf-ui).
 
 ## Docker
 
diff --git a/content/chronograf/v1.8/administration/managing-organizations.md b/content/chronograf/v1.8/administration/managing-organizations.md
index a75bb644b..5518bc48c 100644
--- a/content/chronograf/v1.8/administration/managing-organizations.md
+++ b/content/chronograf/v1.8/administration/managing-organizations.md
@@ -37,7 +37,7 @@ A Chronograf organization is a collection of Chronograf users who share common C
 
 Upon installation, the default organization is ready for use and allows Chronograf to be used as-is.
 
-## Creating organizations
+## Create organizations
 
 Your company, organizational units, teams, and projects may require the creation of additional organizations, beyond the Default organization. Additional organizations can be created as described below.
 
diff --git a/content/enterprise_influxdb/v1.8/administration/backup-and-restore.md b/content/enterprise_influxdb/v1.8/administration/backup-and-restore.md
index 730086ce3..46889899c 100644
--- a/content/enterprise_influxdb/v1.8/administration/backup-and-restore.md
+++ b/content/enterprise_influxdb/v1.8/administration/backup-and-restore.md
@@ -384,7 +384,7 @@ Copying data to <hostname>:8088... Copying data to <hostname>:8088... Done. Rest
 Restored from my-incremental-backup/ in 56.623615ms, transferred 588800 bytes
 ```
 
-Then, in the [`influx` client](/influxdb/v1.8/tools/shell/), use an [`INTO` query](/influxdb/v1.8/query_language/data_exploration/#the-into-clause) to copy the data from the new database into the existing `telegraf` database:
+Then, in the [`influx` client](/influxdb/v1.8/tools/shell/), use an [`INTO` query](/influxdb/v1.8/query_language/explore-data/#the-into-clause) to copy the data from the new database into the existing `telegraf` database:
 
 ```bash
 $ influx
diff --git a/content/enterprise_influxdb/v1.8/administration/config-data-nodes.md b/content/enterprise_influxdb/v1.8/administration/config-data-nodes.md
index 68dfc8e63..699c2f323 100644
--- a/content/enterprise_influxdb/v1.8/administration/config-data-nodes.md
+++ b/content/enterprise_influxdb/v1.8/administration/config-data-nodes.md
@@ -692,7 +692,7 @@ Environment variable: `INFLUXDB_SHARD_PRECREATION_ADVANCE_PERIOD`
 By default, InfluxDB writes system monitoring data to the `_internal` database.
 If that database does not exist, InfluxDB creates it automatically.
 The `DEFAULT` retention policy on the `internal` database is seven days.
-To change the default seven-day retention policy, you must [create](/influxdb/v1.8/query_language/database_management/#retention-policy-management) it.
+To change the default seven-day retention policy, you must [create](/influxdb/v1.8/query_language/manage-database/#retention-policy-management) it.
 
 For InfluxDB Enterprise production systems, InfluxData recommends including a dedicated InfluxDB (OSS) monitoring instance for monitoring InfluxDB Enterprise cluster nodes.
 
diff --git a/content/enterprise_influxdb/v1.8/guides/migration.md b/content/enterprise_influxdb/v1.8/guides/migration.md
index c1b5e6187..6c3e79578 100644
--- a/content/enterprise_influxdb/v1.8/guides/migration.md
+++ b/content/enterprise_influxdb/v1.8/guides/migration.md
@@ -271,7 +271,7 @@ node with other data nodes in the cluster.
 It may take a few minutes before the existing data is available.
 
 ## Rebalance the cluster
-1. Use the [ALTER RETENTION POLICY](/influxdb/v1.8/query_language/database_management/#modify-retention-policies-with-alter-retention-policy)
+1. Use the [ALTER RETENTION POLICY](/influxdb/v1.8/query_language/manage-database/#modify-retention-policies-with-alter-retention-policy)
    statement to increase the [replication factor](/enterprise_influxdb/v1.8/concepts/glossary/#replication-factor)
    on all existing retention polices to the number of data nodes in your cluster.
 2. [Rebalance your cluster manually](/enterprise_influxdb/v1.8/guides/rebalance/)
diff --git a/content/enterprise_influxdb/v1.8/guides/rebalance.md b/content/enterprise_influxdb/v1.8/guides/rebalance.md
index 1c0619c58..c5a59f45e 100644
--- a/content/enterprise_influxdb/v1.8/guides/rebalance.md
+++ b/content/enterprise_influxdb/v1.8/guides/rebalance.md
@@ -260,7 +260,7 @@ safely copy shards from one of the two original data nodes to the new data node.
 
 ### Step 1: Update the Retention Policy
 
-[Update](/influxdb/v1.8/query_language/database_management/#modify-retention-policies-with-alter-retention-policy)
+[Update](/influxdb/v1.8/query_language/manage-database/#modify-retention-policies-with-alter-retention-policy)
 every retention policy to have a replication factor of three.
 This step ensures that the system automatically distributes all newly-created
 shards across the three data nodes in the cluster.
@@ -276,7 +276,7 @@ Here, we use InfluxDB's [CLI](/influxdb/v1.8/tools/shell/) to execute the query:
 
 A successful `ALTER RETENTION POLICY` query returns no results.
 Use the
-[`SHOW RETENTION POLICIES` query](/influxdb/v1.8/query_language/schema_exploration/#show-retention-policies)
+[`SHOW RETENTION POLICIES` query](/influxdb/v1.8/query_language/explore-schema/#show-retention-policies)
 to verify the new replication factor.
 
 Example:
diff --git a/content/influxdb/v1.4/tools/_index.md b/content/influxdb/v1.4/tools/_index.md
index 264fa5330..80233845b 100644
--- a/content/influxdb/v1.4/tools/_index.md
+++ b/content/influxdb/v1.4/tools/_index.md
@@ -40,7 +40,7 @@ For friendlier documentation, see the guides on
 
 ## API client libraries
 
-The list of [client libraries]((/influxdb/v1.4/tools/api_client_libraries/)) for interacting with InfluxDB.
+The list of [client libraries](/influxdb/v1.4/tools/api_client_libraries/) for interacting with InfluxDB.
 
 ## Influx Inspect
 
diff --git a/content/influxdb/v1.6/query_language/_index.md b/content/influxdb/v1.6/query_language/_index.md
index ac78485b1..516b1850b 100644
--- a/content/influxdb/v1.6/query_language/_index.md
+++ b/content/influxdb/v1.6/query_language/_index.md
@@ -72,13 +72,13 @@ covers the use of mathematical operators in InfluxQL.
 
 #### Authentication and authorization
 
-[Authentication and authorization](/influxdb/v1.6/query_language/authentication_and_authorization/) covers how to
-[set up authentication](/influxdb/v1.6/query_language/authentication_and_authorization/#set-up-authentication)
+[Authentication and authorization](/influxdb/v1.6/administration/authentication_and_authorization/) covers how to
+[set up authentication](/influxdb/v1.6/administration/authentication_and_authorization/#set-up-authentication)
 and how to
-[authenticate requests](/influxdb/v1.6/query_language/authentication_and_authorization/#authenticate-requests) in InfluxDB.
+[authenticate requests](/influxdb/v1.6/administration/authentication_and_authorization/#authenticate-requests) in InfluxDB.
 This page also describes the different
-[user types](/influxdb/v1.6/query_language/authentication_and_authorization/#user-types-and-privileges) and the InfluxQL for
-[managing database users](/influxdb/v1.6/query_language/authentication_and_authorization/#user-management-commands).
+[user types](/influxdb/v1.6/administration/authentication_and_authorization/#user-types-and-privileges) and the InfluxQL for
+[managing database users](/influxdb/v1.6/administration/authentication_and_authorization/#user-management-commands).
 
 ## InfluxQL reference
 
diff --git a/content/influxdb/v1.7/query_language/_index.md b/content/influxdb/v1.7/query_language/_index.md
index 550c140cd..89ab31c85 100644
--- a/content/influxdb/v1.7/query_language/_index.md
+++ b/content/influxdb/v1.7/query_language/_index.md
@@ -72,13 +72,13 @@ covers the use of mathematical operators in InfluxQL.
 
 #### Authentication and authorization
 
-[Authentication and authorization](/influxdb/v1.7/query_language/authentication_and_authorization/) covers how to
-[set up authentication](/influxdb/v1.7/query_language/authentication_and_authorization/#set-up-authentication)
+[Authentication and authorization](/influxdb/v1.7/administration/authentication_and_authorization/) covers how to
+[set up authentication](/influxdb/v1.7/administration/authentication_and_authorization/#set-up-authentication)
 and how to
-[authenticate requests](/influxdb/v1.7/query_language/authentication_and_authorization/#authenticate-requests) in InfluxDB.
+[authenticate requests](/influxdb/v1.7/administration/authentication_and_authorization/#authenticate-requests) in InfluxDB.
 This page also describes the different
-[user types](/influxdb/v1.7/query_language/authentication_and_authorization/#user-types-and-privileges) and the InfluxQL for
-[managing database users](/influxdb/v1.7/query_language/authentication_and_authorization/#user-management-commands).
+[user types](/influxdb/v1.7/administration/authentication_and_authorization/#user-types-and-privileges) and the InfluxQL for
+[managing database users](/influxdb/v1.7/administration/authentication_and_authorization/#user-management-commands).
 
 ## InfluxQL reference
 
diff --git a/content/influxdb/v1.7/tools/_index.md b/content/influxdb/v1.7/tools/_index.md
index 90287c687..82055387b 100644
--- a/content/influxdb/v1.7/tools/_index.md
+++ b/content/influxdb/v1.7/tools/_index.md
@@ -24,7 +24,7 @@ starts and runs all the processes necessary for InfluxDB to function.
 
 ## InfluxDB API Reference
 
-Reference documentation for the [InfluxDB HTTP API]((/influxdb/v1.7/tools/api/)).
+Reference documentation for the [InfluxDB HTTP API](/influxdb/v1.7/tools/api/).
 
 Go straight to the reference documentation on:
 
@@ -37,15 +37,15 @@ For friendlier documentation, see the guides on
 
 ## InfluxDB API client libraries
 
-The list of [client libraries]((/influxdb/v1.7/tools/api_client_libraries/)) for interacting with the InfluxDB API.
+The list of [client libraries](/influxdb/v1.7/tools/api_client_libraries/) for interacting with the InfluxDB API.
 
 ## Influx Inspect disk shard utility
 
-[Influx Inspect]((/influxdb/v1.7/tools/influx_inspect/)) is a tool designed to view detailed information about on disk shards, as well as export data from a shard to line protocol that can be inserted back into the database.
+[Influx Inspect](/influxdb/v1.7/tools/influx_inspect/) is a tool designed to view detailed information about on disk shards, as well as export data from a shard to line protocol that can be inserted back into the database.
 
 ## InfluxDB inch tool
 
-Use the [InfluxDB `inch` tool]((/influxdb/v1.7/tools/inch/)) to test InfluxDB performance. Adjust metrics such as the batch size, tag values, and concurrent write streams to test how ingesting different tag cardinalities and metrics affects performance.
+Use the [InfluxDB `inch` tool](/influxdb/v1.7/tools/inch/) to test InfluxDB performance. Adjust metrics such as the batch size, tag values, and concurrent write streams to test how ingesting different tag cardinalities and metrics affects performance.
 
 ## Graphs and dashboards
 
diff --git a/content/influxdb/v1.8/query_language/_index.md b/content/influxdb/v1.8/query_language/_index.md
index 57950e889..837b190d2 100644
--- a/content/influxdb/v1.8/query_language/_index.md
+++ b/content/influxdb/v1.8/query_language/_index.md
@@ -20,19 +20,19 @@ with the documentation.
 
 #### Data exploration
 
-[Data exploration](/influxdb/v1.8/query_language/data_exploration/) covers the
+[Data exploration](/influxdb/v1.8/query_language/explore-data/) covers the
 query language basics for InfluxQL, including the
-[`SELECT` statement](/influxdb/v1.8/query_language/data_exploration/#the-basic-select-statement),
-[`GROUP BY` clauses](/influxdb/v1.8/query_language/data_exploration/#the-group-by-clause),
-[`INTO` clauses](/influxdb/v1.8/query_language/data_exploration/#the-into-clause), and more.
+[`SELECT` statement](/influxdb/v1.8/query_language/explore-data/#the-basic-select-statement),
+[`GROUP BY` clauses](/influxdb/v1.8/query_language/explore-data/#the-group-by-clause),
+[`INTO` clauses](/influxdb/v1.8/query_language/explore-data/#the-into-clause), and more.
 See Data Exploration to learn about
-[time syntax](/influxdb/v1.8/query_language/data_exploration/#time-syntax) and
-[regular expressions](/influxdb/v1.8/query_language/data_exploration/#regular-expressions) in
+[time syntax](/influxdb/v1.8/query_language/explore-data/#time-syntax) and
+[regular expressions](/influxdb/v1.8/query_language/explore-data/#regular-expressions) in
 queries.
 
 #### Schema exploration
 
-[Schema exploration](/influxdb/v1.8/query_language/schema_exploration/) covers
+[Schema exploration](/influxdb/v1.8/query_language/explore-schema/) covers
 queries that are useful for viewing and exploring your
 [schema](/influxdb/v1.8/concepts/glossary/#schema).
 See Schema Exploration for syntax explanations and examples of InfluxQL's `SHOW`
@@ -40,7 +40,7 @@ queries.
 
 #### Database management
 
-[Database management](/influxdb/v1.8/query_language/database_management/) covers InfluxQL for managing
+[Database management](/influxdb/v1.8/query_language/manage-database/) covers InfluxQL for managing
 [databases](/influxdb/v1.8/concepts/glossary/#database) and
 [retention policies](/influxdb/v1.8/concepts/glossary/#retention-policy-rp) in
 InfluxDB.
@@ -74,13 +74,13 @@ covers the use of mathematical operators in InfluxQL.
 
 #### Authentication and authorization
 
-[Authentication and authorization](/influxdb/v1.8/query_language/authentication_and_authorization/) covers how to
-[set up authentication](/influxdb/v1.8/query_language/authentication_and_authorization/#set-up-authentication)
+[Authentication and authorization](/influxdb/v1.8/administration/authentication_and_authorization/) covers how to
+[set up authentication](/influxdb/v1.8/administration/authentication_and_authorization/#set-up-authentication)
 and how to
-[authenticate requests](/influxdb/v1.8/query_language/authentication_and_authorization/#authenticate-requests) in InfluxDB.
+[authenticate requests](/influxdb/v1.8/administration/authentication_and_authorization/#authenticate-requests) in InfluxDB.
 This page also describes the different
-[user types](/influxdb/v1.8/query_language/authentication_and_authorization/#user-types-and-privileges) and the InfluxQL for
-[managing database users](/influxdb/v1.8/query_language/authentication_and_authorization/#user-management-commands).
+[user types](/influxdb/v1.8/administration/authentication_and_authorization/#user-types-and-privileges) and the InfluxQL for
+[managing database users](/influxdb/v1.8/administration/authentication_and_authorization/#user-management-commands).
 
 ## InfluxQL reference
 
diff --git a/content/influxdb/v1.8/query_language/explore-data.md b/content/influxdb/v1.8/query_language/explore-data.md
index cb6220db7..e0b3ddd90 100644
--- a/content/influxdb/v1.8/query_language/explore-data.md
+++ b/content/influxdb/v1.8/query_language/explore-data.md
@@ -8,7 +8,7 @@ menu:
     weight: 20
     parent: InfluxQL
 aliases:
-  - /influxdb/v1.8/query_language/explore-data/
+  - /influxdb/v1.8/query_language/data_exploration/
 ---
 
 InfluxQL is an SQL-like query language for interacting with data in InfluxDB.
diff --git a/content/influxdb/v1.8/query_language/explore-schema.md b/content/influxdb/v1.8/query_language/explore-schema.md
index 1ecfe131e..8e2320058 100644
--- a/content/influxdb/v1.8/query_language/explore-schema.md
+++ b/content/influxdb/v1.8/query_language/explore-schema.md
@@ -7,7 +7,7 @@ menu:
     weight: 30
     parent: InfluxQL
 aliases:
-  - /influxdb/v1.8/query_language/explore-schema/
+  - /influxdb/v1.8/query_language/schema_exploration/
 ---
 
 InfluxQL is an SQL-like query language for interacting with data in InfluxDB.
diff --git a/content/influxdb/v1.8/query_language/manage-database.md b/content/influxdb/v1.8/query_language/manage-database.md
index c38374118..675164586 100644
--- a/content/influxdb/v1.8/query_language/manage-database.md
+++ b/content/influxdb/v1.8/query_language/manage-database.md
@@ -8,7 +8,7 @@ menu:
     weight: 40
     parent: InfluxQL
 aliases:
-  - /influxdb/v1.8/query_language/manage-database/
+  - /influxdb/v1.8/query_language/database_management/
 ---
 
 InfluxQL offers a full suite of administrative commands.
diff --git a/content/influxdb/v1.8/tools/_index.md b/content/influxdb/v1.8/tools/_index.md
index 931d79904..8f9d4db06 100644
--- a/content/influxdb/v1.8/tools/_index.md
+++ b/content/influxdb/v1.8/tools/_index.md
@@ -20,7 +20,7 @@ includes commands to manage many aspects of InfluxDB, including databases, organ
 
 ## `influxd` command
 
-The [`influxd` command]((/influxdb/v1.8/tools/influxd)) starts and runs all the processes necessary for InfluxDB to function.
+The [`influxd` command](/influxdb/v1.8/tools/influxd) starts and runs all the processes necessary for InfluxDB to function.
 
 ## InfluxDB API client libraries