summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-02-28 16:20:02 +0000
committerRémy Coutable <remy@rymai.me>2018-02-28 16:20:02 +0000
commit3297896c776ad23fe3e2d9eb46d2afe7737bf5f4 (patch)
treea81ed0d59e228a4c161f3a0ce96379f620dad6fe
parent607f63f8a841b601cdc28ca11fcfcc21c76f3e8c (diff)
parent94d3a6ed050c1d7ea59a13dd749a72deca1b0485 (diff)
downloadgitlab-ce-3297896c776ad23fe3e2d9eb46d2afe7737bf5f4.tar.gz
Merge branch 'patch-29' into 'master'
Change the wording to reduce confusion about whether you need to reconfigure or restart. See merge request gitlab-org/gitlab-ce!15041
-rw-r--r--doc/integration/saml.md3
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/integration/saml.md b/doc/integration/saml.md
index 3ae98adc465..f8a7dd6b1dc 100644
--- a/doc/integration/saml.md
+++ b/doc/integration/saml.md
@@ -109,8 +109,7 @@ in your SAML IdP:
1. Change the value of `issuer` to a unique name, which will identify the application
to the IdP.
-1. [Reconfigure][] or [restart GitLab][] for the changes to take effect if you
- installed GitLab via Omnibus or from source respectively.
+1. For the changes to take effect, you must [reconfigure][] GitLab if you installed via Omnibus or [restart GitLab][] if you installed from source.
1. Register the GitLab SP in your SAML 2.0 IdP, using the application name specified
in `issuer`.