summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJacob Kaplan-Moss <jacob@jacobian.org>2006-07-27 23:23:55 +0000
committerJacob Kaplan-Moss <jacob@jacobian.org>2006-07-27 23:23:55 +0000
commit847b1ed54ec9da078a2524a3791057f024839eee (patch)
tree912b5931a45d3582b383aa9da2b09d2983efc90b /docs
parent6537401ca45dcaeb8eb285bcf451e403f538eb93 (diff)
Fixed #1650: the {% extends %} tag now can extend a Template object passed into the context. Thanks, clelland@gmail.com.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3465 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/templates.txt12
1 files changed, 8 insertions, 4 deletions
diff --git a/docs/templates.txt b/docs/templates.txt
index 6117bf7b84..d33575f7fd 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -363,10 +363,14 @@ extends
Signal that this template extends a parent template.
-This tag may be used in two ways: ``{% extends "base.html" %}`` (with quotes)
-uses the literal value "base.html" as the name of the parent template to
-extend, or ``{% extends variable %}`` uses the value of ``variable`` as the
-name of the parent template to extend.
+This tag may be used in two ways:
+
+ * ``{% extends "base.html" %}`` (with quotes) uses the literal value
+ "base.html" as the name of the parent template to extend
+
+ * ``{% extends variable %}`` uses the value of ``variable`` as either the
+ name of the parent template to extend (if it evaluates to a string,) or
+ as the parent tempate itelf (if it evaluates to a Template object).
See `Template inheritance`_ for more information.