Add %O% option to make.bat template; update docs

The make.bat.new_t template now passes %O% as well as %SPHINXOPTS% to `sphinx-build`, in parity with Makefile.new_t. The sphinx-build documentation page was updated to explicitly note $(O) and %O% as shortcut variables. Closes sphinx-doc#6323, per the comment thread discussion.
bskinn · May 13, 2019 · 6f9404d · 6f9404d
1 parent 774c598
commit 6f9404d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/doc/man/sphinx-build.rst b/doc/man/sphinx-build.rst
@@ -302,7 +302,8 @@ variables to customize behavior:
 
 .. describe:: SPHINXOPTS
 
-   Additional options for :program:`sphinx-build`.
+   Additional options for :program:`sphinx-build`. These options can
+   also be set via the shortcut variable **O** (capital 'o').
 
 .. _when-deprecation-warnings-are-displayed:
 

diff --git a/sphinx/templates/quickstart/make.bat.new_t b/sphinx/templates/quickstart/make.bat.new_t
@@ -25,11 +25,11 @@ if errorlevel 9009 (
 	exit /b 1
 )
 
-%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
 goto end
 
 :help
-%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS%
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
 
 :end
 popd