diff --git a/docs/internals/documentation.txt b/docs/internals/documentation.txt index 9aa8551266b6c..d12e35e19547a 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 0949b2299e944..c18251f92f6df 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/