summaryrefslogtreecommitdiff
path: root/docs/ref/settings.txt
diff options
context:
space:
mode:
authorPreston Timmons <prestontimmons@gmail.com>2015-01-05 14:43:15 -0600
committerTim Graham <timograham@gmail.com>2015-01-05 19:35:02 -0500
commitde9ebdd39cb4f4b65475b43e0e32772d5a315654 (patch)
treea1829e7865df451879a52f3dfda2affc18453809 /docs/ref/settings.txt
parenta9aec1154e5b65fcaf608801905a1bbafcfbfbf7 (diff)
Fixed #24022 -- Deprecated the ssi tag.
Diffstat (limited to 'docs/ref/settings.txt')
-rw-r--r--docs/ref/settings.txt10
1 files changed, 8 insertions, 2 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 3769695820..8d0d17c010 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -125,8 +125,14 @@ Default: ``()`` (Empty tuple)
.. deprecated:: 1.8
- Set the ``'allowed_include_roots'`` option in the :setting:`OPTIONS
- <TEMPLATES-OPTIONS>` of a ``DjangoTemplates`` backend instead.
+ This setting, along with the :ttag:`ssi` template tag, is deprecated and
+ will be removed in Django 2.0.
+
+.. versionchanged:: 1.8
+
+ You can also set the ``'allowed_include_roots'`` option in the
+ :setting:`OPTIONS <TEMPLATES-OPTIONS>` of a ``DjangoTemplates`` backend
+ instead.
A tuple of strings representing allowed prefixes for the ``{% ssi %}`` template
tag. This is a security measure, so that template authors can't access files