From 4b9d1df6eecd7231c883169b6512f6f69fd3f540 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 12 Sep 2016 05:46:25 +0000 Subject: [PATCH] Small changes to method LDAP documentation --- doc/administration/auth/ldap.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md index c9b6b0245ea596..5caab0b62b017d 100644 --- a/doc/administration/auth/ldap.md +++ b/doc/administration/auth/ldap.md @@ -2,7 +2,7 @@ GitLab integrates with LDAP to support user authentication. This integration works with most LDAP-compliant directory -servers, including Microsoft Active Directory, Apple Open Directory, Open LDAP, +servers, including Microsoft Active Directory, Apple Open Directory, OpenLDAP, and 389 Server. GitLab EE includes enhanced integration, including group membership syncing. @@ -53,9 +53,9 @@ The configuration inside `gitlab_rails['ldap_servers']` below is sensitive to incorrect indentation. Be sure to retain the indentation given in the example. Copy/paste can sometimes cause problems. -> **Note:** The `method` value `ssl` corresponds to 'Simple TLS' in the LDAP +> **Note:** The `method` value `ssl` corresponds to 'Simple TLS' in the Net::LDAP library. `tls` corresponds to StartTLS, not to be confused with regular TLS. - Normally, if you specify `ssl` is will be on port 636 while `tls` (StartTLS) + Normally, if you specify `ssl` this will be on port 636 while `tls` (StartTLS) would be on port 389. `plain` also operates on port 389. **Omnibus configuration** -- GitLab