summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTimo Graham <timograham@gmail.com>2011-05-22 16:43:50 +0000
committerTimo Graham <timograham@gmail.com>2011-05-22 16:43:50 +0000
commit6443adc9a904b0e2b3ac79104defd27202ff2032 (patch)
treeff00a2ab5c76ffd3bff2b08518534e8873b39cfa /docs
parent909e002808135ee943643e6b1866e9aa5cb0b42d (diff)
Fixed #16067 - Couple reST fixes in ref/templates/builtins.txt; thanks julien.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16263 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/templates/builtins.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 29bed25db9..4c8c0e6fe4 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -533,6 +533,8 @@ operators, from lowest to highest, is as follows:
(This follows Python exactly). So, for example, the following complex if tag:
+.. code-block:: django
+
{% if a == b or c == d and e %}
...will be interpreted as:
@@ -1483,7 +1485,7 @@ If ``value`` is the list ``['a', 'b', 'c']``, the output will be ``'a'``.
fix_ampersands
~~~~~~~~~~~~~~
-..note::
+.. note::
This is rarely useful as ampersands are automatically escaped. See escape_ for more information.