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

[georg.brandl]

http://hg.python.org/cpython/rev/3b5150dea580
changeset:   86099:3b5150dea580
parent:      86095:bb027bd31bb7
parent:      86098:9f3da04a0045
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 06 18:20:39 2013 +0200
summary:
  merge with 3.3

files:
  Doc/library/ssl.rst |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -1469,10 +1469,10 @@
 .. 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

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