diff options
| author | Drew Blessing <drew@blessing.io> | 2016-03-28 16:36:42 +0000 |
|---|---|---|
| committer | Drew Blessing <drew@blessing.io> | 2016-03-28 16:36:42 +0000 |
| commit | fd279dd0a28b2a4ff6c6bc4086fda01546777f9b (patch) | |
| tree | 9c03e11859ca24f9b25232de0a7695bf0998333e /doc/README.md | |
| parent | 8b5a8bdb256fa86483358d5fdc357583da647a7d (diff) | |
| parent | b25d42cee9db265afe15d8ef192490a1ce2e3471 (diff) | |
| download | gitlab-ce-fd279dd0a28b2a4ff6c6bc4086fda01546777f9b.tar.gz | |
Merge branch 'update_ldap_docs' into 'master'
Update ldap docs
Related to gitlab-org/gitlab-ee#397
@axil What do you think of moving LDAP configuration docs to `adminstration/auth/ldap.md`? Then we'll probably need to add the relevant group link configuration piece to some user group documentation. We can cross-link and deprecate the current `integration/ldap.md` location.
See merge request !3336
Diffstat (limited to 'doc/README.md')
| -rw-r--r-- | doc/README.md | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/README.md b/doc/README.md index e6fa4fc049b..724c7cca0f1 100644 --- a/doc/README.md +++ b/doc/README.md @@ -19,10 +19,12 @@ ## Administrator documentation +- [Authentication/Authorization](administration/auth/README.md) Configure + external authentication with LDAP, SAML, CAS and additional Omniauth providers. - [Custom git hooks](hooks/custom_hooks.md) Custom git hooks (on the filesystem) for when webhooks aren't enough. - [Install](install/README.md) Requirements, directory structures and installation from source. - [Restart GitLab](administration/restart_gitlab.md) Learn how to restart GitLab and its components -- [Integration](integration/README.md) How to integrate with systems such as JIRA, Redmine, LDAP and Twitter. +- [Integration](integration/README.md) How to integrate with systems such as JIRA, Redmine, Twitter. - [Issue closing](customization/issue_closing.md) Customize how to close an issue from commit messages. - [Libravatar](customization/libravatar.md) Use Libravatar for user avatars. - [Log system](logs/logs.md) Log system. |