summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorCarl Meyer <carl@oddbird.net>2010-11-19 17:30:56 +0000
committerCarl Meyer <carl@oddbird.net>2010-11-19 17:30:56 +0000
commit426a28f9671018f45c85daed17d188a2289468e7 (patch)
tree0e6163e9552f997ebceb2bf93789df88bb8b76bb /docs
parent5ef3269b78cadd6ea6b909cec3027e2c1e739f1d (diff)
[1.2.X] Bumped documentation-building requirements to Sphinx 1.0.2 and Pygments 1.1. The use of 'console' highlight in staticfiles docs requires Pygments 1.1.
Backport of r14624 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14625 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/internals/documentation.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/docs/internals/documentation.txt b/docs/internals/documentation.txt
index 36270eafb7..a0dd17fbc2 100644
--- a/docs/internals/documentation.txt
+++ b/docs/internals/documentation.txt
@@ -15,8 +15,12 @@ Sphinx -- ``easy_install Sphinx`` should do the trick.
.. note::
- The Django documentation can be generated with Sphinx version 0.6 or
- newer, but we recommend using Sphinx 1.0.2 or newer.
+ Building the Django documentation requires Sphinx 1.0.2 or newer. Sphinx
+ also requires the Pygments__ library for syntax highlighting; building the
+ Django documentation requires Pygments 1.1 or newer (a new-enough version
+ should automatically be installed along with Sphinx).
+
+__ http://pygments.org
Then, building the HTML is easy; just ``make html`` from the ``docs`` directory.