Note that we now require Sphinx 1.0

mdboom · mdboom · commit cbedb353f3df · 2011-04-01T12:10:18.000-04:00
diff --git a/doc/README.txt b/doc/README.txt
@@ -30,7 +30,7 @@ python documentation system built on top of ReST.  This directory contains
 * mpl_examples - a link to the matplotlib examples in case any
   documentation wants to literal include them
 
-To build the HTML documentation, install sphinx (0.5 or greater
+To build the HTML documentation, install sphinx (1.0 or greater
 required), then type "python make.py html" in this directory.  Wait
 for the initial run (which builds the example gallery) to be done,
 then run "python make.py html" again. The top file of the results will
diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst
@@ -8,20 +8,12 @@ Getting started
 ===============
 
 The documentation for matplotlib is generated from ReStructured Text
-using the Sphinx_ documentation generation tool. Sphinx-0.5 or later
-is required. You might still run into problems, so most developers
-work from the sphinx source repository (Mercurial based) because it
-is a rapidly evolving project::
+using the Sphinx_ documentation generation tool. Sphinx-1.0 or later
+is required.
 
-  hg clone http://bitbucket.org/birkenfeld/sphinx/
-  cd sphinx
-  python setup.py install
-
-.. _Sphinx: http://sphinx.pocoo.org/
-
-The documentation sources are found in the :file:`doc/` directory in the trunk.
-To build the users guide in html format, cd into :file:`doc/` and
-do::
+The documentation sources are found in the :file:`doc/` directory in
+the trunk.  To build the users guide in html format, cd into
+:file:`doc/` and do::
 
   python make.py html
 
@@ -406,3 +398,4 @@ Some helpful functions::
 
         Shift region to the right
 
+.. TODO: Add section about uploading docs
