merge with 3.3

diff --cc Doc/howto/logging-cookbook.rst
Simple merge

diff --cc Doc/license.rst
index 3508d544700e11dc10cd5309fd26dfb3b32cbbcf,9e80f5dbaaef320403e6383e1b57826e53139b51..c3d5d75ef224f613f582d243a19978d7d71b59a8
--- 1/Doc/license.rst
--- 2/Doc/license.rst
+++ b/Doc/license.rst
@@@ -120,10 -120,10 +120,12 @@@ been GPL-compatible; the table below su
  +----------------+--------------+------------+------------+-----------------+
  | 3.2.3          | 3.2.2        | 2012       | PSF        | yes             |
  +----------------+--------------+------------+------------+-----------------+
+ | 3.2.4          | 3.2.3        | 2013       | PSF        | yes             |
+ +----------------+--------------+------------+------------+-----------------+
  | 3.3.0          | 3.2          | 2012       | PSF        | yes             |
  +----------------+--------------+------------+------------+-----------------+
 +| 3.4.0          | 3.3.0        | 2014       | PSF        | yes             |
 ++----------------+--------------+------------+------------+-----------------+
  
  .. note::
  

diff --cc LICENSE
index 9716405482298cc16070ea485bcffc93efcca59f,2d565c921c3611a02fc5219e15d677a439c6ab95..3e8460d6a689e475fb7c3df9a25c7cea311d11b8
--- 1/LICENSE
--- 2/LICENSE
+++ b/LICENSE
@@@ -74,8 -74,8 +74,9 @@@ the various releases
      3.2.1           3.2         2011        PSF         yes
      3.2.2           3.2.1       2011        PSF         yes
      3.2.3           3.2.2       2012        PSF         yes
+     3.2.4           3.2.3       2013        PSF         yes
      3.3.0           3.2         2012        PSF         yes
 +    3.4.0           3.3.0       2014        PSF         yes
  
  Footnotes:
  

diff --cc Lib/idlelib/NEWS.txt
index 245d72d50577632385b7d0aa14e8c62d5c5e7bc8,54507015a1ee00b0d1c3b2d8dde1c2b3be9a4a73..478c18337ee5217c1378dfeaaae58f4b00de744c
--- 1/Lib/idlelib/NEWS.txt
--- 2/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@@ -4,8 -4,12 +4,10 @@@ What's New in IDLE 3.4.0
  - Issue #17390: Display Python version on Idle title bar.
    Initial patch by Edmond Burnett.
  
 -
 -What's New in IDLE 3.3.1?
 -=========================
 +- Issue #5066: Update IDLE docs. Patch by Todd Rovito.
  
+ - Issue #17625: Close the replace dialog after it is used.
+ 
  - Issue #16226: Fix IDLE Path Browser crash.
    (Patch by Roger Serwy)
  

diff --cc README
Simple merge