summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-04-05 14:37:40 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-04-05 14:37:40 +0000
commit59466a478038210113b21ffa40530799dcdeed40 (patch)
tree47bb565bde83e88192e005868cd02b599fbc43e3
parente1bc16cbdf179425bb54fb41caacad2c4c99fe17 (diff)
parent7b290e29f0c7484617d4f1c09244db84c00c11b4 (diff)
downloadgitlab-ce-59466a478038210113b21ffa40530799dcdeed40.tar.gz
Merge branch 'doc_ldap_fixes' into 'master'
Fix LDAP link and codeblock indentation See merge request !3538
-rw-r--r--doc/administration/auth/ldap.md12
-rw-r--r--doc/integration/ldap.md2
2 files changed, 7 insertions, 7 deletions
diff --git a/doc/administration/auth/ldap.md b/doc/administration/auth/ldap.md
index 237700bbcd9..10096779844 100644
--- a/doc/administration/auth/ldap.md
+++ b/doc/administration/auth/ldap.md
@@ -261,13 +261,13 @@ tree and traverse it.
- Run the following check command to make sure that the LDAP settings are
correct and GitLab can see your users:
- ```bash
- # For Omnibus installations
- sudo gitlab-rake gitlab:ldap:check
+ ```bash
+ # For Omnibus installations
+ sudo gitlab-rake gitlab:ldap:check
- # For installations from source
- sudo -u git -H bundle exec rake gitlab:ldap:check RAILS_ENV=production
- ```
+ # For installations from source
+ sudo -u git -H bundle exec rake gitlab:ldap:check RAILS_ENV=production
+ ```
### Connection Refused
diff --git a/doc/integration/ldap.md b/doc/integration/ldap.md
index fb20308c49c..30f0c15dacc 100644
--- a/doc/integration/ldap.md
+++ b/doc/integration/ldap.md
@@ -1,3 +1,3 @@
# GitLab LDAP integration
-This document was moved under [`administration/auth/ldap`](administration/auth/ldap.md).
+This document was moved under [`administration/auth/ldap`](../administration/auth/ldap.md).