summaryrefslogtreecommitdiffstats
path: root/Doc/tools
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-03-10 18:26:57 (GMT)
committerGeorg Brandl <georg@python.org>2014-03-10 18:26:57 (GMT)
commit18a364fc3de8dc55ba081c322d37637cf9ac5867 (patch)
tree98691f192e305bd0849810e98c1cb9a499afe185 /Doc/tools
parent14d7b718bacb6b8a0702489d04895ea4e4b11131 (diff)
downloadcpython-18a364fc3de8dc55ba081c322d37637cf9ac5867.zip
cpython-18a364fc3de8dc55ba081c322d37637cf9ac5867.tar.gz
cpython-18a364fc3de8dc55ba081c322d37637cf9ac5867.tar.bz2
Closes #20090: update Doc/README and the error message in sphinx-build.py to make
it clear that any Python 3.x is not usable with the checked out Sphinx.
Diffstat (limited to 'Doc/tools')
-rw-r--r--Doc/tools/sphinx-build.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/tools/sphinx-build.py b/Doc/tools/sphinx-build.py
index a446dfa..d3fe702 100644
--- a/Doc/tools/sphinx-build.py
+++ b/Doc/tools/sphinx-build.py
@@ -17,7 +17,7 @@ if __name__ == '__main__':
if sys.version_info[:3] < (2, 4, 0) or sys.version_info[:3] > (3, 0, 0):
sys.stderr.write("""\
-Error: Sphinx needs to be executed with Python 2.4 or newer (not 3.0 though).
+Error: Sphinx needs to be executed with Python 2.4 or newer (not 3.x though).
(If you run this from the Makefile, you can set the PYTHON variable
to the path of an alternative interpreter executable, e.g.,
``make html PYTHON=python2.5``).