merge 3.4

benjaminp · benjaminp · commit 0396cd706738 · 2014-12-30T15:17:09.000-06:00
diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst
@@ -414,7 +414,7 @@ FTP_TLS Objects
 
 .. attribute:: FTP_TLS.ssl_version
 
-   The SSL version to use (defaults to *TLSv1*).
+   The SSL version to use (defaults to :attr:`ssl.PROTOCOL_SSLv23`).
 
 .. method:: FTP_TLS.auth()
 
