From c9151bcba1533756fc6e540c6fb599ed037267a8 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Fri, 26 Feb 2010 17:06:09 +0000 Subject: [PATCH] Fixed #12968 - Added missing versionadded/-changed doc markers for r12466. Thanks, Karen and Ramiro. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12612 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/ref/settings.txt | 5 +++++ docs/ref/templates/api.txt | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 2636bcf7ed4c0..c971ee585ac6e 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1412,6 +1412,11 @@ of items to be merged into the context. default. For more information, see the :ref:`messages documentation `. +.. versionchanged:: 1.2 + The auth context processor was moved in this release from its old location + ``django.core.context_processors.auth`` to + ``django.contrib.auth.context_processors.auth``. + .. setting:: TEMPLATE_DEBUG TEMPLATE_DEBUG diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt index 97f6431ba4208..90e2c76dbe901 100644 --- a/docs/ref/templates/api.txt +++ b/docs/ref/templates/api.txt @@ -325,6 +325,11 @@ and return a dictionary of items to be merged into the context. By default, The ``'messages'`` context processor was added. For more information, see the :ref:`messages documentation `. +.. versionchanged:: 1.2 + The auth context processor was moved in this release from its old location + ``django.core.context_processors.auth`` to + ``django.contrib.auth.context_processors.auth``. + Each processor is applied in order. That means, if one processor adds a variable to the context and a second processor adds a variable with the same name, the second will override the first. The default processors are explained @@ -377,6 +382,10 @@ If :setting:`TEMPLATE_CONTEXT_PROCESSORS` contains this processor, every ``django.core.context_processors.PermWrapper``, representing the permissions that the currently logged-in user has. +.. versionchanged:: 1.2 + This context processor was moved in this release from + ``django.core.context_processors.auth`` to its current location. + .. versionchanged:: 1.2 Prior to version 1.2, the ``messages`` variable was a lazy accessor for ``user.get_and_delete_messages()``. It has been changed to include any