From 4f91087d9a458b21f791a97674451416e5007839 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Fri, 31 Aug 2018 07:15:07 +0200
Subject: [PATCH] docs: minor updates, more work to do

---
 .../authentication/ldap-sync-grafana-ee.md    | 13 -----------
 docs/sources/administration/permissions.md    |  2 --
 .../anonymous-auth.md => auth/anonymous.md}   |  2 +-
 .../authentication => auth}/auth-proxy.md     |  0
 .../authentication => auth}/index.md          |  4 ++--
 .../authentication => auth}/ldap.md           |  0
 .../authentication => auth}/oauth.md          |  0
 .../authentication => auth}/overview.md       | 22 ++++++++++++++-----
 8 files changed, 19 insertions(+), 24 deletions(-)
 delete mode 100644 docs/sources/administration/authentication/ldap-sync-grafana-ee.md
 rename docs/sources/{administration/authentication/anonymous-auth.md => auth/anonymous.md} (96%)
 rename docs/sources/{administration/authentication => auth}/auth-proxy.md (100%)
 rename docs/sources/{administration/authentication => auth}/index.md (91%)
 rename docs/sources/{administration/authentication => auth}/ldap.md (100%)
 rename docs/sources/{administration/authentication => auth}/oauth.md (100%)
 rename docs/sources/{administration/authentication => auth}/overview.md (52%)

diff --git a/docs/sources/administration/authentication/ldap-sync-grafana-ee.md b/docs/sources/administration/authentication/ldap-sync-grafana-ee.md
deleted file mode 100644
index c60b21b0320..00000000000
--- a/docs/sources/administration/authentication/ldap-sync-grafana-ee.md
+++ /dev/null
@@ -1,13 +0,0 @@
-+++
-title = "LDAP Sync with Grafana EE"
-description = "LDAP Sync with Grafana EE Guide "
-keywords = ["grafana", "configuration", "documentation", "ldap", "enterprise"]
-type = "docs"
-[menu.docs]
-name = "LDAP Sync with Grafana EE"
-identifier = "ldap-sync"
-parent = "authentication"
-weight = 2
-+++
-
-# LDAP Sync with Grafana EE
\ No newline at end of file
diff --git a/docs/sources/administration/permissions.md b/docs/sources/administration/permissions.md
index e7b84a417c0..1d1a70607c8 100644
--- a/docs/sources/administration/permissions.md
+++ b/docs/sources/administration/permissions.md
@@ -52,8 +52,6 @@ This admin flag makes a user a `Super Admin`. This means they can access the `Se
 
 ### Dashboard & Folder Permissions
 
-> Introduced in Grafana v5.0
-
 {{< docs-imagebox img="/img/docs/v50/folder_permissions.png" max-width="500px" class="docs-image--right" >}}
 
 For dashboards and dashboard folders there is a **Permissions** page that make it possible to
diff --git a/docs/sources/administration/authentication/anonymous-auth.md b/docs/sources/auth/anonymous.md
similarity index 96%
rename from docs/sources/administration/authentication/anonymous-auth.md
rename to docs/sources/auth/anonymous.md
index f2cde75cacb..39d1059e92e 100644
--- a/docs/sources/administration/authentication/anonymous-auth.md
+++ b/docs/sources/auth/anonymous.md
@@ -4,7 +4,7 @@ description = "Anonymous authentication "
 keywords = ["grafana", "configuration", "documentation", "anonymous"]
 type = "docs"
 [menu.docs]
-name = "Anonymous Auth"
+name = "Anonymous"
 identifier = "anonymous-auth"
 parent = "authentication"
 weight = 4
diff --git a/docs/sources/administration/authentication/auth-proxy.md b/docs/sources/auth/auth-proxy.md
similarity index 100%
rename from docs/sources/administration/authentication/auth-proxy.md
rename to docs/sources/auth/auth-proxy.md
diff --git a/docs/sources/administration/authentication/index.md b/docs/sources/auth/index.md
similarity index 91%
rename from docs/sources/administration/authentication/index.md
rename to docs/sources/auth/index.md
index f9bc9e5f13c..455c361369a 100644
--- a/docs/sources/administration/authentication/index.md
+++ b/docs/sources/auth/index.md
@@ -6,5 +6,5 @@ type = "docs"
 name = "Authentication"
 identifier = "authentication"
 parent = "admin"
-weight = 1
-+++
\ No newline at end of file
+weight = 3
++++
diff --git a/docs/sources/administration/authentication/ldap.md b/docs/sources/auth/ldap.md
similarity index 100%
rename from docs/sources/administration/authentication/ldap.md
rename to docs/sources/auth/ldap.md
diff --git a/docs/sources/administration/authentication/oauth.md b/docs/sources/auth/oauth.md
similarity index 100%
rename from docs/sources/administration/authentication/oauth.md
rename to docs/sources/auth/oauth.md
diff --git a/docs/sources/administration/authentication/overview.md b/docs/sources/auth/overview.md
similarity index 52%
rename from docs/sources/administration/authentication/overview.md
rename to docs/sources/auth/overview.md
index e7daf581abb..03a7a0e9fe4 100644
--- a/docs/sources/administration/authentication/overview.md
+++ b/docs/sources/auth/overview.md
@@ -9,20 +9,30 @@ parent = "authentication"
 weight = 1
 +++
 
-## [auth]
+# Authentication
 
-### disable_login_form
+Grafana provides many ways to authenticate users. By default it will use local users & passwords stored in the Grafana
+database.
+
+## Settings
+
+Via the [server ini config file]({{< relref "installation/debian.md" >}}) you can setup many different authentication methods. Auth settings
+are documented below.
+
+### [auth]
+
+#### disable_login_form
 
 Set to true to disable (hide) the login form, useful if you use OAuth, defaults to false.
 
-### disable_signout_menu
+#### disable_signout_menu
 
 Set to true to disable the signout link in the side menu. useful if you use auth.proxy, defaults to false.
 
 <hr>
 
-## [auth.basic]
-### enabled
+### [auth.basic]
+#### enabled
 When enabled is `true` (default) the http api will accept basic authentication.
 
-<hr>
\ No newline at end of file
+<hr>