Permalink
Browse files

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.
  • Loading branch information...
1 parent 0f37d2e commit 4e3d8ae61055dbb83d193585f2f36af6537b31cc @mrezk mrezk committed with bmispelon Apr 15, 2014
Showing with 3 additions and 0 deletions.
  1. +3 −0 docs/topics/email.txt
View
@@ -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

0 comments on commit 4e3d8ae

Please sign in to comment.