diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-26 17:32:16 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-26 17:32:16 +0300 |
| commit | c8fb2e6a3942330079bde06d919cd33c6bc7600e (patch) | |
| tree | 05779c4012efee4733aa1c797d5ec3698b4ebd93 /doc/user | |
| parent | d54b96a3079a9ee9ac834291995e81f4ab75b95a (diff) | |
Add latest changes from gitlab-org/gitlab@13-3-stable-ee
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/group/saml_sso/index.md | 4 | ||||
| -rw-r--r-- | doc/user/project/pages/custom_domains_ssl_tls_certification/index.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md index f0d0fbff158..f516f4080fa 100644 --- a/doc/user/group/saml_sso/index.md +++ b/doc/user/group/saml_sso/index.md @@ -18,7 +18,7 @@ If you follow our guidance to automate user provisioning using [SCIM](scim_setup User synchronization of SAML SSO groups is supported through [SCIM](scim_setup.md). SCIM supports adding and removing users from the GitLab group. For example, if you remove a user from the SCIM app, SCIM removes that same user from the GitLab group. -SAML SSO is not supported at the subgroup level, +SAML SSO is not supported at the subgroup level. ## Configuring your Identity Provider @@ -265,7 +265,7 @@ Group SAML SSO helps if you need to allow access via multiple SAML identity prov To proceed with configuring Group SAML SSO instead, you'll need to enable the `group_saml` OmniAuth provider. This can be done from: -- `gitlab.rb` for GitLab [Omnibus installations](#omnibus-installations). +- `gitlab.rb` for [Omnibus GitLab installations](#omnibus-installations). - `gitlab/config/gitlab.yml` for [source installations](#source-installations). ### Limitations diff --git a/doc/user/project/pages/custom_domains_ssl_tls_certification/index.md b/doc/user/project/pages/custom_domains_ssl_tls_certification/index.md index 8e8f75be82d..e6912259bfa 100644 --- a/doc/user/project/pages/custom_domains_ssl_tls_certification/index.md +++ b/doc/user/project/pages/custom_domains_ssl_tls_certification/index.md @@ -100,7 +100,7 @@ as it most likely won't work if you set an [`MX` record](dns_concepts.md#mx-reco Subdomains (`subdomain.example.com`) require: -- A DNS [CNAME record](dns_concepts.md#cname-record) record pointing your subdomain to the Pages server. +- A DNS [CNAME record](dns_concepts.md#cname-record) pointing your subdomain to the Pages server. - A DNS [TXT record](dns_concepts.md#txt-record) to verify your domain's ownership. | From | DNS Record | To | |