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

Fri Dec 18 15:47:48 EST 2015

https://hg.python.org/cpython/rev/128fa5eea9b1
changeset: 99629:128fa5eea9b1
parent: 99625:e7ed7db521e9
parent: 99628:e4f3e3ccd06f
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Fri Dec 18 15:47:28 2015 -0500
summary:
 Merge with 3.5
files:
 Lib/idlelib/README.txt | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Lib/idlelib/README.txt b/Lib/idlelib/README.txt
--- a/Lib/idlelib/README.txt
+++ b/Lib/idlelib/README.txt
@@ -1,6 +1,6 @@
 README.txt: an index to idlelib files and the IDLE menu.
 
-IDLE is Python’s Integrated Development and Learning
+IDLE is Python's Integrated Development and Learning
 Environment. The user documentation is part of the Library Reference and
 is available in IDLE by selecting Help => IDLE Help. This README documents
 idlelib for IDLE developers and curious users.
-- 
Repository URL: https://hg.python.org/cpython
