Commit c9151bcb authored by Jannis Leidel's avatar Jannis Leidel
Browse files

Fixed #12968 - Added missing versionadded/-changed doc markers for r12466.... 

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
parent 5787925c

docs/ref/settings.txt

+5 −0
Original line number Diff line number Diff line
@@ -1412,6 +1412,11 @@ of items to be merged into the context. 
   default.  For more information, see the :ref:`messages documentation

   <ref-contrib-messages>`.



.. 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

docs/ref/templates/api.txt

+9 −0
Original line number Diff line number Diff line
@@ -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 <ref-contrib-messages>`.



.. 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