diff options
| author | Guido van Rossum <guido@python.org> | 2007-08-20 19:06:03 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-08-20 19:06:03 (GMT) |
| commit | 61e21b52f1873bc4b0da34431e54a9517c0030e1 (patch) | |
| tree | e569dc3bbc88512e345691a151c2d64a8e7dc910 /Doc/tools | |
| parent | 7d6068e6c9c3f8a2ee17b9b57e4f3f40b149c6eb (diff) | |
| download | cpython-61e21b52f1873bc4b0da34431e54a9517c0030e1.zip cpython-61e21b52f1873bc4b0da34431e54a9517c0030e1.tar.gz cpython-61e21b52f1873bc4b0da34431e54a9517c0030e1.tar.bz2 | |
Merged revisions 57152-57220 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r57155 | brett.cannon | 2007-08-17 11:51:57 -0700 (Fri, 17 Aug 2007) | 2 lines
Clarify the comment about setting the PYTHON variable for the Doc Makefile.
........
r57156 | brett.cannon | 2007-08-17 11:59:58 -0700 (Fri, 17 Aug 2007) | 3 lines
Remove news entry for test.test_support.guard_warnings_filter as it has been
removed.
........
r57158 | facundo.batista | 2007-08-17 12:16:44 -0700 (Fri, 17 Aug 2007) | 9 lines
Added a flag (_send_traceback_header) to the SimpleXMLRPCServer class
that allows sending back exception/stack trace information about
internal server errors (this flag defaults to False to avoid sending
such information unless explicitly enabled). Added tests to verify
behavior of this new feature (these tests are skipped on win32 because
of problems with WSAEWOULDBLOCK). Renamed HTTPTestCase to
SimpleServerTestCase. [GSoC - Alan McIntyre]
........
r57160 | brett.cannon | 2007-08-17 13:16:15 -0700 (Fri, 17 Aug 2007) | 2 lines
Make test_warnings re-entrant.
........
r57175 | georg.brandl | 2007-08-17 23:05:56 -0700 (Fri, 17 Aug 2007) | 2 lines
Fix PDB command descriptions.
........
r57182 | brett.cannon | 2007-08-18 11:30:36 -0700 (Sat, 18 Aug 2007) | 3 lines
Remove Mikael as the maintainer of BeOS at his request. With no maintainer
should the port be deprecated in 2.6?
........
r57199 | georg.brandl | 2007-08-19 11:43:50 -0700 (Sun, 19 Aug 2007) | 2 lines
Fix stray backticks.
........
r57211 | hyeshik.chang | 2007-08-19 23:49:18 -0700 (Sun, 19 Aug 2007) | 2 lines
Add cheot-ga-keut composed make-up sequence support in EUC-KR codec.
........
r57216 | guido.van.rossum | 2007-08-20 08:18:04 -0700 (Mon, 20 Aug 2007) | 4 lines
Add a hack (originally devised in a slightly different form by Thomas Wouters)
to prevent spurious tracebacks when a daemon thread's cleanup happens to wake
up when the world around it has already been destroyed.
........
Diffstat (limited to 'Doc/tools')
| -rw-r--r-- | Doc/tools/sphinx-build.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Doc/tools/sphinx-build.py b/Doc/tools/sphinx-build.py index 8c9331e..e19b10a 100644 --- a/Doc/tools/sphinx-build.py +++ b/Doc/tools/sphinx-build.py @@ -13,9 +13,10 @@ if __name__ == '__main__': if sys.version_info[:3] < (2, 5, 0): print >>sys.stderr, """\ -Error: Sphinx needs to be executed with Python 2.5 or newer. +Error: Sphinx needs to be executed with Python 2.5 or newer (If you run this from the Makefile, you can set the PYTHON variable -to the path of an alternative interpreter executable.) +to the path of an alternative interpreter executable, e.g., +``make html PYTHON=python2.5``). """ sys.exit(1) |