diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2010-09-12 22:38:01 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2010-09-12 22:38:01 +0000 |
| commit | 4084bc735437e7a2e2a09cff469788e036080203 (patch) | |
| tree | 805b39159532c4d85d427006bc9917e4a0a75c57 /docs | |
| parent | 631bb7d0f6f4160b8d4034392f5f1e1b31490aae (diff) | |
Permit custom from-email address in auth forms email.
Patch from cassidy and Rob Hudson. Fixed #11300.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13817 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/topics/auth.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt index 00b95ba085..8c9b0f1cff 100644 --- a/docs/topics/auth.txt +++ b/docs/topics/auth.txt @@ -906,7 +906,7 @@ includes a few other useful built-in views located in default to :file:`registration/password_change_done.html` if not supplied. -.. function:: views.password_reset(request[, is_admin_site, template_name, email_template_name, password_reset_form, token_generator, post_reset_redirect]) +.. function:: views.password_reset(request[, is_admin_site, template_name, email_template_name, password_reset_form, token_generator, post_reset_redirect, from_email]) Allows a user to reset their password by generating a one-time use link that can be used to reset the password, and sending that link to the @@ -932,6 +932,11 @@ includes a few other useful built-in views located in * ``post_reset_redirect``: The URL to redirect to after a successful password change. + .. versionchanged:: 1.3 + + * ``from_email``: A valid e-mail address. By default Django uses + the :setting:`DEFAULT_FROM_EMAIL`. + **Template context:** * ``form``: The form for resetting the user's password. |