updated jinja docs

--HG--
branch : trunk

diff --git a/docs/jinjaext.py b/docs/jinjaext.py
index bd4cab644a9bd52402836fd31e1cea6ae005a37e..8485a62ecbf829d7c75b01e15e26a49733aa3292 100644 (file)
--- a/docs/jinjaext.py
+++ b/docs/jinjaext.py
@@ -44,7 +44,7 @@ class JinjaStyle(Style):
         Name.Decorator:             '#686868',
 
         String:                     '#BE9B5D',
-        Number:                     '#FF0000',
+        Number:                     '#444444',
 
         Generic.Heading:            'bold #000080',
         Generic.Subheading:         'bold #800080',

diff --git a/docs/templates.rst b/docs/templates.rst
index 280b16603bc142d30614ae029bb639b5fad5535b..9700cdaec1fb3065747de50460bcb39fe9097882 100644 (file)
--- a/docs/templates.rst
+++ b/docs/templates.rst
@@ -578,7 +578,13 @@ is
 If Expression
 ~~~~~~~~~~~~~
 
-blah
+It is also possible to use inline `if` expressions.  These are useful in some
+situations.  For example you can use this to extend from one template if a
+variable is defined, otherwise from the default layout template:
+
+.. sourcecode:: jinja
+
+    {% extends layout_template if layout_template is defined else 'master.html' %}
 
 
 .. _builtin-filters:

diff --git a/jinja2/filters.py b/jinja2/filters.py
index 0b55760169ef60683e17bd9f4c406c64448d2b4e..ce8a976c119b7c72d4cec9af47bf13a9824bc076 100644 (file)
--- a/jinja2/filters.py
+++ b/jinja2/filters.py
@@ -112,7 +112,7 @@ def do_xmlattr(_environment, d, autospace=True):
         </ul>
 
     As you can see it automatically prepends a space in front of the item
-    if the filter returned something unless the second parameter is `False`.
+    if the filter returned something unless the second parameter is false.
     """
     rv = u' '.join(
         u'%s="%s"' % (escape(key), escape(value))
@@ -541,7 +541,7 @@ def do_round(value, precision=0, method='common'):
 
 def do_sort(value, reverse=False):
     """Sort a sequence. Per default it sorts ascending, if you pass it
-    `True` as first argument it will reverse the sorting.
+    true as first argument it will reverse the sorting.
     """
     return sorted(value, reverse=reverse)