summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/checks.txt6
-rw-r--r--docs/releases/1.8.4.txt3
2 files changed, 9 insertions, 0 deletions
diff --git a/docs/ref/checks.txt b/docs/ref/checks.txt
index b519b0afab..0509a13db5 100644
--- a/docs/ref/checks.txt
+++ b/docs/ref/checks.txt
@@ -182,6 +182,12 @@ that might occur as a result of a version upgrade.
``django.contrib.messages.middleware.MessageMiddleware`` were removed from
the defaults. If your project needs these middleware then you should
configure this setting.
+* **1_8.W001**: The standalone ``TEMPLATE_*`` settings were deprecated in
+ Django 1.8 and the :setting:`TEMPLATES` dictionary takes precedence. You must
+ put the values of the following settings into your defaults ``TEMPLATES``
+ dict: :setting:`TEMPLATE_DIRS`, :setting:`ALLOWED_INCLUDE_ROOTS`,
+ :setting:`TEMPLATE_CONTEXT_PROCESSORS`, :setting:`TEMPLATE_DEBUG`,
+ :setting:`TEMPLATE_LOADERS`, :setting:`TEMPLATE_STRING_IF_INVALID`.
Admin
-----
diff --git a/docs/releases/1.8.4.txt b/docs/releases/1.8.4.txt
index 9252d9ae5a..e6606cb37f 100644
--- a/docs/releases/1.8.4.txt
+++ b/docs/releases/1.8.4.txt
@@ -11,3 +11,6 @@ Bugfixes
* Added the ability to serialize values from the newly added
:class:`~django.db.models.UUIDField` (:ticket:`25019`).
+
+* Added a system check warning if the old ``TEMPLATE_*`` settings are defined
+ in addition to the new ``TEMPLATES`` setting.