summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.11.txt2
-rw-r--r--docs/topics/auth/default.txt5
2 files changed, 7 insertions, 0 deletions
diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt
index eb983de0dc..3ba4eb2e35 100644
--- a/docs/releases/1.11.txt
+++ b/docs/releases/1.11.txt
@@ -118,6 +118,8 @@ Minor features
* The new ``post_reset_login`` attribute for
:class:`~django.contrib.auth.views.PasswordResetConfirmView` allows
automatically logging in a user after a successful password reset.
+ If you have multiple ``AUTHENTICATION_BACKENDS`` configured, use the
+ ``post_reset_login_backend`` attribute to choose which one to use.
* To avoid the possibility of leaking a password reset token via the HTTP
Referer header (for example, if the reset page includes a reference to CSS or
diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt
index f4090f77cb..1d91bdcf42 100644
--- a/docs/topics/auth/default.txt
+++ b/docs/topics/auth/default.txt
@@ -1506,6 +1506,11 @@ implementation details see :ref:`using-the-views`.
automatically authenticated after a successful password reset. Defaults
to ``False``.
+ * ``post_reset_login_backend``: A dotted path to the authentication
+ backend to use when authenticating a user if ``post_reset_login`` is
+ ``True``. Required only if you have multiple
+ :setting:`AUTHENTICATION_BACKENDS` configured. Defaults to ``None``.
+
* ``form_class``: Form that will be used to set the password. Defaults to
:class:`~django.contrib.auth.forms.SetPasswordForm`.