Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[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
  • Loading branch information...
commit 558887052947e2c18786c3013620cbca299bae5f 1 parent d9bba6b
Jannis Leidel jezdez authored
Showing with 4 additions and 5 deletions.
  1. +1 −1  docs/internals/documentation.txt
  2. +3 −4 docs/intro/whatsnext.txt
2  docs/internals/documentation.txt
View
@@ -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.
7 docs/intro/whatsnext.txt
View
@@ -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/
Please sign in to comment.
Something went wrong with that request. Please try again.