p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #15133 - Some markup issues in the docs; thanks Aryeh Leib Taurog for the report. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15281 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Timo Graham 2011-01-22 12:43:50 +00:00
parent 07b92cd489
commit a757b5b8ca
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/ref/signals.txt
View File

@ -12,7 +12,7 @@ A list of all the signals that Django sends.
The :doc:`comment framework </ref/contrib/comments/index>` sends a :doc:`set
of comment-related signals </ref/contrib/comments/signals>`.
The :ref:`authentication framework <topics-auth>` sends :ref:`signals when
The :doc:`authentication framework </topics/auth>` sends :ref:`signals when
a user is logged in / out <topics-auth-signals>`.
Model signals

2
docs/releases/1.3-beta-1.txt
View File

@ -61,7 +61,7 @@ Permissions for inactive users
If you provide a custom auth backend with ``supports_inactive_user`` set to
``True``, an inactive user model will check the backend for permissions.
This is useful for further centralizing the permission handling. See the
:ref:`authentication docs <topics-auth>` for more details.
:doc:`authentication docs </topics/auth>` for more details.
Backwards-incompatible changes in 1.3 alpha 2
=============================================

12
docs/topics/auth.txt
View File

@ -657,10 +657,10 @@ How to log a user out
Login and logout signals
------------------------
The auth framework uses two :ref:`signals <topic-signals>` that can be used for
notification when a user logs in or out.
The auth framework uses two :doc:`signals </topics/signals>` that can be used
for notification when a user logs in or out.
**:data:`django.contrib.auth.signals.user_logged_in`**
.. data:: django.contrib.auth.signals.user_logged_in
Sent when a user logs in successfully.
@ -675,7 +675,7 @@ Arguments sent with this signal:
``user``
The user instance that just logged in.
**:data:`django.contrib.auth.signals.user_logged_out`**
.. data:: django.contrib.auth.signals.user_logged_outs
Sent when the logout method is called.
@ -1537,11 +1537,11 @@ object the first time a user authenticates::
ADMIN_LOGIN = 'admin'
ADMIN_PASSWORD = 'sha1$4e987$afbcf42e21bd417fb71db8c66b321e9fc33051de'
"""
supports_object_permissions = False
supports_anonymous_user = False
supports_inactive_user = False
def authenticate(self, username=None, password=None):
login_valid = (settings.ADMIN_LOGIN == username)
pwd_valid = check_password(password, settings.ADMIN_PASSWORD)