diff options
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/settings.txt | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 8b069579ba..c970311342 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1055,6 +1055,26 @@ EMAIL_USE_TLS Default: ``False`` Whether to use a TLS (secure) connection when talking to the SMTP server. +This is used for explicit TLS connections, generally on port 587. If you are +experiencing hanging connections, see the implicit TLS setting +:setting:`EMAIL_USE_SSL`. + +.. setting:: EMAIL_USE_SSL + +EMAIL_USE_SSL +------------- + +.. versionadded:: 1.7 + +Default: ``False`` + +Whether to use an implicit TLS (secure) connection when talking to the SMTP +server. In most email documentation this type of TLS connection is referred +to as SSL. It is generally used on port 465. If you are experiencing problems, +see the explicit TLS setting :setting:`EMAIL_USE_TLS`. + +Note that :setting:`EMAIL_USE_TLS`/:setting:`EMAIL_USE_SSL` are mutually +exclusive, so only set one of those settings to ``True``. .. setting:: FILE_CHARSET |