summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2010-02-21 23:40:47 +0000
committerJannis Leidel <jannis@leidel.info>2010-02-21 23:40:47 +0000
commit67d4289c2ef56022d14a038a644d020997e2d9c9 (patch)
tree092922574d1f8a5ea8cab57e8ef4eff68528799a /docs
parent1559f64549ebcc158a5d2bece208f674fa96f537 (diff)
Fixed #12066 - Moved auth context processor from core to the auth app. Thanks, Rob Hudson.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12466 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/deprecation.txt5
-rw-r--r--docs/ref/settings.txt2
-rw-r--r--docs/ref/templates/api.txt6
-rw-r--r--docs/topics/auth.txt4
4 files changed, 11 insertions, 6 deletions
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index f2ae31d4be..a56b522278 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -86,6 +86,11 @@ their deprecation, as per the :ref:`Django deprecation policy
``django.contrib.syndication`` have been deprecated since the 1.2
release. The class-based view ``views.Feed`` should be used instead.
+ * ``django.core.context_processors.auth``. This release will
+ remove the old method in favor of the new method in
+ ``django.contrib.auth.context_processors.auth``. This has been
+ deprecated since the 1.2 release.
+
* 2.0
* ``django.views.defaults.shortcut()``. This function has been moved
to ``django.contrib.contenttypes.views.shortcut()`` as part of the
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 993232f1d9..8bdf395fc8 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -1367,7 +1367,7 @@ TEMPLATE_CONTEXT_PROCESSORS
Default::
- ("django.core.context_processors.auth",
+ ("django.contrib.auth.context_processors.auth",
"django.core.context_processors.debug",
"django.core.context_processors.i18n",
"django.core.context_processors.media",
diff --git a/docs/ref/templates/api.txt b/docs/ref/templates/api.txt
index 7582f8b435..97f6431ba4 100644
--- a/docs/ref/templates/api.txt
+++ b/docs/ref/templates/api.txt
@@ -308,7 +308,7 @@ called **context processors** -- that take a request object as their argument
and return a dictionary of items to be merged into the context. By default,
:setting:`TEMPLATE_CONTEXT_PROCESSORS` is set to::
- ("django.core.context_processors.auth",
+ ("django.contrib.auth.context_processors.auth",
"django.core.context_processors.debug",
"django.core.context_processors.i18n",
"django.core.context_processors.media",
@@ -360,8 +360,8 @@ optional, third positional argument, ``processors``. In this example, the
Here's what each of the default processors does:
-django.core.context_processors.auth
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+django.contrib.auth.context_processors.auth
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
If :setting:`TEMPLATE_CONTEXT_PROCESSORS` contains this processor, every
``RequestContext`` will contain these three variables:
diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt
index 182453f089..1c52ab674e 100644
--- a/docs/topics/auth.txt
+++ b/docs/topics/auth.txt
@@ -1236,8 +1236,8 @@ The currently logged-in user and his/her permissions are made available in the
Technically, these variables are only made available in the template context
if you use :class:`~django.template.context.RequestContext` *and* your
:setting:`TEMPLATE_CONTEXT_PROCESSORS` setting contains
- ``"django.core.context_processors.auth"``, which is default. For more, see
- the :ref:`RequestContext docs <subclassing-context-requestcontext>`.
+ ``"django.contrib.auth.context_processors.auth"``, which is default. For
+ more, see the :ref:`RequestContext docs <subclassing-context-requestcontext>`.
Users
-----