[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5

[terry.reedy]

https://hg.python.org/cpython/rev/8e8170841302
changeset:   100376:8e8170841302
parent:      100374:ced0ccd68ac9
parent:      100375:ca81e799960c
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Tue Mar 01 01:19:02 2016 -0500
summary:
  Merge with 3.5

files:
  Lib/idlelib/help.py |  6 +++---
  1 files changed, 3 insertions(+), 3 deletions(-)


diff --git a/Lib/idlelib/help.py b/Lib/idlelib/help.py
--- a/Lib/idlelib/help.py
+++ b/Lib/idlelib/help.py
@@ -229,7 +229,7 @@
 
 def copy_strip():
     """Copy idle.html to idlelib/help.html, stripping trailing whitespace.
-    
+
     Files with trailing whitespace cannot be pushed to the hg cpython
     repository.  For 3.x (on Windows), help.html is generated, after
     editing idle.rst in the earliest maintenance version, with
@@ -239,13 +239,13 @@
     check  both the diff and displayed text.  Push the diff along with
     the idle.rst change and merge both into default (or an intermediate
     maintenance version).
-    
+
     When the 'earlist' version gets its final maintenance release,
     do an update as described above, without editing idle.rst, to
     rebase help.html on the next version of idle.rst.  Do not worry
     about version changes as version is not displayed.  Examine other
     changes and the result of Help -> IDLE Help.
-    
+
     If maintenance and default versions of idle.rst diverge, and
     merging does not go smoothly, then consider generating
     separate help.html files from separate idle.htmls.

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