Browse files

Fixed #4163 -- Added some "quick notes" documentation about the confi…


variables required to send email. Thanks, Karen Tracey.

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 33ce769 commit 1c2fdf1ebda1c216fb97337eac48e98ca022be06 @malcolmt malcolmt committed Apr 27, 2007
Showing with 15 additions and 4 deletions.
  1. +12 −2 docs/email.txt
  2. +3 −2 docs/settings.txt
@@ -19,13 +19,23 @@ In two lines::
send_mail('Subject here', 'Here is the message.', '',
[''], fail_silently=False)
+Mail will be sent using the SMTP host and port specified in the `EMAIL_HOST`_
+settings, if set, will be used to authenticate to the
+SMTP server.
.. note::
The character set of email sent with ``django.core.mail`` will be set to
the value of your `DEFAULT_CHARSET setting`_.
.. _DEFAULT_CHARSET setting: ../settings/#DEFAULT_CHARSET
+.. _EMAIL_HOST: ../settings/#EMAIL_HOST
+.. _EMAIL_PORT: ../settings/#EMAIL_PORT
@@ -395,8 +395,9 @@ EMAIL_HOST_PASSWORD
Default: ``''`` (Empty string)
-Username to use for the SMTP server defined in ``EMAIL_HOST``. If empty,
-Django won't attempt authentication.
+Password to use for the SMTP server defined in ``EMAIL_HOST``. This setting is
+used in conjunction with EMAIL_HOST_USER when authenticating to the SMTP server.
+If either of these settings is empty, Django won't attempt authenticaion.
See also ``EMAIL_HOST_USER``.

0 comments on commit 1c2fdf1

Please sign in to comment.