diff --git a/book/security.rst b/book/security.rst index 7335d3e784a..7814ec2000a 100644 --- a/book/security.rst +++ b/book/security.rst @@ -146,7 +146,7 @@ that looks like the following: * Any URL matching ``/admin/*`` is secured, and only the ``admin`` user can access it; * All URLs *not* matching ``/admin/*`` are accessible by all users (and the - user is never prompted to login). + user is never prompted to log in). Let's look briefly at how security works and how each part of the configuration comes into play. @@ -1635,9 +1635,9 @@ the first provider is always used: ), )); -In this example, if a user tries to login via HTTP authentication, the authentication +In this example, if a user tries to log in via HTTP authentication, the authentication system will use the ``in_memory`` user provider. But if the user tries to -login via the form login, the ``user_db`` provider will be used (since it's +log in via the form login, the ``user_db`` provider will be used (since it's the default for the firewall as a whole). For more information about user provider and firewall configuration, see @@ -1869,7 +1869,7 @@ Impersonating a User -------------------- Sometimes, it's useful to be able to switch from one user to another without -having to logout and login again (for instance when you are debugging or trying +having to log out and log in again (for instance when you are debugging or trying to understand a bug a user sees that you can't reproduce). This can be easily done by activating the ``switch_user`` firewall listener: diff --git a/cookbook/testing/http_authentication.rst b/cookbook/testing/http_authentication.rst index 0b00422e912..cbb9c86a9fb 100644 --- a/cookbook/testing/http_authentication.rst +++ b/cookbook/testing/http_authentication.rst @@ -22,7 +22,7 @@ You can also override it on a per request basis:: When your application is using a ``form_login``, you can simplify your tests by allowing your test configuration to make use of HTTP authentication. This way you can use the above to authenticate in tests, but still have your users -login via the normal ``form_login``. The trick is to include the ``http_basic`` +log in via the normal ``form_login``. The trick is to include the ``http_basic`` key in your firewall, along with the ``form_login`` key: .. configuration-block:: diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst index dc41ad19f6a..31a20e888d5 100644 --- a/reference/configuration/security.rst +++ b/reference/configuration/security.rst @@ -117,7 +117,7 @@ Each part will be explained in the next section. # submit the login form here check_path: /login_check - # the user is redirected here when he/she needs to login + # the user is redirected here when he/she needs to log in login_path: /login # if true, forward the user to the login form instead of redirecting