5 files changed, 6 insertions, 21 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index d0d9c45f7e..181dc8e441 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -876,8 +876,8 @@ details on these changes.
   supports base36 encoded user IDs
   (``django.contrib.auth.views.password_reset_confirm_uidb36``) will be
   removed. If your site has been running Django 1.6 for more than
-  :setting:`PASSWORD_RESET_TIMEOUT_DAYS`, this change will have no effect. If
-  not, then any password reset links generated before you upgrade to Django 1.7
+  ``PASSWORD_RESET_TIMEOUT_DAYS``, this change will have no effect. If not,
+  then any password reset links generated before you upgrade to Django 1.7
   won't work after the upgrade.
 
 * The ``django.utils.encoding.StrAndUnicode`` mix-in will be removed.
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 55773d5c9b..796045aebd 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2967,21 +2967,6 @@ Used by the :class:`~django.contrib.auth.views.PasswordResetConfirmView`.
    as someone gaining access to email archives that may contain old, unused
    password reset tokens.
 
-.. setting:: PASSWORD_RESET_TIMEOUT_DAYS
-
-``PASSWORD_RESET_TIMEOUT_DAYS``
--------------------------------
-
-Default: ``3``
-
-The number of days a password reset link is valid for.
-
-Used by the :class:`~django.contrib.auth.views.PasswordResetConfirmView`.
-
-.. deprecated:: 3.1
-
-    This setting is deprecated. Use :setting:`PASSWORD_RESET_TIMEOUT` instead.
-
 .. setting:: PASSWORD_HASHERS
 
 ``PASSWORD_HASHERS``
diff --git a/docs/releases/1.4.txt b/docs/releases/1.4.txt
index aa760cc4c9..4659b22f32 100644
--- a/docs/releases/1.4.txt
+++ b/docs/releases/1.4.txt
@@ -781,7 +781,7 @@ time you need to run Django 1.3 for the data to expire or become irrelevant.
 
   * Consequences: Password reset links from before the upgrade will not work.
 
-  * Time period: Defined by :setting:`PASSWORD_RESET_TIMEOUT_DAYS`.
+  * Time period: Defined by ``PASSWORD_RESET_TIMEOUT_DAYS``.
 
 Form-related hashes: these have a much shorter lifetime and are relevant
 only for the short window where a user might fill in a form generated by the
diff --git a/docs/releases/1.6.txt b/docs/releases/1.6.txt
index 60df27ad31..d6342a4cb2 100644
--- a/docs/releases/1.6.txt
+++ b/docs/releases/1.6.txt
@@ -756,7 +756,7 @@ A temporary shim for ``django.contrib.auth.views.password_reset_confirm()``
 that will allow password reset links generated prior to Django 1.6 to continue
 to work has been added to provide backwards compatibility; this will be removed
 in Django 1.7. Thus, as long as your site has been running Django 1.6 for more
-than :setting:`PASSWORD_RESET_TIMEOUT_DAYS`, this change will have no effect.
+than ``PASSWORD_RESET_TIMEOUT_DAYS``, this change will have no effect.
 If not (for example, if you upgrade directly from Django 1.5 to Django 1.7),
 then any password reset links generated before you upgrade to Django 1.7 or
 later won't work after the upgrade.
@@ -788,7 +788,7 @@ the ``name`` argument so it doesn't conflict with the new url::
         'django.contrib.auth.views.password_reset_confirm_uidb36'),
 
 You can remove this URL pattern after your app has been deployed with Django
-1.6 for :setting:`PASSWORD_RESET_TIMEOUT_DAYS`.
+1.6 for ``PASSWORD_RESET_TIMEOUT_DAYS``.
 
 Default session serialization switched to JSON
 ----------------------------------------------
diff --git a/docs/releases/4.0.txt b/docs/releases/4.0.txt
index 636ddf5ec5..3f3d46617e 100644
--- a/docs/releases/4.0.txt
+++ b/docs/releases/4.0.txt
@@ -267,4 +267,4 @@ to remove usage of these features.
 See :ref:`deprecated-features-3.1` for details on these changes, including how
 to remove usage of these features.
 
-* ...
+* The ``PASSWORD_RESET_TIMEOUT_DAYS`` setting is removed.