diff options
| author | Jannis Leidel <jannis@leidel.info> | 2010-08-18 16:35:48 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2010-08-18 16:35:48 +0000 |
| commit | 558887052947e2c18786c3013620cbca299bae5f (patch) | |
| tree | e40e67006c9e2e8060a082b442f6a2a4779650c8 /docs | |
| parent | d9bba6b13f39da08353cf8c9f63e22cc325e397f (diff) | |
[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
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/internals/documentation.txt | 2 | ||||
| -rw-r--r-- | 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/ |