Permalink
Browse files

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 2b50186)

* 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 91b0e7d)
(cherry picked from commit b300c66)
  • Loading branch information...
1 parent de553b8 commit 5e04dfecec478db13031fa507d6b2e21adbce035 @haypo haypo committed on GitHub Feb 16, 2017
Showing with 3 additions and 3 deletions.
  1. +1 −1 Doc/Makefile
  2. +2 −2 Doc/faq/windows.rst
View
@@ -4,7 +4,7 @@
#
# You can set these variables from the command line.
-PYTHON = python
+PYTHON = python3
SPHINXBUILD = sphinx-build
PAPER =
SOURCES =
View
@@ -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.

0 comments on commit 5e04dfe

Please sign in to comment.