summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorMariatta <Mariatta@users.noreply.github.com>2017-04-10 17:27:50 (GMT)
committerGitHub <noreply@github.com>2017-04-10 17:27:50 (GMT)
commite0cba5b45a5c4bafd1ae772be52ca0d69651da24 (patch)
treec01fabee94931dacc9c76d4c3533ccbf5f7adea6 /Doc
parent7026cd92c09a3e7612844a22cfab8f75817392ef (diff)
downloadcpython-e0cba5b45a5c4bafd1ae772be52ca0d69651da24.zip
cpython-e0cba5b45a5c4bafd1ae772be52ca0d69651da24.tar.gz
cpython-e0cba5b45a5c4bafd1ae772be52ca0d69651da24.tar.bz2
[2.7] bpo-29521: Fix two minor documentation build warnings (GH-41) (GH-670)
(cherry picked from commit 3d707be950b387552585451071928e7b39cdfa53)
Diffstat (limited to 'Doc')
-rw-r--r--Doc/faq/windows.rst2
-rw-r--r--Doc/make.bat2
2 files changed, 2 insertions, 2 deletions
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 @@ 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
index 251f822..ef0e412 100644
--- 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%\%*