Author: gwilson
Date: 2010-03-26 19:10:44 -0500 (Fri, 26 Mar 2010)
New Revision: 12861

Modified:
   django/branches/releases/1.1.X/docs/ref/contrib/index.txt
Log:
[1.1.X] Fixed #13202 -- Documented required libraries for markup template tags, 
based on patch from steveed.

Backport of r12860 from trunk.


Modified: django/branches/releases/1.1.X/docs/ref/contrib/index.txt
===================================================================
--- django/branches/releases/1.1.X/docs/ref/contrib/index.txt   2010-03-27 
00:07:31 UTC (rev 12860)
+++ django/branches/releases/1.1.X/docs/ref/contrib/index.txt   2010-03-27 
00:10:44 UTC (rev 12861)
@@ -133,22 +133,27 @@
 
 A collection of template filters that implement common markup languages:
 
-    * ``textile`` -- implements `Textile`_
-    * ``markdown`` -- implements `Markdown`_
+    * ``textile`` -- implements `Textile`_ -- requires `PyTextile`_
+    * ``markdown`` -- implements `Markdown`_ -- requires `Python-markdown`_
     * ``restructuredtext`` -- implements `ReST (ReStructured Text)`_
+      -- requires `doc-utils`_
 
 In each case, the filter expects formatted markup as a string and returns a
 string representing the marked-up text. For example, the ``textile`` filter
 converts text that is marked-up in Textile format to HTML.
 
 To activate these filters, add ``'django.contrib.markup'`` to your
-:setting:`INSTALLED_APPS` setting. Once you've done that, use ``{% load markup 
%}`` in
-a template, and you'll have access to these filters. For more documentation,
-read the source code in django/contrib/markup/templatetags/markup.py.
+:setting:`INSTALLED_APPS` setting. Once you've done that, use
+``{% load markup %}`` in a template, and you'll have access to these filters.
+For more documentation, read the source code in
+:file:`django/contrib/markup/templatetags/markup.py`.
 
 .. _Textile: http://en.wikipedia.org/wiki/Textile_%28markup_language%29
 .. _Markdown: http://en.wikipedia.org/wiki/Markdown
 .. _ReST (ReStructured Text): http://en.wikipedia.org/wiki/ReStructuredText
+.. _PyTextile: http://loopcore.com/python-textile/
+.. _Python-markdown: http://www.freewisdom.org/projects/python-markdown
+.. _doc-utils: http://docutils.sf.net/
 
 redirects
 =========

-- 
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to 
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en.

Reply via email to