Skip to content

Commit 326281d

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Corrected grammar to increased readability.
2 parents 123362b + 89382cf commit 326281d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

security/ldap.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ use the ``ldap`` user provider.
207207
data. It's a static user defined by its username and password (for improved
208208
security, define the password as an environment variable).
209209

210-
If your LDAP server allows to retrieve information anonymously, you can
210+
If your LDAP server allows retrieval of information anonymously, you can
211211
set the ``search_dn`` and ``search_password`` options to ``null``.
212212

213213
The ``ldap`` user provider supports many different configuration options:
@@ -234,15 +234,15 @@ search_dn
234234
**type**: ``string`` **default**: ``null``
235235

236236
This is your read-only user's DN, which will be used to authenticate
237-
against the LDAP server in order to fetch the user's information.
237+
against the LDAP server to fetch the user's information.
238238

239239
search_password
240240
...............
241241

242242
**type**: ``string`` **default**: ``null``
243243

244244
This is your read-only user's password, which will be used to authenticate
245-
against the LDAP server in order to fetch the user's information.
245+
against the LDAP server to fetch the user's information.
246246

247247
default_roles
248248
.............
@@ -292,7 +292,7 @@ load the user ``fabpot``, the final string will be: ``(uid=fabpot)``.
292292
If you pass ``null`` as the value of this option, the default filter is used
293293
``({uid_key}={username})``.
294294

295-
In order to prevent `LDAP injection`_, the username will be escaped.
295+
To prevent `LDAP injection`_, the username will be escaped.
296296

297297
The syntax for the ``filter`` key is defined by `RFC4515`_.
298298

@@ -319,7 +319,7 @@ dn_string
319319

320320
**type**: ``string`` **default**: ``{username}``
321321

322-
This key defines the form of the string used in order to compose the
322+
This key defines the form of the string used to compose the
323323
DN of the user, from the username. The ``{username}`` string is
324324
replaced by the actual username of the person trying to authenticate.
325325

0 commit comments

Comments
 (0)