[svn] renderincluded is now rendertemplate

--HG--
branch : trunk

diff --git a/docs/src/designerdoc.txt b/docs/src/designerdoc.txt
index 8eeaef44d818164c2141296ceea592035824a64d..eb872ce7ef2ad36455f3fedbdf0669ee0266818b 100644 (file)
--- a/docs/src/designerdoc.txt
+++ b/docs/src/designerdoc.txt
@@ -366,7 +366,13 @@ load macros, `include` works better than `extends`:
 If you define a macro called ``my_helper`` in ``myhelpers.html``, you can now
 use it from the template as shown above.
 
-Because of the
+Please keep in mind that include does not render the template indenpendently
+but includes the processing instructions into the current template. Thus if the
+included template contains a ``{% extends %}`` tag it also affects the current
+template.
+
+This is intended because it makes it possible to include macros from other
+templates.
 
 Filtering Blocks
 ================

diff --git a/jinja/defaults.py b/jinja/defaults.py
index 18bcc8f62712a4c0cce7bae1242a2d10a188ad18..0a0001577ea5eb0b48461e2907aff7199bdf16b2 100644 (file)
--- a/jinja/defaults.py
+++ b/jinja/defaults.py
@@ -22,5 +22,5 @@ DEFAULT_NAMESPACE = {
     'debug':                debug_helper,
     'lipsum':               generate_lorem_ipsum,
     'watchchanges':         watch_changes,
-    'renderincluded':       render_included
+    'rendertemplate':       render_included
 }