Author: jezdez
Date: 2010-08-18 11:35:48 -0500 (Wed, 18 Aug 2010)
New Revision: 13605
Modified:
django/branches/releases/1.2.X/docs/internals/documentation.txt
django/branches/releases/1.2.X/docs/intro/whatsnext.txt
Log:
[1.2.X] Fixed #14111 -- Updated Sphinx version recommendation in documentation.
Thanks, Ramiro Morales and Paul McMillan.
Backport of r13604 from trunk.
Modified: django/branches/releases/1.2.X/docs/internals/documentation.txt
===================================================================
--- django/branches/releases/1.2.X/docs/internals/documentation.txt
2010-08-18 16:34:50 UTC (rev 13604)
+++ django/branches/releases/1.2.X/docs/internals/documentation.txt
2010-08-18 16:35:48 UTC (rev 13605)
@@ -18,7 +18,7 @@
.. 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.
Modified: django/branches/releases/1.2.X/docs/intro/whatsnext.txt
===================================================================
--- django/branches/releases/1.2.X/docs/intro/whatsnext.txt 2010-08-18
16:34:50 UTC (rev 13604)
+++ django/branches/releases/1.2.X/docs/intro/whatsnext.txt 2010-08-18
16:35:48 UTC (rev 13605)
@@ -187,11 +187,10 @@
* 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/
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
