diff --git a/docs/sources/_index.md b/docs/sources/_index.md
index 58f34b46b41..7b50a3734e5 100755
--- a/docs/sources/_index.md
+++ b/docs/sources/_index.md
@@ -53,7 +53,7 @@ aliases = ["/docs/grafana/v1.1", "/docs/grafana/latest/guides/reference/admin",
         <h4>Getting started</h4>
         <p>Learn the basics of using Grafana.</p>
     </a>
-    <a href="{{< relref "installation/configuration.md" >}}" class="nav-cards__item nav-cards__item--guide">
+    <a href="{{< relref "administration/configuration.md" >}}" class="nav-cards__item nav-cards__item--guide">
         <h4>Configure Grafana</h4>
         <p>Review the configuration and setup options.</p>
     </a>
diff --git a/docs/sources/administration/cli.md b/docs/sources/administration/cli.md
index 75e51d1b1f2..5b02f04a78b 100644
--- a/docs/sources/administration/cli.md
+++ b/docs/sources/administration/cli.md
@@ -130,7 +130,7 @@ grafana-cli --homepath "c:\Program Files\grafana" admin reset-admin-password myn
 
 ### Override config file
 
-`--config value` overrides the default location where Grafana expects the configuration file. Refer to [Configuration]({{< relref "../installation/configuration.md" >}}) for more information about configuring Grafana and default configuration file locations.
+`--config value` overrides the default location where Grafana expects the configuration file. Refer to [Configuration]({{< relref "../administration/configuration.md" >}}) for more information about configuring Grafana and default configuration file locations.
 
 **Example:**
 ```bash
diff --git a/docs/sources/installation/configuration.md b/docs/sources/administration/configuration.md
similarity index 60%
rename from docs/sources/installation/configuration.md
rename to docs/sources/administration/configuration.md
index 459177041f9..1d5ce776e57 100644
--- a/docs/sources/installation/configuration.md
+++ b/docs/sources/administration/configuration.md
@@ -3,6 +3,7 @@ title = "Configuration"
 description = "Configuration documentation"
 keywords = ["grafana", "configuration", "documentation"]
 type = "docs"
+aliases = ["/docs/grafana/latest/installation/configuration/"]
 [menu.docs]
 name = "Configuration"
 identifier = "config"
@@ -83,17 +84,24 @@ export GF_PLUGIN_GRAFANA_IMAGE_RENDERER_RENDERING_IGNORE_HTTPS_ERRORS=true
 
 > For any changes to `conf/grafana.ini` (or corresponding environment variables) to take effect, you must restart Grafana for the changes to take effect.
 
+<hr />
+
+## app_mode
+
+Options are `production` and `development`. Default is `production`. _Do not_ change this option unless you are working on Grafana development.
+
 ## instance_name
 
 Set the name of the grafana-server instance. Used in logging, internal metrics, and clustering info. Defaults to: `${HOSTNAME}`, which will be replaced with
-environment variable `HOSTNAME`, if that is empty or does not exist Grafana will try to use
-system calls to get the machine name.
+environment variable `HOSTNAME`, if that is empty or does not exist Grafana will try to use system calls to get the machine name.
+
+<hr />
 
 ## [paths]
 
 ### data
 
-Path to where Grafana stores the sqlite3 database (if used), file based sessions (if used), and other data. This path is usually specified via command line in the init.d script or the systemd service file.
+Path to where Grafana stores the sqlite3 database (if used), file-based sessions (if used), and other data. This path is usually specified via command line in the init.d script or the systemd service file.
 
 **macOS:** The default SQLite database is located at `/usr/local/var/lib/grafana`
 
@@ -104,7 +112,7 @@ How long temporary images in `data` directory should be kept. Defaults to: `24h`
 
 ### logs
 
-Path to where Grafana will store logs. This path is usually specified via command line in the init.d script or the systemd service file. You can override it in the configuration file or in the default environment variable file. However, please note that by overriding this the default log path will be used temporarily until Grafana has fully initialized/started.
+Path to where Grafana stores logs. This path is usually specified via command line in the init.d script or the systemd service file. You can override it in the configuration file or in the default environment variable file. However, please note that by overriding this the default log path will be used temporarily until Grafana has fully initialized/started.
 
 Override log path using the command line argument `cfg:default.paths.log`:
 
@@ -116,16 +124,24 @@ Override log path using the command line argument `cfg:default.paths.log`:
 
 ### plugins
 
-Directory where Grafana will automatically scan and look for plugins. Manually or automatically install any plugins here.
+Directory where Grafana automatically scans and looks for plugins. Manually or automatically install any plugins here.
 
 **macOS:** By default, the Mac plugin location is: `/usr/local/var/lib/grafana/plugins`.
 
 ### provisioning
 
-Folder that contains [provisioning]({{< relref "../administration/provisioning" >}}) config files that grafana will apply on startup. Dashboards will be reloaded when the json files changes
+Folder that contains [provisioning]({{< relref "provisioning.md" >}}) config files that grafana will apply on startup. Dashboards will be reloaded when the json files changes
+
+<hr />
 
 ## [server]
 
+### protocol
+
+`http`,`https`,`h2` or `socket`
+
+> **Note:** Grafana versions earlier than 3.0 are vulnerable to [POODLE](https://en.wikipedia.org/wiki/POODLE). So we strongly recommend to upgrade to 3.x or use a reverse proxy for SSL termination.
+
 ### http_addr
 
 The IP address to bind to. If empty will bind to all interfaces
@@ -146,15 +162,6 @@ $ sudo iptables -t nat -A PREROUTING -p tcp --dport 80 -j REDIRECT --to-port 300
 
 Another way is put a webserver like Nginx or Apache in front of Grafana and have them proxy requests to Grafana.
 
-### protocol
-
-`http`,`https`,`h2` or `socket`
-
-> **Note:** Grafana versions earlier than 3.0 are vulnerable to [POODLE](https://en.wikipedia.org/wiki/POODLE). So we strongly recommend to upgrade to 3.x or use a reverse proxy for SSL termination.
-
-### socket
-Path where the socket should be created when `protocol=socket`. Please make sure that Grafana has appropriate permissions.
-
 ### domain
 
 This setting is only used in as a part of the `root_url` setting (see below). Important if you use GitHub or Google OAuth.
@@ -174,14 +181,19 @@ callback URL to be correct).
 > case add the subpath to the end of this URL setting.
 
 ### serve_from_sub_path
-> Available in 6.3 and above
+
+> Available in Grafana 6.3+.
 
 Serve Grafana from subpath specified in `root_url` setting. By default it is set to `false` for compatibility reasons.
 
 By enabling this setting and using a subpath in `root_url` above, e.g.
-`root_url = http://localhost:3000/grafana`, Grafana will be accessible on
+`root_url = http://localhost:3000/grafana`, Grafana is accessible on
 `http://localhost:3000/grafana`.
 
+### router_logging
+
+Set to `true` for Grafana to log all HTTP requests (not just errors). These are logged as Info level events to the Grafana log.
+
 ### static_root_path
 
 The path to the directory where the front end files (HTML, JS, and CSS
@@ -203,10 +215,9 @@ Path to the certificate file (if `protocol` is set to `https` or `h2`).
 
 Path to the certificate key file (if `protocol` is set to `https` or `h2`).
 
-### router_logging
+### socket
 
-Set to `true` for Grafana to log all HTTP requests (not just errors). These are logged as Info level events
-to grafana log.
+Path where the socket should be created when `protocol=socket`. Make sure that Grafana has appropriate permissions before you change this setting.
 
 <hr />
 
@@ -216,20 +227,10 @@ Grafana needs a database to store users and dashboards (and other
 things). By default it is configured to use `sqlite3` which is an
 embedded database (included in the main Grafana binary).
 
-### url
-
-Use either URL or the other fields below to configure the database
-Example: `mysql://user:secret@host:port/database`
-
 ### type
 
 Either `mysql`, `postgres` or `sqlite3`, it's your choice.
 
-### path
-
-Only applicable for `sqlite3` database. The file path where the database
-will be stored.
-
 ### host
 
 Only applicable to MySQL or Postgres. Includes IP or hostname and port or in case of Unix sockets the path to it.
@@ -249,6 +250,25 @@ The database user (not applicable for `sqlite3`).
 
 The database user's password (not applicable for `sqlite3`). If the password contains `#` or `;` you have to wrap it with triple quotes. For example `"""#password;"""`
 
+### url
+
+Use either URL or the other fields below to configure the database
+Example: `mysql://user:secret@host:port/database`
+
+### max_idle_conn
+The maximum number of connections in the idle connection pool.
+
+### max_open_conn
+The maximum number of open connections to the database.
+
+### conn_max_lifetime
+
+Sets the maximum amount of time a connection may be reused. The default is 14400 (which means 14400 seconds or 4 hours). For MySQL, this setting should be shorter than the [`wait_timeout`](https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_wait_timeout) variable.
+
+### log_queries
+
+Set to `true` to log the sql calls and execution times.
+
 ### ssl_mode
 
 For Postgres, use either `disable`, `require` or `verify-full`.
@@ -270,19 +290,10 @@ The path to the client cert. Only if server requires client authentication.
 
 The common name field of the certificate used by the `mysql` or `postgres` server. Not necessary if `ssl_mode` is set to `skip-verify`.
 
-### max_idle_conn
-The maximum number of connections in the idle connection pool.
+### path
 
-### max_open_conn
-The maximum number of open connections to the database.
-
-### conn_max_lifetime
-
-Sets the maximum amount of time a connection may be reused. The default is 14400 (which means 14400 seconds or 4 hours). For MySQL, this setting should be shorter than the [`wait_timeout`](https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_wait_timeout) variable.
-
-### log_queries
-
-Set to `true` to log the sql calls and execution times.
+Only applicable for `sqlite3` database. The file path where the database
+will be stored.
 
 ### cache_mode
 
@@ -295,17 +306,17 @@ Defaults to `private`.
 
 ### type
 
-Either `redis`, `memcached` or `database`. Defaults to `database`
+Either `redis`, `memcached`, or `database`. Defaults to `database`
 
 ### connstr
 
-The remote cache connection string. The format depends on the `type` of the remote cache.
+The remote cache connection string. The format depends on the `type` of the remote cache. Options are `database`, `redis`, and `memcache`.
 
-#### Database
+#### database
 
 Leave empty when using `database` since it will use the primary database.
 
-#### Redis
+#### redis
 
 Example connstr: `addr=127.0.0.1:6379,pool_size=100,db=0,ssl=false`
 
@@ -314,167 +325,12 @@ Example connstr: `addr=127.0.0.1:6379,pool_size=100,db=0,ssl=false`
 - `db` (optional) is the number indentifer of the redis database you want to use.
 - `ssl` (optional) is if SSL should be used to connect to redis server. The value may be `true`, `false`, or `insecure`. Setting the value to `insecure` skips verification of the certificate chain and hostname when making the connection.
 
-#### Memcache
+#### memcache
 
 Example connstr: `127.0.0.1:11211`
 
 <hr />
 
-## [security]
-
-### disable_initial_admin_creation
-
-> Only available in Grafana v6.5+.
-
-Disable creation of admin user on first start of grafana.
-
-### admin_user
-
-The name of the default Grafana admin user (who has full permissions).
-Defaults to `admin`.
-
-### admin_password
-
-The password of the default Grafana admin. Set once on first-run.  Defaults to `admin`.
-
-### login_remember_days
-
-The number of days the keep me logged in / remember me cookie lasts.
-
-### secret_key
-
-Used for signing some data source settings like secrets and passwords, the encryption format used is AES-256 in CFB mode. Cannot be changed without requiring an update
-to data source settings to re-encode them.
-
-### disable_gravatar
-
-Set to `true` to disable the use of Gravatar for user profile images.
-Default is `false`.
-
-### data_source_proxy_whitelist
-
-Define a whitelist of allowed IP addresses or domains, with ports, to be used in data source URLs with the Grafana data source proxy. Format: `ip_or_domain:port` separated by spaces. PostgreSQL, MySQL, and MSSQL data sources do not use the proxy and are therefore unaffected by this setting.
-
-### cookie_secure
-
-Set to `true` if you host Grafana behind HTTPS. Default is `false`.
-
-### disable_brute_force_login_protection
-
-Set to `true` to disable [brute force login protection](https://cheatsheetseries.owasp.org/cheatsheets/Authentication_Cheat_Sheet.html#account-lockout). Default is `false`.
-
-### cookie_samesite
-
-Sets the `SameSite` cookie attribute and prevents the browser from sending this cookie along with cross-site requests. The main goal is to mitigate the risk of cross-origin information leakage. This setting also provides some protection against cross-site request forgery attacks (CSRF),  [read more about SameSite here](https://www.owasp.org/index.php/SameSite). Valid values are `lax`, `strict`, `none`, and `disabled`. Default is `lax`. Using value `disabled` does not add any `SameSite` attribute to cookies.
-
-### allow_embedding
-
-When `false`, the HTTP header `X-Frame-Options: deny` will be set in Grafana HTTP responses which will instruct
-browsers to not allow rendering Grafana in a `<frame>`, `<iframe>`, `<embed>` or `<object>`. The main goal is to
-mitigate the risk of [Clickjacking](https://www.owasp.org/index.php/Clickjacking). Default is `false`.
-
-### strict_transport_security
-
-Set to `true` if you want to enable HTTP `Strict-Transport-Security` (HSTS) response header. This is only sent when HTTPS is enabled in this configuration. HSTS tells browsers that the site should only be accessed using HTTPS. The default value is `false` until the next minor release, `6.3`.
-
-### strict_transport_security_max_age_seconds
-
-Sets how long a browser should cache HSTS in seconds. Only applied if strict_transport_security is enabled. The default value is `86400`.
-
-### strict_transport_security_preload
-
-Set to `true` if to enable HSTS `preloading` option. Only applied if strict_transport_security is enabled. The default value is `false`.
-
-### strict_transport_security_subdomains
-
-Set to `true` if to enable the HSTS includeSubDomains option. Only applied if strict_transport_security is enabled. The default value is `false`.
-
-### x_content_type_options
-
-Set to `true` to enable the X-Content-Type-Options response header. The X-Content-Type-Options response HTTP header is a marker used by the server to indicate that the MIME types advertised in the Content-Type headers should not be changed and be followed. The default value is `false` until the next minor release, `6.3`.
-
-### x_xss_protection
-
-Set to `false` to disable the X-XSS-Protection header, which tells browsers to stop pages from loading when they detect reflected cross-site scripting (XSS) attacks. The default value is `false` until the next minor release, `6.3`.
-
-<hr />
-
-## [users]
-
-### allow_sign_up
-
-Set to `false` to prohibit users from being able to sign up / create
-user accounts. Defaults to `false`.  The admin user can still create
-users from the [Grafana Admin Pages](/reference/admin)
-
-### allow_org_create
-
-Set to `false` to prohibit users from creating new organizations.
-Defaults to `false`.
-
-### auto_assign_org
-
-Set to `true` to automatically add new users to the main organization
-(id 1). When set to `false`, new users will automatically cause a new
-organization to be created for that new user.
-
-### auto_assign_org_id
-
-Set this value to automatically add new users to the provided org.
-This requires `auto_assign_org` to be set to `true`. Please make sure
-that this organization already exists.
-
-### auto_assign_org_role
-
-The role new users will be assigned for the main organization (if the
-above setting is set to true).  Defaults to `Viewer`, other valid
-options are `Admin` and `Editor`. e.g. :
-
-`auto_assign_org_role = Viewer`
-
-### viewers_can_edit
-
-Viewers can edit/inspect dashboard settings in the browser, but not save the dashboard.
-Defaults to `false`.
-
-### editors_can_admin
-
-Editors can administrate dashboards, folders and teams they create.
-Defaults to `false`.
-
-### login_hint
-
-Text used as placeholder text on login page for login/username input.
-
-### password_hint
-
-Text used as placeholder text on login page for password input.
-
-<hr>
-
-## [auth]
-
-Grafana provides many ways to authenticate users. The docs for authentication has been split in to many different pages
-below.
-
-- [Authentication Overview]({{< relref "../auth/overview.md" >}}) (anonymous access options, hide login and more)
-- [Google OAuth]({{< relref "../auth/google.md" >}}) (auth.google)
-- [GitHub OAuth]({{< relref "../auth/github.md" >}}) (auth.github)
-- [Gitlab OAuth]({{< relref "../auth/gitlab.md" >}}) (auth.gitlab)
-- [Generic OAuth]({{< relref "../auth/generic-oauth.md" >}}) (auth.generic_oauth, okta2, auth0, bitbucket, azure)
-- [Basic Authentication]({{< relref "../auth/overview.md" >}}) (auth.basic)
-- [LDAP Authentication]({{< relref "../auth/ldap.md" >}}) (auth.ldap)
-- [Auth Proxy]({{< relref "../auth/auth-proxy.md" >}}) (auth.proxy)
-
-### login_cookie_name
-
-The cookie name for storing the auth token, the default is `grafana_session`.
-
-### oauth_state_cookie_max_age
-
-How long the OAuth state cookie lives before being deleted. Default is `60` (seconds)
-Administrators can increase this if they experience OAuth login state mismatch errors.
-
 ## [dataproxy]
 
 ### logging
@@ -501,14 +357,117 @@ track running instances, versions, dashboard and error counts. It is very helpfu
 to us, so please leave this enabled. Counters are sent every 24 hours. Default
 value is `true`.
 
+### check_for_updates
+
+Set to false to disable all checks to https://grafana.com for new versions of installed plugins and to the Grafana GitHub repository to check for a newer version of Grafana. The version information is used in some UI views to notify that a new Grafana update or a plugin update exists. This option does not cause any auto updates, nor send any sensitive information. The check is run every 10 minutes.
+
 ### google_analytics_ua_id
 
 If you want to track Grafana usage via Google analytics specify *your* Universal
 Analytics ID here. By default this feature is disabled.
 
-### check_for_updates
+### google_tag_manager_id
 
-Set to false to disable all checks to https://grafana.com for new versions of installed plugins and to the Grafana GitHub repository to check for a newer version of Grafana. The version information is used in some UI views to notify that a new Grafana update or a plugin update exists. This option does not cause any auto updates, nor send any sensitive information. The check is run every 10 minutes.
+Google Tag Manager ID, only enabled if you enter an ID here.
+
+<hr />
+
+## [security]
+
+### disable_initial_admin_creation
+
+> Only available in Grafana v6.5+.
+
+Disable creation of admin user on first start of Grafana. Default is `false`.
+
+### admin_user
+
+The name of the default Grafana Admin user, who has full permissions.
+Default is `admin`.
+
+### admin_password
+
+The password of the default Grafana Admin. Set once on first-run. Default is `admin`.
+
+### secret_key
+
+Used for signing some data source settings like secrets and passwords, the encryption format used is AES-256 in CFB mode. Cannot be changed without requiring an update
+to data source settings to re-encode them.
+
+### disable_gravatar
+
+Set to `true` to disable the use of Gravatar for user profile images.
+Default is `false`.
+
+### data_source_proxy_whitelist
+
+Define a whitelist of allowed IP addresses or domains, with ports, to be used in data source URLs with the Grafana data source proxy. Format: `ip_or_domain:port` separated by spaces. PostgreSQL, MySQL, and MSSQL data sources do not use the proxy and are therefore unaffected by this setting.
+
+### disable_brute_force_login_protection
+
+Set to `true` to disable [brute force login protection](https://cheatsheetseries.owasp.org/cheatsheets/Authentication_Cheat_Sheet.html#account-lockout). Default is `false`.
+
+### cookie_secure
+
+Set to `true` if you host Grafana behind HTTPS. Default is `false`.
+
+### cookie_samesite
+
+Sets the `SameSite` cookie attribute and prevents the browser from sending this cookie along with cross-site requests. The main goal is to mitigate the risk of cross-origin information leakage. This setting also provides some protection against cross-site request forgery attacks (CSRF),  [read more about SameSite here](https://www.owasp.org/index.php/SameSite). Valid values are `lax`, `strict`, `none`, and `disabled`. Default is `lax`. Using value `disabled` does not add any `SameSite` attribute to cookies.
+
+### allow_embedding
+
+When `false`, the HTTP header `X-Frame-Options: deny` will be set in Grafana HTTP responses which will instruct
+browsers to not allow rendering Grafana in a `<frame>`, `<iframe>`, `<embed>` or `<object>`. The main goal is to
+mitigate the risk of [Clickjacking](https://www.owasp.org/index.php/Clickjacking). Default is `false`.
+
+### strict_transport_security
+
+Set to `true` if you want to enable HTTP `Strict-Transport-Security` (HSTS) response header. This is only sent when HTTPS is enabled in this configuration. HSTS tells browsers that the site should only be accessed using HTTPS. The default value is `false` until the next minor release, `6.3`.
+
+### strict_transport_security_max_age_seconds
+
+Sets how long a browser should cache HSTS in seconds. Only applied if strict_transport_security is enabled. The default value is `86400`.
+
+### strict_transport_security_preload
+
+Set to `true` to enable HSTS `preloading` option. Only applied if strict_transport_security is enabled. The default value is `false`.
+
+### strict_transport_security_subdomains
+
+Set to `true` if to enable the HSTS includeSubDomains option. Only applied if strict_transport_security is enabled. The default value is `false`.
+
+### x_content_type_options
+
+Set to `true` to enable the X-Content-Type-Options response header. The X-Content-Type-Options response HTTP header is a marker used by the server to indicate that the MIME types advertised in the Content-Type headers should not be changed and be followed. The default value is `false`.
+
+### x_xss_protection
+
+Set to `false` to disable the X-XSS-Protection header, which tells browsers to stop pages from loading when they detect reflected cross-site scripting (XSS) attacks. The default value is `false` until the next minor release, `6.3`.
+
+<hr />
+
+## [snapshots]
+
+### external_enabled
+
+Set to `false` to disable external snapshot publish endpoint (default `true`).
+
+### external_snapshot_url
+
+Set root URL to a Grafana instance where you want to publish external snapshots (defaults to https://snapshots-origin.raintank.io).
+
+### external_snapshot_name
+
+Set name for external snapshot button. Defaults to `Publish to snapshot.raintank.io`.
+
+### public_mode
+
+Set to true to enable this Grafana instance to act as an external snapshot server and allow unauthenticated requests for creating and deleting snapshots. Default is `false`.
+
+### snapshot_remove_expired
+
+Enable this to automatically remove expired snapshots. Default is `true`.
 
 <hr />
 
@@ -522,116 +481,325 @@ Number dashboard versions to keep (per dashboard). Default: `20`, Minimum: `1`.
 
 > Only available in Grafana v6.7+.
 
-This will restrict users to set the refresh interval of a dashboard lower than given interval. Per default this is 5 seconds.
+This prevents users from setting the dashboard refresh interval of a lower than given interval. Per default this is 5 seconds.
 The interval string is a possibly signed sequence of decimal numbers, followed by a unit suffix (ms, s, m, h, d), e.g. `30s` or `1m`.
 
+<hr />
+
+## [users]
+
+### allow_sign_up
+
+Set to `false` to prohibit users from being able to sign up / create
+user accounts. Default is `false`.  The admin user can still create
+users from the [Grafana Admin Pages](/reference/admin).
+
+### allow_org_create
+
+Set to `false` to prohibit users from creating new organizations.
+Default is `false`.
+
+### auto_assign_org
+
+Set to `true` to automatically add new users to the main organization
+(id 1). When set to `false`, new users automatically cause a new
+organization to be created for that new user. Default is `true`.
+
+### auto_assign_org_id
+
+Set this value to automatically add new users to the provided org.
+This requires `auto_assign_org` to be set to `true`. Please make sure
+that this organization already exists. Default is 1.
+
+### auto_assign_org_role
+
+The role new users will be assigned for the main organization (if the
+above setting is set to true).  Defaults to `Viewer`, other valid
+options are `Admin` and `Editor`. e.g.:
+
+`auto_assign_org_role = Viewer`
+
+### verify_email_enabled
+
+Require email validation before sign up completes. Default is `false`.
+
+### login_hint
+
+Text used as placeholder text on login page for login/username input.
+
+### password_hint
+
+Text used as placeholder text on login page for password input.
+
+### default_theme
+
+Set the default UI theme: `dark` or `light`. Default is `dark`.
+
+### External user management
+
+If you manage users externally you can replace the user invite button for organizations with a link to an external site together with a description. 
+
+### viewers_can_edit
+
+Viewers can edit/inspect dashboard settings in the browser, but not save the dashboard.
+Default is `false`.
+
+### editors_can_admin
+
+Editors can administrate dashboards, folders and teams they create.
+Default is `false`.
+
+<hr>
+
+## [auth]
+
+Grafana provides many ways to authenticate users. Refer to the Grafana [Authentication overview]({{< relref "../auth/overview.md" >}}) and other authentication documentation for detailed instructions on how to set up and configure authentication.
+
+### login_cookie_name
+
+The cookie name for storing the auth token. Default is `grafana_session`.
+
+### login_maximum_inactive_lifetime_days
+
+The lifetime (days) an authenticated user can be inactive before being required to log in at next visit. Default is 7 days.
+
+### login_maximum_lifetime_days
+
+The maximum lifetime (days) an authenticated user can be logged in before being required to login. Default is 30 days.
+
+### token_rotation_interval_minutes
+
+How often auth tokens are rotated for authenticated users when the user is active. The default is each 10 minutes.
+
+### disable_login_form
+
+Set to true to disable (hide) the login form, useful if you use OAuth. Default is false.
+
+### disable_signout_menu
+
+Set to `true` to disable the signout link in the side menu. This is useful if you use auth.proxy. Default is `false`.
+
+### signout_redirect_url
+
+URL to redirect the user to after they sign out.
+
+### oauth_auto_login
+
+Set to `true` to attempt login with OAuth automatically, skipping the login screen.
+This setting is ignored if multiple OAuth providers are configured. Default is `false`.
+
+### oauth_state_cookie_max_age
+
+How long the OAuth state cookie lives before being deleted. Default is `60` (seconds)
+Administrators can increase this if they experience OAuth login state mismatch errors.
+
+### api_key_max_seconds_to_live
+
+Limit of API key seconds to live before expiration. Default is -1 (unlimited).
+
 ### default_home_dashboard_path
 
 Path to the default home dashboard. If this value is empty, then Grafana uses StaticRootPath + "dashboards/home.json"
 
+<hr />
 
-## [dashboards.json]
+## [auth.anonymous]
 
-> This have been replaced with dashboards [provisioning]({{< relref "../administration/provisioning" >}}) in 5.0+
+Refer to [Anonymous authentication]({{< relref "../auth/#anonymous-authentication" >}}) for detailed instructions.
 
-### enabled
-`true` or `false`. Is disabled by default.
+<hr />
 
-### path
-The full path to a directory containing your json dashboards.
+## [auth.github]
+
+Refer to [GitHub OAuth2 authentication]({{< relref "../auth/github.md" >}}) for detailed instructions.
+
+<hr />
+
+## [auth.gitlab]
+
+Refer to [Gitlab OAuth2 authentication]({{< relref "../auth/gitlab.md" >}}) for detailed instructions.
+
+<hr />
+
+## [auth.google]
+
+Refer to [Google OAuth2 authentication]({{< relref "../auth/google.md" >}}) for detailed instructions.
+
+<hr />
+
+## [auth.grafananet]
+
+Legacy key names, still in the config file so they work in env variables.
+
+<hr />
+
+## [auth.grafana_com]
+
+Legacy key names, still in the config file so they work in env variables.
+
+<hr />
+
+## [auth.azuread]
+
+Refer to [Azure AD OAuth2 authentication]({{< relref "../auth/azuread.md" >}}) for detailed instructions.
+
+<hr />
+
+## [auth.okta]
+
+Refer to [Okta OAuth2 authentication]({{< relref "../auth/okta.md" >}}) for detailed instructions.
+
+<hr />
+
+## [auth.generic_oauth]
+
+Refer to [Generic OAuth authentication]({{< relref "../auth/generic-oauth.md" >}}) for detailed instructions.
+
+<hr />
+
+## [auth.basic]
+
+Refer to [Basic authentication]({{< relref "../auth/overview.md#basic-authentication" >}}) for detailed instructions.
+
+<hr />
+
+## [auth.proxy]
+
+Refer to [Auth proxy authentication]({{< relref "../auth/auth-proxy.md" >}}) for detailed instructions.
+
+<hr />
+
+## [auth.ldap]
+
+Refer to [LDAO authentication]({{< relref "../auth/ldap.md" >}}) for detailed instructions.
+
+<hr />
 
 ## [smtp]
+
 Email server settings.
 
 ### enabled
-defaults to `false`
+
+Enable this to allow Grafana to send email. Default is `false`.
+
+If the password contains `#` or `;`, then you have to wrap it with triple quotes. Example:  """#password;"""
 
 ### host
-defaults to `localhost:25`
+
+Default is `localhost:25`.
 
 ### user
-In case of SMTP auth, defaults to `empty`
+
+In case of SMTP auth, default is `empty`.
 
 ### password
-In case of SMTP auth, defaults to `empty`
+
+In case of SMTP auth, default is `empty`.
 
 ### cert_file
-File path to a cert file, defaults to `empty`
+
+File path to a cert file, default is `empty`.
 
 ### key_file
-File path to a key file, defaults to `empty`
+
+File path to a key file, default is `empty`.
 
 ### skip_verify
-Verify SSL for SMTP server? defaults to `false`
+
+Verify SSL for SMTP server, default is `false`.
 
 ### from_address
-Address used when sending out emails, defaults to `admin@grafana.localhost`
+
+Address used when sending out emails, default is `admin@grafana.localhost`.
 
 ### from_name
-Name to be used when sending out emails, defaults to `Grafana`
+
+Name to be used when sending out emails, default is `Grafana`.
 
 ### ehlo_identity
-Name to be used as client identity for EHLO in SMTP dialog, defaults to instance_name.
+
+Name to be used as client identity for EHLO in SMTP dialog, default is `<instance_name>`.
 
 ### startTLS_policy
-Either "OpportunisticStartTLS", "MandatoryStartTLS", "NoStartTLS". Default is "OpportunisticStartTLS"
+
+Either "OpportunisticStartTLS", "MandatoryStartTLS", "NoStartTLS". Default is `empty`.
+
+<hr>
+
+## [emails]
+
+### welcome_email_on_sign_up
+
+Default is `false`.
+
+### templates_pattern 
+
+Default is `emails/*.html`.
+
+<hr>
 
 ## [log]
 
+Grafana logging options.
+
 ### mode
-Either "console", "file", "syslog". Default is "console" and "file".
-Use spaces to separate multiple modes, e.g. `console file`
+
+Options are "console", "file", and "syslog". Default is "console" and "file". Use spaces to separate multiple modes, e.g. `console file`.
 
 ### level
 
-Either "debug", "info", "warn", "error", "critical", default is `info`.
+Options are "debug", "info", "warn", "error", and "critical". Default is `info`.
 
 ### filters
 
-optional settings to set different levels for specific loggers.
-For example `filters = sqlstore:debug`.
+Optional settings to set different levels for specific loggers.
+For example: `filters = sqlstore:debug`
+
+<hr>
 
 ## [log.console]
 
-Only applicable when "console" used in `[log]` mode.
+Only applicable when "console" is used in `[log]` mode.
 
 ### level
 
-Either "debug", "info", "warn", "error", "critical", default is inherited from `[log]` level.
+Options are "debug", "info", "warn", "error", and "critical". Default is inherited from `[log]` level.
 
 ### format
 
 Log line format, valid options are text, console and json. Default is `console`.
 
+<hr>
+
 ## [log.file]
 
 Only applicable when "file" used in `[log]` mode.
 
 ### level
 
-Either "debug", "info", "warn", "error", "critical", default is inherited from `[log]` level.
+Options are "debug", "info", "warn", "error", and "critical". Default is inherited from `[log]` level.
 
 ### format
 
-Log line format, valid options are text, console and json. Default is `console`.
+Log line format, valid options are text, console and json. Default is `text`.
 
 ### log_rotate
 
-Enable automated log rotation, valid options are false or true. Default is `true`.
-When enabled use the `max_lines`, `max_size_shift`, `daily_rotate` and `max_days` below
-to configure the behavior of the log rotation.
+Enable automated log rotation, valid options are `false` or `true`. Default is `true`.
+When enabled use the `max_lines`, `max_size_shift`, `daily_rotate` and `max_days` to configure the behavior of the log rotation.
 
 ### max_lines
 
-Maximum lines per file before rotating it. Default is 1000000.
+Maximum lines per file before rotating it. Default is `1000000`.
 
 ### max_size_shift
 
-Maximum size of file before rotating it. Default is `28` which means `1 << 28`, `256MB`.
+Maximum size of file before rotating it. Default is `28`, which means `1 << 28`, `256MB`.
 
 ### daily_rotate
 
-Enable daily rotation of files, valid options are false or true. Default is `true`.
+Enable daily rotation of files, valid options are `false` or `true`. Default is `true`.
 
 ### max_days
 
@@ -643,15 +811,15 @@ Only applicable when "syslog" used in `[log]` mode.
 
 ### level
 
-Either "debug", "info", "warn", "error", "critical", default is inherited from `[log]` level.
+Options are "debug", "info", "warn", "error", and "critical". Default is inherited from `[log]` level.
 
 ### format
 
-Log line format, valid options are text, console and json. Default is `console`.
+Log line format, valid options are text, console, and json. Default is `text`.
 
 ### network and address
 
-Syslog network type and address. This can be UDP, TCP, or unix. If left blank, the default unix endpoints will be used.
+Syslog network type and address. This can be UDP, TCP, or UNIX. If left blank, then the default UNIX endpoints are used.
 
 ### facility
 
@@ -661,213 +829,162 @@ Syslog facility. Valid options are user, daemon or local0 through local7. Defaul
 
 Syslog tag. By default, the process's `argv[0]` is used.
 
-## [metrics]
+<hr>
 
-For detailed instructions, refer to [Internal Grafana metrics]({{< relref "../administration/metrics.md" >}}).
+## [quota]
+
+Set quotas to `-1` to make unlimited.
 
 ### enabled
-Enable metrics reporting. defaults true. Available via HTTP API `/metrics`.
 
-### basic_auth_username
-If set configures the username to use for basic authentication on the metrics endpoint.
+Enable usage quotas. Default is `false`.
 
-### basic_auth_password
-If set configures the password to use for basic authentication on the metrics endpoint.
+### org_user
 
-### disable_total_stats
-If set to `true`, then total stats generation (`stat_totals_*` metrics) is disabled. The default is `false`.
+Limit the number of users allowed per organization. Default is 10.
 
-### interval_seconds
+### org_dashboard
 
-Flush/Write interval when sending metrics to external TSDB. Defaults to 10s.
+Limit the number of dashboards allowed per organization. Default is 100.
 
-## [metrics.graphite]
-Include this section if you want to send internal Grafana metrics to Graphite.
+### org_data_source
 
-### address
-Format `<Hostname or ip>`:port
+Limit the number of data sources allowed per organization. Default is 10.
 
-### prefix
-Graphite metric prefix. Defaults to `prod.grafana.%(instance_name)s.`
+### org_api_key
 
-## [snapshots]
+Limit the number of API keys that can be entered per organization. Default is 10.
 
-### external_enabled
-Set to `false` to disable external snapshot publish endpoint (default `true`)
+### user_org
 
-### external_snapshot_url
-Set root URL to a Grafana instance where you want to publish external snapshots (defaults to https://snapshots-origin.raintank.io)
+Limit the number of organizations a user can create. Default is 10.
 
-### external_snapshot_name
-Set name for external snapshot button. Defaults to `Publish to snapshot.raintank.io`
+### global_user
 
-### snapshot_remove_expired
-Enabled to automatically remove expired snapshots
+Sets a global limit of users. Default is -1 (unlimited).
 
-## [external_image_storage]
-These options control how images should be made public so they can be shared on services like slack.
+### global_org
 
-### provider
-You can choose between (s3, webdav, gcs, azure_blob, local). If left empty Grafana will ignore the upload action.
+Sets a global limit on the number of organizations that can be created. Default is -1 (unlimited).
 
-## [external_image_storage.s3]
+### global_dashboard
 
-### endpoint
-Optional endpoint URL (hostname or fully qualified URI) to override the default generated S3 endpoint. If you want to
-keep the default, just leave this empty. You must still provide a `region` value if you specify an endpoint.
+Sets a global limit on the number of dashboards that can be created. Default is -1 (unlimited).
 
-## path_style_access
-Set this to true to force path-style addressing in S3 requests, i.e., `http://s3.amazonaws.com/BUCKET/KEY`, instead
-of the default, which is virtual hosted bucket addressing when possible (`http://BUCKET.s3.amazonaws.com/KEY`).
+### global_api_key
 
-Note: This option is specific to the Amazon S3 service.
+Sets global limit of API keys that can be entered. Default is -1 (unlimited).
 
-### bucket
-Bucket name for S3. e.g. grafana.snapshot.
+### global_session
 
-### region
-Region name for S3. e.g. 'us-east-1', 'cn-north-1', etc.
+Sets a global limit on number of users that can be logged in at one time. Default is -1 (unlimited).
 
-### path
-Optional extra path inside bucket, useful to apply expiration policies.
-
-### bucket_url
-(for backward compatibility, only works when no bucket or region are configured)
-Bucket URL for S3. AWS region can be specified within URL or defaults to 'us-east-1', e.g.
-- http://grafana.s3.amazonaws.com/
-- https://grafana.s3-ap-southeast-2.amazonaws.com/
-
-### access_key
-Access key, e.g. AAAAAAAAAAAAAAAAAAAA.
-
-Access key requires permissions to the S3 bucket for the 's3:PutObject' and 's3:PutObjectAcl' actions.
-
-### secret_key
-Secret key, e.g. AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA.
-
-## [external_image_storage.webdav]
-
-### url
-URL to where Grafana will send PUT request with images
-
-### public_url
-Optional parameter. URL to send to users in notifications. If the string contains the sequence ${file}, it will be replaced with the uploaded filename. Otherwise, the file name will be appended to the path part of the URL, leaving any query string unchanged.
-
-### username
-basic auth username
-
-### password
-basic auth password
-
-## [external_image_storage.gcs]
-
-### key_file
-Path to JSON key file associated with a Google service account to authenticate and authorize.
-Service Account keys can be created and downloaded from https://console.developers.google.com/permissions/serviceaccounts.
-
-Service Account should have "Storage Object Writer" role. The access control model of the bucket needs to be "Set object-level and bucket-level permissions". Grafana itself will make the images public readable.
-
-### bucket
-Bucket Name on Google Cloud Storage.
-
-### path
-Optional extra path inside bucket
-
-## [external_image_storage.azure_blob]
-
-### account_name
-Storage account name
-
-### account_key
-Storage account key
-
-### container_name
-Container name where to store "Blob" images with random names. Creating the blob container beforehand is required. Only public containers are supported.
+<hr>
 
 ## [alerting]
 
+For more information about the Alerting feature in Grafana, refer to [Alerts overview]({{< relref "../alerting/alerts-overview.md" >}}).
+
 ### enabled
-Defaults to `true`. Set to `false` to disable alerting engine and hide Alerting from UI.
+
+Set to `false` to disable alerting engine and hide Alerting in the Grafana UI. Default is `true`.
 
 ### execute_alerts
 
-Makes it possible to turn off alert rule execution.
+Turns off alert rule execution, but Alerting is still visible in the Grafana UI.
 
 ### error_or_timeout
-> Available in 5.3 and above
 
 Default setting for new alert rules. Defaults to categorize error and timeouts as alerting. (alerting, keep_state)
 
 ### nodata_or_nullvalues
-> Available in 5.3  and above
 
-Default setting for how Grafana handles nodata or null values in alerting. (alerting, no_data, keep_state, ok)
+Defines how Grafana handles nodata or null values in alerting. Options are `alerting`, `no_data`, `keep_state`, and `ok`. Default is `no_data`.
 
 ### concurrent_render_limit
 
-> Available in 5.3  and above
-
 Alert notifications can include images, but rendering many images at the same time can overload the server.
-This limit will protect the server from render overloading and make sure notifications are sent out quickly. Default
-value is `5`.
-
+This limit protects the server from render overloading and ensures notifications are sent out quickly. Default value is `5`.
 
 ### evaluation_timeout_seconds
 
-Default setting for alert calculation timeout. Default value is `30`
+Sets the alert calculation timeout. Default value is `30`.
 
 ### notification_timeout_seconds
 
-Default setting for alert notification timeout. Default value is `30`
+Sets the alert notification timeout. Default value is `30`.
 
 ### max_attempts
 
-Default setting for max attempts to sending alert notifications. Default value is `3`
+Sets a maximum limit on attempts to sending alert notifications. Default value is `3`.
 
 ### min_interval_seconds
 
-Default setting for minimum interval between rule evaluations. Default value is `1`
+Sets the minimum interval between rule evaluations. Default value is `1`.
 
-> **Note.** This setting has precedence over each individual rule frequency. Therefore, if a rule frequency is lower than this value, this value will be enforced.
+> **Note.** This setting has precedence over each individual rule frequency. If a rule frequency is lower than this value, then this value is enforced.
 
-## [rendering]
+<hr>
 
-Options to configure a remote HTTP image rendering service, e.g. using https://github.com/grafana/grafana-image-renderer.
+## [explore]
 
-### server_url
+For more information about this feature, refer to [Explore]({{< relref "../features/explore/index.md" >}}).
 
-URL to a remote HTTP image renderer service, e.g. http://localhost:8081/render, will enable Grafana to render panels and dashboards to PNG-images using HTTP requests to an external service.
+### enabled
 
-### callback_url
+Enable or disable the Explore section. Default is `enabled`.
 
-If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
+## [metrics]
 
-### concurrent_render_request_limit
+For detailed instructions, refer to [Internal Grafana metrics]({{< relref "metrics.md" >}}).
 
-Concurrent render request limit affects when the /render HTTP endpoint is used. Rendering many images at the same time can overload the server,
-which this setting can help protect against by only allowing a certain amount of concurrent requests.
+### enabled
 
-## [panels]
+Enable metrics reporting. defaults true. Available via HTTP API `<URL>/metrics`.
 
-### disable_sanitize_html
+### interval_seconds
 
-If set to true Grafana will allow script tags in text panels. Not recommended as it enable XSS vulnerabilities. Default
-is false. This settings was introduced in Grafana v6.0.
+Flush/write interval when sending metrics to external TSDB. Defaults to `10`.
 
-## [plugins]
+### disable_total_stats
 
-### enable_alpha
+If set to `true`, then total stats generation (`stat_totals_*` metrics) is disabled. Default is `false`.
 
-Set to true if you want to test alpha plugins that are not yet ready for general usage.
+### basic_auth_username and basic_auth_password
 
-### allow_loading_unsigned_plugins
+If both are set, then basic authentication is required to access the metrics endpoint.
 
-Enter a comma-separated list of plugin identifiers to identify plugins that are allowed to be loaded even if they lack a valid signature.
+<hr>
 
-## [feature_toggles]
-### enable
+## [metrics.graphite]
 
-Keys of alpha features to enable, separated by space. Available alpha features are: `transformations`
+Use these options if you want to send internal Grafana metrics to Graphite.
+
+### address
+
+Enable by setting the address. Format is `<Hostname or ip>`:port.
+
+### prefix
+
+Graphite metric prefix. Defaults to `prod.grafana.%(instance_name)s.`
+
+<hr>
+
+## [grafana_net]
+
+### url
+
+Default is https://grafana.com.
+
+<hr>
+
+## [grafana_com]
+
+### url
+
+Default is https://grafana.com.
+
+<hr>
 
 ## [tracing.jaeger]
 
@@ -928,39 +1045,255 @@ Default value is `false`.
 
 Setting this to `true` turns off shared RPC spans. Leaving this available is the most common setting when using Zipkin elsewhere in your infrastructure.
 
-<hr />
+<hr>
 
-# Removed options
-Please note that these options have been removed.
+## [external_image_storage]
 
-## [session]
-**Removed starting from Grafana v6.2. Please use [remote_cache](#remote-cache) option instead.**
+These options control how images should be made public so they can be shared on services like Slack or email message.
 
 ### provider
 
-Valid values are `memory`, `file`, `mysql`, `postgres`, `memcache` or `redis`. Default is `file`.
+Options are s3, webdav, gcs, azure_blob, local). If left empty, then Grafana ignores the upload action.
 
-### provider_config
+<hr>
 
-This option should be configured differently depending on what type of
-session provider you have configured.
+## [external_image_storage.s3]
 
-- **file:** session file path, e.g. `data/sessions`
-- **mysql:** go-sql-driver/mysql dsn config string, e.g. `user:password@tcp(127.0.0.1:3306)/database_name`
-- **postgres:** ex:  `user=a password=b host=localhost port=5432 dbname=c sslmode=verify-full`
-- **memcache:** ex:  `127.0.0.1:11211`
-- **redis:** ex: `addr=127.0.0.1:6379,pool_size=100,prefix=grafana`. For Unix socket, use for example: `network=unix,addr=/var/run/redis/redis.sock,pool_size=100,db=grafana`
+### endpoint
 
-Postgres valid `sslmode` are `disable`, `require`, `verify-ca`, and `verify-full` (default).
+Optional endpoint URL (hostname or fully qualified URI) to override the default generated S3 endpoint. If you want to
+keep the default, just leave this empty. You must still provide a `region` value if you specify an endpoint.
 
-### cookie_name
+### path_style_access
 
-The name of the Grafana session cookie.
+Set this to true to force path-style addressing in S3 requests, i.e., `http://s3.amazonaws.com/BUCKET/KEY`, instead
+of the default, which is virtual hosted bucket addressing when possible (`http://BUCKET.s3.amazonaws.com/KEY`).
 
-### cookie_secure
+> Note: This option is specific to the Amazon S3 service.
 
-Set to true if you host Grafana behind HTTPS only. Defaults to `false`.
+### bucket_url
 
-### session_life_time
+(for backward compatibility, only works when no bucket or region are configured)
+Bucket URL for S3. AWS region can be specified within URL or defaults to 'us-east-1', e.g.
+- http://grafana.s3.amazonaws.com/
+- https://grafana.s3-ap-southeast-2.amazonaws.com/
 
-How long sessions lasts in seconds. Defaults to `86400` (24 hours).
+### bucket
+
+Bucket name for S3. e.g. grafana.snapshot.
+
+### region
+
+Region name for S3. e.g. 'us-east-1', 'cn-north-1', etc.
+
+### path
+
+Optional extra path inside bucket, useful to apply expiration policies.
+
+### access_key
+
+Access key, e.g. AAAAAAAAAAAAAAAAAAAA.
+
+Access key requires permissions to the S3 bucket for the 's3:PutObject' and 's3:PutObjectAcl' actions.
+
+### secret_key
+
+Secret key, e.g. AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA.
+
+<hr>
+
+## [external_image_storage.webdav]
+
+### url
+
+URL where Grafana sends PUT request with images.
+
+### username
+
+Basic auth username.
+
+### password
+
+Basic auth password.
+
+### public_url
+
+Optional URL to send to users in notifications. If the string contains the sequence ${file}, it is replaced with the uploaded filename. Otherwise, the file name is appended to the path part of the URL, leaving any query string unchanged.
+
+<hr>
+
+## [external_image_storage.gcs]
+
+### key_file
+
+Path to JSON key file associated with a Google service account to authenticate and authorize.
+Service Account keys can be created and downloaded from https://console.developers.google.com/permissions/serviceaccounts.
+
+Service Account should have "Storage Object Writer" role. The access control model of the bucket needs to be "Set object-level and bucket-level permissions". Grafana itself will make the images public readable.
+
+### bucket
+
+Bucket Name on Google Cloud Storage.
+
+### path
+
+Optional extra path inside bucket.
+
+## [external_image_storage.azure_blob]
+
+### account_name
+
+Storage account name.
+
+### account_key
+
+Storage account key
+
+### container_name
+
+Container name where to store "Blob" images with random names. Creating the blob container beforehand is required. Only public containers are supported.
+
+<hr>
+
+## [external_image_storage.local]
+
+This option does not require any configuration.
+
+<hr>
+
+## [rendering]
+
+Options to configure a remote HTTP image rendering service, e.g. using https://github.com/grafana/grafana-image-renderer.
+
+### server_url
+
+URL to a remote HTTP image renderer service, e.g. http://localhost:8081/render, will enable Grafana to render panels and dashboards to PNG-images using HTTP requests to an external service.
+
+### callback_url
+
+If the remote HTTP image renderer service runs on a different server than the Grafana server you may have to configure this to a URL where Grafana is reachable, e.g. http://grafana.domain/.
+
+### concurrent_render_request_limit
+
+Concurrent render request limit affects when the /render HTTP endpoint is used. Rendering many images at the same time can overload the server,
+which this setting can help protect against by only allowing a certain amount of concurrent requests. Default is `30`.
+
+## [panels]
+
+### enable_alpha
+
+Set to `true` if you want to test alpha panels that are not yet ready for general usage. Default is `false`.
+
+### disable_sanitize_html
+
+If set to true Grafana will allow script tags in text panels. Not recommended as it enable XSS vulnerabilities. Default is false. This settings was introduced in Grafana v6.0.
+
+## [plugins]
+
+### enable_alpha
+
+Set to `true` if you want to test alpha plugins that are not yet ready for general usage. Default is `false`.
+
+### allow_loading_unsigned_plugins
+
+Enter a comma-separated list of plugin identifiers to identify plugins that are allowed to be loaded even if they lack a valid signature.
+
+<hr>
+
+## [plugin.grafana-image-renderer]
+
+For more information, refer to [Image rendering]({{< relref "image_rendering.md" >}}).
+
+### rendering_timezone
+
+Instruct headless browser instance to use a default timezone when not provided by Grafana, e.g. when rendering panel image of alert. See [ICUs metaZones.txt](https://cs.chromium.org/chromium/src/third_party/icu/source/data/misc/metaZones.txt) for a list of supported timezone IDs. Fallbacks to TZ environment variable if not set.
+
+### rendering_language
+
+Instruct headless browser instance to use a default language when not provided by Grafana, e.g. when rendering panel image of alert.
+Refer to the HTTP header Accept-Language to understand how to format this value, e.g. 'fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7, *;q=0.5'.
+
+### rendering_viewport_device_scale_factor
+
+Instruct headless browser instance to use a default device scale factor when not provided by Grafana, e.g. when rendering panel image of alert.
+Default is `1`. Using a higher value will produce more detailed images (higher DPI), but requires more disk space to store an image.
+
+### rendering_ignore_https_errors
+
+Instruct headless browser instance whether to ignore HTTPS errors during navigation. Per default HTTPS errors are not ignored. Due to the security risk, we do not recommend that you ignore HTTPS errors.
+
+### rendering_verbose_logging
+
+Instruct headless browser instance whether to capture and log verbose information when rendering an image. Default is `false` and will only capture and log error messages. 
+
+When enabled, debug messages are captured and logged as well.
+
+For the verbose information to be included in the Grafana server log you have to adjust the rendering log level to debug, configure [log].filter = rendering:debug.
+
+### rendering_dumpio
+
+Instruct headless browser instance whether to output its debug and error messages into running process of remote rendering service. Default is `false`.
+
+It can be useful to set this to `true` when troubleshooting.
+
+### rendering_args
+
+Additional arguments to pass to the headless browser instance. Default is --no-sandbox. The list of Chromium flags can be found at (https://peter.sh/experiments/chromium-command-line-switches/). Separate multiple arguments with commas.
+
+### rendering_chrome_bin
+
+You can configure the plugin to use a different browser binary instead of the pre-packaged version of Chromium.
+
+Please note that this is _not_ recommended. You might encounter problems if the installed version of Chrome/Chromium is not compatible with the plugin.
+
+### rendering_mode
+
+Instruct how headless browser instances are created. Default is `default` and will create a new browser instance on each request.
+
+Mode `clustered` will make sure that only a maximum of browsers/incognito pages can execute concurrently.
+
+Mode `reusable` will have one browser instance and will create a new incognito page on each request.
+
+### rendering_clustering_mode
+
+When rendering_mode = clustered you can instruct how many browsers or incognito pages can execute concurrently. Default is `browser` and will cluster using browser instances.
+
+Mode `context` will cluster using incognito pages.
+
+### rendering_clustering_max_concurrency
+
+When rendering_mode = clustered you can define maximum number of browser instances/incognito pages that can execute concurrently..
+
+### rendering_viewport_max_width
+
+Limit the maximum viewport width that can be requested.
+
+### rendering_viewport_max_height
+
+Limit the maximum viewport height that can be requested.
+
+### rendering_viewport_max_device_scale_factor
+
+Limit the maximum viewport device scale factor that can be requested.
+
+### grpc_host
+
+Change the listening host of the gRPC server. Default host is `127.0.0.1`.
+
+### grpc_port
+
+Change the listening port of the gRPC server. Default port is `0` and will automatically assign a port not in use.
+
+<hr>
+
+## [enterprise]
+
+For more information about Grafana Enterprise, refer to [Grafana Enterprise]({{< relref "../enterprise/_index.md" >}}).
+
+<hr>
+
+## [feature_toggles]
+
+### enable
+
+Keys of alpha features to enable, separated by space. Available alpha features are: `transformations`
diff --git a/docs/sources/administration/image_rendering.md b/docs/sources/administration/image_rendering.md
index 1ba04b2fe63..9beceb6c46f 100755
--- a/docs/sources/administration/image_rendering.md
+++ b/docs/sources/administration/image_rendering.md
@@ -14,7 +14,7 @@ Grafana supports automatic rendering of panels and dashboards as PNG images. Thi
 
 While an image is being rendered, the PNG image is temporarily written to the file system. When the image is rendered, the PNG image is temporarily written to the `png` folder in the Grafana `data` folder.
 
-A background job runs every 10 minutes and removes temporary images. You can configure how long an image should be stored before being removed by configuring the [temp-data-lifetime]({{< relref "../installation/configuration/#temp-data-lifetime" >}}) setting.
+A background job runs every 10 minutes and removes temporary images. You can configure how long an image should be stored before being removed by configuring the [temp-data-lifetime]({{< relref "../administration/configuration/#temp-data-lifetime" >}}) setting.
 
 You can also render a PNG by clicking the dropdown arrow next to a panel title, then clicking **Share > Direct link rendered image**.
 
@@ -26,7 +26,7 @@ Rendering images can require a lot of memory, mainly because Grafana creates bro
 
 ## Alerting and render limits
 
-Alert notifications can include images, but rendering many images at the same time can overload the server where the renderer is running. For instructions of how to configure this, see [concurrent_render_limit]({{< relref "../installation/configuration/#concurrent_render_limit" >}}).
+Alert notifications can include images, but rendering many images at the same time can overload the server where the renderer is running. For instructions of how to configure this, see [concurrent_render_limit]({{< relref "../administration/configuration/#concurrent_render_limit" >}}).
 
 ## Install Grafana Image Renderer plugin
 
diff --git a/docs/sources/administration/metrics.md b/docs/sources/administration/metrics.md
index 3cffed01bf5..9a1b0ddf5ce 100644
--- a/docs/sources/administration/metrics.md
+++ b/docs/sources/administration/metrics.md
@@ -12,7 +12,7 @@ weight = 8
 
 Grafana collects some metrics about itself internally. Grafana supports pushing metrics to Graphite or exposing them to be scraped by Prometheus.
 
-For more information about configuration options related to Grafana metrics, refer to [metrics]({{< relref "../installation/configuration/#metrics" >}}) and [metrics.graphite]({{< relref "../installation/configuration/#metrics-graphite" >}}) in [Configuration]({{< relref "../installation/configuration.md" >}}).
+For more information about configuration options related to Grafana metrics, refer to [metrics]({{< relref "../administration/configuration/#metrics" >}}) and [metrics.graphite]({{< relref "../administration/configuration/#metrics-graphite" >}}) in [Configuration]({{< relref "../administration/configuration.md" >}}).
 
 ## Available metrics
 
diff --git a/docs/sources/administration/provisioning.md b/docs/sources/administration/provisioning.md
old mode 100755
new mode 100644
index 3fbe0b8aae0..137d504ed0d
--- a/docs/sources/administration/provisioning.md
+++ b/docs/sources/administration/provisioning.md
@@ -15,7 +15,7 @@ In previous versions of Grafana, you could only use the API for provisioning dat
 
 ## Config File
 
-Check out the [configuration]({{< relref "../installation/configuration" >}}) page for more information on what you can configure in `grafana.ini`
+Check out the [configuration]({{< relref "configuration.md" >}}) page for more information on what you can configure in `grafana.ini`
 
 ### Config File Locations
 
@@ -61,17 +61,17 @@ Currently we do not provide any scripts/manifests for configuring Grafana. Rathe
 | Saltstack | [https://github.com/salt-formulas/salt-formula-grafana](https://github.com/salt-formulas/salt-formula-grafana) |
 | Jsonnet   | [https://github.com/grafana/grafonnet-lib/](https://github.com/grafana/grafonnet-lib/)                         |
 
-## Datasources
+## Data sources
 
 > This feature is available from v5.0
 
-You can manage data sources in Grafana by adding one or more YAML config files in the [`provisioning/datasources`]({{< relref "../installation/configuration/#provisioning" >}}) directory. Each config file can contain a list of `datasources` that will be added or updated during start up. If the data source already exists, then Grafana updates it to match the configuration file. The config file can also contain a list of data sources that should be deleted. That list is called `deleteDatasources`. Grafana deletes data sources listed in `deleteDatasources` before inserting or updating those in the `datasource` list.
+It's possible to manage data sources in Grafana by adding one or more yaml config files in the [`provisioning/datasources`](/administration/configuration/#provisioning) directory. Each config file can contain a list of `datasources` that will be added or updated during start up. If the data source already exists, then Grafana updates it to match the configuration file. The config file can also contain a list of data sources that should be deleted. That list is called `deleteDatasources`. Grafana will delete data sources listed in `deleteDatasources` before inserting/updating those in the `datasource` list.
 
 ### Running Multiple Grafana Instances
 
 If you are running multiple instances of Grafana you might run into problems if they have different versions of the `datasource.yaml` configuration file. The best way to solve this problem is to add a version number to each datasource in the configuration and increase it when you update the config. Grafana will only update datasources with the same or lower version number than specified in the config. That way, old configs cannot overwrite newer configs if they restart at the same time.
 
-### Example Datasource Config File
+### Example data source Config File
 
 ```yaml
 # config file version
@@ -177,7 +177,7 @@ Since not all datasources have the same configuration settings we only have the
 
 `{"authType":"keys","defaultRegion":"us-west-2","timeField":"@timestamp"}`
 
-Secure json data is a map of settings that will be encrypted with [secret key]({{< relref "../installation/configuration/#secret-key" >}}) from the Grafana config. The purpose of this is only to hide content from the users of the application. This should be used for storing TLS Cert and password that Grafana will append to the request on the server side. All of these settings are optional.
+Secure json data is a map of settings that will be encrypted with [secret key]({{< relref "configuration.md#secret-key" >}}) from the Grafana config. The purpose of this is only to hide content from the users of the application. This should be used for storing TLS Cert and password that Grafana will append to the request on the server side. All of these settings are optional.
 
 | Name              | Type   | Datasource | Description                             |
 | ----------------- | ------ | ---------- | --------------------------------------- |
@@ -191,7 +191,7 @@ Secure json data is a map of settings that will be encrypted with [secret key]({
 
 #### Custom HTTP headers for datasources
 
-Datasources managed by Grafanas provisioning can be configured to add HTTP headers to all requests
+Data sources managed by Grafanas provisioning can be configured to add HTTP headers to all requests
 going to that datasource. The header name is configured in the `jsonData` field and the header value should be
 configured in `secureJsonData`.
 
@@ -212,7 +212,7 @@ datasources:
 
 > This feature is available from v7.1
 
-You can manage plugins in Grafana by adding one or more YAML config files in the [`provisioning/plugins`]({{< relref "../installation/configuration/#provisioning" >}}) directory. Each config file can contain a list of `apps` that will be updated during start up. Grafana updates each app to match the configuration file.
+You can manage plugins in Grafana by adding one or more YAML config files in the [`provisioning/plugins`]({{< relref "configuration.md#provisioning" >}}) directory. Each config file can contain a list of `apps` that will be updated during start up. Grafana updates each app to match the configuration file.
 
 ### Example plugin configuration file
 
@@ -240,7 +240,7 @@ apps:
 
 ## Dashboards
 
-You can manage dashboards in Grafana by adding one or more YAML config files in the [`provisioning/dashboards`]({{< relref "../installation/configuration.md" >}}) directory. Each config file can contain a list of `dashboards providers` that load dashboards into Grafana from the local filesystem.
+You can manage dashboards in Grafana by adding one or more YAML config files in the [`provisioning/dashboards`]({{< relref "configuration.md" >}}) directory. Each config file can contain a list of `dashboards providers` that load dashboards into Grafana from the local filesystem.
 
 The dashboard provider config file looks somewhat like this:
 
@@ -304,7 +304,7 @@ By default Grafana will delete dashboards in the database if the file is removed
 
 ## Alert Notification Channels
 
-Alert Notification Channels can be provisioned by adding one or more yaml config files in the [`provisioning/notifiers`](/installation/configuration/#provisioning) directory.
+Alert Notification Channels can be provisioned by adding one or more yaml config files in the [`provisioning/notifiers`](/administration/configuration/#provisioning) directory.
 
 Each config file can contain the following top-level fields:
 
diff --git a/docs/sources/alerting/create-alerts.md b/docs/sources/alerting/create-alerts.md
index f9cd564f250..ac8302f6b23 100644
--- a/docs/sources/alerting/create-alerts.md
+++ b/docs/sources/alerting/create-alerts.md
@@ -41,7 +41,7 @@ This section describes the fields you fill out to create an alert.
 - **Evaluate every -** Specify how often the scheduler should evaluate the alert rule. This is referred to as the _evaluation interval_.
 - **For -** Specify how long the query needs to violate the configured thresholds before the alert notification triggers.
 
-You can set a minimum evaluation interval in the `alerting.min_interval_seconds` config field, to set a minimum time between evaluations. Refer to [Configuration]({{< relref "../installation/configuration.md" >}}#min-interval-seconds) for more information.
+You can set a minimum evaluation interval in the `alerting.min_interval_seconds` config field, to set a minimum time between evaluations. Refer to [Configuration]({{< relref "../administration/configuration.md" >}}#min-interval-seconds) for more information.
 
 > **Caution:** Do not use `For` with the `If no data or all values are null` setting set to `No Data`. The triggering of `No Data` will trigger instantly and not take `For` into consideration. This may also result in that an OK notification not being sent if alert transitions from `No Data -> Pending -> OK`.
 
diff --git a/docs/sources/alerting/notifications.md b/docs/sources/alerting/notifications.md
index ac467e6e255..bffc5397e87 100644
--- a/docs/sources/alerting/notifications.md
+++ b/docs/sources/alerting/notifications.md
@@ -76,7 +76,7 @@ VictorOps | `victorops` | yes, external only | no
 
 ### Email
 
-To enable email notifications you have to setup [SMTP settings]({{< relref "../installation/configuration/#smtp" >}})
+To enable email notifications you have to setup [SMTP settings]({{< relref "../administration/configuration/#smtp" >}})
 in the Grafana config. Email notifications will upload an image of the alert graph to an
 external image destination if available or fallback to attaching the image to the email.
 Be aware that if you use the `local` image storage email servers and clients might not be
@@ -213,11 +213,11 @@ Alertmanager handles alerts sent by client applications such as Prometheus serve
 Grafana can render the panel associated with the alert rule as a PNG image and include that in the notification. Read more about the requirements and how to configure
 [image rendering]({{< relref "../administration/image_rendering/" >}}).
 
-You must configure an [external image storage provider]({{< relref "../installation/configuration/#external-image-storage" >}}) in order to receive images in alert notifications. If your notification channel requires that the image be publicly accessible (e.g. Slack, PagerDuty), configure a provider which uploads the image to a remote image store like Amazon S3, Webdav, Google Cloud Storage, or Azure Blob Storage. Otherwise, the local provider can be used to serve the image directly from Grafana.
+You must configure an [external image storage provider]({{< relref "../administration/configuration/#external-image-storage" >}}) in order to receive images in alert notifications. If your notification channel requires that the image be publicly accessible (e.g. Slack, PagerDuty), configure a provider which uploads the image to a remote image store like Amazon S3, Webdav, Google Cloud Storage, or Azure Blob Storage. Otherwise, the local provider can be used to serve the image directly from Grafana.
 
 Notification services which need public image access are marked as 'external only'.
 
 ## Configure the link back to Grafana from alert notifications
 
 All alert notifications contain a link back to the triggered alert in the Grafana instance.
-This URL is based on the [domain]({{< relref "../installation/configuration/#domain" >}}) setting in Grafana.
+This URL is based on the [domain]({{< relref "../administration/configuration/#domain" >}}) setting in Grafana.
diff --git a/docs/sources/auth/azuread.md b/docs/sources/auth/azuread.md
index 77f3b42daea..74f9ee01616 100644
--- a/docs/sources/auth/azuread.md
+++ b/docs/sources/auth/azuread.md
@@ -94,7 +94,7 @@ To enable the Azure AD OAuth2 you must register your application with Azure AD.
 
 ## Enable Azure AD OAuth in Grafana
 
-1. Add the following to the [Grafana configuration file]({{< relref "../installation/configuration.md#config-file-locations" >}}):
+1. Add the following to the [Grafana configuration file]({{< relref "../administration/configuration.md#config-file-locations" >}}):
 
 ```ini
 [auth.azuread]
@@ -110,7 +110,7 @@ allowed_domains =
 allowed_groups =
 ```
 
-> Note: Ensure that the [root_url]({{< relref "../installation/configuration/#root-url" >}}) in Grafana is set in your Azure Application Reply URLs (App -> Settings -> Reply URLs)
+> Note: Ensure that the [root_url]({{< relref "../administration/configuration/#root-url" >}}) in Grafana is set in your Azure Application Reply URLs (App -> Settings -> Reply URLs)
 
 ### Configure allowed groups and domains
 
diff --git a/docs/sources/auth/google.md b/docs/sources/auth/google.md
index 896036030e5..f494135d54b 100644
--- a/docs/sources/auth/google.md
+++ b/docs/sources/auth/google.md
@@ -31,7 +31,7 @@ First, you need to create a Google OAuth Client:
 
 ## Enable Google OAuth in Grafana
 
-Specify the Client ID and Secret in the [Grafana configuration file]({{< relref "../installation/configuration.md#config-file-locations" >}}). For example:
+Specify the Client ID and Secret in the [Grafana configuration file]({{< relref "../administration/configuration.md#config-file-locations" >}}). For example:
 
 ```bash
 [auth.google]
diff --git a/docs/sources/auth/ldap.md b/docs/sources/auth/ldap.md
index bdd9b75cbc0..214826605e2 100644
--- a/docs/sources/auth/ldap.md
+++ b/docs/sources/auth/ldap.md
@@ -26,7 +26,7 @@ This means that you should be able to configure LDAP integration using any compl
 
 ## Enable LDAP
 
-In order to use LDAP integration you'll first need to enable LDAP in the [main config file]({{< relref "../installation/configuration.md" >}}) as well as specify the path to the LDAP
+In order to use LDAP integration you'll first need to enable LDAP in the [main config file]({{< relref "../administration/configuration.md" >}}) as well as specify the path to the LDAP
 specific configuration file (default: `/etc/grafana/ldap.toml`).
 
 ```bash
@@ -355,7 +355,7 @@ Please inspect your Active Directory configuration and documentation to find the
 
 ## Troubleshooting
 
-To troubleshoot and get more log info enable LDAP debug logging in the [main config file]({{< relref "../installation/configuration.md" >}}).
+To troubleshoot and get more log info enable LDAP debug logging in the [main config file]({{< relref "../administration/configuration.md" >}}).
 
 ```bash
 [log]
diff --git a/docs/sources/auth/okta.md b/docs/sources/auth/okta.md
index 832fcce2e89..1f200e5d809 100644
--- a/docs/sources/auth/okta.md
+++ b/docs/sources/auth/okta.md
@@ -38,7 +38,7 @@ Before you can sign a user in, you need to create an Okta application from the O
 
 ## Enable Okta OAuth in Grafana
 
-1. Add the following to the [Grafana configuration file]({{< relref "../installation/configuration.md#config-file-locations" >}}):
+1. Add the following to the [Grafana configuration file]({{< relref "../administration/configuration.md#config-file-locations" >}}):
 
 ```ini
 [auth.okta]
diff --git a/docs/sources/developers/plugins/_index.md b/docs/sources/developers/plugins/_index.md
index 7ace0ee1fe1..025fe98ed7a 100644
--- a/docs/sources/developers/plugins/_index.md
+++ b/docs/sources/developers/plugins/_index.md
@@ -11,7 +11,7 @@ For more information on the types of plugins you can build, refer to the [Plugin
 
 The easiest way to start developing Grafana plugins is to use the [Grafana Toolkit](https://www.npmjs.com/package/@grafana/toolkit).
 
-Open the terminal, and run the following command in your [plugin directory]({{< relref "../../installation/configuration.md#plugins" >}}):
+Open the terminal, and run the following command in your [plugin directory]({{< relref "../../administration/configuration.md#plugins" >}}):
 
 ```bash
 npx @grafana/toolkit plugin:create my-grafana-plugin
diff --git a/docs/sources/developers/plugins/legacy/_index.md b/docs/sources/developers/plugins/legacy/_index.md
index 399e4928f30..4315afeab95 100644
--- a/docs/sources/developers/plugins/legacy/_index.md
+++ b/docs/sources/developers/plugins/legacy/_index.md
@@ -87,7 +87,7 @@ export { WorldmapCtrl as PanelCtrl };
 There are three ways that you can start developing a Grafana plugin.
 
 1. Set up a Grafana development environment. [(described here)](https://github.com/grafana/grafana/blob/master/contribute/developer-guide.md) and place your plugin in the `data/plugins` folder.
-2. Install Grafana and place your plugin in the plugins directory which is set in your [config file](/installation/configuration). By default this is `/var/lib/grafana/plugins` on Linux systems.
+2. Install Grafana and place your plugin in the plugins directory which is set in your [config file](/administration/configuration). By default this is `/var/lib/grafana/plugins` on Linux systems.
 3. Place your plugin directory anywhere you like and specify it grafana.ini.
 
 We encourage people to set up the full Grafana environment so that you can get inspiration from the rest of the Grafana code base.
diff --git a/docs/sources/enterprise/_index.md b/docs/sources/enterprise/_index.md
index 10229f39bcc..c22b0dfe7d9 100755
--- a/docs/sources/enterprise/_index.md
+++ b/docs/sources/enterprise/_index.md
@@ -89,9 +89,9 @@ This setting can also be set with an environment variable, which is useful if yo
 
 ### Root URL
 
-Update the [`root_url`](../installation/configuration/#root-url) in your configuration. It should be the URL that users type in their browsers to access the frontend, not the node hostname(s).
+Update the [`root_url`](../administration/configuration/#root-url) in your configuration. It should be the URL that users type in their browsers to access the frontend, not the node hostname(s).
 
-This is important, because as part of the validation checks at startup, Grafana compares the license URL to the [`root_url`](../installation/configuration/#root-url) in your configuration. 
+This is important, because as part of the validation checks at startup, Grafana compares the license URL to the [`root_url`](../administration/configuration/#root-url) in your configuration. 
 
 In your configuration file:
 
diff --git a/docs/sources/enterprise/enterprise-configuration.md b/docs/sources/enterprise/enterprise-configuration.md
index 5d75ada1ca4..929056acff1 100644
--- a/docs/sources/enterprise/enterprise-configuration.md
+++ b/docs/sources/enterprise/enterprise-configuration.md
@@ -12,7 +12,7 @@ weight = 300
 
 # Grafana Enterprise configuration
 
-This page describes Grafana Enterprise-specific configuration options that you can specify in a `.ini` configuration file or using environment variables. Refer to [Configuration]({{< relref "../installation/configuration.md" >}}) for more information about available configuration options.
+This page describes Grafana Enterprise-specific configuration options that you can specify in a `.ini` configuration file or using environment variables. Refer to [Configuration]({{< relref "../administration/configuration.md" >}}) for more information about available configuration options.
 
 ## [white_labeling]
 
diff --git a/docs/sources/enterprise/license-expiration.md b/docs/sources/enterprise/license-expiration.md
index c5dfb13f145..91486cfdda2 100644
--- a/docs/sources/enterprise/license-expiration.md
+++ b/docs/sources/enterprise/license-expiration.md
@@ -16,7 +16,7 @@ If your license has expired most of Grafana keeps working as normal. Some enterp
 
 ## Update your license
 
-1. Locate your current `license.jwt` file. In a standard installation it is stored inside Grafana's data directory, which on a typical Linux installation is in `/var/lib/grafana/data`. This location might be overridden in the ini file [Configuration](https://grafana.com/docs/grafana/latest/installation/configuration/).
+1. Locate your current `license.jwt` file. In a standard installation it is stored inside Grafana's data directory, which on a typical Linux installation is in `/var/lib/grafana/data`. This location might be overridden in the ini file [Configuration](https://grafana.com/docs/grafana/latest/administration/configuration/).
     ```ini
     [enterprise]
     license_path = /path/to/your/license.jwt
diff --git a/docs/sources/enterprise/reporting.md b/docs/sources/enterprise/reporting.md
index 00aff68aec5..937b90fa1be 100644
--- a/docs/sources/enterprise/reporting.md
+++ b/docs/sources/enterprise/reporting.md
@@ -21,7 +21,7 @@ Any changes you make to a dashboard used in a report are reflected the next time
 
 ## Requirements
 
-* SMTP must be configured for reports to be sent. Refer to [SMTP]({{< relref "../installation/configuration.md#smtp" >}}) in [Configuration]({{< relref "../installation/configuration.md" >}}) for more information.
+* SMTP must be configured for reports to be sent. Refer to [SMTP]({{< relref "../administration/configuration.md#smtp" >}}) in [Configuration]({{< relref "../administration/configuration.md" >}}) for more information.
 * The Image Renderer plugin must be installed or the remote rendering service must be set up. Refer to [Image rendering]({{< relref "../administration/image_rendering.md" >}}) for more information.
 
 ## Create or update a report
@@ -109,7 +109,7 @@ When generating reports, each panel renders separately before being collected in
 
 To modify the panels' clarity you can set a scale factor for the rendered images. A higher scale factor is more legible but will increase the file size of the generated PDF.
 
- These options are available in the [configuration]({{< relref "../installation/configuration.md">}}) file.
+ These options are available in the [configuration]({{< relref "../administration/configuration.md">}}) file.
 
 ```ini
 [reporting]
@@ -132,7 +132,7 @@ If the time zone is set differently between your Grafana server and its remote i
 
 ## Troubleshoot reporting
 
-To troubleshoot and get more log information, enable debug logging in the configuration file. Refer to [Configuration]({{< relref "../installation/configuration.md#filters" >}}) for more information.
+To troubleshoot and get more log information, enable debug logging in the configuration file. Refer to [Configuration]({{< relref "../administration/configuration.md#filters" >}}) for more information.
 
 ```bash
 [log]
diff --git a/docs/sources/enterprise/saml.md b/docs/sources/enterprise/saml.md
index 12ccd03bf3c..813227a7bef 100644
--- a/docs/sources/enterprise/saml.md
+++ b/docs/sources/enterprise/saml.md
@@ -39,7 +39,7 @@ In terms of initiation:
 
 ## Set up SAML authentication
 
-The table below describes all SAML configuration options. Continue reading below for details on specific options. Like any other Grafana configuration, you can apply these options as [environment variables]({{< relref "../installation/configuration.md#configure-with-environment-variables" >}}).
+The table below describes all SAML configuration options. Continue reading below for details on specific options. Like any other Grafana configuration, you can apply these options as [environment variables]({{< relref "../administration/configuration.md#configure-with-environment-variables" >}}).
 
 | Setting                                                     | Required | Description                                                                                        | Default       |
 | ----------------------------------------------------------- | -------- | -------------------------------------------------------------------------------------------------- | ------------- |
@@ -65,7 +65,7 @@ The table below describes all SAML configuration options. Continue reading below
 
 To use the SAML integration, in the `auth.saml` section of in the Grafana custom configuration file, set `enabled` to `true`. 
 
-Refer to [Configuration]({{< relref "../installation/configuration.md" >}}) for more information about configuring Grafana.
+Refer to [Configuration]({{< relref "../administration/configuration.md" >}}) for more information about configuring Grafana.
 
 ### Certificate and private key
 
@@ -239,7 +239,7 @@ To configure SAML integration with Okta, create integration inside the Okta orga
 
 ### Edit SAML options in the Grafana config file
 
-Once the application is created, configure Grafana to use it for SAML authentication. Refer to [Configuration]({{< relref "../installation/configuration.md" >}}) to get more information about how to configure Grafana.
+Once the application is created, configure Grafana to use it for SAML authentication. Refer to [Configuration]({{< relref "../administration/configuration.md" >}}) to get more information about how to configure Grafana.
 
 1. In the `[auth.saml]` section in the Grafana configuration file, set [`enabled`]({{< relref "./enterprise-configuration.md#enabled" >}}) to `true`.
 1. Configure the [certificate and private key]({{< relref "#certificate-and-private-key" >}}).
@@ -271,7 +271,7 @@ assertion_attribute_groups = Group
 
 ## Troubleshoot SAML authentication
 
-To troubleshoot and get more log information, enable SAML debug logging in the configuration file. Refer to [Configuration]({{< relref "../installation/configuration.md#filters" >}}) for more information.
+To troubleshoot and get more log information, enable SAML debug logging in the configuration file. Refer to [Configuration]({{< relref "../administration/configuration.md#filters" >}}) for more information.
 
 ```bash
 [log]
diff --git a/docs/sources/enterprise/usage-insights.md b/docs/sources/enterprise/usage-insights.md
index db7672c611e..2e82a32fb8a 100644
--- a/docs/sources/enterprise/usage-insights.md
+++ b/docs/sources/enterprise/usage-insights.md
@@ -28,7 +28,7 @@ When more users are active on a dashboard than can fit in the presence indicator
 
 {{< docs-imagebox img="/img/docs/enterprise/presence_indicators.png" max-width="400px" class="docs-image--no-shadow" >}}
 
-You can choose your own definition of "recent" by setting it in the [configuration]({{< relref "../installation/configuration.md">}}) file.
+You can choose your own definition of "recent" by setting it in the [configuration]({{< relref "../administration/configuration.md">}}) file.
 
 ```ini
 [analytics.views]
diff --git a/docs/sources/enterprise/white-labeling.md b/docs/sources/enterprise/white-labeling.md
index ccd16cc6d30..1d93239790f 100644
--- a/docs/sources/enterprise/white-labeling.md
+++ b/docs/sources/enterprise/white-labeling.md
@@ -34,7 +34,7 @@ You can change the following elements:
 
 {{< docs-imagebox img="/img/docs/v66/whitelabeling_1.png" max-width="800px" caption="White labeling example" >}}
 
-The configuration file in Grafana Enterprise contains the following options. Each option is defined in the file. For more information about configuring Grafana, refer to [Configuration]({{< relref "../installation/configuration.md">}}).
+The configuration file in Grafana Enterprise contains the following options. Each option is defined in the file. For more information about configuring Grafana, refer to [Configuration]({{< relref "../administration/configuration.md">}}).
 
 ```ini
 # Enterprise only
diff --git a/docs/sources/getting-started/getting-started.md b/docs/sources/getting-started/getting-started.md
index 275e2b88fe7..6882a281644 100644
--- a/docs/sources/getting-started/getting-started.md
+++ b/docs/sources/getting-started/getting-started.md
@@ -54,7 +54,7 @@ All users might want to learn about:
 
 Administrators might want to learn about:
 
-* [Grafana configuration]({{< relref "../installation/configuration.md" >}})
+* [Grafana configuration]({{< relref "../administration/configuration.md" >}})
 * [Authentication]({{< relref "../auth/overview.md" >}})
 * [User permissions and roles]({{< relref "../permissions/overview.md" >}})
 * [Provisioning]({{< relref "../administration/provisioning.md" >}})
diff --git a/docs/sources/getting-started/what-is-grafana.md b/docs/sources/getting-started/what-is-grafana.md
index 4b015aa8565..902a61fbde0 100644
--- a/docs/sources/getting-started/what-is-grafana.md
+++ b/docs/sources/getting-started/what-is-grafana.md
@@ -51,7 +51,7 @@ Templating allows you to drill down into your data, say, from all data to North
 
 ## Configure Grafana
 
-If you're a Grafana administrator, then you'll want to thoroughly familiarize yourself with [Grafana configuration options]({{< relref "../installation/configuration.md" >}}) and the [Grafana CLI]({{< relref "../administration/cli.md" >}}).
+If you're a Grafana administrator, then you'll want to thoroughly familiarize yourself with [Grafana configuration options]({{< relref "../administration/configuration.md" >}}) and the [Grafana CLI]({{< relref "../administration/cli.md" >}}).
 
 Configuration covers both config files and environment variables. You can set up default ports, logging levels, email IP addresses, security, and more.
 
diff --git a/docs/sources/guides/whats-new-in-v6-0.md b/docs/sources/guides/whats-new-in-v6-0.md
index 6e0deebd84c..f8a3ecd417a 100644
--- a/docs/sources/guides/whats-new-in-v6-0.md
+++ b/docs/sources/guides/whats-new-in-v6-0.md
@@ -143,8 +143,8 @@ Read more about the short-lived token solution and how to configure it [here](/a
 
 Besides these changes we have also made security improvements regarding Cross-Site Request Forgery (CSRF) and Cross-site Scripting (XSS) vulnerabilities:
 
-* Cookies are per default using the [SameSite](/installation/configuration/#cookie-samesite) attribute to protect against CSRF attacks
-* Script tags in text panels are per default [disabled](/installation/configuration/#disable-sanitize-html) to protect against XSS attacks
+* Cookies are per default using the [SameSite](/administration/configuration/#cookie-samesite) attribute to protect against CSRF attacks
+* Script tags in text panels are per default [disabled](/administration/configuration/#disable-sanitize-html) to protect against XSS attacks
 
 > If you're using [Auth Proxy Authentication](/auth/auth-proxy/) you still need to have user sessions set up and configured
 but our goal is to remove this requirement in the near future.
diff --git a/docs/sources/guides/whats-new-in-v6-1.md b/docs/sources/guides/whats-new-in-v6-1.md
index 3ac5fa820f9..3e15c948034 100644
--- a/docs/sources/guides/whats-new-in-v6-1.md
+++ b/docs/sources/guides/whats-new-in-v6-1.md
@@ -32,7 +32,7 @@ This feature also adds a new Team permission that can be assigned to any user wi
 
 We believe that this is more in line with the Grafana philosophy, as it will allow teams to be more self-organizing. This option will be made permanent if it gets positive feedback from the community so let us know what you think in the [issue on GitHub](https://github.com/grafana/grafana/issues/15590).
 
-To turn this feature on add the following [config option](/installation/configuration/#editors-can-admin) to your Grafana ini file in the `users` section and then restart the Grafana server:
+To turn this feature on add the following [config option](/administration/configuration/#editors-can-admin) to your Grafana ini file in the `users` section and then restart the Grafana server:
 
 ```ini
 [users]
diff --git a/docs/sources/guides/whats-new-in-v6-2.md b/docs/sources/guides/whats-new-in-v6-2.md
index 15a4f8b166e..04b84c93247 100644
--- a/docs/sources/guides/whats-new-in-v6-2.md
+++ b/docs/sources/guides/whats-new-in-v6-2.md
@@ -80,7 +80,7 @@ to use the full panel height in case there is no panel title.
 This release contains a lot of small features and fixes:
 
 - Explore - Adds user time zone support, reconnect for failing data sources and a fix that prevents killing Prometheus instances when Histogram metrics are loaded.
-- Alerting - Adds support for configuring timeout durations and retries, see [configuration](/installation/configuration/#evaluation-timeout-seconds) for more information.
+- Alerting - Adds support for configuring timeout durations and retries, see [configuration](/administration/configuration/#evaluation-timeout-seconds) for more information.
 - Azure Monitor - Adds support for multiple subscriptions per data source.
 - Elasticsearch - A small bug fix to properly display percentiles metrics in table panel.
 - InfluxDB - Support for POST HTTP verb.
diff --git a/docs/sources/guides/whats-new-in-v6-4.md b/docs/sources/guides/whats-new-in-v6-4.md
index f1d5d17b3ad..ec6e8dfdb43 100644
--- a/docs/sources/guides/whats-new-in-v6-4.md
+++ b/docs/sources/guides/whats-new-in-v6-4.md
@@ -90,7 +90,7 @@ Grafana 6.4 continues the work started in 6.3 of creating a data model and query
 
 The first new feature all these changes have enabled is the ability to share query results between panels. So for example if you have an expensive query you can visualize the same results in a graph, table and singlestat panel. To reuse another panel’s query result select the data source named `-- Dashboard --` and then select the panel.
 
-To make the sharing of query results even more powerful we are introducing a transformation step as well that allows you to select specific parts of the query result and transform it. This new transformation feature is in [alpha](https://grafana.com/docs/installation/configuration/#enable-alpha) state and has to be enabled in the config file.
+To make the sharing of query results even more powerful we are introducing a transformation step as well that allows you to select specific parts of the query result and transform it. This new transformation feature is in [alpha](https://grafana.com/docs/administration/configuration/#enable-alpha) state and has to be enabled in the config file.
 
 DataFrame, our primary data model, has now a [columnar](https://en.wikipedia.org/wiki/Column-oriented_DBMS) layout. This
 will support easier frontend processing. The DataSource query interface has been updated to better support streaming.
diff --git a/docs/sources/guides/whats-new-in-v6-6.md b/docs/sources/guides/whats-new-in-v6-6.md
index 226dd45e9e4..d0ef4e84c48 100644
--- a/docs/sources/guides/whats-new-in-v6-6.md
+++ b/docs/sources/guides/whats-new-in-v6-6.md
@@ -103,7 +103,7 @@ The time picker has gotten a major design update. Key changes:
 
 ## Cookie management modifications
 
-In order to align with a [change in Chrome 80](https://www.chromestatus.com/feature/5088147346030592), a breaking change has been introduced to Grafana's [`cookie_samesite` setting]({{< relref "../installation/configuration.md#cookie-samesite" >}}). Grafana now properly renders cookies with the `SameSite=None` attribute when this setting is `none`. The previous behavior of `none` was to omit the `SameSite` attribute from cookies. Grafana will use the previous behavior when `cookie_samesite` is set to `disabled`.
+In order to align with a [change in Chrome 80](https://www.chromestatus.com/feature/5088147346030592), a breaking change has been introduced to Grafana's [`cookie_samesite` setting]({{< relref "../administration/configuration.md#cookie-samesite" >}}). Grafana now properly renders cookies with the `SameSite=None` attribute when this setting is `none`. The previous behavior of `none` was to omit the `SameSite` attribute from cookies. Grafana will use the previous behavior when `cookie_samesite` is set to `disabled`.
 
 Read more about this in the [upgrade notes]({{< relref "../installation/upgrading/#important-changes-regarding-samesite-cookie-attribute" >}}).
 
diff --git a/docs/sources/guides/whats-new-in-v6-7.md b/docs/sources/guides/whats-new-in-v6-7.md
index 6f837313333..dc31698e7bd 100644
--- a/docs/sources/guides/whats-new-in-v6-7.md
+++ b/docs/sources/guides/whats-new-in-v6-7.md
@@ -47,7 +47,7 @@ Grafana v6.7 comes with a new OAuth integration for Microsoft Azure Active Direc
 
 Allowing a low dashboard refresh interval can cause severe load on data sources and Grafana. Grafana v6.7 allows you to restrict the dashboard refresh interval so it cannot be set lower than a given interval. This provides a way for administrators to control dashboard refresh behavior on a global level.
 
-Refer to min_refresh_interval in [Configuration]({{< relref "../installation/configuration#min-refresh-interval" >}}) for more information and how to enable this feature.
+Refer to min_refresh_interval in [Configuration]({{< relref "../administration/configuration#min-refresh-interval" >}}) for more information and how to enable this feature.
 
 ### Stackdriver project selector
 
diff --git a/docs/sources/http_api/admin.md b/docs/sources/http_api/admin.md
index 2087272574f..1b234ac982a 100644
--- a/docs/sources/http_api/admin.md
+++ b/docs/sources/http_api/admin.md
@@ -229,7 +229,7 @@ Content-Type: application/json
 }
 ```
 
-Note that `OrgId` is an optional parameter that can be used to assign a new user to a different organization when [auto_assign_org](https://grafana.com/docs/grafana/latest/installation/configuration/#auto-assign-org) is set to `true`.
+Note that `OrgId` is an optional parameter that can be used to assign a new user to a different organization when [auto_assign_org](https://grafana.com/docs/grafana/latest/administration/configuration/#auto-assign-org) is set to `true`.
 
 **Example Response**:
 
diff --git a/docs/sources/installation/security.md b/docs/sources/installation/security.md
index 344e2ddd9cf..505f245083e 100644
--- a/docs/sources/installation/security.md
+++ b/docs/sources/installation/security.md
@@ -18,7 +18,7 @@ To prevent this type of exploitation from happening, we recommend that you apply
 
 ## Limit IP addresses/hostnames for data source URL
 
-You can configure Grafana to only allow certain IP addresses or hostnames to be used as data source URLs and proxied through the Grafana data source proxy. Refer to [data_source_proxy_whitelist]({{< relref "configuration/#data-source-proxy-whitelist" >}}) for usage instructions.
+You can configure Grafana to only allow certain IP addresses or hostnames to be used as data source URLs and proxied through the Grafana data source proxy. Refer to [data_source_proxy_whitelist]({{< relref "../administration/configuration/#data-source-proxy-whitelist" >}}) for usage instructions.
 
 ## Firewall rules
 
diff --git a/docs/sources/installation/upgrading.md b/docs/sources/installation/upgrading.md
index ed9d6148222..91cddacf872 100755
--- a/docs/sources/installation/upgrading.md
+++ b/docs/sources/installation/upgrading.md
@@ -146,7 +146,7 @@ If you're using systemd and have a large amount of annotations consider temporar
 ## Upgrading to v6.0
 
 If you have text panels with script tags they will no longer work due to a new setting that per default disallow unsanitized HTML.
-Read more [here]({{< relref "configuration/#disable-sanitize-html" >}}) about this new setting.
+Read more [here]({{< relref "../administration/configuration/#disable-sanitize-html" >}}) about this new setting.
 
 ### Authentication and security
 
@@ -191,7 +191,7 @@ configuration.
 ### Embedding Grafana
 
 If you're embedding Grafana in a `<frame>`, `<iframe>`, `<embed>` or `<object>` on a different website it will no longer work due to a new setting
-that per default instructs the browser to not allow Grafana to be embedded. Read more [here]({{< relref "configuration/#allow-embedding" >}}) about
+that per default instructs the browser to not allow Grafana to be embedded. Read more [here]({{< relref "../administration/configuration/#allow-embedding" >}}) about
 this new setting.
 
 ### Session storage is no longer used
@@ -237,7 +237,7 @@ The Generic OAuth setting `send_client_credentials_via_post`, used for supportin
 
 Chrome 80 treats cookies as `SameSite=Lax` by default if no `SameSite` attribute is specified, see https://www.chromestatus.com/feature/5088147346030592.
 
-Due to this change in Chrome, the `[security]` setting `cookie_samesite` configured to `none` now renders cookies with `SameSite=None` attribute compared to before where no `SameSite` attribute was added to cookies. To get the old behavior, use value `disabled` instead of `none`, see [cookie_samesite in Configuration]({{< relref "configuration/#cookie-samesite" >}}) for more information.
+Due to this change in Chrome, the `[security]` setting `cookie_samesite` configured to `none` now renders cookies with `SameSite=None` attribute compared to before where no `SameSite` attribute was added to cookies. To get the old behavior, use value `disabled` instead of `none`, see [cookie_samesite in Configuration]({{< relref "../administration/configuration/#cookie-samesite" >}}) for more information.
 
 **Note:** There is currently a bug affecting Mac OSX and iOS that causes `SameSite=None` cookies to be treated as `SameSite=Strict` and therefore not sent with cross-site requests, see https://bugs.webkit.org/show_bug.cgi?id=198181 for details. Until this is fixed, `SameSite=None` might not work properly on Safari.
 
@@ -252,12 +252,12 @@ PhantomJS was deprecated in [Grafana v6.4]({{< relref "../guides/whats-new-in-v6
 
 ### Dashboard minimum refresh interval enforced
 
-A global minimum dashboard refresh interval is now enforced and defaults to 5 seconds. Read more [here]({{< relref "configuration/#min-refresh-interval" >}}) about this setting.
+A global minimum dashboard refresh interval is now enforced and defaults to 5 seconds. Read more [here]({{< relref "../administration/configuration/#min-refresh-interval" >}}) about this setting.
 
 ### Backend plugins
 
-Grafana now requires backend plugins to be signed. If a backend plugin is not signed Grafana will not load/start it. This is an additional security measure to make sure backend plugin binaries and files haven't been tampered with.  All Grafana Labs authored backend plugins, including Enterprise plugins, are now signed. It's possible to allow unsigned plugins using a configuration setting, but is something we strongly advise against doing. Read more [here]({{< relref "configuration/#allow-loading-unsigned-plugins" >}}) about this setting.
+Grafana now requires backend plugins to be signed. If a backend plugin is not signed Grafana will not load/start it. This is an additional security measure to make sure backend plugin binaries and files haven't been tampered with.  All Grafana Labs authored backend plugins, including Enterprise plugins, are now signed. It's possible to allow unsigned plugins using a configuration setting, but is something we strongly advise against doing. Read more [here]({{< relref "../administration/#allow-loading-unsigned-plugins" >}}) about this setting.
 
 ### Cookie path
 
-Starting from Grafana v7.0.0, the cookie path does not include the trailing slash if Grafana is served from a subpath in order to align with [RFC 6265](https://tools.ietf.org/html/rfc6265#section-5.1.4). However, stale session cookies (set before the upgrade) can result in unsuccessful logins because they can not be deleted during the standard login phase due to the changed cookie path. Therefore users experiencing login problems are advised to manually delete old session cookies, or administrators can fix this for all users by changing the [`login_cookie_name`]({{< relref "configuration/#login-cookie-name" >}}), so the old cookie would get ignored.
+Starting from Grafana v7.0.0, the cookie path does not include the trailing slash if Grafana is served from a subpath in order to align with [RFC 6265](https://tools.ietf.org/html/rfc6265#section-5.1.4). However, stale session cookies (set before the upgrade) can result in unsuccessful logins because they can not be deleted during the standard login phase due to the changed cookie path. Therefore users experiencing login problems are advised to manually delete old session cookies, or administrators can fix this for all users by changing the [`login_cookie_name`]({{< relref "../administration/#login-cookie-name" >}}), so the old cookie would get ignored.
diff --git a/docs/sources/menu.yaml b/docs/sources/menu.yaml
index 302df2cfd22..489f62bd08a 100644
--- a/docs/sources/menu.yaml
+++ b/docs/sources/menu.yaml
@@ -32,7 +32,7 @@
   link: /administration/
   children:
     - name: Configuration
-      link: /installation/configuration/
+      link: /administration/configuration/
     - name: Configure Docker image
       link: /installation/configure-docker/
     - name: Security
diff --git a/docs/sources/permissions/organization_roles.md b/docs/sources/permissions/organization_roles.md
index fc76f6b12c8..5998c681be5 100644
--- a/docs/sources/permissions/organization_roles.md
+++ b/docs/sources/permissions/organization_roles.md
@@ -28,7 +28,7 @@ Can do everything scoped to the organization. For example:
 - Can create and modify dashboards and alert rules. This can be disabled on specific folders and dashboards.
 - **Cannot** create or edit data sources nor invite new users.
 
-This role can be tweaked via Grafana server setting [editors_can_admin]({{< relref "../installation/configuration.md#editors_can_admin" >}}). If you set this to true users
+This role can be tweaked via Grafana server setting [editors_can_admin]({{< relref "../administration/configuration.md#editors_can_admin" >}}). If you set this to true users
 with **Editor** can also administrate dashboards, folders and teams they create. Useful for enabling self organizing teams.
 
 ## Viewer Role
@@ -36,6 +36,6 @@ with **Editor** can also administrate dashboards, folders and teams they create.
 - View any dashboard. This can be disabled on specific folders and dashboards.
 - **Cannot** create or edit dashboards nor data sources.
 
-This role can be tweaked via Grafana server setting [viewers_can_edit]({{< relref "../installation/configuration.md#viewers-can-edit" >}}). If you set this to true users
+This role can be tweaked via Grafana server setting [viewers_can_edit]({{< relref "../administration/configuration.md#viewers-can-edit" >}}). If you set this to true users
 with **Viewer** can also make transient dashboard edits, meaning they can modify panels and queries but not save the changes (nor create new dashboards).
 Useful for public Grafana installations where you want anonymous users to be able to edit panels and queries but not save or create new dashboards.
diff --git a/docs/sources/plugins/plugin-signature-verification.md b/docs/sources/plugins/plugin-signature-verification.md
index b98b611aceb..2654d51eb05 100644
--- a/docs/sources/plugins/plugin-signature-verification.md
+++ b/docs/sources/plugins/plugin-signature-verification.md
@@ -74,7 +74,7 @@ EROR[06-01|16:45:59] Failed to load plugin   error=plugin <plugin id> is unsigne
 
 ## Allow unsigned plugins
 
-While you can allow unsigned plugins using a configuration setting, we strongly advise you not to. For more information on how to allow unsigned backend plugin, refer to [Configuration]({{< relref "../installation/configuration.md#allow-loading-unsigned-plugins" >}}). Allowing unsigned plugins will not skip verifying the authenticity of a plugin if plugin has a _MANIFEST.txt_ file.
+While you can allow unsigned plugins using a configuration setting, we strongly advise you not to. For more information on how to allow unsigned backend plugin, refer to [Configuration]({{< relref "../administration/configuration.md#allow-loading-unsigned-plugins" >}}). Allowing unsigned plugins will not skip verifying the authenticity of a plugin if plugin has a _MANIFEST.txt_ file.
 
 If you run an unsigned backend plugin, then Grafana writes a warning message to the server log:
 
diff --git a/docs/sources/reference/share_panel.md b/docs/sources/reference/share_panel.md
index 18651938cb3..9db2865688a 100644
--- a/docs/sources/reference/share_panel.md
+++ b/docs/sources/reference/share_panel.md
@@ -33,7 +33,7 @@ https://play.grafana.org/d/000000012/grafana-play-home?orgId=1&from=156871968017
 
 You can embed a panel using an iframe on another web site. This tab will show you the html that you need to use.
 
-> **Note:** This sharing requires [allow_embedding]({{< relref "../installation/configuration.md#allow-embedding" >}}) enabled and anonymous access, or proper configuration of the [cookie_samesite]({{< relref "../installation/configuration.md#cookie-samesite" >}}) setting.
+> **Note:** This sharing requires [allow_embedding]({{< relref "../administration/configuration.md#allow-embedding" >}}) enabled and anonymous access, or proper configuration of the [cookie_samesite]({{< relref "../administration/configuration.md#cookie-samesite" >}}) setting.
 
 Example:
 
diff --git a/docs/sources/sharing/share-panel.md b/docs/sources/sharing/share-panel.md
index e2dff6926c0..93639cc0b2a 100644
--- a/docs/sources/sharing/share-panel.md
+++ b/docs/sources/sharing/share-panel.md
@@ -33,7 +33,7 @@ https://play.grafana.org/d/000000012/grafana-play-home?orgId=1&from=156871968017
 
 You can embed a panel using an iframe on another web site. This tab will show you the html that you need to use.
 
-> **Note:** This sharing requires [allow_embedding]({{< relref "../installation/configuration.md#allow-embedding" >}}) enabled and anonymous access, or proper configuration of the [cookie_samesite]({{< relref "../installation/configuration.md#cookie-samesite" >}}) setting.
+> **Note:** This sharing requires [allow_embedding]({{< relref "../administration/configuration.md#allow-embedding" >}}) enabled and anonymous access, or proper configuration of the [cookie_samesite]({{< relref "../administration/configuration.md#cookie-samesite" >}}) setting.
 
 Example:
 
diff --git a/docs/sources/tutorials/ha_setup.md b/docs/sources/tutorials/ha_setup.md
index 832041798e4..2834b67fc12 100755
--- a/docs/sources/tutorials/ha_setup.md
+++ b/docs/sources/tutorials/ha_setup.md
@@ -20,7 +20,7 @@ MySQL or Postgres.
 ## Configure multiple servers to use the same database
 
 First, you need to setup MySQL or Postgres on another server and configure Grafana to use that database.
-You can find the configuration for doing that in the [[database]]({{< relref "../installation/configuration.md" >}}#database) section in the grafana config.
+You can find the configuration for doing that in the [[database]]({{< relref "../administration/configuration.md" >}}#database) section in the grafana config.
 Grafana will now persist all long term data in the database. How to configure the database for high availability is out of scope for this guide. We recommend finding an expert on for the database you're using.
 
 ## Alerting
@@ -30,7 +30,7 @@ Currently alerting supports a limited form of high availability. Since v4.2.0, a
 ## User sessions
 
 > After Grafana 6.2 you don't need to configure session storage since the database will be used by default.
-> If you want to offload the login session data from the database you can configure [remote_cache]({{< relref "../installation/configuration.md" >}}#remote-cache)
+> If you want to offload the login session data from the database you can configure [remote_cache]({{< relref "../administration/configuration.md" >}}#remote-cache)
 
 The second thing to consider is how to deal with user sessions and how to configure your load balancer in front of Grafana.
 Grafana supports two ways of storing session data: locally on disk or in a database/cache-server.
@@ -43,7 +43,7 @@ stored on disk rather than on a shared database. This is the default behavior fo
 
 ### Stateless sessions
 You can also choose to store session data in a Redis/Memcache/Postgres/MySQL which means that the load balancer can send a user to any Grafana server without having to log in on each server. This requires a little bit more work from the operator but enables you to remove/add grafana servers without impacting the user experience.
-If you use MySQL/Postgres for session storage, you first need a table to store the session data in. More details about that in [[sessions]]({{< relref "../installation/configuration.md" >}}#session)
+If you use MySQL/Postgres for session storage, you first need a table to store the session data in. More details about that in [[sessions]]({{< relref "../administration/configuration.md" >}}#session)
 
 For Grafana itself it doesn't really matter if you store the session data on disk or database/redis/memcache. But we recommend using a database/redis/memcache since it makes it easier to manage the grafana servers.