diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2019-01-30 10:02:06 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-01-30 10:02:06 +0000 |
| commit | 59e69a56c59e9f528c8a172dea64d2b433b6056a (patch) | |
| tree | ec77e70f65993160eb6b476a5b82a82d360f5508 | |
| parent | ebb90a09f8579d7e414401cddba43e5676d42173 (diff) | |
| parent | b6d3cf4f3f2622477d245afe02f3050e36683eab (diff) | |
| download | gitlab-ce-59e69a56c59e9f528c8a172dea64d2b433b6056a.tar.gz | |
Merge branch 'docs/surface-auth-section-link' into 'master'
Surface link to auth section index
See merge request gitlab-org/gitlab-ce!24787
| -rw-r--r-- | doc/administration/index.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/administration/index.md b/doc/administration/index.md index ecb0801bac4..0b673d61139 100644 --- a/doc/administration/index.md +++ b/doc/administration/index.md @@ -89,7 +89,7 @@ Learn how to install, configure, update, and maintain your GitLab instance. - [Libravatar](../customization/libravatar.md): Use Libravatar instead of Gravatar for user avatars. - [Sign-up restrictions](../user/admin_area/settings/sign_up_restrictions.md): block email addresses of specific domains, or whitelist only specific domains. - [Access restrictions](../user/admin_area/settings/visibility_and_access_controls.md#enabled-git-access-protocols): Define which Git access protocols can be used to talk to GitLab (SSH, HTTP, HTTPS). -- [Authentication/Authorization](../topics/authentication/index.md#gitlab-administrators): Enforce 2FA, configure external authentication with LDAP, SAML, CAS and additional Omniauth providers. +- [Authentication and Authorization](auth/README.md): Configure external authentication with LDAP, SAML, CAS and additional providers. See also other [authentication](../topics/authentication/index.md#gitlab-administrators) topics (for example, enforcing 2FA). - [Incoming email](incoming_email.md): Configure incoming emails to allow users to [reply by email], create [issues by email] and [merge requests by email], and to enable [Service Desk]. |