diff options
| author | Claude Paroz <claude@2xlibre.net> | 2013-07-11 20:58:06 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2013-07-11 22:00:08 +0200 |
| commit | 59ebe39812858ba37e83ab0ee886f676980d472d (patch) | |
| tree | 321863def25ef1148b27881adff1836b6c23ad1e /docs/topics | |
| parent | 684a606a4ea21de6d1cc59b69f43b3a133672d59 (diff) | |
Fixed #17471 -- Added smtplib.SMTP_SSL connection option for SMTP backend
Thanks dj.facebook at gmail.com for the report and initial patch
and Areski Belaid and senko for improvements.
Diffstat (limited to 'docs/topics')
| -rw-r--r-- | docs/topics/email.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/topics/email.txt b/docs/topics/email.txt index b3d7254e7f..8bf501c62a 100644 --- a/docs/topics/email.txt +++ b/docs/topics/email.txt @@ -27,7 +27,8 @@ Mail is sent using the SMTP host and port specified in the :setting:`EMAIL_HOST` and :setting:`EMAIL_PORT` settings. The :setting:`EMAIL_HOST_USER` and :setting:`EMAIL_HOST_PASSWORD` settings, if set, are used to authenticate to the SMTP server, and the -:setting:`EMAIL_USE_TLS` setting controls whether a secure connection is used. +:setting:`EMAIL_USE_TLS` and :setting:`EMAIL_USE_SSL` settings control whether +a secure connection is used. .. note:: @@ -408,8 +409,8 @@ SMTP backend This is the default backend. Email will be sent through a SMTP server. The server address and authentication credentials are set in the :setting:`EMAIL_HOST`, :setting:`EMAIL_PORT`, :setting:`EMAIL_HOST_USER`, -:setting:`EMAIL_HOST_PASSWORD` and :setting:`EMAIL_USE_TLS` settings in your -settings file. +:setting:`EMAIL_HOST_PASSWORD`, :setting:`EMAIL_USE_TLS` and +:setting:`EMAIL_USE_SSL` settings in your settings file. The SMTP backend is the default configuration inherited by Django. If you want to specify it explicitly, put the following in your settings:: |