[1.2.X] Fixed #14111 -- Updated Sphinx version recommendation in docu…

…mentation. Thanks, Ramiro Morales and Paul McMillan. Backport of r13604 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13605 bcc190cf-cafb-0310-a4f2-bffc1f526a37
django · Aug 18, 2010 · 5588870 · 5588870
1 parent d9bba6b
commit 5588870
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/docs/internals/documentation.txt b/docs/internals/documentation.txt
@@ -18,7 +18,7 @@ Sphinx -- ``easy_install Sphinx`` should do the trick.
 .. note::
 
     Generation of the Django documentation will work with Sphinx version 0.6
-    or newer, but we recommend going straigh to Sphinx 1.0 or newer.
+    or newer, but we recommend going straigh to Sphinx 1.0.2 or newer.
 
 Then, building the html is easy; just ``make html`` from the ``docs`` directory.
 

diff --git a/docs/intro/whatsnext.txt b/docs/intro/whatsnext.txt
@@ -187,11 +187,10 @@ You can get a local copy of the HTML documentation following a few easy steps:
 
     * The HTML documentation will be placed in ``docs/_build/html``.
 
-.. warning::
+.. note::
 
-    At the time of this writing, Django's using a version of Sphinx not
-    yet released, so you'll currently need to install Sphinx from the
-    source. We'll fix this shortly.
+    Generation of the Django documentation will work with Sphinx version 0.6
+    or newer, but we recommend going straight to Sphinx 1.0.2 or newer.
 
 __ http://sphinx.pocoo.org/
 __ http://www.gnu.org/software/make/