[2.7] bpo-29521: Fix two minor documentation build warnings (GH-41) (GH-670)

Mariatta · web-flow · commit e0cba5b45a5c · 2017-04-10T10:27:50.000-07:00
(cherry picked from commit 3d707be)
diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst
@@ -295,7 +295,7 @@ this respect, and is easily configured to use spaces: Take :menuselection:`Tools
 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
@@ -71,7 +71,7 @@ goto end
 
 :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%\%*
 

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ goto end`
`71`	`71`
`72`	`72`	`:build`
`73`	`73`	`if NOT "%PAPER%" == "" (`
`74`		`- set SPHINXOPTS=-D latex_paper_size=%PAPER% %SPHINXOPTS%`
	`74`	`+ set SPHINXOPTS=-D latex_elements.papersize=%PAPER% %SPHINXOPTS%`
`75`	`75`	`)`
`76`	`76`	`cmd /C %SPHINXBUILD% %SPHINXOPTS% -b%1 -dbuild\doctrees . %BUILDDIR%\%*`
`77`	`77`