[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/01437956ea67
changeset:   93994:01437956ea67
parent:      93992:33603f7949c5
parent:      93993:29689050ec78
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Dec 30 15:17:09 2014 -0600
summary:
  merge 3.4

files:
  Doc/library/ftplib.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst
--- a/Doc/library/ftplib.rst
+++ b/Doc/library/ftplib.rst
@@ -414,7 +414,7 @@
 
 .. 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()
 

-- 
Repository URL: https://hg.python.org/cpython