diff options
| author | Chris Burchhardt <christian.burchhardt@gmail.com> | 2020-05-04 21:42:30 -0700 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2020-05-05 08:19:25 +0200 |
| commit | d2b9a9fdbbc9b5e19b22b144d3e305b87c03b6c8 (patch) | |
| tree | ac7c106e9418cf6cb7c1e9f9a684d071301eff86 /docs | |
| parent | 2522559d1a612a4e8885de4780ff2b7aa7b8d375 (diff) | |
Refs #28622 -- Corrected PASSWORD_RESET_TIMEOUT/PASSWORD_RESET_TIMEOUT_DAYS docs.
Removed outdated note about an extra day in PASSWORD_RESET_TIMEOUT
docs and incorrect "minimum" phrase.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/ref/settings.txt | 5 | ||||
| -rw-r--r-- | docs/releases/3.1.txt | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 84401151d1..10e7ab8a6e 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -2971,7 +2971,7 @@ rendered. Default: ``259200`` (3 days, in seconds) -The minimum number of seconds a password reset link is valid for. +The number of seconds a password reset link is valid for. Used by the :class:`~django.contrib.auth.views.PasswordResetConfirmView`. @@ -2992,8 +2992,7 @@ Used by the :class:`~django.contrib.auth.views.PasswordResetConfirmView`. Default: ``3`` -The minimum number of days a password reset link is valid for. Depending on -when the link is generated, it will be valid for up to a day longer. +The number of days a password reset link is valid for. Used by the :class:`~django.contrib.auth.views.PasswordResetConfirmView`. diff --git a/docs/releases/3.1.txt b/docs/releases/3.1.txt index e3f0353d2d..f821d65449 100644 --- a/docs/releases/3.1.txt +++ b/docs/releases/3.1.txt @@ -90,10 +90,10 @@ Minor features * The default iteration count for the PBKDF2 password hasher is increased from 180,000 to 216,000. -* Added the :setting:`PASSWORD_RESET_TIMEOUT` setting to define the minimum - number of seconds a password reset link is valid for. This is encouraged - instead of deprecated ``PASSWORD_RESET_TIMEOUT_DAYS``, which will be removed - in Django 4.0. +* Added the :setting:`PASSWORD_RESET_TIMEOUT` setting to define the number of + seconds a password reset link is valid for. This is encouraged instead of + deprecated ``PASSWORD_RESET_TIMEOUT_DAYS``, which will be removed in Django + 4.0. * The password reset mechanism now uses the SHA-256 hashing algorithm. Support for tokens that use the old hashing algorithm remains until Django 4.0. |