diff -r 3ae2cd85a908 Doc/library/smtplib.rst
--- a/Doc/library/smtplib.rst	Sun Mar 09 11:18:16 2014 +0100
+++ b/Doc/library/smtplib.rst	Wed Mar 19 14:12:40 2014 +0100
@@ -32,7 +32,9 @@
    than a success code, an :exc:`SMTPConnectError` is raised. The optional
    *timeout* parameter specifies a timeout in seconds for blocking operations
    like the connection attempt (if not specified, the global default timeout
-   setting will be used). The optional source_address parameter allows to bind
+   setting will be used). A :exc:`socket.timeout` is raised if the timeout
+   expires.
+   The optional source_address parameter allows to bind
    to some specific source address in a machine with multiple network
    interfaces, and/or to some specific source TCP port. It takes a 2-tuple
    (host, port), for the socket to bind to as its source address before