diff -r 2072deff3b2f Doc/library/smtplib.rst --- a/Doc/library/smtplib.rst Mon Feb 24 14:31:25 2014 -0800 +++ b/Doc/library/smtplib.rst Wed Mar 05 01:20:40 2014 +0530 @@ -297,7 +297,8 @@ Put the SMTP connection in TLS (Transport Layer Security) mode. All SMTP commands that follow will be encrypted. You should then call :meth:`ehlo` - again. + again. If server supports TLS but fails to start it, then it does not raise + any exception. If *keyfile* and *certfile* are provided, these are passed to the :mod:`socket` module's :func:`ssl` function.