summaryrefslogtreecommitdiff
path: root/docs/topics/auth
diff options
context:
space:
mode:
authorrowanv <rrvspam@gmail.com>2016-01-24 22:26:11 +0100
committerTim Graham <timograham@gmail.com>2016-02-01 10:42:05 -0500
commita6ef025dfb2a1d1bd23893408eef6d066fb506d9 (patch)
treeb29b3624a20cc65184c743102e0f5f620412105f /docs/topics/auth
parent8bf8d0e0ecc1805480deb94feb4675b09d3b3a95 (diff)
Fixed #26124 -- Added missing code formatting to docs headers.
Diffstat (limited to 'docs/topics/auth')
-rw-r--r--docs/topics/auth/customizing.txt30
-rw-r--r--docs/topics/auth/default.txt19
-rw-r--r--docs/topics/auth/passwords.txt4
3 files changed, 27 insertions, 26 deletions
diff --git a/docs/topics/auth/customizing.txt b/docs/topics/auth/customizing.txt
index 3da3cc6970..a1f99f9140 100644
--- a/docs/topics/auth/customizing.txt
+++ b/docs/topics/auth/customizing.txt
@@ -289,8 +289,8 @@ example, the following checks if a user may view tasks::
.. _extending-user:
-Extending the existing User model
-=================================
+Extending the existing ``User`` model
+=====================================
There are two ways to extend the default
:class:`~django.contrib.auth.models.User` model without substituting your own
@@ -360,8 +360,8 @@ the extra database load.
.. _auth-custom-user:
-Substituting a custom User model
-================================
+Substituting a custom ``User`` model
+====================================
Some kinds of projects may have authentication requirements for which Django's
built-in :class:`~django.contrib.auth.models.User` model is not always
@@ -414,8 +414,8 @@ use as your User model.
:class:`~django.db.models.OneToOneField` to ``settings.AUTH_USER_MODEL``
as described below.
-Referencing the User model
---------------------------
+Referencing the ``User`` model
+------------------------------
.. currentmodule:: django.contrib.auth
@@ -462,8 +462,8 @@ different User model.
.. _specifying-custom-user-model:
-Specifying a custom User model
-------------------------------
+Specifying a custom ``User`` model
+----------------------------------
.. admonition:: Model design considerations
@@ -716,8 +716,8 @@ utility methods:
* ``o``, ``O``, and ``0`` (lowercase letter o, uppercase letter o,
and zero)
-Extending Django's default User
--------------------------------
+Extending Django's default ``User``
+-----------------------------------
If you're entirely happy with Django's :class:`~django.contrib.auth.models.User`
model and you just want to add some additional profile information, you could
@@ -875,16 +875,16 @@ methods and attributes:
(the Django app label). If the user is inactive, this method will
always return ``False``.
-.. admonition:: ModelBackend
+.. admonition:: ``PermissionsMixin`` and ``ModelBackend``
If you don't include the
:class:`~django.contrib.auth.models.PermissionsMixin`, you must ensure you
don't invoke the permissions methods on ``ModelBackend``. ``ModelBackend``
- assumes that certain fields are available on your user model. If your User
- model doesn't provide those fields, you will receive database errors when
- you check permissions.
+ assumes that certain fields are available on your user model. If your
+ ``User`` model doesn't provide those fields, you will receive database
+ errors when you check permissions.
-Custom users and Proxy models
+Custom users and proxy models
-----------------------------
One limitation of custom User models is that installing a custom User model
diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt
index e59f0318cc..5b6472f7a3 100644
--- a/docs/topics/auth/default.txt
+++ b/docs/topics/auth/default.txt
@@ -17,8 +17,8 @@ are somewhat coupled.
.. _user-objects:
-User objects
-============
+``User`` objects
+================
:class:`~django.contrib.auth.models.User` objects are the core of the
authentication system. They typically represent the people interacting with
@@ -112,7 +112,7 @@ passwords.
Changing a user's password will log out all their sessions. See
:ref:`session-invalidation-on-password-change` for details.
-Authenticating Users
+Authenticating users
--------------------
.. function:: authenticate(\**credentials)
@@ -363,13 +363,14 @@ If you have an authenticated user you want to attach to the current session
:func:`~django.contrib.auth.login()`. Now you can set the backend using
the new ``backend`` argument.
-Selecting the :ref:`authentication backend <authentication-backends>`
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Selecting the authentication backend
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
When a user logs in, the user's ID and the backend that was used for
authentication are saved in the user's session. This allows the same
-authentication backend to fetch the user's details on a future request. The
-authentication backend to save in the session is selected as follows:
+:ref:`authentication backend <authentication-backends>` to fetch the user's
+details on a future request. The authentication backend to save in the session
+is selected as follows:
#. Use the value of the optional ``backend`` argument, if provided.
#. Use the value of the ``user.backend`` attribute, if present. This allows
@@ -1673,7 +1674,7 @@ model. Groups can be created, and permissions can be assigned to users or
groups. A log of user edits to models made within the admin is also stored and
displayed.
-Creating Users
+Creating users
--------------
You should see a link to "Users" in the "Auth"
@@ -1695,7 +1696,7 @@ non-superuser the ability to edit users, this is ultimately the same as giving
them superuser status because they will be able to elevate permissions of
users including themselves!
-Changing Passwords
+Changing passwords
------------------
User passwords are not displayed in the admin (nor stored in the database), but
diff --git a/docs/topics/auth/passwords.txt b/docs/topics/auth/passwords.txt
index 944c81408e..ef14f7f330 100644
--- a/docs/topics/auth/passwords.txt
+++ b/docs/topics/auth/passwords.txt
@@ -74,8 +74,8 @@ setting.
.. _bcrypt_usage:
-Using bcrypt with Django
-------------------------
+Using ``bcrypt`` with Django
+----------------------------
Bcrypt_ is a popular password storage algorithm that's specifically designed
for long-term password storage. It's not the default used by Django since it