summaryrefslogtreecommitdiff
path: root/docs/ref/settings.txt
diff options
context:
space:
mode:
authorGabriel Hurley <gabehr@gmail.com>2010-11-02 11:53:01 +0000
committerGabriel Hurley <gabehr@gmail.com>2010-11-02 11:53:01 +0000
commitbb062c376ff561497f3ddef77fe456c118939872 (patch)
treef3b8b8fc488aa450a28f95737cc01733aa4edfe6 /docs/ref/settings.txt
parent3e62e253d2dbe3cf5d79c5459fa8ca15f04824e1 (diff)
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.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14437 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/settings.txt')
-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 5943b88a26..fa88a9492d 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1210,10 +1210,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