[1.8.x] Updated docstring for firstof tag to reflect new auto-escaping behavior.

Backport of a1842e3299daf3bde0ab5d418c912a265e7479c9 from master

1 files changed, 8 insertions, 4 deletions

diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
index fc8baf9611..4f3a5fb3ef 100644
--- a/django/template/defaulttags.py
+++ b/django/template/defaulttags.py
@@ -770,11 +770,15 @@ def firstof(parser, token):
 
         {% firstof var1 var2 var3 "fallback value" %}
 
-    If you want to escape the output, use a filter tag::
+    If you want to disable auto-escaping of variables you can use::
 
-        {% filter force_escape %}
-            {% firstof var1 var2 var3 "fallback value" %}
-        {% endfilter %}
+        {% autoescape off %}
+            {% firstof var1 var2 var3 "<strong>fallback value</strong>" %}
+        {% autoescape %}
+
+    Or if only some variables should be escaped, you can use::
+
+        {% firstof var1 var2|safe var3 "<strong>fallback value</strong>"|safe %}
 
     """
     bits = token.split_contents()[1:]