From e7ebf1453beb1a40e65630897fa1e35a3c2d3ec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Wirtel?= Date: Wed, 10 Oct 2018 15:39:34 +0200 Subject: [3.6] bpo-34906: Doc: Fix typos (2) (GH-9735) (cherry picked from commit 683281f536981da395575b5a07d6761118259fd2) --- Doc/whatsnew/3.3.rst | 4 ++-- Doc/whatsnew/3.5.rst | 2 +- Lib/idlelib/NEWS.txt | 6 +++--- Misc/HISTORY | 10 +++++----- Misc/NEWS.d/3.5.0a1.rst | 10 +++++----- Misc/NEWS.d/3.5.0a2.rst | 2 +- Misc/NEWS.d/3.5.0a3.rst | 2 +- Misc/NEWS.d/3.5.0a4.rst | 2 +- Misc/NEWS.d/3.5.1rc1.rst | 2 +- Misc/NEWS.d/3.5.2rc1.rst | 2 +- Misc/NEWS.d/3.5.3rc1.rst | 2 +- Misc/NEWS.d/3.6.0a1.rst | 4 ++-- Misc/NEWS.d/3.6.0a2.rst | 6 +++--- Misc/NEWS.d/3.6.0a3.rst | 2 +- Misc/NEWS.d/3.6.0a4.rst | 2 +- Misc/NEWS.d/3.6.0b1.rst | 2 +- Misc/NEWS.d/3.6.2rc2.rst | 2 +- Misc/NEWS.d/3.6.3rc1.rst | 6 +++--- Misc/NEWS.d/3.6.4rc1.rst | 4 ++-- Misc/NEWS.d/3.6.6rc1.rst | 2 +- Modules/_ctypes/libffi_msvc/win32.c | 2 +- 21 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Doc/whatsnew/3.3.rst b/Doc/whatsnew/3.3.rst index 8042255..79b3490 100644 --- a/Doc/whatsnew/3.3.rst +++ b/Doc/whatsnew/3.3.rst @@ -303,7 +303,7 @@ The launcher can also be used explicitly from the command line as the ``py`` application. Running ``py`` follows the same version selection rules as implicitly launching scripts, but a more specific version can be selected by passing appropriate arguments (such as ``-3`` to request Python 3 when -Python 2 is also installed, or ``-2.6`` to specifclly request an earlier +Python 2 is also installed, or ``-2.6`` to specifically request an earlier Python version when a more recent version is installed). In addition to the launcher, the Windows installer now includes an @@ -2386,7 +2386,7 @@ Porting Python code finder, you will need to remove keys paired with values of ``None`` **and** :class:`imp.NullImporter` to be backwards-compatible. This will lead to extra overhead on older versions of Python that re-insert ``None`` into - :attr:`sys.path_importer_cache` where it repesents the use of implicit + :attr:`sys.path_importer_cache` where it represents the use of implicit finders, but semantically it should not change anything. * :class:`importlib.abc.Finder` no longer specifies a `find_module()` abstract diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst index 96f86e6..dc6a3ea 100644 --- a/Doc/whatsnew/3.5.rst +++ b/Doc/whatsnew/3.5.rst @@ -2471,7 +2471,7 @@ Changes in the Python API parameter to help control the ``opt-`` tag. Because of this, the *debug_override* parameter of the function is now deprecated. `.pyo` files are also no longer supported as a file argument to the Python interpreter and - thus serve no purpose when distributed on their own (i.e. sourcless code + thus serve no purpose when distributed on their own (i.e. sourceless code distribution). Due to the fact that the magic number for bytecode has changed in Python 3.5, all old `.pyo` files from previous versions of Python are invalid regardless of this PEP. diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt index 84880cc..8ecd85a 100644 --- a/Lib/idlelib/NEWS.txt +++ b/Lib/idlelib/NEWS.txt @@ -240,7 +240,7 @@ To see the example in action, enable it on options extensions tab. bpo-31421: Document how IDLE runs tkinter programs. IDLE calls tcl/tk update in the background in order to make live -interaction and experimentatin with tkinter applications much easier. +interaction and experimentation with tkinter applications much easier. bpo-31414: Fix tk entry box tests by deleting first. Adding to an int entry is not the same as deleting and inserting @@ -488,7 +488,7 @@ Released on 2016-12-23 -w option but without -jn. Fix warning from test_config. - Issue #27621: Put query response validation error messages in the query - box itself instead of in a separate massagebox. Redo tests to match. + box itself instead of in a separate messagebox. Redo tests to match. Add Mac OSX refinements. Original patch by Mark Roseman. - Issue #27620: Escape key now closes Query box as cancelled. @@ -554,7 +554,7 @@ Released on 2016-12-23 - Issue #27239: idlelib.macosx.isXyzTk functions initialize as needed. -- Issue #27262: move Aqua unbinding code, which enable context menus, to maxosx. +- Issue #27262: move Aqua unbinding code, which enable context menus, to macosx. - Issue #24759: Make clear in idlelib.idle_test.__init__ that the directory is a private implementation of test.test_idle and tool for maintainers. diff --git a/Misc/HISTORY b/Misc/HISTORY index 4ce431f..76d7b95 100644 --- a/Misc/HISTORY +++ b/Misc/HISTORY @@ -629,7 +629,7 @@ Library - Issue #21560: An attempt to write a data of wrong type no longer cause GzipFile corruption. Original patch by Wolfgang Maier. -- Issue #23647: Increase impalib's MAXLINE to accommodate modern mailbox sizes. +- Issue #23647: Increase imaplib's MAXLINE to accommodate modern mailbox sizes. - Issue #23539: If body is None, http.client.HTTPConnection.request now sets Content-Length to 0 for PUT, POST, and PATCH headers to avoid 411 errors from @@ -677,7 +677,7 @@ Library - Issue #23521: Corrected pure python implementation of timedelta division. * Eliminated OverflowError from timedelta * float for some floats; - * Corrected rounding in timedlta true division. + * Corrected rounding in timedelta true division. - Issue #21619: Popen objects no longer leave a zombie after exit in the with statement if the pipe was broken. Patch by Martin Panter. @@ -966,7 +966,7 @@ Core and Builtins returned NotImplemented. Original patch by Martin Panter. - Issue #23321: Fixed a crash in str.decode() when error handler returned - replacment string longer than mailformed input data. + replacement string longer than malformed input data. - Issue #23048: Fix jumping out of an infinite while loop in the pdb. @@ -1042,7 +1042,7 @@ Library - Issue #23250: In the http.cookies module, capitalize "HttpOnly" and "Secure" as they are written in the standard. -- Issue #23063: In the disutils' check command, fix parsing of reST with code or +- Issue #23063: In the distutils' check command, fix parsing of reST with code or code-block directives. - Issue #23209, #23225: selectors.BaseSelector.close() now clears its internal @@ -9956,7 +9956,7 @@ Library ensure that it will be found regardless of the shell PATH. This ensures that multiprocessing.cpu_count works on default installs of MacOSX. -- Issue #11501: disutils.archive_utils.make_zipfile no longer fails if zlib is +- Issue #11501: distutils.archive_utils.make_zipfile no longer fails if zlib is not installed. Instead, the zipfile.ZIP_STORED compression is used to create the ZipFile. Patch by Natalia B. Bidart. diff --git a/Misc/NEWS.d/3.5.0a1.rst b/Misc/NEWS.d/3.5.0a1.rst index 92ca7ca..8cab0e9 100644 --- a/Misc/NEWS.d/3.5.0a1.rst +++ b/Misc/NEWS.d/3.5.0a1.rst @@ -75,8 +75,8 @@ NotImplemented. Original patch by Martin Panter. .. nonce: HQelge .. section: Core and Builtins -Fixed a crash in str.decode() when error handler returned replacment string -longer than mailformed input data. +Fixed a crash in str.decode() when error handler returned replacement string +longer than malformed input data. .. @@ -998,7 +998,7 @@ written in the standard. .. nonce: 9-UJRs .. section: Library -In the disutils' check command, fix parsing of reST with code or code-block +In the distutils' check command, fix parsing of reST with code or code-block directives. .. @@ -2877,7 +2877,7 @@ closed socket. repr(socket.socket) already works fine. .. nonce: nkBNci .. section: Library -Reprs of most Python implemened classes now contain actual class name +Reprs of most Python implemented classes now contain actual class name instead of hardcoded one. .. @@ -3036,7 +3036,7 @@ by Phil Elson. os.read() now uses a :c:func:`Py_ssize_t` type instead of :c:type:`int` for the size to support reading more than 2 GB at once. On Windows, the size is -truncted to INT_MAX. As any call to os.read(), the OS may read less bytes +truncated to INT_MAX. As any call to os.read(), the OS may read less bytes than the number of requested bytes. .. diff --git a/Misc/NEWS.d/3.5.0a2.rst b/Misc/NEWS.d/3.5.0a2.rst index d66e4cb..b3db311 100644 --- a/Misc/NEWS.d/3.5.0a2.rst +++ b/Misc/NEWS.d/3.5.0a2.rst @@ -114,7 +114,7 @@ Lawrence. Corrected pure python implementation of timedelta division. Eliminated OverflowError from ``timedelta * float`` for some floats; -Corrected rounding in timedlta true division. +Corrected rounding in timedelta true division. .. diff --git a/Misc/NEWS.d/3.5.0a3.rst b/Misc/NEWS.d/3.5.0a3.rst index 9e2d3e8..1ef375b 100644 --- a/Misc/NEWS.d/3.5.0a3.rst +++ b/Misc/NEWS.d/3.5.0a3.rst @@ -239,7 +239,7 @@ Added support for writing ZIP files to unseekable streams. .. nonce: pX2qrx .. section: Library -Increase impalib's MAXLINE to accommodate modern mailbox sizes. +Increase imaplib's MAXLINE to accommodate modern mailbox sizes. .. diff --git a/Misc/NEWS.d/3.5.0a4.rst b/Misc/NEWS.d/3.5.0a4.rst index 0707cf6..21fd8c8 100644 --- a/Misc/NEWS.d/3.5.0a4.rst +++ b/Misc/NEWS.d/3.5.0a4.rst @@ -482,7 +482,7 @@ sqlite3.Row now supports slice indexing. .. nonce: 89RHm- .. section: Library -Fixed 2to3 and 3to2 compatible pickle mappings. Fixed ambigious reverse +Fixed 2to3 and 3to2 compatible pickle mappings. Fixed ambiguous reverse mappings. Added many new mappings. Import mapping is no longer applied to modules already mapped with full name mapping. diff --git a/Misc/NEWS.d/3.5.1rc1.rst b/Misc/NEWS.d/3.5.1rc1.rst index 93d0dbc..b72940f 100644 --- a/Misc/NEWS.d/3.5.1rc1.rst +++ b/Misc/NEWS.d/3.5.1rc1.rst @@ -191,7 +191,7 @@ comprehensions correspond to the opening brace. Hide the private _Py_atomic_xxx symbols from the public Python.h header to fix a compilation error with OpenMP. PyThreadState_GET() becomes an alias to -PyThreadState_Get() to avoid ABI incompatibilies. +PyThreadState_Get() to avoid ABI incompatibilities. .. diff --git a/Misc/NEWS.d/3.5.2rc1.rst b/Misc/NEWS.d/3.5.2rc1.rst index 97385b5..2c9d81d 100644 --- a/Misc/NEWS.d/3.5.2rc1.rst +++ b/Misc/NEWS.d/3.5.2rc1.rst @@ -1366,7 +1366,7 @@ fileinput now uses sys.stdin as-is if it does not have a buffer attribute .. nonce: AtHkWA .. section: Library -Copying the lru_cache() wrapper object now always works, independedly from +Copying the lru_cache() wrapper object now always works, independently from the type of the wrapped object (by returning the original object unchanged). .. diff --git a/Misc/NEWS.d/3.5.3rc1.rst b/Misc/NEWS.d/3.5.3rc1.rst index 4fd1ed0..728612d 100644 --- a/Misc/NEWS.d/3.5.3rc1.rst +++ b/Misc/NEWS.d/3.5.3rc1.rst @@ -1036,7 +1036,7 @@ attack (CVE-2016-2183). .. nonce: WI70Tc .. section: Library -Add ChaCha20 Poly1305 to ssl module's default ciper list. (Required OpenSSL +Add ChaCha20 Poly1305 to ssl module's default cipher list. (Required OpenSSL 1.1.0 or LibreSSL). .. diff --git a/Misc/NEWS.d/3.6.0a1.rst b/Misc/NEWS.d/3.6.0a1.rst index 62bfd4e..254d361 100644 --- a/Misc/NEWS.d/3.6.0a1.rst +++ b/Misc/NEWS.d/3.6.0a1.rst @@ -2684,7 +2684,7 @@ pickletools.dis() now outputs implicit memo index for the MEMOIZE opcode. .. nonce: ebqGy- .. section: Library -Add an optional newline paramer to binascii.b2a_base64(). base64.b64encode() +Add an optional newline parameter to binascii.b2a_base64(). base64.b64encode() uses it to avoid a memory copy. .. @@ -3938,4 +3938,4 @@ programming bugs. ValueError is now raised instead of TypeError on buffer overflow in parsing "es#" and "et#" format units. SystemError is now raised instead of -TypeError on programmical error in parsing format string. +TypeError on programmatical error in parsing format string. diff --git a/Misc/NEWS.d/3.6.0a2.rst b/Misc/NEWS.d/3.6.0a2.rst index 46387a5..9e7326b 100644 --- a/Misc/NEWS.d/3.6.0a2.rst +++ b/Misc/NEWS.d/3.6.0a2.rst @@ -126,7 +126,7 @@ work at runtime anyway. .. nonce: ffzxpX .. section: Library -Generated names for Tkinter widgets are now more meanful and recognizirable. +Generated names for Tkinter widgets are now more meaningful and recognizable. .. @@ -516,7 +516,7 @@ are added to cover changes. IDLE requires tk 8.5 and availability ttk widgets. Delete now unneeded tk version tests and code for older versions. Add test for IDLE syntax -colorizoer. +colorizer. .. @@ -534,7 +534,7 @@ idlelib.macosx.isXyzTk functions initialize as needed. .. nonce: t7ckly .. section: IDLE -move Aqua unbinding code, which enable context menus, to maxosx. +move Aqua unbinding code, which enable context menus, to macosx. .. diff --git a/Misc/NEWS.d/3.6.0a3.rst b/Misc/NEWS.d/3.6.0a3.rst index 251e6aa..2ca2580 100644 --- a/Misc/NEWS.d/3.6.0a3.rst +++ b/Misc/NEWS.d/3.6.0a3.rst @@ -476,7 +476,7 @@ Update Windows builds to use OpenSSL 1.0.2h. Rename the platform directory from plat-$(MACHDEP) to plat-$(PLATFORM_TRIPLET). Rename the config directory (LIBPL) from config-$(LDVERSION) to config-$(LDVERSION)-$(PLATFORM_TRIPLET). Install the -platform specifc _sysconfigdata module into the platform directory and +platform specific _sysconfigdata module into the platform directory and rename it to include the ABIFLAGS. .. diff --git a/Misc/NEWS.d/3.6.0a4.rst b/Misc/NEWS.d/3.6.0a4.rst index 07e20e4..0be9c82 100644 --- a/Misc/NEWS.d/3.6.0a4.rst +++ b/Misc/NEWS.d/3.6.0a4.rst @@ -487,7 +487,7 @@ without -jn. Fix warning from test_config. .. section: IDLE Put query response validation error messages in the query box itself instead -of in a separate massagebox. Redo tests to match. Add Mac OSX refinements. +of in a separate messagebox. Redo tests to match. Add Mac OSX refinements. Original patch by Mark Roseman. .. diff --git a/Misc/NEWS.d/3.6.0b1.rst b/Misc/NEWS.d/3.6.0b1.rst index 476059f..f151557 100644 --- a/Misc/NEWS.d/3.6.0b1.rst +++ b/Misc/NEWS.d/3.6.0b1.rst @@ -958,7 +958,7 @@ attack (CVE-2016-2183). .. nonce: WI70Tc .. section: Library -Add ChaCha20 Poly1305 to ssl module's default ciper list. (Required OpenSSL +Add ChaCha20 Poly1305 to ssl module's default cipher list. (Required OpenSSL 1.1.0 or LibreSSL). .. diff --git a/Misc/NEWS.d/3.6.2rc2.rst b/Misc/NEWS.d/3.6.2rc2.rst index 45be03e..8c6545f 100644 --- a/Misc/NEWS.d/3.6.2rc2.rst +++ b/Misc/NEWS.d/3.6.2rc2.rst @@ -36,4 +36,4 @@ Python already gets entropy from the OS to set the expat secret using Fix urllib.parse.splithost() to correctly parse fragments. For example, ``splithost('//127.0.0.1#@evil.com/')`` now correctly returns the ``127.0.0.1`` host, instead of treating ``@evil.com`` as the host in an -authentification (``login@host``). +authentication (``login@host``). diff --git a/Misc/NEWS.d/3.6.3rc1.rst b/Misc/NEWS.d/3.6.3rc1.rst index 2fc3c08..ca812c6 100644 --- a/Misc/NEWS.d/3.6.3rc1.rst +++ b/Misc/NEWS.d/3.6.3rc1.rst @@ -517,7 +517,7 @@ LF. Patch by Dong-hee Na. .. section: Library multiprocessing.Queue.get() with a timeout now polls its reader in -non-blocking mode if it succeeded to aquire the lock but the acquire took +non-blocking mode if it succeeded to acquire the lock but the acquire took longer than the timeout. .. @@ -818,7 +818,7 @@ IDLE - make tests pass with zzdummy extension disabled by default. Document how IDLE runs tkinter programs. IDLE calls tcl/tk update in the background in order to make live -interaction and experimentatin with tkinter applications much easier. +interaction and experimentation with tkinter applications much easier. .. @@ -837,7 +837,7 @@ not the same as deleting and inserting because int('') will fail. .. nonce: 50Jp_Q .. section: IDLE -Rearrange IDLE condigdialog GenPage into Window, Editor, and Help sections. +Rearrange IDLE configdialog GenPage into Window, Editor, and Help sections. .. diff --git a/Misc/NEWS.d/3.6.4rc1.rst b/Misc/NEWS.d/3.6.4rc1.rst index c91cc62..ff7110f 100644 --- a/Misc/NEWS.d/3.6.4rc1.rst +++ b/Misc/NEWS.d/3.6.4rc1.rst @@ -758,7 +758,7 @@ interruptions. If it crashes, restart it when necessary. .. nonce: 91mhWm .. section: Documentation -Added asyncio.BaseEventLoop.connect_accepted_socket versionaddded marker. +Added asyncio.BaseEventLoop.connect_accepted_socket versionadded marker. .. @@ -974,7 +974,7 @@ Cheryl Sabella. .. nonce: VuSA_e .. section: IDLE -IDLE -- Restrict shell prompt manipulaton to the shell. Editor and output +IDLE -- Restrict shell prompt manipulation to the shell. Editor and output windows only see an empty last prompt line. This simplifies the code and fixes a minor bug when newline is inserted. Sys.ps1, if present, is read on Shell start-up, but is not set or changed. diff --git a/Misc/NEWS.d/3.6.6rc1.rst b/Misc/NEWS.d/3.6.6rc1.rst index 85428d8..f603876 100644 --- a/Misc/NEWS.d/3.6.6rc1.rst +++ b/Misc/NEWS.d/3.6.6rc1.rst @@ -861,7 +861,7 @@ Fix pystackv and pystack gdbinit macros. .. nonce: dL5x7C .. section: Tools/Demos -Add an ``-n`` flag for ``Tools/scripts/pathfix.py`` to disbale automatic +Add an ``-n`` flag for ``Tools/scripts/pathfix.py`` to disable automatic backup creation (files with ``~`` suffix). .. diff --git a/Modules/_ctypes/libffi_msvc/win32.c b/Modules/_ctypes/libffi_msvc/win32.c index d1149a8..f44a5fe 100644 --- a/Modules/_ctypes/libffi_msvc/win32.c +++ b/Modules/_ctypes/libffi_msvc/win32.c @@ -90,7 +90,7 @@ noclean: // If the return value pointer is NULL, assume no return value. /* - Intel asm is weird. We have to explicitely specify 'DWORD PTR' in the nexr instruction, + Intel asm is weird. We have to explicitly specify 'DWORD PTR' in the next instruction, otherwise only one BYTE will be compared (instead of a DWORD)! */ cmp DWORD PTR [ebp + 24], 0 -- cgit v0.12