merge from 3.2. News update.

diff --cc Misc/NEWS
index f051d20319f3b33ba2cb192c2f7c3a28e5813404,7e6ce40574da87527048ec395a72cec6b39475bf..cff314042935d3ae0424299d64ef1fe3744bd496
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -419,14 -97,10 +419,16 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #12798: Updated the mimetypes documentation.
+ 
 +- Issue #13626: Add support for SSL Diffie-Hellman key exchange, through the
 +  SSLContext.load_dh_params() method and the ssl.OP_SINGLE_DH_USE option.
 +
  - Issue #11006: Don't issue low level warning in subprocess when pipe2() fails.
  
 +- Issue #13620: Support for Chrome browser in webbrowser.py Patch contributed
 +  by Arnaud Calmettes.
 +
  - Issue #11829: Fix code execution holes in inspect.getattr_static for
    metaclasses with metaclasses. Patch by Andreas Stührk.