summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-01-22 10:17:44 -0500
committerTim Graham <timograham@gmail.com>2014-01-22 10:19:02 -0500
commitf7c2852f30fd5fe6980d6983725a41e64c6d2c53 (patch)
treee8e4e5c7becb55dd0caad6c29f3af1929fb66876
parenta292ad1105409771f270a2b1255f3511b102c504 (diff)
[1.6.x] Fixed #21726 -- Clarified that password should not be included in REQUIRED_FIELDS.
Thanks russellm for the report. Backport of 6f06c749b7 from master
-rw-r--r--docs/topics/auth/customizing.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/topics/auth/customizing.txt b/docs/topics/auth/customizing.txt
index 7c1cb94803..0788038f07 100644
--- a/docs/topics/auth/customizing.txt
+++ b/docs/topics/auth/customizing.txt
@@ -530,8 +530,9 @@ password resets. You must then provide some key implementation details:
.. note::
- ``REQUIRED_FIELDS`` must contain all required fields on your User
- model, but should *not* contain the ``USERNAME_FIELD``.
+ ``REQUIRED_FIELDS`` must contain all required fields on your
+ ``User`` model, but should *not* contain the ``USERNAME_FIELD`` or
+ ``password`` as these fields will always be prompted for.
.. attribute:: is_active