kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'patch-28' into 'master'

Browse source 
Fix LDAP config key name

See merge request gitlab-org/gitlab-ce!14739
This commit is contained in:
Douwe Maan 2017-10-07 11:02:26 +00:00
commit 2ef28db9a1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/administration/auth/ldap.md
View file

@ -287,11 +287,11 @@ LDAP email address, and then sign into GitLab via their LDAP credentials.
There are two encryption methods, `simple_tls` and `start_tls`.
For either encryption method, if setting `validate_certificates: false`, TLS
For either encryption method, if setting `verify_certificates: false`, TLS
encryption is established with the LDAP server before any LDAP-protocol data is
exchanged but no validation of the LDAP server's SSL certificate is performed.
>**Note**: Before GitLab 9.5, `validate_certificates: false` is the default if
>**Note**: Before GitLab 9.5, `verify_certificates: false` is the default if
unspecified.
## Limitations