#14735: merge with 3.3.

diff --cc Lib/idlelib/help.txt
index 4429c4b1cbdc78b5c7db41fa85f7e1f591eb45a9,919ac72acc5ef8a31f44b9ccb092d61664c230cb..b70c79fea5c293ea7bc17f929840bcb7f0c83aac
--- 1/Lib/idlelib/help.txt
--- 2/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 9a5d38de2d1e54c35ba4440f2eadfc1785e26218,0b118d50937c55e415edb9a3a6cab5a01ab317fb..63f8d4b6627a893c74b8462a552f1c7db1819f9a
--- 1/Misc/NEWS
--- 2/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?
  ===============================================