summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesus Cea <jcea@jcea.es>2014-03-17 18:01:11 (GMT)
committerJesus Cea <jcea@jcea.es>2014-03-17 18:01:11 (GMT)
commitf6f3c4588a6bd75841d324b71be9ba4e34bdd46c (patch)
tree8801ec00bdb18d8c8f3233e27bbc6b259b5bceb9
parent809383ea0d70e0a37c5f401140305b4f61006749 (diff)
parentcec25b01ec0e842e2244df67e74054e1d9a5b774 (diff)
downloadcpython-f6f3c4588a6bd75841d324b71be9ba4e34bdd46c.zip
cpython-f6f3c4588a6bd75841d324b71be9ba4e34bdd46c.tar.gz
cpython-f6f3c4588a6bd75841d324b71be9ba4e34bdd46c.tar.bz2
MERGE: Typo
-rw-r--r--Doc/whatsnew/3.4.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index 1b751b0..112b76b 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -1456,7 +1456,7 @@ OpenSSL does not do any CRL verification by default. (Contributed by
Christien Heimes in :issue:`8813`.)
New :class:`~ssl.SSLContext` method :meth:`~ssl.SSLContext.load_default_certs`
-loads a set of dfault "certificate authority" (CA) certificates from default
+loads a set of default "certificate authority" (CA) certificates from default
locations, which vary according to the platform. It can be used to load both
TLS web server authentication certificates
(``purpose=``:data:`~ssl.Purpose.SERVER_AUTH`) for a client to use to verify a