diff options
| author | Mariano Rezk <marian@streema.com> | 2014-04-15 16:15:32 -0400 |
|---|---|---|
| committer | Baptiste Mispelon <bmispelon@gmail.com> | 2014-04-15 17:48:45 -0400 |
| commit | 5672b29d57bcd7041268727c0a288b33eb708af4 (patch) | |
| tree | d91f766efa5cdcc47e6dd7d1624ac8e461270f62 /docs | |
| parent | 76ed0a615cd0ef6cb411257a9d447656d1887f16 (diff) | |
[1.7.x] Fixed #22443 -- Document smtp.EmailBackend.timeout default value
Django 1.7 introduces a new timeout parameter for the SMTP email backend:
http://docs.djangoproject.com/en/dev/topics/email/#django.core.mail.backends.smtp.EmailBackend.timeout
However, there was no mention of the default value for this parameter.
Backport of 4e3d8ae61055dbb83d193585f2f36af6537b31cc from master.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/topics/email.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/topics/email.txt b/docs/topics/email.txt index 6b93d7d2b8..84c108876d 100644 --- a/docs/topics/email.txt +++ b/docs/topics/email.txt @@ -457,6 +457,9 @@ SMTP backend Then point the :setting:`EMAIL_BACKEND` setting at your custom backend as described above. + If unspecified, the default ``timeout`` will be the one provided by + :func:`socket.getdefaulttimeout()`, which defaults to ``None`` (no timeout). + .. _topic-email-console-backend: Console backend |