#14735: merge with 3.3.

2013-04-17 00:27:31 -05:00 · 2013-04-17 00:27:31 -05:00 · 22b9e651c2
parent 5aa7685a1c 643ea53c14
commit 22b9e651c2
2 changed files with 7 additions and 2 deletions
--- a/Lib/idlelib/help.txt
+++ b/Lib/idlelib/help.txt
@ -277,8 +277,7 @@ Completions:
 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:
--- a/Misc/NEWS
+++ b/Misc/NEWS
@ -139,6 +139,12 @@ C-API
 - 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?
 ===============================================