diff --git a/Doc/library/email.generator.rst b/Doc/library/email.generator.rst index ab0fbc29d1ec85..5c058943eb9afa 100644 --- a/Doc/library/email.generator.rst +++ b/Doc/library/email.generator.rst @@ -89,7 +89,7 @@ over channels that are not "8 bit clean". needed using an ASCII-compatible :mailheader:`Content-Transfer-Encoding`. That is, transform parts with non-ASCII :mailheader:`Cotnent-Transfer-Encoding` - (:mailheader:`Content-Transfer-Encoding: 8bit`) to an ASCII compatibile + (:mailheader:`Content-Transfer-Encoding: 8bit`) to an ASCII compatible :mailheader:`Content-Transfer-Encoding`, and encode RFC-invalid non-ASCII bytes in headers using the MIME ``unknown-8bit`` character set, thus rendering them RFC-compliant. diff --git a/Doc/library/email.message.rst b/Doc/library/email.message.rst index 32852e706986b4..d36e769f763cd8 100644 --- a/Doc/library/email.message.rst +++ b/Doc/library/email.message.rst @@ -364,7 +364,7 @@ message objects. *header* specifies an alternative header to :mailheader:`Content-Type`. If the value contains non-ASCII characters, the charset and language may - be explicity specified using the optional *charset* and *language* + be explicitly specified using the optional *charset* and *language* parameters. Optional *language* specifies the :rfc:`2231` language, defaulting to the empty string. Both *charset* and *language* should be strings. The default is to use the ``utf8`` *charset* and ``None`` for diff --git a/Misc/NEWS b/Misc/NEWS index eb870b7d48b76b..24e6aedf00aa1a 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -338,7 +338,7 @@ Library re.sub() replacement templates regular expressions now are errors. - Issue #28835: Fix a regression introduced in warnings.catch_warnings(): - call warnings.showwarning() if it was overriden inside the context manager. + call warnings.showwarning() if it was overridden inside the context manager. - Issue #27172: To assist with upgrades from 2.7, the previously documented deprecation of ``inspect.getfullargspec()`` has been reversed. This decision @@ -998,7 +998,7 @@ Library again. But they still are deprecated and will be disabled in 3.7. - Issue #28835: Fix a regression introduced in warnings.catch_warnings(): - call warnings.showwarning() if it was overriden inside the context manager. + call warnings.showwarning() if it was overridden inside the context manager. - Issue #27172: To assist with upgrades from 2.7, the previously documented deprecation of ``inspect.getfullargspec()`` has been reversed. This decision diff --git a/Modules/zlib/deflate.c b/Modules/zlib/deflate.c index 1ec761448de926..0e882f48e67d7f 100644 --- a/Modules/zlib/deflate.c +++ b/Modules/zlib/deflate.c @@ -1638,7 +1638,7 @@ local void fill_window(s) * * deflate_stored() is written to minimize the number of times an input byte is * copied. It is most efficient with large input and output buffers, which - * maximizes the opportunites to have a single copy from next_in to next_out. + * maximizes the opportunities to have a single copy from next_in to next_out. */ local block_state deflate_stored(s, flush) deflate_state *s; diff --git a/aclocal.m4 b/aclocal.m4 index 9a9cc557281571..db79e6e63e9b92 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -100,7 +100,7 @@ dnl Check to see whether a particular set of modules exists. Similar to dnl PKG_CHECK_MODULES(), but does not set variables or print errors. dnl dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -dnl only at the first occurence in configure.ac, so if the first place +dnl only at the first occurrence in configure.ac, so if the first place dnl it's called might be skipped (such as if it is within an "if", you dnl have to call PKG_CHECK_EXISTS manually AC_DEFUN([PKG_CHECK_EXISTS],