From a757b5b8ca64d2fe8973e2a0696a12f9d10146d5 Mon Sep 17 00:00:00 2001 From: Timo Graham Date: Sat, 22 Jan 2011 12:43:50 +0000 Subject: [PATCH] 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 --- docs/ref/signals.txt | 2 +- docs/releases/1.3-beta-1.txt | 2 +- docs/topics/auth.txt | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/ref/signals.txt b/docs/ref/signals.txt index 46e433a8b4..85b4288ae7 100644 --- a/docs/ref/signals.txt +++ b/docs/ref/signals.txt @@ -12,7 +12,7 @@ A list of all the signals that Django sends. The :doc:`comment framework ` sends a :doc:`set of comment-related signals `. - The :ref:`authentication framework ` sends :ref:`signals when + The :doc:`authentication framework ` sends :ref:`signals when a user is logged in / out `. Model signals diff --git a/docs/releases/1.3-beta-1.txt b/docs/releases/1.3-beta-1.txt index f01080a4ba..5d924f8d92 100644 --- a/docs/releases/1.3-beta-1.txt +++ b/docs/releases/1.3-beta-1.txt @@ -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 ` for more details. +:doc:`authentication docs ` for more details. Backwards-incompatible changes in 1.3 alpha 2 ============================================= diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt index 84e8ae8199..70a33974e7 100644 --- a/docs/topics/auth.txt +++ b/docs/topics/auth.txt @@ -657,10 +657,10 @@ How to log a user out Login and logout signals ------------------------ -The auth framework uses two :ref:`signals ` that can be used for -notification when a user logs in or out. +The auth framework uses two :doc:`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)