From: delirious-lettuce Date: Mon, 22 May 2017 17:16:53 +0000 (-0600) Subject: [2.7] Fix typos in multiple `.rst` files (GH-1668) (#1707) X-Git-Tag: v2.7.14rc1~134 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=374e57d92870d16fe9d0bcdacd9bb417fd71b4fd;p=python [2.7] Fix typos in multiple `.rst` files (GH-1668) (#1707) --- diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst index d9e333311b..db302d8ee0 100644 --- a/Doc/c-api/exceptions.rst +++ b/Doc/c-api/exceptions.rst @@ -290,7 +290,7 @@ is a separate error indicator for each thread. :c:data:`PyExc_Warning` is a subclass of :c:data:`PyExc_Exception`; the default warning category is :c:data:`PyExc_RuntimeWarning`. The standard Python warning categories are available as global variables whose names are - enumerated at :ref:`standarwarningcategories`. + enumerated at :ref:`standardwarningcategories`. For information about warning control, see the documentation for the :mod:`warnings` module and the :option:`-W` option in the command line @@ -665,7 +665,7 @@ Notes: Only defined on VMS; protect code that uses this by testing that the preprocessor macro ``__VMS`` is defined. -.. _standarwarningcategories: +.. _standardwarningcategories: Standard Warning Categories =========================== @@ -678,7 +678,7 @@ the variables: .. index:: single: PyExc_Warning single: PyExc_BytesWarning - single: PyExc_DepricationWarning + single: PyExc_DeprecationWarning single: PyExc_FutureWarning single: PyExc_ImportWarning single: PyExc_PendingDeprecationWarning @@ -700,7 +700,7 @@ the variables: +------------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_ImportWarning` | :exc:`ImportWarning` | | +------------------------------------------+---------------------------------+----------+ -| :c:data:`PyExc_PendingDepricationWarning`| :exc:`PendingDeprecationWarning`| | +| :c:data:`PyExc_PendingDeprecationWarning`| :exc:`PendingDeprecationWarning`| | +------------------------------------------+---------------------------------+----------+ | :c:data:`PyExc_RuntimeWarning` | :exc:`RuntimeWarning` | | +------------------------------------------+---------------------------------+----------+ diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst index 0818fda682..b9b5120f05 100644 --- a/Doc/howto/logging-cookbook.rst +++ b/Doc/howto/logging-cookbook.rst @@ -814,7 +814,7 @@ Implementing structured logging ------------------------------- Although most logging messages are intended for reading by humans, and thus not -readily machine-parseable, there might be cirumstances where you want to output +readily machine-parseable, there might be circumstances where you want to output messages in a structured format which *is* capable of being parsed by a program (without needing complex regular expressions to parse the log message). This is straightforward to achieve using the logging package. There are a number of diff --git a/Doc/library/email.mime.rst b/Doc/library/email.mime.rst index dcf7b59c05..5cbb4dd39e 100644 --- a/Doc/library/email.mime.rst +++ b/Doc/library/email.mime.rst @@ -210,7 +210,7 @@ Here are the classes: Unless the ``_charset`` parameter is explicitly set to ``None``, the MIMEText object created will have both a :mailheader:`Content-Type` header - with a ``charset`` parameter, and a :mailheader:`Content-Transfer-Endcoding` + with a ``charset`` parameter, and a :mailheader:`Content-Transfer-Encoding` header. This means that a subsequent ``set_payload`` call will not result in an encoded payload, even if a charset is passed in the ``set_payload`` command. You can "reset" this behavior by deleting the diff --git a/Doc/library/sunau.rst b/Doc/library/sunau.rst index 5d57d4b957..5bf48033a7 100644 --- a/Doc/library/sunau.rst +++ b/Doc/library/sunau.rst @@ -117,7 +117,7 @@ AU_read objects, as returned by :func:`.open` above, have the following methods: .. method:: AU_read.getnchannels() - Returns number of audio channels (1 for mone, 2 for stereo). + Returns number of audio channels (1 for mono, 2 for stereo). .. method:: AU_read.getsampwidth() diff --git a/Misc/NEWS b/Misc/NEWS index 938a02955a..3c6f829f05 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1225,15 +1225,15 @@ Library - Issue #24091: Fixed various crashes in corner cases in cElementTree. -- Issue #15267: HTTPConnection.request() now is compatibile with old-style +- Issue #15267: HTTPConnection.request() now is compatible with old-style classes (such as TemporaryFile). Original patch by Atsuo Ishimoto. - Issue #20014: array.array() now accepts unicode typecodes. Based on patch by Vajrasky Kok. -- Issue #23637: Showing a warning no longer fails with UnicodeErrror. +- Issue #23637: Showing a warning no longer fails with UnicodeError. Formatting unicode warning in the file with the path containing non-ascii - characters no longer fails with UnicodeErrror. + characters no longer fails with UnicodeError. - Issue #24134: Reverted issue #24134 changes. @@ -1974,7 +1974,7 @@ Library sequence is used on some terminal (ex: TERM=xterm-256color") to enable support of 8 bit characters. -- Issue #22017: Correct reference counting errror in the initialization of the +- Issue #22017: Correct reference counting error in the initialization of the _warnings module. - Issue #21868: Prevent turtle crash when undo buffer set to a value less @@ -2907,7 +2907,7 @@ Library - Issue #11973: Fix a problem in kevent. The flags and fflags fields are now properly handled as unsigned. -- Issue #16809: Fixed some tkinter incompabilities with Tcl/Tk 8.6. +- Issue #16809: Fixed some tkinter incompatibilities with Tcl/Tk 8.6. - Issue #16809: Tkinter's splitlist() and split() methods now accept Tcl_Obj argument.