Skip to content

Commit

Permalink
Fixed #22443 -- Document smtp.EmailBackend.timeout default value
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
mrezk authored and bmispelon committed Apr 15, 2014
1 parent 0f37d2e commit 4e3d8ae
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions docs/topics/email.txt
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4e3d8ae

Please sign in to comment.