From 9a708c021e13eb562c1f546304211ef29b3d87da Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Sat, 28 Dec 2019 18:20:50 -0500 Subject: [PATCH] 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) # Conflicts: # Doc/c-api/structures.rst # Doc/library/ast.rst # Doc/library/test.rst # Misc/NEWS.d/3.9.0a2.rst --- Doc/c-api/init.rst | 2 +- Doc/c-api/init_config.rst | 2 +- Doc/faq/programming.rst | 2 +- Lib/idlelib/NEWS.txt | 2 +- Lib/tkinter/tix.py | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst index 155edba82f96df..81cb4f825fee7a 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 6b16b5bb72859a..79a8815ed4199d 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 9d45765abaacf2..70b11d6e93056f 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 e829bc910ea877..0baec813b044d1 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 d9c097a77cdd18..ac545502e45c30 100644 --- a/Lib/tkinter/tix.py +++ b/Lib/tkinter/tix.py @@ -1890,7 +1890,7 @@ def size_column(self, index, **kw): 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 @@ def size_row(self, index, **kw): 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