Merged revisions 81231 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81231 | antoine.pitrou | 2010-05-16 16:19:41 +0200 (dim., 16 mai 2010) | 9 lines

  Merged revisions 81229 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r81229 | antoine.pitrou | 2010-05-16 16:16:56 +0200 (dim., 16 mai 2010) | 3 lines

    Document that SSL v2 is insecure.
  ........
................

diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 702c52f9528a01cbb9d5d5e0c65e413dcfae4316..5c783453d3bd29e9d95c908944ad388e92b5d458 100644 (file)
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -219,6 +219,10 @@ Functions, Constants, and Exceptions
 
    Selects SSL version 2 as the channel encryption protocol.
 
+   .. warning::
+
+      SSL version 2 is insecure.  Its use is highly discouraged.
+
 .. data:: PROTOCOL_SSLv23
 
    Selects SSL version 2 or 3 as the channel encryption protocol.  This is a