0
0
mirror of https://github.com/django/django.git synced 2024-12-01 15:42:04 +01:00

Merge remote-tracking branch 'django/master' into t3011

This commit is contained in:
Russell Keith-Magee 2012-09-26 18:37:04 +08:00
commit d84749a0f0

View File

@ -433,7 +433,7 @@ django.contrib.auth.context_processors.auth
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
If :setting:`TEMPLATE_CONTEXT_PROCESSORS` contains this processor, every
``RequestContext`` will contain these three variables:
``RequestContext`` will contain these variables:
* ``user`` -- An ``auth.User`` instance representing the currently
logged-in user (or an ``AnonymousUser`` instance, if the client isn't