summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-04-10 20:02:56 +0000
committerClaude Paroz <claude@2xlibre.net>2012-04-10 20:02:56 +0000
commit8ed9e9074c9841c0e5e6b35d659fdc7c654eea93 (patch)
tree87d31486b7f8caa7fc8013ff71f366ab2d7dde9e /docs
parent01dfe35b38b26137165f28b7821c6a6178956bc1 (diff)
[1.4.X] Fixed #18095 -- Added missing 'cc' mention in EmailMessage recipients() description. Thanks Stéphane Raimbault for the report and the patch.
Backport of r17891 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.4.X@17892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/email.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/topics/email.txt b/docs/topics/email.txt
index 0c5f1adf8d..2069773f8a 100644
--- a/docs/topics/email.txt
+++ b/docs/topics/email.txt
@@ -290,8 +290,8 @@ The class has the following methods:
override this method to put the content you want into the MIME object.
* ``recipients()`` returns a list of all the recipients of the message,
- whether they're recorded in the ``to`` or ``bcc`` attributes. This is
- another method you might need to override when subclassing, because the
+ whether they're recorded in the ``to``, ``cc`` or ``bcc`` attributes. This
+ is another method you might need to override when subclassing, because the
SMTP server needs to be told the full list of recipients when the message
is sent. If you add another way to specify recipients in your class, they
need to be returned from this method as well.