diff options
| author | Timo Graham <timograham@gmail.com> | 2011-05-22 16:44:14 +0000 |
|---|---|---|
| committer | Timo Graham <timograham@gmail.com> | 2011-05-22 16:44:14 +0000 |
| commit | 82b9fed1c7a9faf7c9cc8de70aae45e9c66f05e5 (patch) | |
| tree | faacb2d5c43fe5db04f40a3625432c9909b18bf6 /docs/ref | |
| parent | 2c3d3400ef5abfd6be15276d4b5d584319ccecc3 (diff) | |
[1.3.X] Fixed #16067 - Couple reST fixes in ref/templates/builtins.txt; thanks julien.
Backport of r16263 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.3.X@16264 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/templates/builtins.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index eaa576ef15..353a7c7845 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: @@ -1471,7 +1473,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. |