summaryrefslogtreecommitdiff
path: root/docs/releases/1.10.txt
diff options
context:
space:
mode:
Diffstat (limited to 'docs/releases/1.10.txt')
-rw-r--r--docs/releases/1.10.txt12
1 files changed, 12 insertions, 0 deletions
diff --git a/docs/releases/1.10.txt b/docs/releases/1.10.txt
index a0b0a873cc..410180f838 100644
--- a/docs/releases/1.10.txt
+++ b/docs/releases/1.10.txt
@@ -1012,6 +1012,18 @@ This method must accept a :class:`~django.db.models.query.QuerySet` instance
as its single argument and return a filtered version of the queryset for the
model instance the manager is bound to.
+The "escape" half of ``django.utils.safestring``
+------------------------------------------------
+
+The ``mark_for_escaping()`` function and the classes it uses: ``EscapeData``,
+``EscapeBytes``, ``EscapeText``, ``EscapeString``, and ``EscapeUnicode`` are
+deprecated.
+
+As a result, the "lazy" behavior of the ``escape`` filter (where it would
+always be applied as the last filter no matter where in the filter chain it
+appeared) is deprecated. The filter will change to immediately apply
+:func:`~django.utils.html.conditional_escape` in Django 2.0.
+
Miscellaneous
-------------