innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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.
This commit is contained in:
Mariano Rezk 2014-04-15 16:15:32 -04:00 committed by Baptiste Mispelon
parent 0f37d2e4c0
commit 4e3d8ae610
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/topics/email.txt
View File

@ -472,6 +472,9 @@ SMTP backend
Then point the :setting:`EMAIL_BACKEND` setting at your custom backend as Then point the :setting:`EMAIL_BACKEND` setting at your custom backend as
described above. 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: .. _topic-email-console-backend:
Console backend Console backend