[Python-checkins] cpython (merge 3.3 -> default): #14735: merge with 3.3.

[roger.serwy]

http://hg.python.org/cpython/rev/3fda81465102
changeset:   83421:3fda81465102
parent:      83418:61a17d9e58e2
parent:      83420:017891cc973f
user:        Roger Serwy <roger.serwy at gmail.com>
date:        Wed Apr 17 00:27:31 2013 -0500
summary:
  #14735: merge with 3.3.

files:
  Lib/idlelib/help.txt |  3 +--
  Misc/NEWS            |  6 ++++++
  2 files changed, 7 insertions(+), 2 deletions(-)


diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt
--- a/Lib/idlelib/help.txt
+++ b/Lib/idlelib/help.txt
@@ -277,8 +277,7 @@
 Python Shell window:
 
         Control-c interrupts executing command.
-        Control-d sends end-of-file; closes window if typed at >>> prompt
-                (this is Control-z on Windows).
+        Control-d sends end-of-file; closes window if typed at >>> prompt.
         Alt-/ expand word is also useful to reduce typing.
 
     Command history:
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -139,6 +139,12 @@
 - Issue #17327: Add PyDict_SetDefault.
 
 
+IDLE
+----
+
+- Issue #14735: Update IDLE docs to omit "Control-z on Windows".
+
+
 What's New in Python 3.3.1 release candidate 1?
 ===============================================
 

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