summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-09-07 23:36:43 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-09-07 23:36:43 (GMT)
commit1aa642f6bd8e7f6315721201165efa873e77259b (patch)
treec42aa75c38096b648fef5355f6969a388896e0d7 /Misc
parent1c748f383033df1126f2f79f051eee440ba08449 (diff)
parent0f0eac431f6abcc5f6853b26e848b15f848e8844 (diff)
downloadcpython-1aa642f6bd8e7f6315721201165efa873e77259b.zip
cpython-1aa642f6bd8e7f6315721201165efa873e77259b.tar.gz
cpython-1aa642f6bd8e7f6315721201165efa873e77259b.tar.bz2
Issue #27993: Merge plural fixes from 3.5
Diffstat (limited to 'Misc')
-rw-r--r--Misc/HISTORY2
-rw-r--r--Misc/NEWS4
2 files changed, 3 insertions, 3 deletions
diff --git a/Misc/HISTORY b/Misc/HISTORY
index 5995d3a..73fb1d3 100644
--- a/Misc/HISTORY
+++ b/Misc/HISTORY
@@ -26057,7 +26057,7 @@ machinery is moved to the new file importdl.c.
module implementing deepcopy and normal (shallow) copy operations.
See the library reference manual.
-- Documentation strings for many objects types are accessible through
+- Documentation strings for many object types are accessible through
the __doc__ attribute. Modules, classes and functions support special
syntax to initialize the __doc__ attribute: if the first statement
consists of just a string literal, that string literal becomes the
diff --git a/Misc/NEWS b/Misc/NEWS
index 9e6975e..edfff7b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -6017,7 +6017,7 @@ Core and Builtins
- Issue #20588: Make Python-ast.c C89 compliant.
-- Issue #20437: Fixed 22 potential bugs when deleting objects references.
+- Issue #20437: Fixed 22 potential bugs when deleting object references.
- Issue #20500: Displaying an exception at interpreter shutdown no longer
risks triggering an assertion failure in PyObject_Str.
@@ -6922,7 +6922,7 @@ Core and Builtins
when the creation of the replacement exception won't lose any information.
- Issue #19466: Clear the frames of daemon threads earlier during the
- Python shutdown to call objects destructors. So "unclosed file" resource
+ Python shutdown to call object destructors. So "unclosed file" resource
warnings are now correctly emitted for daemon threads.
- Issue #19514: Deduplicate some _Py_IDENTIFIER declarations.