IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Docs: minor fixes (#22223)

Browse Source 
* Update enhanced_ldap.md

* Update ldap.md

* Minor fixes
This commit is contained in:
Diana Payton 2020-02-18 12:28:59 -08:00 committed by GitHub
parent 39e0ce305b
commit e08b39d4f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/sources/auth/enhanced_ldap.md
View File

@ -12,8 +12,6 @@ weight = 3
# Enhanced LDAP integration
> Enhanced LDAP Integration is only available in Grafana Enterprise. Read more about [Grafana Enterprise]({{< relref "../enterprise" >}}).
The enhanced LDAP integration adds additional functionality on top of the [existing LDAP integration]({{< relref "ldap.md" >}}).
The enhanced LDAP integration adds additional functionality on top of the existing {LDAP integration]({{< relref "ldap.md" >}}).
> Enhanced LDAP integration is only available in Grafana Enterprise. For more information, refer to [Enhanced LDAP integration]({{< relref "../enterprise/enhanced_ldap.md" >}}) in [Grafana Enterprise]({{< relref "../enterprise" >}}).

2
docs/sources/auth/ldap.md
View File

@ -16,6 +16,8 @@ weight = 2
The LDAP integration in Grafana allows your Grafana users to login with their LDAP credentials. You can also specify mappings between LDAP
group memberships and Grafana Organization user roles.
> [Enhanced LDAP authentication]({{< relref "../enterprise/enhanced_ldap.md" >}}) is available in [Grafana Enterprise]({{< relref "../enterprise" >}}).
## Supported LDAP Servers
Grafana uses a [third-party LDAP library](https://github.com/go-ldap/ldap) under the hood that supports basic LDAP v3 functionality.

4
docs/sources/enterprise/white-labeling.md
View File

@ -16,7 +16,7 @@ weight = 5
{{< docs-imagebox img="/img/docs/v66/whitelabeling_1.png" max-width="800px" caption="White labeling example" >}}
This release adds new white labeling options to the `grafana.ini` file (can also be set via ENV variables).
Grafana Enterprise has white labeling options in the `grafana.ini` file (can also be set via ENV variables).
You can change the following elements:
@ -26,7 +26,7 @@ You can change the following elements:
- Footer & Help menu links
- Fav icon (shown in browser tab)
> You will have to host your logo and other images used by the white labeling feature separately
> You will have to host your logo and other images used by the white labeling feature separately.
```ini
# Enterprise only