summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-10-31 11:48:53 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2015-10-31 11:48:53 (GMT)
commit1f1177d69a21805c374b6b4cfce9f9f76bceb822 (patch)
tree14d59076b529affba00fd59610399131db4d1dc7
parent3e8a7ad7fc6224f8cae7d1c43d676d2093442611 (diff)
downloadcpython-1f1177d69a21805c374b6b4cfce9f9f76bceb822.zip
cpython-1f1177d69a21805c374b6b4cfce9f9f76bceb822.tar.gz
cpython-1f1177d69a21805c374b6b4cfce9f9f76bceb822.tar.bz2
Fix some spelling errors in documentation and code comments
-rw-r--r--Doc/library/ssl.rst2
-rw-r--r--Doc/library/tracemalloc.rst2
-rw-r--r--Doc/whatsnew/3.4.rst2
-rw-r--r--Lib/html/entities.py2
-rw-r--r--Misc/HISTORY2
-rw-r--r--Misc/NEWS2
6 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
index 233de8d..b0cf4eb 100644
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -827,7 +827,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.
diff --git a/Doc/library/tracemalloc.rst b/Doc/library/tracemalloc.rst
index a04a432..cd62e55 100644
--- a/Doc/library/tracemalloc.rst
+++ b/Doc/library/tracemalloc.rst
@@ -460,7 +460,7 @@ Snapshot
All inclusive filters are applied at once, a trace is ignored if no
inclusive filters match it. A trace is ignored if at least one exclusive
- filter matchs it.
+ filter matches it.
.. classmethod:: load(filename)
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index 7faea32..7d9bc0d 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -2076,7 +2076,7 @@ using ``-Wd``).
Deprecations in the Python API
------------------------------
-* As mentioned in :ref:`whatsnew-pep-451`, a number of :mod:`importilb`
+* As mentioned in :ref:`whatsnew-pep-451`, a number of :mod:`importlib`
methods and functions are deprecated: :meth:`importlib.find_loader` is
replaced by :func:`importlib.util.find_spec`;
:meth:`importlib.machinery.PathFinder.find_module` is replaced by
diff --git a/Lib/html/entities.py b/Lib/html/entities.py
index f7deae6..be3f627 100644
--- a/Lib/html/entities.py
+++ b/Lib/html/entities.py
@@ -221,7 +221,7 @@ name2codepoint = {
'spades': 0x2660, # black spade suit, U+2660 ISOpub
'sub': 0x2282, # subset of, U+2282 ISOtech
'sube': 0x2286, # subset of or equal to, U+2286 ISOtech
- 'sum': 0x2211, # n-ary sumation, U+2211 ISOamsb
+ 'sum': 0x2211, # n-ary summation, U+2211 ISOamsb
'sup': 0x2283, # superset of, U+2283 ISOtech
'sup1': 0x00b9, # superscript one = superscript digit one, U+00B9 ISOnum
'sup2': 0x00b2, # superscript two = superscript digit two = squared, U+00B2 ISOnum
diff --git a/Misc/HISTORY b/Misc/HISTORY
index 5957956..a053962 100644
--- a/Misc/HISTORY
+++ b/Misc/HISTORY
@@ -1966,7 +1966,7 @@ Core and Builtins
change also applies to bytes.splitlines and bytearray.splitlines.
- Issue #7732: Don't open a directory as a file anymore while importing a
- module. Ignore the direcotry if its name matchs the module name (e.g.
+ module. Ignore the directory if its name matches the module name (e.g.
"__init__.py") and raise a ImportError instead.
- Issue #13021: Missing decref on an error path. Thanks to Suman Saha for
diff --git a/Misc/NEWS b/Misc/NEWS
index 3d4cbcb..d2bb816 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1403,7 +1403,7 @@ Library
- Issue #21402: tkinter.ttk now works when default root window is not set.
-- Issue #10203: sqlite3.Row now truly supports sequence protocol. In particulr
+- Issue #10203: sqlite3.Row now truly supports sequence protocol. In particular
it supports reverse() and negative indices. Original patch by Claudiu Popa.
- Issue #18807: If copying (no symlinks) specified for a venv, then the python