[Python-checkins] cpython: Fixed merge error in Misc/NEWS for issue #23722.

[serhiy.storchaka]

https://hg.python.org/cpython/rev/fa4d8276d0fb
changeset:   105469:fa4d8276d0fb
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Tue Dec 06 00:24:19 2016 +0200
summary:
  Fixed merge error in Misc/NEWS for issue #23722.

files:
  Misc/NEWS |  13 +++++--------
  1 files changed, 5 insertions(+), 8 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -35,14 +35,6 @@
   non-encodable characters (non-ASCII for the ASCII codec, characters out
   of the U+0000-U+00FF range for Latin1).
 
-Documentation
--------------
-
-- Issue #23722: The data model reference and the porting section in the
-  3.6 What's New guide now cover the additional ``__classcell__`` handling
-  needed for custom metaclasses to fully support PEP 487 and zero-argument
-  ``super()``.
-
 - Issue #28731: Optimize _PyDict_NewPresized() to create correct size dict.
   Improve speed of dict literal with constant keys up to 30%.
 
@@ -499,6 +491,11 @@
 Documentation
 -------------
 
+- Issue #23722: The data model reference and the porting section in the
+  3.6 What's New guide now cover the additional ``__classcell__`` handling
+  needed for custom metaclasses to fully support PEP 487 and zero-argument
+  ``super()``.
+
 - Issue #28513: Documented command-line interface of zipfile.
 
 Build

-- 
Repository URL: https://hg.python.org/cpython