summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/deprecation.txt3
-rw-r--r--docs/ref/templates/builtins.txt5
-rw-r--r--docs/releases/1.11.txt5
3 files changed, 13 insertions, 0 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 5d93915dc6..151cdff68d 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -33,6 +33,9 @@ details on these changes.
* The ``host`` parameter of ``django.utils.http.is_safe_url()`` will be
removed.
+* Silencing of exceptions raised while rendering the ``{% include %}`` template
+ tag will be removed.
+
.. _deprecation-removed-in-2.0:
2.0
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 61c36f47fb..6395f97607 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -731,6 +731,11 @@ is turned off, ``{% include %}`` logs a warning to the ``django.template``
logger with the exception that happens while rendering the included template
and returns an empty string.
+.. deprecated:: 1.11
+
+ Silencing exceptions raised while rendering the ``{% include %}`` template
+ tag is deprecated. In Django 2.1, the exception will be raised.
+
.. note::
The :ttag:`include` tag should be considered as an implementation of
"render this subtemplate and include the HTML", not as "parse this
diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt
index 0c1e387b66..221f58f291 100644
--- a/docs/releases/1.11.txt
+++ b/docs/releases/1.11.txt
@@ -528,3 +528,8 @@ Miscellaneous
* The ``host`` parameter of ``django.utils.http.is_safe_url()`` is deprecated
in favor of the new ``allowed_hosts`` parameter.
+
+* Silencing exceptions raised while rendering the
+ :ttag:`{% include %} <include>` template tag is deprecated as the behavior is
+ often more confusing than helpful. In Django 2.1, the exception will be
+ raised.