summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-11-01 09:16:37 +0100
committerGeorg Brandl <georg@python.org>2011-11-01 09:16:37 +0100
commitd5d6352f55f780db8faabd1f37dc9773357b42de (patch)
tree77ffea96a5c303311dbeef072ca9acad3e82e278 /doc
parent90d7f0e8b66b2fa03ff2dcf84acd76884b1a1d4e (diff)
downloadsphinx-d5d6352f55f780db8faabd1f37dc9773357b42de.tar.gz
Closes #793: Fix docutils version references.
Diffstat (limited to 'doc')
-rw-r--r--doc/ext/appapi.rst7
-rw-r--r--doc/intro.rst2
2 files changed, 3 insertions, 6 deletions
diff --git a/doc/ext/appapi.rst b/doc/ext/appapi.rst
index 643de995..1f5c063c 100644
--- a/doc/ext/appapi.rst
+++ b/doc/ext/appapi.rst
@@ -115,11 +115,8 @@ the following public API:
<http://docutils.sourceforge.net/docs/howto/rst-directives.html>`_ for
details.
- The directive class normally must inherit from the class
- ``docutils.parsers.rst.Directive``. When writing a directive for usage in
- a Sphinx extension, you inherit from ``sphinx.util.compat.Directive``
- instead which does the right thing even on docutils 0.4 (which doesn't
- support directive classes otherwise).
+ The directive class must inherit from the class
+ ``docutils.parsers.rst.Directive``.
For example, the (already existing) :rst:dir:`literalinclude` directive would be
added like this:
diff --git a/doc/intro.rst b/doc/intro.rst
index 46e4436b..5d76dd29 100644
--- a/doc/intro.rst
+++ b/doc/intro.rst
@@ -51,7 +51,7 @@ Prerequisites
-------------
Sphinx needs at least **Python 2.4** or **Python 3.1** to run, as well as the
-docutils_ and Jinja2_ libraries. Sphinx should work with docutils version 0.5
+docutils_ and Jinja2_ libraries. Sphinx should work with docutils version 0.7
or some (not broken) SVN trunk snapshot. If you like to have source code
highlighting support, you must also install the Pygments_ library.