From 2f0e0eee450775a71ac3eb42707dcd970ede42c8 Mon Sep 17 00:00:00 2001
From: Tim Graham <timograham@gmail.com>
Date: Tue, 10 May 2016 12:46:47 -0400
Subject: Fixed #24046 -- Deprecated the "escape" half of utils.safestring.

---
 docs/ref/templates/builtins.txt | 6 ++++++
 docs/ref/utils.txt              | 2 ++
 2 files changed, 8 insertions(+)

(limited to 'docs/ref')

diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 0959679ed7..f44dbb0a6f 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -1578,6 +1578,12 @@ For example, you can apply ``escape`` to fields when :ttag:`autoescape` is off::
         {{ title|escape }}
     {% endautoescape %}
 
+.. deprecated:: 1.10
+
+    The "lazy" behavior of the ``escape`` filter is deprecated. It will change
+    to immediately apply :func:`~django.utils.html.conditional_escape` in
+    Django 2.0.
+
 .. templatefilter:: escapejs
 
 ``escapejs``
diff --git a/docs/ref/utils.txt b/docs/ref/utils.txt
index 8328d91fc5..eadd036cb6 100644
--- a/docs/ref/utils.txt
+++ b/docs/ref/utils.txt
@@ -839,6 +839,8 @@ appropriate entities.
 
 .. function:: mark_for_escaping(s)
 
+    .. deprecated:: 1.10
+
     Explicitly mark a string as requiring HTML escaping upon output. Has no
     effect on ``SafeData`` subclasses.
 
-- 
cgit v1.3