[svn] update on webpage and docs

--HG--
branch : trunk

diff --git a/docs/src/loaders.txt b/docs/src/loaders.txt
index 8fd6fe83ee0ac41176ff8f6d39a9ec19aa9c370b..20c69e248cc8051bc1bdbcc0e98fa571a71dad7d 100644 (file)
--- a/docs/src/loaders.txt
+++ b/docs/src/loaders.txt
@@ -82,9 +82,10 @@ Note that you have to give it a higher priority in the MRO than the
             fn = join(self.path, name)
             if exists(fn):
                 return getmtime(fn)
-            return 0
+            return -1
 
 You don't have to provide the `check_source_changed` method. If it doesn't
 exist the option `auto_reload` won't have an effect. Also note that the
 `check_source_changed` method must not raise an exception if the template
-does not exist but return ``0``.
+does not exist but return ``-1``. The return value ``-1`` is considered
+"always reload" whereas ``0`` means "do not reload".
\ No newline at end of file

diff --git a/www/faq.tmpl b/www/faq.tmpl
index 630aeef53480b39b256fafde1fd81c2c3881105a..ac4ebea2fdf7c81f02e3787e8e8a366d307f649d 100644 (file)
--- a/www/faq.tmpl
+++ b/www/faq.tmpl
@@ -42,4 +42,44 @@
     python constructs have a look at mako. If you want sandboxed templates
     you probably want to check out Jinja.
   </p>
+  <h2>Differences to Django</h2>
+  <p>
+    While the Jinja default syntax looks pretty much like Django the rest of
+    the template engine works completely different. Jinja was designed to be
+    used without Django and to support Python expressions.
+  </p>
+  <p>Features that Jinja has in common with Django</p>
+  <ul>
+    <li>filter functions</li>
+    <li>block based template inheritance</li>
+    <li>the <tt>{% cycle %}</tt> and <tt>{% filter %}</li> tag</li>
+    <li>being sandboxed</li>
+    <li>similar default syntax</li>
+  </ul>
+  <p>Differences to Django</p>
+  <ul>
+    <li>advanced lexer that allows escaping of tags</li>
+    <li>generation of bytecode for faster template execution</li>
+    <li>definition of macros (often recurring tasks like rendering
+        dialog boxes, form elements etc.)</li>
+    <li>raw blocks</li>
+    <li>uncoupled internationalization support</li>
+    <li>expression support in any tag</li>
+    <li>abbility of modifying the context from the template
+        by using the <tt>{% set %}</li> tag.</li>
+    <li>support for function calling with arguments</li>
+    <li>filters can be called with a variable argument count</li>
+    <li>full unicode support</li>
+    <li>deferred objects (objects that are resolved on first
+        access, not on context instanciation)</li>
+    <li>Missing support for <tt>{{ block.super }}</tt></li>
+    <li>Support for recursing by using recursing for loops
+        or self calling macros.</li>
+    <li>If blocks have support for multiple elif statements</li>
+    <li>for loops have an optional else block executed if
+        there was no iteration.</li>
+    <li>test functions like <tt>is even</tt> etc.</li>
+    <li>block delimiters are exchangeable.</il>
+    <li>no implicit function calling</li>
+  </ul>
 <% endblock %>