clean up

lsmith77 · lsmith77 · commit 143ae0a9836e · 2017-02-03T10:00:59.000+01:00
diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst
@@ -454,10 +454,10 @@ query_string
 **type**: ``string`` **default**: ``null``
 
 This is the string which will be used to query for the DN. The ``{username}``
-placeholder will be replaced with the user-provided value (his login).
+placeholder will be replaced with the user-provided value (their login).
 Depending on your LDAP server's configuration, you will need to override
-this value. This setting is only necessary if the users DN cannot be derived
-statically using the `dn_string` config option.
+this value. This setting is only necessary if the user's DN cannot be derived
+statically using the ``dn_string`` config option.
 
 User provider
 ~~~~~~~~~~~~~
diff --git a/security/ldap.rst b/security/ldap.rst
@@ -295,19 +295,6 @@ than one is found.
 Examples are provided below, for both ``form_login_ldap`` and
 ``http_basic_ldap``.
 
-query_string
-............
-
-**type**: ``string`` **default**: ``null``
-
-This optional key defines the form of the query used in order to search the
-DN of the user, from the username. The ``{username}`` string is replaced by
-the actual username of the person trying to authenticate.
-
-This setting is only necessary if the users DN cannot be derived statically
-using the `dn_string` config option.
-
-
 Configuration example for form login
 ....................................
 
@@ -456,13 +443,14 @@ Configuration example for form login and query_string
                             check-path="login_check"
                             service="ldap"
                             dn-string="dc=example,dc=com"
-                            query-string="(&(uid={username})(memberOf=cn=users,ou=Services,dc=example,dc=com))" />
+                            query-string="(&amp;(uid={username})(memberOf=cn=users,ou=Services,dc=example,dc=com))" />
                 </firewall>
             </config>
         </srv:container>
 
     .. code-block:: php
 
+        // app/config/security.php
         $container->loadFromExtension('security', array(
             'firewalls' => array(
                 'main' => array(
