innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.11.x] Fixed #28190 -- Clarifed how include/extends treat template names. 

Backport of 1f2e4f9cfe from master
This commit is contained in:
Anupam 2017-06-03 17:41:04 +05:30 committed by Tim Graham
parent 34ea3d61af
commit 9a3bcaf46a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/ref/templates/builtins.txt
View File

@ -215,8 +215,9 @@ This tag can be used in two ways:
See :ref:`template-inheritance` for more information. See :ref:`template-inheritance` for more information.
A string argument may be a relative path starting with ``./`` or ``../``. For Normally the template name is relative to the template loader's root directory.
example, assume the following directory structure:: A string argument may also be a relative path starting with ``./`` or ``../``.
For example, assume the following directory structure::
dir1/ dir1/
template.html template.html
@ -682,8 +683,9 @@ This example includes the contents of the template ``"foo/bar.html"``::
{% include "foo/bar.html" %} {% include "foo/bar.html" %}
A string argument may be a relative path starting with ``./`` or ``../`` as Normally the template name is relative to the template loader's root directory.
described in the :ttag:`extends` tag. A string argument may also be a relative path starting with ``./`` or ``../``
as described in the :ttag:`extends` tag.
.. versionadded:: 1.10 .. versionadded:: 1.10