summaryrefslogtreecommitdiffstats
path: root/Doc/library/ssl.rst
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-10-31 12:16:18 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2015-10-31 12:16:18 (GMT)
commit4827e488a4d1d82eb7bfeb194a7ad1d420535513 (patch)
tree3b561031a30e1c2329dce853e11ae76b2f08c2f9 /Doc/library/ssl.rst
parentc02948126c851b53109e4c0b4b11f26a62cceba9 (diff)
parent1f1177d69a21805c374b6b4cfce9f9f76bceb822 (diff)
downloadcpython-4827e488a4d1d82eb7bfeb194a7ad1d420535513.zip
cpython-4827e488a4d1d82eb7bfeb194a7ad1d420535513.tar.gz
cpython-4827e488a4d1d82eb7bfeb194a7ad1d420535513.tar.bz2
Merge spelling fixes from 3.4 into 3.5
Diffstat (limited to 'Doc/library/ssl.rst')
-rw-r--r--Doc/library/ssl.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 4075134..391d4c8 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -880,7 +880,7 @@ SSL sockets also have the following additional methods and attributes:
The :meth:`~SSLSocket.read` and :meth:`~SSLSocket.write` methods are the
low-level methods that read and write unencrypted, application-level data
- and and decrypt/encrypt it to encrypted, wire-level data. These methods
+ and decrypt/encrypt it to encrypted, wire-level data. These methods
require an active SSL connection, i.e. the handshake was completed and
:meth:`SSLSocket.unwrap` was not called.