1
0
mirror of https://github.com/django/django.git synced 2024-12-24 18:16:19 +00:00

[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 4e3d8ae610 from master.
This commit is contained in:
Mariano Rezk 2014-04-15 16:15:32 -04:00 committed by Baptiste Mispelon
parent 76ed0a615c
commit 5672b29d57

View File

@ -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