summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-08-18 10:36:51 -0400
committerTim Graham <timograham@gmail.com>2014-08-23 19:32:58 -0400
commite39af5ea592bbe4e7a643e67f0c379adc10ed392 (patch)
treef3327e152fe72dd01ab86272013124f8b1a6e648 /docs
parent0c9f40f776e2be75656996e1bb1e5f37f903675f (diff)
Fixed #21648 -- Deprecated is_admin_site option to auth.views.password_reset().
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/deprecation.txt3
-rw-r--r--docs/releases/1.8.txt5
-rw-r--r--docs/topics/auth/default.txt5
3 files changed, 13 insertions, 0 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index eca4a5f4f3..10ef6e5850 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -54,6 +54,9 @@ about each item can often be found in the release notes of two versions prior.
* The ``remove_tags()`` and ``strip_entities()`` functions in
``django.utils.html`` will be removed.
+* The ``is_admin_site`` argument to
+ ``django.contrib.auth.views.password_reset()`` will be removed.
+
.. _deprecation-removed-in-1.9:
1.9
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index e5cecc230c..b720c036ed 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -708,3 +708,8 @@ they are not actually safe.
The unused and undocumented ``django.utils.html.strip_entities()`` function has
also been deprecated.
+
+``is_admin_site`` argument to ``django.contrib.auth.views.password_reset()``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+It's a legacy option that should no longer be necessary.
diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt
index 2b7eeba7ac..149b8d314c 100644
--- a/docs/topics/auth/default.txt
+++ b/docs/topics/auth/default.txt
@@ -984,6 +984,11 @@ patterns.
``html_email_template_name`` was added.
+ .. deprecated:: 1.8
+
+ The ``is_admin_site`` argument is deprecated and will be removed in
+ Django 2.0.
+
**Template context:**
* ``form``: The form (see ``password_reset_form`` above) for resetting