summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2019-12-28 19:05:15 -0500
committerGitHub <noreply@github.com>2019-12-28 19:05:15 -0500
commitdf647f3340d7a40628ba731f80425cb469e72653 (patch)
tree3bc830a3119ad3dbf84743c6609caa4312ea487b
parent9ee1b156146cb8114ba6d24811bdec456bbf7b8f (diff)
downloadcpython-git-df647f3340d7a40628ba731f80425cb469e72653.tar.gz
[3.8] bpo-39136: Fixed typos (GH-17720)
funtion -> function; configuraton -> configuration; defintitions -> definitions; focusses -> focuses; necesarily -> necessarily; follwing -> following; Excape -> Escape, (cherry picked from commit 6c7bb38ff2799ac218e6df598b2b262f89e2bc1e)
-rw-r--r--Doc/c-api/init.rst2
-rw-r--r--Doc/c-api/init_config.rst2
-rw-r--r--Doc/faq/programming.rst2
-rw-r--r--Lib/idlelib/NEWS.txt2
-rw-r--r--Lib/tkinter/tix.py4
5 files changed, 6 insertions, 6 deletions
diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst
index 155edba82f..81cb4f825f 100644
--- a/Doc/c-api/init.rst
+++ b/Doc/c-api/init.rst
@@ -1181,7 +1181,7 @@ It is usually the only Python interpreter in a process. Unlike sub-interpreters
the main interpreter has unique process-global responsibilities like signal
handling. It is also responsible for execution during runtime initialization and
is usually the active interpreter during runtime finalization. The
-:c:func:`PyInterpreterState_Main` funtion returns a pointer to its state.
+:c:func:`PyInterpreterState_Main` function returns a pointer to its state.
You can switch between sub-interpreters using the :c:func:`PyThreadState_Swap`
function. You can create and destroy them using the following functions:
diff --git a/Doc/c-api/init_config.rst b/Doc/c-api/init_config.rst
index 6b16b5bb72..79a8815ed4 100644
--- a/Doc/c-api/init_config.rst
+++ b/Doc/c-api/init_config.rst
@@ -757,7 +757,7 @@ configuration, and then override some parameters::
PyConfig config;
PyConfig_InitPythonConfig(&config);
- /* Set the program name before reading the configuraton
+ /* Set the program name before reading the configuration
(decode byte string from the locale encoding).
Implicitly preinitialize Python. */
diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
index 9d45765aba..70b11d6e93 100644
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -1019,7 +1019,7 @@ That's a tough one, in general. First, here are a list of things to
remember before diving further:
* Performance characteristics vary across Python implementations. This FAQ
- focusses on :term:`CPython`.
+ focuses on :term:`CPython`.
* Behaviour can vary across operating systems, especially when talking about
I/O or multi-threading.
* You should always find the hot spots in your program *before* attempting to
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index e829bc910e..0baec813b0 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -6,7 +6,7 @@ Released on 2019-12-16?
bpo-38943: Fix autocomplete windows not always appearing on some
systems. Patch by Johnny Najera.
-bpo-38944: Excape key now closes IDLE completion windows. Patch by
+bpo-38944: Escape key now closes IDLE completion windows. Patch by
Johnny Najera.
bpo-38862: 'Strip Trailing Whitespace' on the Format menu removes extra
diff --git a/Lib/tkinter/tix.py b/Lib/tkinter/tix.py
index d9c097a77c..ac545502e4 100644
--- a/Lib/tkinter/tix.py
+++ b/Lib/tkinter/tix.py
@@ -1890,7 +1890,7 @@ class Grid(TixWidget, XView, YView):
containing the current size setting of the given column. When
option-value pairs are given, the corresponding options of the
size setting of the given column are changed. Options may be one
- of the follwing:
+ of the following:
pad0 pixels
Specifies the paddings to the left of a column.
pad1 pixels
@@ -1915,7 +1915,7 @@ class Grid(TixWidget, XView, YView):
When no option-value pair is given, this command returns a list con-
taining the current size setting of the given row . When option-value
pairs are given, the corresponding options of the size setting of the
- given row are changed. Options may be one of the follwing:
+ given row are changed. Options may be one of the following:
pad0 pixels
Specifies the paddings to the top of a row.
pad1 pixels