magic-removal: Merged to [2120]

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2121 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 14 insertions, 0 deletions

diff --git a/docs/templates.txt b/docs/templates.txt
index 78e94c5b54..20fe62bbae 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -283,6 +283,20 @@ Example::
 
     {% load comments i18n %}
 
+Custom libraries and template inheritance
+-----------------------------------------
+
+When you load a custom tag or filter library, the tags/filters are only made
+available to the current template -- not any parent or child templates along
+the template-inheritance path.
+
+For example, if a template ``foo.html`` has ``{% load comments %}``, a child
+template (e.g., one that has ``{% extends foo %}`` will *not* have access to
+the comments template tags and filters. The child template is responsible for
+its own ``{% load comments %}``.
+
+This is a feature for the sake of maintainability and sanity.
+
 Built-in tag and filter reference
 =================================