diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-05-03 13:35:02 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-05-03 13:35:02 +0000 |
| commit | 7a84ad93e69faf7a14342ebb4da1f6be265f1fe0 (patch) | |
| tree | a9c4992c5a152c37f9a07f952e0aceb7a7a3b73a /docs | |
| parent | 21a2ca6a2121bc96edef4212f7ce79e8bb0a8062 (diff) | |
Fixed #2897 -- Added support for TLS connections to email handling. This means
servers like Google's SMTP server can now be used for admin emails.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5144 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/email.txt | 4 | ||||
| -rw-r--r-- | docs/settings.txt | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/docs/email.txt b/docs/email.txt index 74127526dd..56a552bdb7 100644 --- a/docs/email.txt +++ b/docs/email.txt @@ -22,7 +22,8 @@ In two lines:: Mail will be sent using the SMTP host and port specified in the `EMAIL_HOST`_ and `EMAIL_PORT`_ settings. The `EMAIL_HOST_USER`_ and `EMAIL_HOST_PASSWORD`_ -settings, if set, will be used to authenticate to the SMTP server. +settings, if set, will be used to authenticate to the SMTP server and the +`EMAIL_USE_TLS`_ settings will control whether a secure connection is used. .. note:: @@ -34,6 +35,7 @@ settings, if set, will be used to authenticate to the SMTP server. .. _EMAIL_PORT: ../settings/#email-port .. _EMAIL_HOST_USER: ../settings/#email-host-user .. _EMAIL_HOST_PASSWORD: ../settings/#email-host-password +.. _EMAIL_USE_TLS: ../settings/#email-use-tls send_mail() diff --git a/docs/settings.txt b/docs/settings.txt index 042347ccdb..58d590f7c2 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -428,6 +428,13 @@ Subject-line prefix for e-mail messages sent with ``django.core.mail.mail_admins or ``django.core.mail.mail_managers``. You'll probably want to include the trailing space. +EMAIL_USE_TLS +------------- + +Default: ``False`` + +Whether to use a TLS (secure) connection when talking to the SMTP server. + FIXTURE_DIRS ------------- |