summaryrefslogtreecommitdiff
path: root/docs/settings.txt
diff options
context:
space:
mode:
authorAdrian Holovaty <adrian@holovaty.com>2006-03-22 19:47:15 +0000
committerAdrian Holovaty <adrian@holovaty.com>2006-03-22 19:47:15 +0000
commitfe24eca81aee4c75365101430940d2fbb5979bc6 (patch)
tree06f7be1394241008b6a1e012f82232e80437c7d3 /docs/settings.txt
parente67f1a680d8780b52c2a1020c37b51c5455b0d4b (diff)
Fixed #1529 -- Added support for authenticated SMTP to django.core.mail. Thanks, Bruce Kroeze
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2548 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/settings.txt')
-rw-r--r--docs/settings.txt24
1 files changed, 24 insertions, 0 deletions
diff --git a/docs/settings.txt b/docs/settings.txt
index af277f4ca2..256a1b950c 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -334,6 +334,30 @@ Default: ``'localhost'``
The host to use for sending e-mail.
+EMAIL_HOST_PASSWORD
+-------------------
+
+Default: ``''`` (Empty string)
+
+**New in Django development version.**
+
+Username to use for the SMTP server defined in ``EMAIL_HOST``. If empty,
+Django won't attempt authentication.
+
+See also ``EMAIL_HOST_USER``.
+
+EMAIL_HOST_USER
+---------------
+
+Default: ``''`` (Empty string)
+
+**New in Django development version.**
+
+Username to use for the SMTP server defined in ``EMAIL_HOST``. If empty,
+Django won't attempt authentication.
+
+See also ``EMAIL_HOST_PASSWORD``.
+
EMAIL_SUBJECT_PREFIX
--------------------