summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-12-30 21:17:09 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-12-30 21:17:09 (GMT)
commit0396cd706738a8efab375f7d1c2d1b27f9f6fdd0 (patch)
tree86b3e5a40333af1059639a4a7908aaedd96fd18a
parentbfdec6263f7ad9965d3c15f0535a7a08ac805af1 (diff)
parentbab69bf6555664a7f68ac87685216d6c8b390865 (diff)
downloadcpython-0396cd706738a8efab375f7d1c2d1b27f9f6fdd0.zip
cpython-0396cd706738a8efab375f7d1c2d1b27f9f6fdd0.tar.gz
cpython-0396cd706738a8efab375f7d1c2d1b27f9f6fdd0.tar.bz2
merge 3.4
-rw-r--r--Doc/library/ftplib.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/ftplib.rst b/Doc/library/ftplib.rst
index ede1b6c..3b9f50c 100644
--- 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()