From: Roger Serwy <roger.serwy@gmail.com>
Date: Wed, 17 Apr 2013 05:27:31 +0000 (-0500)
Subject: #14735: merge with 3.3.
X-Git-Tag: v3.4.0a1~901
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=22b9e651c2914dcf511665dd80cc9ce10ca53a1d;p=thirdparty%2FPython%2Fcpython.git

#14735: merge with 3.3.
---

22b9e651c2914dcf511665dd80cc9ce10ca53a1d
diff --cc Lib/idlelib/help.txt
index 4429c4b1cbdc,919ac72acc5e..b70c79fea5c2
--- a/Lib/idlelib/help.txt
+++ b/Lib/idlelib/help.txt
@@@ -276,10 -232,8 +276,9 @@@ Completions
  
  Python Shell window:
  
 -	Control-c interrupts executing command.
 -	Control-d sends end-of-file; closes window if typed at >>> prompt.
 +        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 --cc Misc/NEWS
index 9a5d38de2d1e,0b118d50937c..63f8d4b6627a
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -131,14 -123,28 +131,20 @@@ Test
  - Issue #6696: add documentation for the Profile objects, and improve
    profile/cProfile docs.  Patch by Tom Pinckney.
  
 +C-API
 +-----
  
 -What's New in Python 3.3.1?
 -===========================
 +- Issue #17522: Add the PyGILState_Check() API.
  
 -*Release date: 07-Apr-2013*
 +- Issue #17327: Add PyDict_SetDefault.
  
 -Build
 ------
 -
 -- Issue #17550: Fix the --enable-profiling configure switch.
  
+ IDLE
 --------
++----
+ 
 -- Issue #17625: In IDLE, close the replace dialog after it is used.
++- Issue #14735: Update IDLE docs to omit "Control-z on Windows".
+ 
+ 
  What's New in Python 3.3.1 release candidate 1?
  ===============================================