summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSubhav Gautam <subhav.gautam@sky.uk>2018-05-30 11:37:55 +0100
committerTim Graham <timograham@gmail.com>2018-06-02 11:10:02 -0400
commit84afe81b9e31ed3819708aaac6fa00a9325d536d (patch)
tree5ef2656b3709a9ac7cf9ca0765527eda17cf9c5d
parentcc8ef6321139182e491373829e94c9ad7546f4ab (diff)
[2.1.x] Fixed #29430 -- Clarified send_mail()'s fail_silently docs.
Backport of 085ebc5f1a0e96784516e551cb9225cc6836f1d0 from master
-rw-r--r--AUTHORS1
-rw-r--r--docs/topics/email.txt6
2 files changed, 4 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index a68a5beb48..27fb443f91 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -776,6 +776,7 @@ answer newbie questions, and generally made Django that much better:
Steven L. Smith (fvox13) <steven@stevenlsmith.com>
Steven Noorbergen (Xaroth) <xaroth+django@xaroth.nl>
Stuart Langridge <http://www.kryogenix.org/>
+ Subhav Gautam <subhavgautam@yahoo.co.uk>
Sujay S Kumar <sujay.skumar141295@gmail.com>
Sune Kirkeby <http://ibofobi.dk/>
Sung-Jin Hong <serialx.net@gmail.com>
diff --git a/docs/topics/email.txt b/docs/topics/email.txt
index 48943e95cc..2ba1036ff6 100644
--- a/docs/topics/email.txt
+++ b/docs/topics/email.txt
@@ -57,9 +57,9 @@ are required.
* ``recipient_list``: A list of strings, each an email address. Each
member of ``recipient_list`` will see the other recipients in the "To:"
field of the email message.
-* ``fail_silently``: A boolean. If it's ``False``, ``send_mail`` will raise
- an :exc:`smtplib.SMTPException`. See the :mod:`smtplib` docs for a list of
- possible exceptions, all of which are subclasses of
+* ``fail_silently``: A boolean. When it's ``False``, ``send_mail()`` will raise
+ an :exc:`smtplib.SMTPException` if an error occurs. See the :mod:`smtplib`
+ docs for a list of possible exceptions, all of which are subclasses of
:exc:`~smtplib.SMTPException`.
* ``auth_user``: The optional username to use to authenticate to the SMTP
server. If this isn't provided, Django will use the value of the