From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Mon, 21 Sep 2015 23:33:46 +0000 (-0400)
Subject: Merge with 3.5
X-Git-Tag: v3.6.0a1~1481^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bbde7ad3886237eb32275a6afc6bdf486e4cfe51;p=thirdparty%2FPython%2Fcpython.git

Merge with 3.5
---

bbde7ad3886237eb32275a6afc6bdf486e4cfe51
diff --cc Lib/idlelib/NEWS.txt
index 22a5184e3a89,18761e9c946a..ea5300e45d9c
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@@ -1,7 -1,10 +1,10 @@@
 -What's New in IDLE 3.5.1?
 -=========================
 -*Release date: 2015-09-13*
 +What's New in IDLE 3.6.0a1?
 +===========================
 +*Release date: 2017?*
  
+ - Issue #24861: Most of idlelib is private and subject to change.
+   Use idleib.idle.* to start Idle. See idlelib.__init__.__doc__.   
+ 
  - Issue #25199: Idle: add synchronization comments for future maintainers.
  
  - Issue #16893: Replace help.txt with idle.html for Idle doc display.