diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2014-07-25 18:31:36 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2014-07-25 18:31:36 (GMT) |
| commit | b27d3a2d21b27444a61c4cb7f36b9de32143ddff (patch) | |
| tree | 9cd23c34aecba5d64aba739417b4a3cb3a68e3ad | |
| parent | ab9a446f234c5b8417c13dfebb12db72defd246c (diff) | |
| parent | 88a1977a087bba87b07b2dc94269539108da300d (diff) | |
| download | cpython-b27d3a2d21b27444a61c4cb7f36b9de32143ddff.zip cpython-b27d3a2d21b27444a61c4cb7f36b9de32143ddff.tar.gz cpython-b27d3a2d21b27444a61c4cb7f36b9de32143ddff.tar.bz2 | |
Closes #22072: Merge typo fixes from 3.4
| -rw-r--r-- | Doc/library/ssl.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index a9710e8..d5328c3 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -808,7 +808,7 @@ SSL sockets also have the following additional methods and attributes: 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 @@ to speed up repeated connections from the same clients. 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. |