summaryrefslogtreecommitdiff
path: root/docs/ref/settings.txt
diff options
context:
space:
mode:
authorGabriel Hurley <gabehr@gmail.com>2010-11-06 23:30:10 +0000
committerGabriel Hurley <gabehr@gmail.com>2010-11-06 23:30:10 +0000
commit11b012038cb077b6d3648b49ddb754e088e39f0c (patch)
treee032d4826738fad1320dd40bc38f19c0db562559 /docs/ref/settings.txt
parent4eec036ab3dea211af209d1bd0bdac8955269aaa (diff)
Fixed #14600 -- Added a versionchanged directive to the TEMPLATE_CONTEXT_PROCESSORS setting reference, and added a currentmodule directive to the staticfiles docs so that the crossref targets would point to the right place even with full paths in the staticfiles docs. Thanks to mathijs for the report and suggested text.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14479 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/ref/settings.txt')
-rw-r--r--docs/ref/settings.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index fa88a9492d..abe4a443e5 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1500,7 +1500,7 @@ These callables take a request object as their argument and return a dictionary
of items to be merged into the context.
.. versionchanged:: 1.2
- ``"django.contrib.messages.context_processors.messages"`` was added to the
+ ``django.contrib.messages.context_processors.messages`` was added to the
default. For more information, see the :doc:`messages documentation
</ref/contrib/messages>`.
@@ -1509,6 +1509,12 @@ of items to be merged into the context.
``django.core.context_processors.auth`` to
``django.contrib.auth.context_processors.auth``.
+.. versionchanged:: 1.3
+ ``django.core.context_processors.media`` was replaced by
+ :func:`django.contrib.staticfiles.context_processors.staticfiles` in the
+ default. For more information, see the :doc:`staticfiles documentation
+ </ref/contrib/staticfiles>`.
+
.. setting:: TEMPLATE_DEBUG
TEMPLATE_DEBUG