summaryrefslogtreecommitdiff
path: root/docs/ref
diff options
context:
space:
mode:
Diffstat (limited to 'docs/ref')
-rw-r--r--docs/ref/checks.txt5
-rw-r--r--docs/ref/settings.txt112
2 files changed, 2 insertions, 115 deletions
diff --git a/docs/ref/checks.txt b/docs/ref/checks.txt
index 36f0b6222b..cc8400395a 100644
--- a/docs/ref/checks.txt
+++ b/docs/ref/checks.txt
@@ -252,9 +252,8 @@ that might occur as a result of a version upgrade.
* **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:`TEMPLATE_CONTEXT_PROCESSORS`,
- :setting:`TEMPLATE_DEBUG`, :setting:`TEMPLATE_LOADERS`,
- :setting:`TEMPLATE_STRING_IF_INVALID`.
+ dict: ``TEMPLATE_DIRS``, ``TEMPLATE_CONTEXT_PROCESSORS``, ``TEMPLATE_DEBUG``,
+ ``TEMPLATE_LOADERS``, ``TEMPLATE_STRING_IF_INVALID``.
Admin
-----
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index d4b175e198..9c1ed34dd9 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2314,113 +2314,6 @@ depending on the template backend. See
:class:`~django.template.backends.jinja2.Jinja2` for the options of the
built-in backends.
-.. setting:: TEMPLATE_CONTEXT_PROCESSORS
-
-TEMPLATE_CONTEXT_PROCESSORS
----------------------------
-
-Default::
-
- ["django.contrib.auth.context_processors.auth",
- "django.template.context_processors.debug",
- "django.template.context_processors.i18n",
- "django.template.context_processors.media",
- "django.template.context_processors.static",
- "django.template.context_processors.tz",
- "django.contrib.messages.context_processors.messages"]
-
-.. deprecated:: 1.8
-
- Set the ``'context_processors'`` option in the :setting:`OPTIONS
- <TEMPLATES-OPTIONS>` of a ``DjangoTemplates`` backend instead.
-
-A list of callables that are used to populate the context in ``RequestContext``.
-These callables take a request object as their argument and return a dictionary
-of items to be merged into the context.
-
-.. versionchanged:: 1.8
-
- Built-in template context processors were moved from
- ``django.core.context_processors`` to
- ``django.template.context_processors`` in Django 1.8.
-
-.. setting:: TEMPLATE_DEBUG
-
-TEMPLATE_DEBUG
---------------
-
-Default: ``False``
-
-.. deprecated:: 1.8
-
- Set the ``'debug'`` option in the :setting:`OPTIONS <TEMPLATES-OPTIONS>`
- of a ``DjangoTemplates`` backend instead.
-
-A boolean that turns on/off template debug mode. If this is ``True``, the fancy
-error page will display a detailed report for any exception raised during
-template rendering. This report contains the relevant snippet of the template,
-with the appropriate line highlighted.
-
-Note that Django only displays fancy error pages if :setting:`DEBUG` is ``True``, so
-you'll want to set that to take advantage of this setting.
-
-See also :setting:`DEBUG`.
-
-.. setting:: TEMPLATE_DIRS
-
-TEMPLATE_DIRS
--------------
-
-Default: ``[]`` (Empty list)
-
-.. deprecated:: 1.8
-
- Set the :setting:`DIRS <TEMPLATES-DIRS>` option of a ``DjangoTemplates``
- backend instead.
-
-List of locations of the template source files searched by
-:class:`django.template.loaders.filesystem.Loader`, in search order.
-
-Note that these paths should use Unix-style forward slashes, even on Windows.
-
-See :doc:`/ref/templates/language`.
-
-.. setting:: TEMPLATE_LOADERS
-
-TEMPLATE_LOADERS
-----------------
-
-Default::
-
- ['django.template.loaders.filesystem.Loader',
- 'django.template.loaders.app_directories.Loader']
-
-.. deprecated:: 1.8
-
- Set the ``'loaders'`` option in the :setting:`OPTIONS <TEMPLATES-OPTIONS>`
- of a ``DjangoTemplates`` backend instead.
-
-A list of template loader classes, specified as strings. Each ``Loader`` class
-knows how to import templates from a particular source. Optionally, a tuple can be
-used instead of a string. The first item in the tuple should be the ``Loader``’s
-module, subsequent items are passed to the ``Loader`` during initialization. See
-:doc:`/ref/templates/api`.
-
-.. setting:: TEMPLATE_STRING_IF_INVALID
-
-TEMPLATE_STRING_IF_INVALID
---------------------------
-
-Default: ``''`` (Empty string)
-
-.. deprecated:: 1.8
-
- Set the ``'string_if_invalid'`` option in the :setting:`OPTIONS
- <TEMPLATES-OPTIONS>` of a ``DjangoTemplates`` backend instead.
-
-Output, as a string, that the template system should use for invalid (e.g.
-misspelled) variables. See :ref:`invalid-template-variables`.
-
.. setting:: TEST_RUNNER
TEST_RUNNER
@@ -3406,11 +3299,6 @@ Serialization
Templates
---------
* :setting:`TEMPLATES`
-* :setting:`TEMPLATE_CONTEXT_PROCESSORS`
-* :setting:`TEMPLATE_DEBUG`
-* :setting:`TEMPLATE_DIRS`
-* :setting:`TEMPLATE_LOADERS`
-* :setting:`TEMPLATE_STRING_IF_INVALID`
Testing
-------