summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2011-06-19 11:24:39 +0000
committerJannis Leidel <jannis@leidel.info>2011-06-19 11:24:39 +0000
commit656360c24044e06c881baa648f2aad9d671c3bd8 (patch)
treee64847efecc7e4e2a24fd181cb4bb901fb45d0bf /docs
parent63f9b6712909970693a9e509d13218856306bbd6 (diff)
Fixed #12202 -- Removed hardcoded password reset subject and added a subject_template_name parameter to the password_reset view. Thanks, Ramiro Morales, Claude Paroz and agabel.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16438 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/auth.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt
index 2862b4c04c..228f53ba2b 100644
--- a/docs/topics/auth.txt
+++ b/docs/topics/auth.txt
@@ -964,6 +964,12 @@ includes a few other useful built-in views located in
generating the email with the new password. This will default to
:file:`registration/password_reset_email.html` if not supplied.
+ * ``subject_template_name``: The full name of a template to use for
+ the subject of the email with the new password. This will default
+ to :file:`registration/password_reset_subject.txt` if not supplied.
+
+ .. versionadded:: 1.4
+
* ``password_reset_form``: Form that will be used to set the password.
Defaults to :class:`~django.contrib.auth.forms.PasswordResetForm`.