Commit 5672b29d authored by Mariano Rezk's avatar Mariano Rezk Committed by Baptiste Mispelon
Browse files

[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 4e3d8ae6 from master.
parent 76ed0a61

docs/topics/email.txt

+3 −0
Original line number Diff line number Diff line
@@ -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