From 82b9fed1c7a9faf7c9cc8de70aae45e9c66f05e5 Mon Sep 17 00:00:00 2001 From: Timo Graham Date: Sun, 22 May 2011 16:44:14 +0000 Subject: [PATCH] [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 --- docs/ref/templates/builtins.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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.