From 0b78bd7a42a341bb227fb544b5b12abf8e152a41 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Mon, 20 Oct 2014 16:22:36 +0200
Subject: [PATCH] Keep the legacy LDAP syntax in the documentation

---
 doc/integration/ldap.md | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/doc/integration/ldap.md b/doc/integration/ldap.md
index a89c2d38779..869850d29d7 100644
--- a/doc/integration/ldap.md
+++ b/doc/integration/ldap.md
@@ -24,22 +24,31 @@ If you want to limit all GitLab access to a subset of the LDAP users on your LDA
 The filter must comply with [RFC 4515](http://tools.ietf.org/search/rfc4515).
 
 ```ruby
-# For omnibus-gitlab
-gitlab_rails['ldap_user_filter'] = '(employeeType=developer)'
+# For omnibus packages; new LDAP server syntax
 gitlab_rails['ldap_servers'] = YAML.load <<-EOS
 main:
   # snip...
   user_filter: '(employeeType=developer)'
 EOS
+
+# omnibus package; legacy syntax
+gitlab_rails['ldap_user_filter'] = '(employeeType=developer)'
 ```
 
 ```yaml
-# For installations from source
+# For installations from source; new LDAP server syntax
 production:
   ldap:
     servers:
       main:
+        # snip...
         user_filter: '(employeeType=developer)'
+
+# installations from source; legacy syntax
+production:
+  ldap:
+    # snip...
+    user_filter: '(employeeType=developer)'
 ```
 
 Tip: if you want to limit access to the nested members of an Active Directory group you can use the following syntax: