diff options
| author | Georg Brandl <georg@python.org> | 2013-10-06 16:20:39 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-10-06 16:20:39 (GMT) |
| commit | 99b1a12f2f565f0bdc959ec42268e7ef823819be (patch) | |
| tree | 7742a715331b9ba703e5a7030d6be03462affc1a | |
| parent | e448ccaa6f1752c924a21ce3b9ff57be49074cff (diff) | |
| parent | 4a6cf6c9d15a7944860349c87cdf4bbfcc4b9910 (diff) | |
| download | cpython-99b1a12f2f565f0bdc959ec42268e7ef823819be.zip cpython-99b1a12f2f565f0bdc959ec42268e7ef823819be.tar.gz cpython-99b1a12f2f565f0bdc959ec42268e7ef823819be.tar.bz2 | |
merge with 3.3
| -rw-r--r-- | Doc/library/ssl.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index bb4ceca..59ebcd4 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -1469,10 +1469,10 @@ use the ``openssl ciphers`` command on your system. .. seealso:: Class :class:`socket.socket` - Documentation of underlying :mod:`socket` class + Documentation of underlying :mod:`socket` class - `TLS (Transport Layer Security) and SSL (Secure Socket Layer) <http://www3.rad.com/networks/applications/secure/tls.htm>`_ - Debby Koren + `SSL/TLS Strong Encryption: An Introduction <http://httpd.apache.org/docs/trunk/en/ssl/ssl_intro.html>`_ + Intro from the Apache webserver documentation `RFC 1422: Privacy Enhancement for Internet Electronic Mail: Part II: Certificate-Based Key Management <http://www.ietf.org/rfc/rfc1422>`_ Steve Kent |