From e08b39d4f0fd06dd47d73825e62fb2941f2cbd2a Mon Sep 17 00:00:00 2001 From: Diana Payton <52059945+oddlittlebird@users.noreply.github.com> Date: Tue, 18 Feb 2020 12:28:59 -0800 Subject: [PATCH] Docs: minor fixes (#22223) * Update enhanced_ldap.md * Update ldap.md * Minor fixes --- docs/sources/auth/enhanced_ldap.md | 4 +--- docs/sources/auth/ldap.md | 2 ++ docs/sources/enterprise/white-labeling.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/sources/auth/enhanced_ldap.md b/docs/sources/auth/enhanced_ldap.md index f89a1d6a5a6..4faeb2719c1 100755 --- a/docs/sources/auth/enhanced_ldap.md +++ b/docs/sources/auth/enhanced_ldap.md @@ -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" >}}). diff --git a/docs/sources/auth/ldap.md b/docs/sources/auth/ldap.md index 673cdb2c85b..2e7a29c0e4c 100644 --- a/docs/sources/auth/ldap.md +++ b/docs/sources/auth/ldap.md @@ -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. diff --git a/docs/sources/enterprise/white-labeling.md b/docs/sources/enterprise/white-labeling.md index c7e92730a10..1dd3df3742e 100644 --- a/docs/sources/enterprise/white-labeling.md +++ b/docs/sources/enterprise/white-labeling.md @@ -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