summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarten Kenbeek <marten.knbk@gmail.com>2015-03-05 13:09:08 +0100
committerTim Graham <timograham@gmail.com>2015-03-05 12:18:13 -0500
commitbd7c879d5a0daeaa58f2a32901db6e8d8ed5212d (patch)
tree12c7f647d106e66332162f39765edbc29d67830b
parent2bef57f3fb523d67ddf2d0d2db0180a21c9fd989 (diff)
[1.8.x] Stressed authentication should be successful before logging in a user.
Backport of 8e744fa1507b6d425860c54e7673e603279367eb from master
-rw-r--r--docs/topics/auth/default.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt
index aed6187a37..6cdda816a6 100644
--- a/docs/topics/auth/default.txt
+++ b/docs/topics/auth/default.txt
@@ -354,8 +354,8 @@ If you have an authenticated user you want to attach to the current session
.. admonition:: Calling ``authenticate()`` first
- When you're manually logging a user in, you *must* call
- :func:`~django.contrib.auth.authenticate()` before you call
+ When you're manually logging a user in, you *must* successfully authenticate
+ the user with :func:`~django.contrib.auth.authenticate()` before you call
:func:`~django.contrib.auth.login()`.
:func:`~django.contrib.auth.authenticate()`
sets an attribute on the :class:`~django.contrib.auth.models.User` noting