Browse Source

docs: minor docs fix

Torkel Ödegaard 7 years ago
parent
commit
913b8576f8
3 changed files with 3 additions and 2 deletions
  1. 1 0
      CHANGELOG.md
  2. 1 1
      conf/ldap.toml
  3. 1 1
      docs/sources/installation/ldap.md

+ 1 - 0
CHANGELOG.md

@@ -2,6 +2,7 @@
 
 * **Dataproxy**: Pass configured/auth headers to a Datasource [#10971](https://github.com/grafana/grafana/issues/10971), thx [@mrsiano](https://github.com/mrsiano)
 * **Cleanup**: Make temp file time to live configurable [#11607](https://github.com/grafana/grafana/issues/11607), thx [@xapon](https://github.com/xapon)
+* **LDAP**: Define Grafana Admin permission in ldap group mappings [#2469](https://github.com/grafana/grafana/issues/2496), PR [#12622](https://github.com/grafana/grafana/issues/12622)
 
 ### Minor
 

+ 1 - 1
conf/ldap.toml

@@ -72,7 +72,7 @@ email =  "email"
 [[servers.group_mappings]]
 group_dn = "cn=admins,dc=grafana,dc=org"
 org_role = "Admin"
-# To make user a instance admin  (Grafana Admin) uncomment line below
+# To make user an instance admin  (Grafana Admin) uncomment line below
 # grafana_admin = true
 # The Grafana organization database id, optional, if left out the default org (id 1) will be used
 # org_id = 1

+ 1 - 1
docs/sources/installation/ldap.md

@@ -74,7 +74,7 @@ email =  "email"
 [[servers.group_mappings]]
 group_dn = "cn=admins,dc=grafana,dc=org"
 org_role = "Admin"
-# To make user a instance admin  (Grafana Admin) uncomment line below
+# To make user an instance admin  (Grafana Admin) uncomment line below
 # grafana_admin = true
 # The Grafana organization database id, optional, if left out the default org (id 1) will be used.  Setting this allows for multiple group_dn's to be assigned to the same org_role provided the org_id differs
 # org_id = 1