Closes #17386: Merge with 3.4

diff --cc Doc/README.txt
index c5737adcdd1b8dd79edef7db2db1f2cfd5cbc8f9,6df12ab1577a16a57243fd26619dc5a818525ddb..fed1f749c0a35252746359608843fa2399ee7408
--- 1/Doc/README.txt
--- 2/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 d39775df18dd7117de678e5c167d1cbe7f52e43a,93d3631bc664408461c2c44773c05cc29a1ab9a4..0e2447a1ca0a75ab7c2b45b588e174d1a4ea5458
--- 1/Misc/NEWS
--- 2/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.