diff options
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/templates/builtins.txt | 6 | ||||
| -rw-r--r-- | docs/ref/utils.txt | 2 |
2 files changed, 8 insertions, 0 deletions
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. |