[Python-checkins] cpython (merge 3.4 -> default): Closes #22072: Merge typo fixes from 3.4

[zach.ware]

http://hg.python.org/cpython/rev/967311e6c0d2
changeset:   91865:967311e6c0d2
parent:      91863:619feea86ce4
parent:      91864:1c7567ec6292
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Fri Jul 25 13:31:36 2014 -0500
summary:
  Closes #22072: Merge typo fixes from 3.4

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


diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -808,7 +808,7 @@
    Perform the SSL setup handshake.
 
    .. versionchanged:: 3.4
-      The handshake method also performce :func:`match_hostname` when the
+      The handshake method also performs :func:`match_hostname` when the
       :attr:`~SSLContext.check_hostname` attribute of the socket's
       :attr:`~SSLSocket.context` is true.
 
@@ -1132,7 +1132,7 @@
    returned.  Other return values will result in a TLS fatal error with
    :const:`ALERT_DESCRIPTION_INTERNAL_ERROR`.
 
-   If there is a IDNA decoding error on the server name, the TLS connection
+   If there is an IDNA decoding error on the server name, the TLS connection
    will terminate with an :const:`ALERT_DESCRIPTION_INTERNAL_ERROR` fatal TLS
    alert message to the client.
 

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