From 806c30cd634c1654c8050b64ff4b46dc559c9eb8 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Wed, 18 Aug 2010 16:34:50 +0000 Subject: [PATCH] Fixed #14111 -- Updated Sphinx version recommendation in documentation. Thanks, Ramiro Morales and Paul McMillan. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13604 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/internals/documentation.txt | 2 +- docs/intro/whatsnext.txt | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docs/internals/documentation.txt b/docs/internals/documentation.txt index 9aa8551266..d12e35e195 100644 --- 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 index 0949b2299e..c18251f92f 100644 --- 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/