#14735: merge with 3.3.

22b9e651 · Roger Serwy · 5aa7685a · 643ea53c · 22b9e651 · 22b9e651
Kaydet (Commit) 22b9e651 authored Nis 17, 2013 tarafından Roger Serwy
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

help.txt Lib/idlelib/help.txt +1 -2

NEWS Misc/NEWS +6 -0

No files found.
--- 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?
 ===============================================