Commit 55888705 authored by Jannis Leidel's avatar Jannis Leidel
Browse files

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

[1.2.X] Fixed #14111 -- Updated Sphinx version recommendation in documentation. 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
parent d9bba6b1

docs/internals/documentation.txt

+1 −1
Original line number Diff line number Diff line
@@ -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.

docs/intro/whatsnext.txt

+3 −4
Original line number Diff line number Diff line
@@ -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/