diff options
| author | Tim Graham <timograham@gmail.com> | 2014-07-30 08:15:13 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-07-30 08:16:01 -0400 |
| commit | 7e6eeef366d00b1bac3406477cc8e7714725baf7 (patch) | |
| tree | 2715fdfd9244868e596d8c7f89578bf8980a2b42 | |
| parent | 8e7fdfdb6fb0e910d5b507ba2da56a297bfba25c (diff) | |
[1.7.x] Fixed #23132 -- Removed confusing clause in auth docs.
Backport of abb97cffdf from master
| -rw-r--r-- | docs/topics/auth/default.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt index f1cd96e99c..aa7b61318a 100644 --- a/docs/topics/auth/default.txt +++ b/docs/topics/auth/default.txt @@ -7,10 +7,9 @@ Using the Django authentication system This document explains the usage of Django's authentication system in its default configuration. This configuration has evolved to serve the most common project needs, handling a reasonably wide range of tasks, and has a careful -implementation of passwords and permissions, and can handle many projects as -is. For projects where authentication needs differ from the default, Django -supports extensive :doc:`extension and customization -</topics/auth/customizing>` of authentication. +implementation of passwords and permissions. For projects where authentication +needs differ from the default, Django supports extensive :doc:`extension and +customization </topics/auth/customizing>` of authentication. Django authentication provides both authentication and authorization together and is generally referred to as the authentication system, as these features |