Skip to content

Commit 5e04dfe

Browse files
authored
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)
1 parent de553b8 commit 5e04dfe

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Doc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55

66
# You can set these variables from the command line.
7-
PYTHON = python
7+
PYTHON = python3
88
SPHINXBUILD = sphinx-build
99
PAPER =
1010
SOURCES =

Doc/faq/windows.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,9 +300,9 @@ this respect, and is easily configured to use spaces: Take :menuselection:`Tools
300300
--> Options --> Tabs`, and for file type "Default" set "Tab size" and "Indent
301301
size" to 4, and select the "Insert spaces" radio button.
302302

303-
Python raises :exc:`IndentationError` or :exc:`TabError` if mixed tabs
303+
Python raises :exc:`IndentationError` or :exc:`TabError` if mixed tabs
304304
and spaces are causing problems in leading whitespace.
305-
You may also run the :mod:`tabnanny` module to check a directory tree
305+
You may also run the :mod:`tabnanny` module to check a directory tree
306306
in batch mode.
307307

308308

0 commit comments

Comments
 (0)