From 4e3d8ae61055dbb83d193585f2f36af6537b31cc Mon Sep 17 00:00:00 2001
From: Mariano Rezk <marian@streema.com>
Date: Tue, 15 Apr 2014 16:15:32 -0400
Subject: [PATCH] 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.
---
 docs/topics/email.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/topics/email.txt b/docs/topics/email.txt
index 1989b5e4f3..becf652739 100644
--- a/docs/topics/email.txt
+++ b/docs/topics/email.txt
@@ -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