summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/deprecation.txt4
-rw-r--r--docs/ref/contrib/formtools/form-wizard.txt2
2 files changed, 5 insertions, 1 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index f4ebadd6f4..c227f9ab5c 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -114,6 +114,10 @@ their deprecation, as per the :ref:`Django deprecation policy
:class:`~django.test.simple.DjangoTestRunner` will be removed in
favor of using the unittest-native class.
+ * The undocumented function
+ :func:`django.contrib.formtools.utils.security_hash`
+ is deprecated, in favour of :func:`django.contrib.formtools.utils.form_hmac`
+
* 2.0
* ``django.views.defaults.shortcut()``. This function has been moved
to ``django.contrib.contenttypes.views.shortcut()`` as part of the
diff --git a/docs/ref/contrib/formtools/form-wizard.txt b/docs/ref/contrib/formtools/form-wizard.txt
index ab7b4829c9..1bc4fa894c 100644
--- a/docs/ref/contrib/formtools/form-wizard.txt
+++ b/docs/ref/contrib/formtools/form-wizard.txt
@@ -240,7 +240,7 @@ Advanced ``FormWizard`` methods
Calculates the security hash for the given request object and
:class:`~django.forms.Form` instance.
- By default, this uses an MD5 hash of the form data and your
+ By default, this generates a SHA1 HMAC using your form data and your
:setting:`SECRET_KEY` setting. It's rare that somebody would need to
override this.