Merge with 3.2

diff --cc Misc/NEWS
index e4eba6e038fc8bd65ecd6b33011d226f35bb410b,b5dc98b23883f11ac8af9577b67ae63577c0c611..fdd410b77d5e289900cf174fe32c879923606897
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -459,13 -257,11 +459,18 @@@ Test
  - Issue #10826: Prevent sporadic failure in test_subprocess on Solaris due
    to open door files.
  
 +- Issue #10990: Prevent tests from clobbering a set trace function.
 +
 +C-API
 +-----
 +
 +- PY_PATCHLEVEL_REVISION has been removed, since it's meaningless with Mercurial.
 +
+ Documentation
+ -------------
+ 
+ - Issue #11818: Fix tempfile examples for Python 3.
+ 
  
  What's New in Python 3.2?
  =========================