summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
authorAnupam <anupamjain@gmail.com>2017-06-03 17:41:04 +0530
committerTim Graham <timograham@gmail.com>2017-06-03 08:11:41 -0400
commit9a3bcaf46aba223789f42df8bc08348694d9f16f (patch)
tree655194bd24608f2f7c88edbce832fe04675fabb9 /docs/ref
parent34ea3d61af2361c1ed2f4f0709d59c9a64bb866c (diff)
[1.11.x] Fixed #28190 -- Clarifed how include/extends treat template names.
Backport of 1f2e4f9cfe26dd9ad1fc85375c1dce38c65bbe6b from master
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/templates/builtins.txt10
1 files changed, 6 insertions, 4 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 80ba36b93a..e990322384 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -215,8 +215,9 @@ This tag can be used in two ways:
See :ref:`template-inheritance` for more information.
-A string argument may be a relative path starting with ``./`` or ``../``. For
-example, assume the following directory structure::
+Normally the template name is relative to the template loader's root directory.
+A string argument may also be a relative path starting with ``./`` or ``../``.
+For example, assume the following directory structure::
dir1/
template.html
@@ -682,8 +683,9 @@ This example includes the contents of the template ``"foo/bar.html"``::
{% include "foo/bar.html" %}
-A string argument may be a relative path starting with ``./`` or ``../`` as
-described in the :ttag:`extends` tag.
+Normally the template name is relative to the template loader's root directory.
+A string argument may also be a relative path starting with ``./`` or ``../``
+as described in the :ttag:`extends` tag.
.. versionadded:: 1.10