diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-10-07 11:02:26 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-10-07 11:02:26 +0000 |
| commit | 2ef28db9a1b7d56c5dda6230dcffcf4e140ecc45 (patch) | |
| tree | 5a987e4280e2832c7c0d2a164fde139c6f80d3a9 /doc | |
| parent | 546b18b90317c0c9c0163ddcc5c54798a0bed841 (diff) | |
| parent | 55e6552c8d28d646a4b83777e8cb8f60681efc27 (diff) | |
| download | gitlab-ce-2ef28db9a1b7d56c5dda6230dcffcf4e140ecc45.tar.gz | |
Merge branch 'patch-28' into 'master'
Fix LDAP config key name
See merge request gitlab-org/gitlab-ce!14739
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/administration/auth/ldap.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md index ad904908472..ad903aef896 100644 --- a/doc/administration/auth/ldap.md +++ b/doc/administration/auth/ldap.md @@ -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 |