summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Doc/library/email.rst2
-rw-r--r--Doc/library/importlib.rst2
-rw-r--r--Doc/library/xmlrpc.client.rst2
-rw-r--r--Doc/using/cmdline.rst2
-rw-r--r--Doc/whatsnew/3.3.rst2
-rw-r--r--Doc/whatsnew/3.6.rst2
-rw-r--r--Doc/whatsnew/3.7.rst2
7 files changed, 7 insertions, 7 deletions
diff --git a/Doc/library/email.rst b/Doc/library/email.rst
index c4187dd..1033d8c 100644
--- a/Doc/library/email.rst
+++ b/Doc/library/email.rst
@@ -133,7 +133,7 @@ Legacy API:
.. seealso::
Module :mod:`smtplib`
- SMTP (Simple Mail Transport Protcol) client
+ SMTP (Simple Mail Transport Protocol) client
Module :mod:`poplib`
POP (Post Office Protocol) client
diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst
index e33abae..74a73fd 100644
--- a/Doc/library/importlib.rst
+++ b/Doc/library/importlib.rst
@@ -249,7 +249,7 @@ ABC hierarchy::
.. abstractmethod:: find_module(fullname, path=None)
- An abstact method for finding a :term:`loader` for the specified
+ An abstract method for finding a :term:`loader` for the specified
module. Originally specified in :pep:`302`, this method was meant
for use in :data:`sys.meta_path` and in the path-based import subsystem.
diff --git a/Doc/library/xmlrpc.client.rst b/Doc/library/xmlrpc.client.rst
index ed2ccae..27d92e3 100644
--- a/Doc/library/xmlrpc.client.rst
+++ b/Doc/library/xmlrpc.client.rst
@@ -145,7 +145,7 @@ between conformable Python objects and XML on the wire.
.. versionchanged:: 3.6
Added support of type tags with prefixes (e.g. ``ex:nil``).
- Added support of unmarsalling additional types used by Apache XML-RPC
+ Added support of unmarshalling additional types used by Apache XML-RPC
implementation for numerics: ``i1``, ``i2``, ``i8``, ``biginteger``,
``float`` and ``bigdecimal``.
See http://ws.apache.org/xmlrpc/types.html for a description.
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
index 9ddc515..b61df8a 100644
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -905,7 +905,7 @@ conflict.
If this environment variable is not set at all, then the interpreter defaults
to using the current locale settings, *unless* the current locale is
identified as a legacy ASCII-based locale
- (as descibed for :envvar:`PYTHONCOERCECLOCALE`), and locale coercion is
+ (as described for :envvar:`PYTHONCOERCECLOCALE`), and locale coercion is
either disabled or fails. In such legacy locales, the interpreter will
default to enabling UTF-8 mode unless explicitly instructed not to do so.
diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst
index 7e5133d..0575ac9 100644
--- a/Doc/whatsnew/3.3.rst
+++ b/Doc/whatsnew/3.3.rst
@@ -1414,7 +1414,7 @@ http
:class:`http.server.BaseHTTPRequestHandler` now buffers the headers and writes
them all at once when :meth:`~http.server.BaseHTTPRequestHandler.end_headers` is
called. A new method :meth:`~http.server.BaseHTTPRequestHandler.flush_headers`
-can be used to directly manage when the accumlated headers are sent.
+can be used to directly manage when the accumulated headers are sent.
(Contributed by Andrew Schaaf in :issue:`3709`.)
:class:`http.server` now produces valid ``HTML 4.01 strict`` output.
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
index bb32361..1360af7 100644
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -1856,7 +1856,7 @@ Build and C API Changes
For more information, see :pep:`7` and :issue:`17884`.
* Cross-compiling CPython with the Android NDK and the Android API level set to
- 21 (Android 5.0 Lollilop) or greater runs successfully. While Android is not
+ 21 (Android 5.0 Lollipop) or greater runs successfully. While Android is not
yet a supported platform, the Python test suite runs on the Android emulator
with only about 16 tests failures. See the Android meta-issue :issue:`26865`.
diff --git a/Doc/whatsnew/3.7.rst b/Doc/whatsnew/3.7.rst
index f175426..287a027 100644
--- a/Doc/whatsnew/3.7.rst
+++ b/Doc/whatsnew/3.7.rst
@@ -2262,7 +2262,7 @@ Changes in the Python API
* Because :func:`shutil.rmtree` is now implemented using the :func:`os.scandir`
function, the user specified handler *onerror* is now called with the first
- argument ``os.scandir`` instead of ``os.listdir`` when listing the direcory
+ argument ``os.scandir`` instead of ``os.listdir`` when listing the directory
is failed.
* Support for nested sets and set operations in regular expressions as in