summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Phalip <jphalip@gmail.com>2013-02-24 12:03:24 -0800
committerJulien Phalip <jphalip@gmail.com>2013-02-24 12:03:24 -0800
commit438ce4ec559152d219a03b50fe840f49dc0e5191 (patch)
treebba777edc15925fb4e1ad5fd3981b0f605d556de
parentb88bf9f1257080d5dcc08792c8e57118fb183987 (diff)
Fixed some docstrings that were raising Sphinx warnings when running the admindocs tests.
-rw-r--r--django/templatetags/future.py24
1 files changed, 12 insertions, 12 deletions
diff --git a/django/templatetags/future.py b/django/templatetags/future.py
index a385c6d565..7203f394bf 100644
--- a/django/templatetags/future.py
+++ b/django/templatetags/future.py
@@ -23,13 +23,13 @@ def cycle(parser, token):
By default all strings are escaped.
- If you want to disable auto-escaping of variables you can use:
+ If you want to disable auto-escaping of variables you can use::
{% autoescape off %}
{% cycle var1 var2 var3 as somecycle %}
{% autoescape %}
- Or if only some variables should be escaped, you can use:
+ Or if only some variables should be escaped, you can use::
{% cycle var1 var2|safe var3|safe as somecycle %}
"""
@@ -41,23 +41,23 @@ def firstof(parser, token):
"""
This is the future version of `firstof` with auto-escaping.
- This is equivalent to:
+ This is equivalent to::
- {% if var1 %}
- {{ var1 }}
- {% elif var2 %}
- {{ var2 }}
- {% elif var3 %}
- {{ var3 }}
- {% endif %}
+ {% if var1 %}
+ {{ var1 }}
+ {% elif var2 %}
+ {{ var2 }}
+ {% elif var3 %}
+ {{ var3 }}
+ {% endif %}
- If you want to disable auto-escaping of variables you can use:
+ If you want to disable auto-escaping of variables you can use::
{% autoescape off %}
{% firstof var1 var2 var3 "<strong>fallback value</strong>" %}
{% autoescape %}
- Or if only some variables should be escaped, you can use:
+ Or if only some variables should be escaped, you can use::
{% firstof var1 var2|safe var3 "<strong>fallback value</strong>"|safe %}