summaryrefslogtreecommitdiff
path: root/docs/internals/deprecation.txt
diff options
context:
space:
mode:
Diffstat (limited to 'docs/internals/deprecation.txt')
-rw-r--r--docs/internals/deprecation.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index b3d03dd37a..218e79d66f 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -168,6 +168,13 @@ details on these changes.
* ``FileField`` methods ``get_directory_name()`` and ``get_filename()`` will be
removed.
+* The ``mark_for_escaping()`` function and the classes it uses: ``EscapeData``,
+ ``EscapeBytes``, ``EscapeText``, ``EscapeString``, and ``EscapeUnicode`` will
+ be removed.
+
+* The ``escape`` filter will change to use
+ ``django.utils.html.conditional_escape()``.
+
.. _deprecation-removed-in-1.10:
1.10