From b8030533e1d25315452cb5b8b859296c1c5da250 Mon Sep 17 00:00:00 2001 From: xzmeng Date: Tue, 29 Aug 2023 08:14:21 +0800 Subject: [PATCH 1/2] Fix misc doc typos (#108592) --- Doc/library/idle.rst | 2 +- Doc/library/sqlite3.rst | 2 +- Doc/library/statistics.rst | 1 - Doc/library/tkinter.rst | 2 +- Doc/using/configure.rst | 4 ++-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst index 3058bcead661f3..3211da50dc745c 100644 --- a/Doc/library/idle.rst +++ b/Doc/library/idle.rst @@ -479,7 +479,7 @@ Search and Replace Any selection becomes a search target. However, only selections within a line work because searches are only performed within lines with the -terminal newline removed. If ``[x] Regular expresion`` is checked, the +terminal newline removed. If ``[x] Regular expression`` is checked, the target is interpreted according to the Python re module. .. _completions: diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst index 53c21aed2d6098..f3bcfb5a28f9a3 100644 --- a/Doc/library/sqlite3.rst +++ b/Doc/library/sqlite3.rst @@ -1380,7 +1380,7 @@ Cursor objects :raises ProgrammingError: If *sql* contains more than one SQL statement, - or is not a DML statment. + or is not a DML statement. Example: diff --git a/Doc/library/statistics.rst b/Doc/library/statistics.rst index 03867b3d391a49..3f97932d216759 100644 --- a/Doc/library/statistics.rst +++ b/Doc/library/statistics.rst @@ -1026,7 +1026,6 @@ The final prediction goes to the largest posterior. This is known as the >>> 'male' if posterior_male > posterior_female else 'female' 'female' - .. # This modelines must appear within the last ten lines of the file. kate: indent-width 3; remove-trailing-space on; replace-tabs on; encoding utf-8; diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst index 2aa34422703872..246abf374b0219 100644 --- a/Doc/library/tkinter.rst +++ b/Doc/library/tkinter.rst @@ -352,7 +352,7 @@ Understanding How Tkinter Wraps Tcl/Tk When your application uses Tkinter's classes and methods, internally Tkinter is assembling strings representing Tcl/Tk commands, and executing those -commands in the Tcl interpreter attached to your applicaton's :class:`Tk` +commands in the Tcl interpreter attached to your application's :class:`Tk` instance. Whether it's trying to navigate reference documentation, trying to find diff --git a/Doc/using/configure.rst b/Doc/using/configure.rst index 25ba5084d5daa7..c2b2dee5615ba5 100644 --- a/Doc/using/configure.rst +++ b/Doc/using/configure.rst @@ -179,7 +179,7 @@ Install Options Install architecture-independent files in PREFIX. On Unix, it defaults to :file:`/usr/local`. - This value can be retrived at runtime using :data:`sys.prefix`. + This value can be retrieved at runtime using :data:`sys.prefix`. As an example, one can use ``--prefix="$HOME/.local/"`` to install a Python in its home directory. @@ -188,7 +188,7 @@ Install Options Install architecture-dependent files in EPREFIX, defaults to :option:`--prefix`. - This value can be retrived at runtime using :data:`sys.exec_prefix`. + This value can be retrieved at runtime using :data:`sys.exec_prefix`. .. cmdoption:: --disable-test-modules From 18405a387efff083e77de147383759e0ce81875d Mon Sep 17 00:00:00 2001 From: AlexWaygood Date: Tue, 29 Aug 2023 09:44:47 +0100 Subject: [PATCH 2/2] Fix bad merge --- Doc/library/statistics.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/Doc/library/statistics.rst b/Doc/library/statistics.rst index 3f97932d216759..03867b3d391a49 100644 --- a/Doc/library/statistics.rst +++ b/Doc/library/statistics.rst @@ -1026,6 +1026,7 @@ The final prediction goes to the largest posterior. This is known as the >>> 'male' if posterior_male > posterior_female else 'female' 'female' + .. # This modelines must appear within the last ten lines of the file. kate: indent-width 3; remove-trailing-space on; replace-tabs on; encoding utf-8;