diff options
Diffstat (limited to 'docs/ref/templates')
| -rw-r--r-- | docs/ref/templates/api.txt | 2 | ||||
| -rw-r--r-- | docs/ref/templates/upgrading.txt | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt index 0355fb59ed..07dd2f1bb1 100644 --- a/docs/ref/templates/api.txt +++ b/docs/ref/templates/api.txt @@ -936,7 +936,7 @@ Template origin When an :class:`~django.template.Engine` is initialized with ``debug=True``, its templates have an ``origin`` attribute depending on the source they are loaded from. For engines initialized by Django, ``debug`` defaults to the -value of :setting:`TEMPLATE_DEBUG`. +value of :setting:`DEBUG`. .. class:: loader.LoaderOrigin diff --git a/docs/ref/templates/upgrading.txt b/docs/ref/templates/upgrading.txt index 02588175d6..b2ef23c4b8 100644 --- a/docs/ref/templates/upgrading.txt +++ b/docs/ref/templates/upgrading.txt @@ -10,7 +10,7 @@ The :setting:`TEMPLATES` settings ================================= A new setting was introduced in Django 1.8: :setting:`TEMPLATES`. All existing -template-related settings except :setting:`TEMPLATE_DEBUG` were deprecated. +template-related settings were deprecated. During the deprecation period, Django will create a backwards-compatible :setting:`TEMPLATES` based on the ``TEMPLATE_*`` settings if you don't define @@ -85,9 +85,13 @@ If your settings module defines ``ALLOWED_INCLUDE_ROOTS`` or ``'allowed_include_roots'`` and ``'string_if_invalid'`` keys in the ``'OPTIONS'`` dictionary. +If it sets ``TEMPLATE_DEBUG`` to a value that differs from :setting:`DEBUG`, +include that value under the ``'debug'`` key in ``'OPTIONS'``. + Once you have defined :setting:`TEMPLATES`, you can safely remove -``ALLOWED_INCLUDE_ROOTS``, ``TEMPLATE_CONTEXT_PROCESSORS``, ``TEMPLATE_DIRS``, -``TEMPLATE_LOADERS``, and ``TEMPLATE_STRING_IF_INVALID``. +``ALLOWED_INCLUDE_ROOTS``, ``TEMPLATE_CONTEXT_PROCESSORS``, +``TEMPLATE_DEBUG``, ``TEMPLATE_DIRS``, ``TEMPLATE_LOADERS``, and +``TEMPLATE_STRING_IF_INVALID``. If you are overriding some of these settings in tests, you should override the entire :setting:`TEMPLATES` setting instead. |