diff options
| author | Jannis Leidel <jannis@leidel.info> | 2010-11-11 21:44:33 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2010-11-11 21:44:33 +0000 |
| commit | 70edd4e103832dc95c42643365d1d676c6d5ded6 (patch) | |
| tree | 0f7a943a0fab4b35d1e06532f070b95740f2df06 /docs | |
| parent | 63023e6ad99da9030ceb60ffa6ff7c952660af6d (diff) | |
Reverted deprecation of media context processor (from r14293) to separate static files and media files a bit more.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14535 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/howto/static-files.txt | 1 | ||||
| -rw-r--r-- | docs/ref/settings.txt | 6 | ||||
| -rw-r--r-- | docs/ref/templates/api.txt | 11 |
3 files changed, 4 insertions, 14 deletions
diff --git a/docs/howto/static-files.txt b/docs/howto/static-files.txt index 8dca80eb84..37f1fc361d 100644 --- a/docs/howto/static-files.txt +++ b/docs/howto/static-files.txt @@ -154,6 +154,7 @@ editing that setting by hand it should look something like:: TEMPLATE_CONTEXT_PROCESSORS = ( 'django.core.context_processors.debug', 'django.core.context_processors.i18n', + 'django.core.context_processors.media', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', 'django.contrib.staticfiles.context_processors.staticfiles', diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 2c338df6c7..66c6e264af 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1512,12 +1512,6 @@ 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 diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt index 4bb61b80b7..aa4951eebe 100644 --- a/docs/ref/templates/api.txt +++ b/docs/ref/templates/api.txt @@ -311,8 +311,9 @@ and return a dictionary of items to be merged into the context. By default, ("django.contrib.auth.context_processors.auth", "django.core.context_processors.debug", "django.core.context_processors.i18n", - "django.contrib.staticfiles.context_processors.staticfiles", - "django.contrib.messages.context_processors.messages") + "django.core.context_processors.media", + "django.contrib.messages.context_processors.messages", + "django.contrib.staticfiles.context_processors.staticfiles") .. versionadded:: 1.2 In addition to these, ``RequestContext`` always uses @@ -434,12 +435,6 @@ If :setting:`TEMPLATE_CONTEXT_PROCESSORS` contains this processor, every ``RequestContext`` will contain a variable ``MEDIA_URL``, providing the value of the :setting:`MEDIA_URL` setting. -.. versionchanged:: 1.3 - This context processor has been moved to the new - :doc:`/ref/contrib/staticfiles` app. Please use the new - ``django.contrib.staticfiles.context_processors.staticfiles`` - context processor. - django.core.context_processors.csrf ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |