From 103890561be52a074ef30c08d4ecc2d98066c259 Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Fri, 30 Dec 2011 20:23:26 +0000
Subject: [PATCH] Moved 'User-requested password resets' docs from [17266] from
 auth docs to admin docs

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17305 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 docs/ref/contrib/admin/index.txt | 25 +++++++++++++++++++++++++
 docs/topics/auth.txt             | 28 ----------------------------
 2 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt
index 91b44dc3f3..76ea7804ab 100644
--- a/docs/ref/contrib/admin/index.txt
+++ b/docs/ref/contrib/admin/index.txt
@@ -1928,6 +1928,31 @@ a pattern for your new view.
     be set to either ``self.name`` if your view is on an ``AdminSite`` or
     ``self.admin_site.name`` if your view is on a ``ModelAdmin``.
 
+.. _auth_password_reset:
+
+Adding a password-reset feature
+-------------------------------
+
+You can add a password-reset feature to the admin site by adding a few lines to
+your URLconf. Specifically, add these four patterns:
+
+.. code-block:: python
+
+    url(r'^admin/password_reset/$', 'django.contrib.auth.views.password_reset', name='admin_password_reset'),
+    (r'^admin/password_reset/done/$', 'django.contrib.auth.views.password_reset_done'),
+    (r'^reset/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', 'django.contrib.auth.views.password_reset_confirm'),
+    (r'^reset/done/$', 'django.contrib.auth.views.password_reset_complete'),
+
+(This assumes you've added the admin at ``admin/`` and requires that you put
+the URLs starting with ``^admin/`` before the line that includes the admin app
+itself).
+
+.. versionchanged:: 1.4
+
+The presence of the ``admin_password_reset`` named URL will cause a "forgotten
+your password?" link to appear on the default admin log-in page under the
+password box.
+
 .. _admin-reverse-urls:
 
 Reversing admin URLs
diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt
index 626e7c4b89..1cfccfc5e0 100644
--- a/docs/topics/auth.txt
+++ b/docs/topics/auth.txt
@@ -371,34 +371,6 @@ Don't set the :attr:`~django.contrib.auth.models.User.password` attribute
 directly unless you know what you're doing. This is explained in the next
 section.
 
-.. _auth_password_reset:
-
-User-requested password resets
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-There is a bundled reset mechanism that integrates into the admin, allowing
-users to reset their passwords by email. It can be customized and is described
-in detail below under :func:`~django.contrib.auth.views.password_reset`. To
-enable it without customization, add lines something like the following to your
-urls.py:
-
-.. code-block:: python
-
-    url(r'^admin/password_reset/$', 'django.contrib.auth.views.password_reset', name='admin_password_reset'),
-    (r'^admin/password_reset/done/$', 'django.contrib.auth.views.password_reset_done'),
-    (r'^reset/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', 'django.contrib.auth.views.password_reset_confirm'),
-    (r'^reset/done/$', 'django.contrib.auth.views.password_reset_complete'),
-
-(This assumes you've added the admin at ``admin/``, and requires that you put
-the URLs starting with ``^admin/`` before the line that includes the admin app
-itself).
-
-.. versionchanged:: 1.4
-
-The presence of the 'admin_password_reset' named URL will cause a "forgotten
-your password?" link to appear on the default admin login page under the
-password box.
-
 .. _auth_password_storage:
 
 How Django stores passwords