summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/2.1.txt3
-rw-r--r--docs/topics/auth/default.txt10
2 files changed, 4 insertions, 9 deletions
diff --git a/docs/releases/2.1.txt b/docs/releases/2.1.txt
index 9f1648122a..e70e3fa591 100644
--- a/docs/releases/2.1.txt
+++ b/docs/releases/2.1.txt
@@ -229,3 +229,6 @@ how to remove usage of these features.
* ``contrib.auth.views.login()``, ``logout()``, ``password_change()``,
``password_change_done()``, ``password_reset()``, ``password_reset_done()``,
``password_reset_confirm()``, and ``password_reset_complete()`` are removed.
+
+* The ``extra_context`` parameter of ``contrib.auth.views.logout_then_login()``
+ is removed.
diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt
index 0d70bfc1c8..4b1e13288f 100644
--- a/docs/topics/auth/default.txt
+++ b/docs/topics/auth/default.txt
@@ -1126,7 +1126,7 @@ implementation details see :ref:`using-the-views`.
:attr:`request.META['SERVER_NAME'] <django.http.HttpRequest.META>`.
For more on sites, see :doc:`/ref/contrib/sites`.
-.. function:: logout_then_login(request, login_url=None, extra_context=None)
+.. function:: logout_then_login(request, login_url=None)
Logs a user out, then redirects to the login page.
@@ -1137,14 +1137,6 @@ implementation details see :ref:`using-the-views`.
* ``login_url``: The URL of the login page to redirect to.
Defaults to :setting:`settings.LOGIN_URL <LOGIN_URL>` if not supplied.
- * ``extra_context``: A dictionary of context data that will be added to the
- default context data passed to the template.
-
- .. deprecated:: 1.11
-
- The unused ``extra_context`` parameter is deprecated and will be
- removed in Django 2.1.
-
.. class:: PasswordChangeView
.. versionadded:: 1.11