Merge branch 'enable-bat-build-from-different-dir-2215' into 1.5-release

CHANGES

@@ -11,6 +11,8 @@ Features added
 
 * #3095: Add :confval:`tls_verify` and :confval:`tls_cacerts` to support
   self-signed HTTPS servers in linkcheck and intersphinx
+* #2215: make.bat generated by sphinx-quickstart can be called from another dir.
+  Thanks to Timotheus Kampik.
 
 Bugs fixed
 ----------
@@ -19,6 +21,8 @@ Bugs fixed
   one ``\addto\captions...``
 * #3123: user ``'babel'`` key setting is not obeyed anymore
 * #3155: Fix JavaScript for `html_sourcelink_suffix` fails with IE and Opera
+* #3085: keep current directory after breaking build documentation. Thanks to
+  Timotheus Kampik.
 
 Release 1.5 beta1 (released Nov 6, 2016)
 ========================================

sphinx/templates/quickstart/make.bat.new_t

@@ -1,5 +1,7 @@
 @ECHO OFF
 
+pushd %~dp0
+
 REM Command file for Sphinx documentation
 
 if "%SPHINXBUILD%" == "" (
@@ -31,4 +33,5 @@ goto end
 %SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
 
 :end
+popd
 

sphinx/templates/quickstart/make.bat_t

@@ -2,6 +2,8 @@
 
 REM Command file for Sphinx documentation
 
+pushd %~dp0
+
 if "%SPHINXBUILD%" == "" (
 	set SPHINXBUILD=sphinx-build
 )
@@ -279,4 +281,5 @@ if "%1" == "dummy" (
 )
 
 :end
+popd