summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorGabriel Hurley <gabehr@gmail.com>2010-11-02 11:53:53 +0000
committerGabriel Hurley <gabehr@gmail.com>2010-11-02 11:53:53 +0000
commit72e3bc6e6f6035e3657069790391ce5058d95e20 (patch)
treeb1ca747c9a3ef573230d690ce42dc20c2444e517 /docs
parent5b78abeba795364e0f90448d9f51c255d0708394 (diff)
[1.2.X] Fixed #14584 -- Documented settings.PASSWORD_RESET_TIMEOUT_DAYS. Also fixed some cross-refs in the neighborhood. Thanks to hop for the report and Adam Mckerlie for the draft patch.
Backport of [14437] from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14438 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/settings.txt14
1 files changed, 12 insertions, 2 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 80a2d5b900..b2a9b550ef 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1176,10 +1176,20 @@ Default: ``0``
Number of digits grouped together on the integer part of a number. Common use
is to display a thousand separator. If this setting is ``0``, then, no grouping
will be applied to the number. If this setting is greater than ``0`` then the
-setting ``THOUSAND_SEPARATOR`` will be used as the separator between those
+setting :setting:`THOUSAND_SEPARATOR` will be used as the separator between those
groups.
-See also ``THOUSAND_SEPARATOR``
+See also :setting:`THOUSAND_SEPARATOR`.
+
+.. 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
+:mod:`django.contrib.auth` password reset mechanism.
.. setting:: PREPEND_WWW