Skip to content

Commit

Permalink
Fixed #24659 -- Clarified docs of smtp.EmailBackend parameters.
Browse files Browse the repository at this point in the history
  • Loading branch information
timgraham committed Apr 20, 2015
1 parent 37e23c6 commit ffe83d1
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions docs/topics/email.txt
Expand Up @@ -450,12 +450,19 @@ SMTP backend
.. class:: backends.smtp.EmailBackend([host=None, port=None, username=None, password=None, use_tls=None, fail_silently=False, use_ssl=None, timeout=None, ssl_keyfile=None, ssl_certfile=None, **kwargs])

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`, :setting:`EMAIL_USE_TLS`,
:setting:`EMAIL_USE_SSL`, :setting:`EMAIL_TIMEOUT`,
:setting:`EMAIL_SSL_CERTFILE` and :setting:`EMAIL_SSL_KEYFILE` settings
in your settings file.

The value for each argument is retrieved from the matching setting if the
argument is ``None``:

* ``host``: :setting:`EMAIL_HOST`
* ``port``: :setting:`EMAIL_PORT`
* ``username``: :setting:`EMAIL_HOST_USER`
* ``password``: :setting:`EMAIL_HOST_PASSWORD`
* ``use_tls``: :setting:`EMAIL_USE_TLS`
* ``use_ssl``: :setting:`EMAIL_USE_SSL`
* ``timeout``: :setting:`EMAIL_TIMEOUT`
* ``ssl_keyfile``: :setting:`EMAIL_SSL_KEYFILE`
* ``ssl_certfile``: :setting:`EMAIL_SSL_CERTFILE`

The SMTP backend is the default configuration inherited by Django. If you
want to specify it explicitly, put the following in your settings::
Expand Down

0 comments on commit ffe83d1

Please sign in to comment.