diff options
| author | Tim Graham <timograham@gmail.com> | 2016-11-23 15:03:33 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-11-23 15:17:00 -0500 |
| commit | 63696982b8deb33fa4840dbe57ccbd3cf3dea9cb (patch) | |
| tree | c5a8f82c24dabe2af1129f24e42bcc4a5f1f03cc /docs/ref | |
| parent | 9f89ca41dbf8a89031f1f29d7ed3ac4e1973018d (diff) | |
[1.10.x] Normalized casing of "custom user model".
Backport of 93a081946d92da010c7de62dc58e697c6c33e5d3 from master
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/contrib/auth.txt | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/docs/ref/contrib/auth.txt b/docs/ref/contrib/auth.txt index c0e4f5bdc6..d68c062b68 100644 --- a/docs/ref/contrib/auth.txt +++ b/docs/ref/contrib/auth.txt @@ -183,9 +183,9 @@ Methods .. method:: get_username() - Returns the username for the user. Since the User model can be swapped - out, you should use this method instead of referencing the username - attribute directly. + Returns the username for the user. Since the ``User`` model can be + swapped out, you should use this method instead of referencing the + username attribute directly. .. method:: get_full_name() @@ -305,7 +305,7 @@ Manager methods The ``extra_fields`` keyword arguments are passed through to the :class:`~django.contrib.auth.models.User`’s ``__init__`` method to - allow setting arbitrary fields on a :ref:`custom User model + allow setting arbitrary fields on a :ref:`custom user model <auth-custom-user>`. See :ref:`Creating users <topics-auth-creating-users>` for example usage. @@ -599,16 +599,14 @@ The following backends are available in :mod:`django.contrib.auth.backends`: .. attribute:: RemoteUserBackend.create_unknown_user - ``True`` or ``False``. Determines whether or not a - :class:`~django.contrib.auth.models.User` object is created if not already - in the database. Defaults to ``True``. + ``True`` or ``False``. Determines whether or not a user object is created + if not already in the database Defaults to ``True``. .. method:: RemoteUserBackend.authenticate(remote_user) The username passed as ``remote_user`` is considered trusted. This method - simply returns the ``User`` object with the given username, creating a new - ``User`` object if :attr:`~RemoteUserBackend.create_unknown_user` is - ``True``. + simply returns the user object with the given username, creating a new + user object if :attr:`~RemoteUserBackend.create_unknown_user` is ``True``. Returns ``None`` if :attr:`~RemoteUserBackend.create_unknown_user` is ``False`` and a ``User`` object with the given username is not found in the @@ -617,9 +615,8 @@ The following backends are available in :mod:`django.contrib.auth.backends`: .. method:: RemoteUserBackend.clean_username(username) Performs any cleaning on the ``username`` (e.g. stripping LDAP DN - information) prior to using it to get or create a - :class:`~django.contrib.auth.models.User` object. Returns the cleaned - username. + information) prior to using it to get or create a user object. Returns the + cleaned username. .. method:: RemoteUserBackend.configure_user(user) |
