diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-02-16 09:43:16 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-16 09:43:16 (GMT) |
| commit | 5e04dfecec478db13031fa507d6b2e21adbce035 (patch) | |
| tree | 1ec15b03851b1d868d5ce00302ba4890e71a41aa /Doc | |
| parent | de553b8210882823d3df3f1ef6882eba3f8accf3 (diff) | |
| download | cpython-5e04dfecec478db13031fa507d6b2e21adbce035.zip cpython-5e04dfecec478db13031fa507d6b2e21adbce035.tar.gz cpython-5e04dfecec478db13031fa507d6b2e21adbce035.tar.bz2 | |
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)
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/Makefile | 2 | ||||
| -rw-r--r-- | Doc/faq/windows.rst | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Doc/Makefile b/Doc/Makefile index 9ad7b86..b0800c1 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 b9b7b8d..6ac83e4 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. |