[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5.

[serhiy.storchaka]

https://hg.python.org/cpython/rev/6ff4c9517b7c
changeset:   96447:6ff4c9517b7c
parent:      96441:89521ac669f0
parent:      96446:5969972458c7
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Mon Jun 01 09:44:25 2015 +0300
summary:
  Merge with 3.5.

files:
  .hgtags      |   1 +
  Doc/Makefile |   4 ++--
  Misc/NEWS    |  14 +++++++++++++-
  3 files changed, 16 insertions(+), 3 deletions(-)


diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -149,3 +149,4 @@
 82656e28b5e5c4ae48d8dd8b5f0d7968908a82b6 v3.5.0a3
 413e0e0004f4f954331cb8122aa55fe208984955 v3.5.0a4
 071fefbb5e3db770c6c19fba9994699f121b1cea v3.5.0b1
+7a088af5615bf04024e9912068f4bd8f43ed3917 v3.5.0b2
diff --git a/Doc/Makefile b/Doc/Makefile
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -96,8 +96,8 @@
 
 pydoc-topics: BUILDER = pydoc-topics
 pydoc-topics: build
-	@echo "Building finished; now copy build/pydoc-topics/topics.py" \
-	      "to ../Lib/pydoc_data/topics.py"
+	@echo "Building finished; now run this:" \
+	      "cp build/pydoc-topics/topics.py ../Lib/pydoc_data/topics.py"
 
 htmlview: html
 	 $(PYTHON) -c "import webbrowser; webbrowser.open('build/html/index.html')"
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -14,10 +14,22 @@
 -------
 
 
+What's New in Python 3.5.0 beta 3?
+==================================
+
+Release date: 2015-07-05
+
+Core and Builtins
+-----------------
+
+Library
+-------
+
+
 What's New in Python 3.5.0 beta 2?
 ==================================
 
-Release date: 2015-07-05
+Release date: 2015-05-31
 
 Core and Builtins
 -----------------

-- 
Repository URL: https://hg.python.org/cpython