From 2b3907cf74b7d4c15e50661c659f6b5ec7cb2f8d Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Thu, 16 Nov 2017 10:37:50 -0500 Subject: [PATCH] [2.0.x] Fixed #28802 -- Fixed typo in docs/topics/auth/default.txt. Backport of d392fc293c9439c19451e152f9560f24d1659563 from master --- docs/releases/1.8.txt | 2 +- docs/topics/auth/default.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt index 94eff8f92d5..d6ae31ef9bd 100644 --- a/docs/releases/1.8.txt +++ b/docs/releases/1.8.txt @@ -200,7 +200,7 @@ Minor features and :meth:`~django.contrib.auth.models.User.has_module_perms` to short-circuit permission checking. * :class:`~django.contrib.auth.forms.PasswordResetForm` now - has a method :meth:`~django.contrib.auth.forms.PasswordResetForm.send_email` + has a method :meth:`~django.contrib.auth.forms.PasswordResetForm.send_mail` that can be overridden to customize the mail to be sent. * The ``max_length`` of :attr:`Permission.name diff --git a/docs/topics/auth/default.txt b/docs/topics/auth/default.txt index 049df901ee6..f1c41a5b11b 100644 --- a/docs/topics/auth/default.txt +++ b/docs/topics/auth/default.txt @@ -1570,7 +1570,7 @@ provides several built-in forms located in :mod:`django.contrib.auth.forms`: A form for generating and emailing a one-time use link to reset a user's password. - .. method:: send_email(subject_template_name, email_template_name, context, from_email, to_email, html_email_template_name=None) + .. method:: send_mail(subject_template_name, email_template_name, context, from_email, to_email, html_email_template_name=None) Uses the arguments to send an ``EmailMultiAlternatives``. Can be overridden to customize how the email is sent to the user.