summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorDaniel Roseman <daniel.roseman@digital.cabinet-office.gov.uk>2015-07-11 18:15:38 +0100
committerTim Graham <timograham@gmail.com>2015-07-13 17:55:19 -0400
commit4cc0baa98e8a5bb8f2cf91539d141cbc30af6f61 (patch)
tree4bee2dafe47dd41f05055bd53b5c21efac4fce65 /docs
parent269315d81a955b9352777961a76763a47fb61667 (diff)
[1.8.x] Fixed #25079 -- Added warning if both TEMPLATES and TEMPLATE_* settings are defined.
Django ignores the value of the TEMPLATE_* settings if TEMPLATES is also set, which is confusing for users following older tutorials. This change adds a system check that warns if any of the TEMPLATE_* settings have changed from their defaults but the TEMPLATES dict is also non-empty. Removed the TEMPLATE_DIRS from the test settings file; this was marked for removal in 1.10 but no tests fail if it is removed now. Backport of 24620d71f2116da31abe6c9391f7bc807ac23c0b from master
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.