summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2015-05-18 22:36:55 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2015-05-18 22:36:55 (GMT)
commit315e104d11c36b9f4de0a125d639e834e06ed3e6 (patch)
treead8f2e022087ca535ed1337acb650f654af801e5
parent2a8baed833f70f074252e72b9062b76b35cc422f (diff)
downloadcpython-315e104d11c36b9f4de0a125d639e834e06ed3e6.zip
cpython-315e104d11c36b9f4de0a125d639e834e06ed3e6.tar.gz
cpython-315e104d11c36b9f4de0a125d639e834e06ed3e6.tar.bz2
Issue #24232: Fix typos. Patch by Ville Skyttä.
-rw-r--r--Doc/howto/clinic.rst2
-rw-r--r--Doc/howto/logging-cookbook.rst2
-rw-r--r--Doc/library/collections.rst2
-rw-r--r--Doc/library/ssl.rst2
4 files changed, 4 insertions, 4 deletions
diff --git a/Doc/howto/clinic.rst b/Doc/howto/clinic.rst
index 750ddbe..0b7cada 100644
--- a/Doc/howto/clinic.rst
+++ b/Doc/howto/clinic.rst
@@ -1498,7 +1498,7 @@ preset configurations, as follows:
the ``buffer`` preset.
Suppresses the ``impl_prototype``, write the ``docstring_definition``
- and ``parser_defintion`` to ``buffer``, write everything else to ``block``.
+ and ``parser_definition`` to ``buffer``, write everything else to ``block``.
The third new directive is ``destination``::
diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
index 114ec09..6305d24 100644
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -1408,7 +1408,7 @@ works::
def worker_process(config):
"""
A number of these are spawned for the purpose of illustration. In
- practice, they could be a heterogenous bunch of processes rather than
+ practice, they could be a heterogeneous bunch of processes rather than
ones which are identical to each other.
This initialises logging according to the specified configuration,
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index 50cc97c..b6ffd5e 100644
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -333,7 +333,7 @@ counts, but the output will exclude results with counts of zero or less.
>>> c | d # union: max(c[x], d[x])
Counter({'a': 3, 'b': 2})
-Unary addition and substraction are shortcuts for adding an empty counter
+Unary addition and subtraction are shortcuts for adding an empty counter
or subtracting from an empty counter.
>>> c = Counter(a=2, b=-4)
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index bc28e97..233de8d 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -1269,7 +1269,7 @@ to speed up repeated connections from the same clients.
.. attribute:: SSLContext.check_hostname
- Wether to match the peer cert's hostname with :func:`match_hostname` in
+ Whether to match the peer cert's hostname with :func:`match_hostname` in
:meth:`SSLSocket.do_handshake`. The context's
:attr:`~SSLContext.verify_mode` must be set to :data:`CERT_OPTIONAL` or
:data:`CERT_REQUIRED`, and you must pass *server_hostname* to