merge 2.7.9 release branch
diff --git a/Misc/NEWS b/Misc/NEWS
index eef00b1..cb13dfd 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -43,6 +43,12 @@
- Issue #22943: bsddb tests are locale independend now.
+IDLE
+----
+
+- Issue #16893: Update Idle doc chapter to match current Idle and add new
+ information.
+
What's New in Python 2.7.9?
===========================
@@ -63,11 +69,11 @@
- Issue #22960: Add a context argument to xmlrpclib.ServerProxy.
-IDLE
-----
+Build
+-----
-- Issue #16893: Update Idle doc chapter to match current Idle and add new
- information.
+- Issue #22935: Allow the ssl module to be compiled if openssl doesn't support
+ SSL 3.
What's New in Python 2.7.9 release candidate 1?