summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/template/defaulttags.py4
-rw-r--r--docs/ref/templates/builtins.txt6
2 files changed, 10 insertions, 0 deletions
diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
index 2d4a180e75..701515a66d 100644
--- a/django/template/defaulttags.py
+++ b/django/template/defaulttags.py
@@ -617,6 +617,10 @@ def do_filter(parser, token):
{% filter force_escape|lower %}
This text will be HTML-escaped, and will appear in lowercase.
{% endfilter %}
+
+ Note that the ``escape`` and ``safe`` filters are not acceptable arguments.
+ Instead, use the ``autoescape`` tag to manage autoescaping for blocks of
+ template code.
"""
_, rest = token.contents.split(None, 1)
filter_expr = parser.compile_filter("var|%s" % (rest))
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 123e8f9868..62abcbf118 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -237,6 +237,12 @@ Sample usage::
This text will be HTML-escaped, and will appear in all lowercase.
{% endfilter %}
+.. note::
+
+ The :tfilter:`escape` and :tfilter:`safe` filters are not acceptable
+ arguments. Instead, use the :ttag:`autoescape` tag to manage autoescaping
+ for blocks of template code.
+
.. templatetag:: firstof
firstof