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:47:51 -0400 |
| commit | 4e3d8ae61055dbb83d193585f2f36af6537b31cc (patch) | |
| tree | 9c8770ad0c12b2631cb607b9e084e2fe6caa7d26 /docs | |
| parent | 0f37d2e4c0175d7b0ebe63e1146250437fc88cd0 (diff) | |
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.
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 1989b5e4f3..becf652739 100644 --- a/docs/topics/email.txt +++ b/docs/topics/email.txt @@ -472,6 +472,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 |