diff options
| author | Tobias Bengfort <tobias.bengfort@posteo.de> | 2019-02-28 15:27:15 +0100 |
|---|---|---|
| committer | Carlton Gibson <carlton.gibson@noumenal.es> | 2019-02-28 15:28:56 +0100 |
| commit | 18211d0a4d1d7e3cc7c4d3f2c154b4656b69600c (patch) | |
| tree | dccf013dd9a43c52c69141394a2433981e4bf7a0 /docs | |
| parent | 459f7c804daf9ffb3bfecee13e078926cc324dd3 (diff) | |
[2.2.x] Clarified permission-related docs.
Backport of 632d4861ddb99a2c9d11642fcfa4ad542b427d6b from master
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/topics/auth/customizing.txt | 2 | ||||
| -rw-r--r-- | docs/topics/auth/index.txt | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/topics/auth/customizing.txt b/docs/topics/auth/customizing.txt index 51d1e2abe5..cc0c791f59 100644 --- a/docs/topics/auth/customizing.txt +++ b/docs/topics/auth/customizing.txt @@ -95,7 +95,7 @@ a set of optional permission related :ref:`authorization methods The ``get_user`` method takes a ``user_id`` -- which could be a username, database ID or whatever, but has to be the primary key of your user object -- -and returns a user object. +and returns a user object or ``None``. The ``authenticate`` method takes a ``request`` argument and credentials as keyword arguments. Most of the time, it'll just look like this:: diff --git a/docs/topics/auth/index.txt b/docs/topics/auth/index.txt index 3a3253a5ac..10815945b1 100644 --- a/docs/topics/auth/index.txt +++ b/docs/topics/auth/index.txt @@ -44,6 +44,7 @@ of these common problems have been implemented in third-party packages: * Password strength checking * Throttling of login attempts * Authentication against third-parties (OAuth, for example) +* Object-level permissions Installation ============ |