summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoger Serwy <roger.serwy@gmail.com>2013-04-17 05:27:31 (GMT)
committerRoger Serwy <roger.serwy@gmail.com>2013-04-17 05:27:31 (GMT)
commit22b9e651c2914dcf511665dd80cc9ce10ca53a1d (patch)
tree666c59be3c843865642f9cb22cbd43e76c474236
parent5aa7685a1cdd396489ae7e91cb86fc61fb506b01 (diff)
parent643ea53c140e2d2b3e21197fd87c1778131297d0 (diff)
downloadcpython-22b9e651c2914dcf511665dd80cc9ce10ca53a1d.zip
cpython-22b9e651c2914dcf511665dd80cc9ce10ca53a1d.tar.gz
cpython-22b9e651c2914dcf511665dd80cc9ce10ca53a1d.tar.bz2
#14735: merge with 3.3.
-rw-r--r--Lib/idlelib/help.txt3
-rw-r--r--Misc/NEWS6
2 files changed, 7 insertions, 2 deletions
diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt
index 4429c4b..b70c79f 100644
--- 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:
diff --git a/Misc/NEWS b/Misc/NEWS
index 9a5d38d..63f8d4b 100644
--- 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?
===============================================