[2.7] bpo-29521: Fix two minor documentation build warnings (GH-41) (GH-670)
(cherry picked from commit 3d707be950b387552585451071928e7b39cdfa53)
diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst
index 25c73b8..f8e23cf 100644
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
@@ -295,7 +295,7 @@
size" to 4, and select the "Insert spaces" radio button.
If you suspect mixed tabs and spaces are causing problems in leading whitespace,
-run Python with the :option:`-t` switch or run ``Tools/Scripts/tabnanny.py`` to
+run Python with the :option:`-t` switch or run the :mod:`tabnanny` module to
check a directory tree in batch mode.
diff --git a/Doc/make.bat b/Doc/make.bat
index 251f822..ef0e412 100644
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -71,7 +71,7 @@
:build
if NOT "%PAPER%" == "" (
- set SPHINXOPTS=-D latex_paper_size=%PAPER% %SPHINXOPTS%
+ set SPHINXOPTS=-D latex_elements.papersize=%PAPER% %SPHINXOPTS%
)
cmd /C %SPHINXBUILD% %SPHINXOPTS% -b%1 -dbuild\doctrees . %BUILDDIR%\%*