From: Zachary Ware <zachary.ware@gmail.com>
Date: Tue, 29 Apr 2014 14:47:39 +0000 (-0500)
Subject: Closes #17386: Merge with 3.4
X-Git-Tag: v3.5.0a1~1765
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e83ce4b90f02690928248451cc1de166a6e052ad;p=thirdparty%2FPython%2Fcpython.git

Closes #17386: Merge with 3.4
---

e83ce4b90f02690928248451cc1de166a6e052ad
diff --cc Doc/README.txt
index c5737adcdd1b,6df12ab1577a..fed1f749c0a3
--- a/Doc/README.txt
+++ b/Doc/README.txt
@@@ -3,9 -3,9 +3,9 @@@ Python Documentation READM
  
  This directory contains the reStructuredText (reST) sources to the Python
  documentation.  You don't need to build them yourself, prebuilt versions are
 -available at <https://docs.python.org/3.4/download.html>.
 +available at <https://docs.python.org/dev/download.html>.
  
- Documentation on the authoring Python documentation, including information about
+ Documentation on authoring Python documentation, including information about
  both style and markup, is available in the "Documenting Python" chapter of the
  developers guide <http://docs.python.org/devguide/documenting.html>.
  
diff --cc Misc/NEWS
index d39775df18dd,93d3631bc664..0e2447a1ca0a
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -340,9 -237,9 +340,12 @@@ C AP
  Documentation
  -------------
  
+ - Issue #17386: Expanded functionality of the ``Doc/make.bat`` script to make
+   it much more comparable to ``Doc/Makefile``.
+ 
 +- Issue #21312: Update the thread_foobar.h template file to include newer
 +  threading APIs.  Patch by Jack McCracken.
 +
  - Issue #21043: Remove the recommendation for specific CA organizations and to
    mention the ability to load the OS certificates.