summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-05-08 14:02:35 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-05-08 14:02:35 (GMT)
commit1ce738e08f147beb724f22a9411724a955cd418d (patch)
tree9c2b84d7b81d1117159dd791094994d96094077e /Doc
parentcc22984d9e5e5357212db2eb1841f93e75fe75f5 (diff)
parent4c35964b764540988bfb342bffc7c4b1cb674031 (diff)
downloadcpython-1ce738e08f147beb724f22a9411724a955cd418d.zip
cpython-1ce738e08f147beb724f22a9411724a955cd418d.tar.gz
cpython-1ce738e08f147beb724f22a9411724a955cd418d.tar.bz2
Merge typo fixes from 3.5
Diffstat (limited to 'Doc')
-rw-r--r--Doc/howto/logging-cookbook.rst2
-rw-r--r--Doc/library/codecs.rst2
-rw-r--r--Doc/reference/simple_stmts.rst2
3 files changed, 3 insertions, 3 deletions
diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
index 57b4333..e784acc 100644
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -2231,7 +2231,7 @@ flushing behavior.
The example script has a simple function, ``foo``, which just cycles through
all the logging levels, writing to ``sys.stderr`` to say what level it's about
-to log at, and then actually logging a message that that level. You can pass a
+to log at, and then actually logging a message at that level. You can pass a
parameter to ``foo`` which, if true, will log at ERROR and CRITICAL levels -
otherwise, it only logs at DEBUG, INFO and WARNING levels.
diff --git a/Doc/library/codecs.rst b/Doc/library/codecs.rst
index 49068cb..577a800 100644
--- a/Doc/library/codecs.rst
+++ b/Doc/library/codecs.rst
@@ -977,7 +977,7 @@ particular, the following variants typically exist:
* an ISO 8859 codeset
-* a Microsoft Windows code page, which is typically derived from a 8859 codeset,
+* a Microsoft Windows code page, which is typically derived from an 8859 codeset,
but replaces control characters with additional graphic characters
* an IBM EBCDIC code page
diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst
index 5f60540..79a46e2 100644
--- a/Doc/reference/simple_stmts.rst
+++ b/Doc/reference/simple_stmts.rst
@@ -237,7 +237,7 @@ Assignment of an object to a single target is recursively defined as follows.
phase, causing less detailed error messages.
Although the definition of assignment implies that overlaps between the
-left-hand side and the right-hand side are 'simultanenous' (for example ``a, b =
+left-hand side and the right-hand side are 'simultaneous' (for example ``a, b =
b, a`` swaps two variables), overlaps *within* the collection of assigned-to
variables occur left-to-right, sometimes resulting in confusion. For instance,
the following program prints ``[0, 2]``::