From: Victor Stinner <victor.stinner@gmail.com>
Date: Thu, 16 Feb 2017 09:43:16 +0000 (+0100)
Subject: Backport35 doc fixes: PR#68 and PR#124 (#125) (#126)
X-Git-Tag: v3.5.4rc1~344
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e04dfecec478db13031fa507d6b2e21adbce035;p=python

Backport35 doc fixes: PR#68 and PR#124 (#125) (#126)

* Travis CI: run rstlint.py in the docs job (#68)

Currently, http://buildbot.python.org/all/buildslaves/ware-docs
buildbot is only run as post-commit. For example, bpo-29521 (PR#41)
introduced two warnings, unnotified by the Travis CI docs job.

Modify the docs job to run toosl/rstlint.py.

Fix also the two minor warnings which causes the buildbot slave to
fail.
(cherry picked from commit 2b501866ed493758e4c4b29f0ce9b24023d910a1)

* Doc/Makefile: set PYTHON to python3 (#124)

rstlint.py run by "make check" doesn't support Python 2.

"make venv" runs "$(PYTHON) -m venv", whereas Python 2 doens't
provide the venv module: it's a module of Python 3 standard library.

(cherry picked from commit 91b0e7d0ca7c59df28f6a6fc1e8eb86a3925b76c)
(cherry picked from commit b300c660d34d2027d443098ea605a8e0eb51d383)
---

diff --git a/Doc/Makefile b/Doc/Makefile
index 9ad7b86579..b0800c15b5 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -4,7 +4,7 @@
 #
 
 # You can set these variables from the command line.
-PYTHON       = python
+PYTHON       = python3
 SPHINXBUILD  = sphinx-build
 PAPER        =
 SOURCES      =
diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst
index b9b7b8d359..6ac83e45d2 100644
--- a/Doc/faq/windows.rst
+++ b/Doc/faq/windows.rst
@@ -300,9 +300,9 @@ this respect, and is easily configured to use spaces: Take :menuselection:`Tools
 --> Options --> Tabs`, and for file type "Default" set "Tab size" and "Indent
 size" to 4, and select the "Insert spaces" radio button.
 
-Python raises :exc:`IndentationError` or :exc:`TabError` if mixed tabs 
+Python raises :exc:`IndentationError` or :exc:`TabError` if mixed tabs
 and spaces are causing problems in leading whitespace.
-You may also run the :mod:`tabnanny` module to check a directory tree 
+You may also run the :mod:`tabnanny` module to check a directory tree
 in batch mode.