summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-12-05 22:15:21 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-12-05 22:15:21 +0000
commit183b40f5187b58662ac17baefe38435e11e786c6 (patch)
treeea3b59fdc8c0186d14ec7c7d0f79fd919caf2173
parent1e7e7977e0a14572abc52c08291984cd78fd033d (diff)
parentc1f3cbb5498574bcf686347a774c1fef88131974 (diff)
downloadgitlab-ce-183b40f5187b58662ac17baefe38435e11e786c6.tar.gz
Merge branch 'fix-nignx-typo' into 'master'
NIGNX -> Nginx This shouldn't be in all caps, and it should be spelled correctly! See merge request !7929
-rw-r--r--doc/integration/shibboleth.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/integration/shibboleth.md b/doc/integration/shibboleth.md
index eb9bbb67e7d..696c1011eeb 100644
--- a/doc/integration/shibboleth.md
+++ b/doc/integration/shibboleth.md
@@ -2,7 +2,7 @@
This documentation is for enabling shibboleth with omnibus-gitlab package.
-In order to enable Shibboleth support in gitlab we need to use Apache instead of Nginx (It may be possible to use Nginx, however this is difficult to configure using the bundled NIGNX provided in the omnibus-gitlab package). Apache uses mod_shib2 module for shibboleth authentication and can pass attributes as headers to omniauth-shibboleth provider.
+In order to enable Shibboleth support in gitlab we need to use Apache instead of Nginx (It may be possible to use Nginx, however this is difficult to configure using the bundled Nginx provided in the omnibus-gitlab package). Apache uses mod_shib2 module for shibboleth authentication and can pass attributes as headers to omniauth-shibboleth provider.
To enable the Shibboleth OmniAuth provider you must: