diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-21 06:08:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-21 06:08:58 +0000 |
commit | 18b8435318887d3fc6e9f9d305967a953cdd7d3f (patch) | |
tree | 28cb71f255eb364c224ff24dd085f8cd836951b1 /doc/administration/index.md | |
parent | 4359b9650ecf0960f04f0fd38fc25bec7b478a11 (diff) | |
download | gitlab-ce-18b8435318887d3fc6e9f9d305967a953cdd7d3f.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/index.md')
-rw-r--r-- | doc/administration/index.md | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/administration/index.md b/doc/administration/index.md index fcfdcfdf6c8..0028f7d8a1d 100644 --- a/doc/administration/index.md +++ b/doc/administration/index.md @@ -76,7 +76,7 @@ Learn how to install, configure, update, and maintain your GitLab instance. ### Maintaining GitLab -- [Raketasks](../raketasks/README.md): Perform various tasks for maintenance, backups, automatic webhooks setup, etc. +- [Raketasks](../raketasks/README.md): Perform various tasks for maintenance, backups, automatic webhooks setup, and more. - [Backup and restore](../raketasks/backup_restore.md): Backup and restore your GitLab instance. - [Operations](operations/index.md): Keeping GitLab up and running (clean up Redis sessions, moving repositories, Sidekiq MemoryKiller, Unicorn). - [Restart GitLab](restart_gitlab.md): Learn how to restart GitLab and its components. @@ -107,7 +107,7 @@ Learn how to install, configure, update, and maintain your GitLab instance. - [Libravatar](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 and Authorization](auth/README.md): Configure external authentication with LDAP, SAML, CAS and additional providers. +- [Authentication and Authorization](auth/README.md): Configure external authentication with LDAP, SAML, CAS, and additional providers. - [Sync LDAP](auth/ldap-ee.md) **(STARTER ONLY)** - [Kerberos authentication](../integration/kerberos.md) **(STARTER ONLY)** - See also other [authentication](../topics/authentication/index.md#gitlab-administrators) topics (for example, enforcing 2FA). @@ -230,4 +230,3 @@ who are aware of the risks. - [Strace zine](https://wizardzines.com/zines/strace/) - GitLab.com-specific resources: - [Group SAML/SCIM setup](troubleshooting/group_saml_scim.md) -
\ No newline at end of file |