summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2014-03-01 08:20:21 +0100
committerGeorg Brandl <georg@python.org>2014-03-01 08:20:21 +0100
commitdf61586c5bc6c03eced862a30c92272830d5ad3e (patch)
treedcad09ac8b3293dbc1b43ae6de2e571acc24d389 /doc
parent238101f8739eee4bd74bd49609225ec12f674d63 (diff)
parentd052523421497a756449a78c7077ed53aab92139 (diff)
downloadsphinx-df61586c5bc6c03eced862a30c92272830d5ad3e.tar.gz
Merged in shimizukawa/sphinx-drop-old-docutils (pull request #206)
Drop docutils-0.7, 0.8, 0.9 support.
Diffstat (limited to 'doc')
-rw-r--r--doc/builders.rst5
-rw-r--r--doc/intro.rst2
2 files changed, 1 insertions, 6 deletions
diff --git a/doc/builders.rst b/doc/builders.rst
index 00f4e223..2dbbb188 100644
--- a/doc/builders.rst
+++ b/doc/builders.rst
@@ -133,11 +133,6 @@ for details.
Its name is ``man``.
- .. note::
-
- This builder requires the docutils manual page writer, which is only
- available as of docutils 0.6.
-
.. versionadded:: 1.0
diff --git a/doc/intro.rst b/doc/intro.rst
index dd541bf1..a796d937 100644
--- a/doc/intro.rst
+++ b/doc/intro.rst
@@ -55,7 +55,7 @@ Prerequisites
-------------
Sphinx needs at least **Python 2.6** or **Python 3.2** to run, as well as the
-docutils_ and Jinja2_ libraries. Sphinx should work with docutils version 0.7
+docutils_ and Jinja2_ libraries. Sphinx should work with docutils version 0.10
or some (not broken) SVN trunk snapshot. If you like to have source code
highlighting support, you must also install the Pygments_ library.