summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUri <uri@speedy.net>2020-08-08 08:05:38 +0300
committerCarlton Gibson <carlton.gibson@noumenal.es>2020-08-08 17:33:43 +0200
commitcdfdbb3411b7634ae119998a1d69801e1df275ff (patch)
treef9dc4d7d4acd11cf4d3ae3a0f9218e89beb88fcb
parentc21bbe0883772ea91993eabac6c91ff575a81912 (diff)
[3.1.x] Refs #31864 -- Doc'd that DEFAULT_HASHING_ALGORITHM requires 3.1.1+ in release notes.
Backport of b2b0711b555fa292751763c2df4fe577c396f265 from master
-rw-r--r--docs/releases/3.1.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/releases/3.1.txt b/docs/releases/3.1.txt
index db090de3f6..f44bef411d 100644
--- a/docs/releases/3.1.txt
+++ b/docs/releases/3.1.txt
@@ -109,9 +109,9 @@ reset tokens in the admin site, user sessions, and signatures created by
Support for SHA-256 was added in Django 3.1. If you are upgrading multiple
instances of the same project to Django 3.1, you should set
:setting:`DEFAULT_HASHING_ALGORITHM` to ``'sha1'`` during the transition, in
-order to allow compatibility with the older versions of Django. Once the
-transition to 3.1 is complete you can stop overriding
-:setting:`DEFAULT_HASHING_ALGORITHM`.
+order to allow compatibility with the older versions of Django. Note that this
+requires Django 3.1.1+. Once the transition to 3.1 is complete you can stop
+overriding :setting:`DEFAULT_HASHING_ALGORITHM`.
This setting is deprecated as of this release, because support for tokens,
cookies, sessions, and signatures that use SHA-1 algorithm will be removed in