summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-12-18 01:26:53 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-12-18 01:26:53 (GMT)
commit59b0eb524f6b476db0805ba0a83661122a3fa2fe (patch)
treef157444fcdb57c66a3fa6ef3fffcac2d269cc40f
parentfff07e34fab1d70b09458fcb351da84fd866c0f9 (diff)
downloadcpython-59b0eb524f6b476db0805ba0a83661122a3fa2fe.zip
cpython-59b0eb524f6b476db0805ba0a83661122a3fa2fe.tar.gz
cpython-59b0eb524f6b476db0805ba0a83661122a3fa2fe.tar.bz2
Issue #28987: Typos, grammar, spelling in documentation
-rw-r--r--Doc/whatsnew/3.6.rst2
-rw-r--r--Misc/NEWS8
2 files changed, 5 insertions, 5 deletions
diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst
index 922ee64..a3c3d89 100644
--- a/Doc/whatsnew/3.6.rst
+++ b/Doc/whatsnew/3.6.rst
@@ -360,7 +360,7 @@ ensure that the new ``__classcell__`` namespace entry is propagated to
PEP 487: Descriptor Protocol Enhancements
-----------------------------------------
-:pep:`487` extends the descriptor protocol has to include the new optional
+:pep:`487` extends the descriptor protocol to include the new optional
:meth:`~object.__set_name__` method. Whenever a new class is defined, the new
method will be called on all descriptors included in the definition, providing
them with a reference to the class being defined and the name given to the
diff --git a/Misc/NEWS b/Misc/NEWS
index 4a39f06..b948db8 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -17,10 +17,10 @@ Core and Builtins
to/from UTF-8, instead of the locale encoding to avoid inconsistencies with
os.fsencode() and os.fsdecode() which are already using UTF-8.
-- Issue #28991: functools.lru_cache() was susceptible to an obscure $
+- Issue #28991: functools.lru_cache() was susceptible to an obscure reentrancy
bug triggerable by a monkey-patched len() function.
-- Issue #28739: f-string expressions no longer accepted as docstrings and
+- Issue #28739: f-string expressions are no longer accepted as docstrings and
by ast.literal_eval() even if they do not include expressions.
- Issue #28512: Fixed setting the offset attribute of SyntaxError by
@@ -49,7 +49,7 @@ Library
Windows
-------
-- Issue #25778: winreg does not truncase string correctly (Patch by Eryk Sun)
+- Issue #25778: winreg does not truncate string correctly (Patch by Eryk Sun)
- Issue #28896: Deprecate WindowsRegistryFinder and disable it by default.
@@ -84,7 +84,7 @@ Core and Builtins
must not convert combined table into split table. Patch written by INADA
Naoki.
-- Issue #28990: Fix asynchio SSL hanging if connection is closed before
+- Issue #28990: Fix asyncio SSL hanging if connection is closed before
handshake is completed. (Patch by HoHo-Ho)
Tools/Demos