Ticket #17110: filter-tag-doc-note.diff

django/template/defaulttags.py

@@ -607 +607 @@
         {% 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))

docs/ref/templates/builtins.txt

@@ -227 +227 @@
         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