[3.6] bpo-35110: Fix unintentional spaces around hyphens and dashes. (GH-10231). (GH-10254)

(cherry picked from commit 3f819ca138db6945ee4271bf13e42db9f9b3b1e4)

6 files changed, 22 insertions, 14 deletions

diff --git a/Misc/NEWS.d/3.5.0a1.rst b/Misc/NEWS.d/3.5.0a1.rst
index 8cab0e9..5ac0fab 100644
--- a/Misc/NEWS.d/3.5.0a1.rst
+++ b/Misc/NEWS.d/3.5.0a1.rst
@@ -2707,7 +2707,11 @@ Added support for the "xztar" format in the shutil module.
 .. section: Library
 
 Don't force 3rd party C extensions to be built with
+<<<<<<< HEAD
 ``-Werror=declaration-after-statement``.
+=======
+-Werror=declaration-after-statement.
+>>>>>>> 3f819ca138... bpo-35110: Fix unintentional spaces around hyphens and dashes. (GH-10231)
 
 ..
 
@@ -5060,7 +5064,11 @@ Anticipated fixes to support OS X versions > 10.9.
 .. section: Build
 
 Prevent possible segfaults and other random failures of python
+<<<<<<< HEAD
 ``--generate-posix-vars`` in pybuilddir.txt build target.
+=======
+--generate-posix-vars in pybuilddir.txt build target.
+>>>>>>> 3f819ca138... bpo-35110: Fix unintentional spaces around hyphens and dashes. (GH-10231)
 
 ..
 
diff --git a/Misc/NEWS.d/3.5.1rc1.rst b/Misc/NEWS.d/3.5.1rc1.rst
index b72940f..fbb0ca2 100644
--- a/Misc/NEWS.d/3.5.1rc1.rst
+++ b/Misc/NEWS.d/3.5.1rc1.rst
@@ -1085,9 +1085,9 @@ them a 'sheet'.  Patch by Mark Roseman.
 
 Enhance the initial html viewer now used for Idle Help. Properly indent
 fixed-pitch text (patch by Mark Roseman). Give code snippet a very
-Sphinx-like light blueish-gray background. Re-use initial width and height set by
-users for shell and editor. When the Table of Contents (TOC) menu is used,
-put the section header at the top of the screen.
+Sphinx-like light blueish-gray background. Re-use initial width and height
+set by users for shell and editor. When the Table of Contents (TOC) menu is
+used, put the section header at the top of the screen.
 
 ..
 
diff --git a/Misc/NEWS.d/3.5.2rc1.rst b/Misc/NEWS.d/3.5.2rc1.rst
index 2c9d81d..3df9c6c 100644
--- a/Misc/NEWS.d/3.5.2rc1.rst
+++ b/Misc/NEWS.d/3.5.2rc1.rst
@@ -1953,9 +1953,9 @@ Fix linking extension modules for cross builds. Patch by Xavier de Gaye.
 .. section: Build
 
 Disable the rules for running _freeze_importlib and pgen when
-cross-compiling.  The output of these programs is normally saved with the source
-code anyway, and is still regenerated when doing a native build. Patch by
-Xavier de Gaye.
+cross-compiling.  The output of these programs is normally saved with the
+source code anyway, and is still regenerated when doing a native build.
+Patch by Xavier de Gaye.
 
 ..
 
diff --git a/Misc/NEWS.d/3.5.3rc1.rst b/Misc/NEWS.d/3.5.3rc1.rst
index 728612d..ed6b64b 100644
--- a/Misc/NEWS.d/3.5.3rc1.rst
+++ b/Misc/NEWS.d/3.5.3rc1.rst
@@ -1124,10 +1124,10 @@ after a commit.
 .. nonce: cYraeH
 .. section: Library
 
-A new version of typing.py from https://github.com/python/typing: -
-Collection (only for 3.6) (Issue #27598) - Add FrozenSet to __all__
-(upstream #261) - fix crash in _get_type_vars() (upstream #259) - Remove the
-dict constraint in ForwardRef._eval_type (upstream #252)
+A new version of typing.py from https://github.com/python/typing:
+Collection (only for 3.6) (Issue #27598). Add FrozenSet to __all__
+(upstream #261). Fix crash in _get_type_vars() (upstream #259). Remove the
+dict constraint in ForwardRef._eval_type (upstream #252).
 
 ..
 
diff --git a/Misc/NEWS.d/3.6.7rc1.rst b/Misc/NEWS.d/3.6.7rc1.rst
index 4941861..5115970 100644
--- a/Misc/NEWS.d/3.6.7rc1.rst
+++ b/Misc/NEWS.d/3.6.7rc1.rst
@@ -989,8 +989,8 @@ Fix unresponsiveness after closing certain windows and dialogs.
 .. nonce: Ow7alv
 .. section: IDLE
 
-Avoid small type when running htests. Since part of the purpose of human-
-viewed tests is to determine that widgets look right, it is important that
+Avoid small type when running htests. Since part of the purpose of
+human-viewed tests is to determine that widgets look right, it is important that
 they look the same for testing as when running IDLE.
 
 ..
diff --git a/Misc/NEWS.d/next/Library/2018-10-26-22-53-16.bpo-35079.Tm5jvF.rst b/Misc/NEWS.d/next/Library/2018-10-26-22-53-16.bpo-35079.Tm5jvF.rst
index 33f6dc4..991bae3 100644
--- a/Misc/NEWS.d/next/Library/2018-10-26-22-53-16.bpo-35079.Tm5jvF.rst
+++ b/Misc/NEWS.d/next/Library/2018-10-26-22-53-16.bpo-35079.Tm5jvF.rst
@@ -1,2 +1,2 @@
-Improve difflib.SequenceManager.get_matching_blocks doc by adding 'non-
-overlapping' and changing '!=' to '<'.
+Improve difflib.SequenceManager.get_matching_blocks doc by adding
+'non-overlapping' and changing '!=' to '<'.