From 6f9404d7060b94a6f27f3aad56e0ffecdf711aec Mon Sep 17 00:00:00 2001 From: Brian Skinn Date: Mon, 13 May 2019 10:14:30 -0400 Subject: [PATCH] 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 #6323, per the comment thread discussion. --- doc/man/sphinx-build.rst | 3 ++- sphinx/templates/quickstart/make.bat.new_t | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/man/sphinx-build.rst b/doc/man/sphinx-build.rst index 5ec53cf7f14..1ef0e07dc3b 100644 --- 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 index 50a12e7af68..1bb2f34896f 100644 --- 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