Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[1.1.X] Fixed #13202 -- Documented required libraries for markup temp…

…late tags, based on patch from steveed.

Backport of r12860 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 87e40f8daa0b6070d05299cbc6414007be62993b 1 parent 52e2e5c
Gary Wilson Jr. authored March 27, 2010

Showing 1 changed file with 10 additions and 5 deletions. Show diff stats Hide diff stats

  1. 15  docs/ref/contrib/index.txt
15  docs/ref/contrib/index.txt
@@ -133,22 +133,27 @@ markup
133 133
 
134 134
 A collection of template filters that implement common markup languages:
135 135
 
136  
-    * ``textile`` -- implements `Textile`_
137  
-    * ``markdown`` -- implements `Markdown`_
  136
+    * ``textile`` -- implements `Textile`_ -- requires `PyTextile`_
  137
+    * ``markdown`` -- implements `Markdown`_ -- requires `Python-markdown`_
138 138
     * ``restructuredtext`` -- implements `ReST (ReStructured Text)`_
  139
+      -- requires `doc-utils`_
139 140
 
140 141
 In each case, the filter expects formatted markup as a string and returns a
141 142
 string representing the marked-up text. For example, the ``textile`` filter
142 143
 converts text that is marked-up in Textile format to HTML.
143 144
 
144 145
 To activate these filters, add ``'django.contrib.markup'`` to your
145  
-:setting:`INSTALLED_APPS` setting. Once you've done that, use ``{% load markup %}`` in
146  
-a template, and you'll have access to these filters. For more documentation,
147  
-read the source code in django/contrib/markup/templatetags/markup.py.
  146
+:setting:`INSTALLED_APPS` setting. Once you've done that, use
  147
+``{% load markup %}`` in a template, and you'll have access to these filters.
  148
+For more documentation, read the source code in
  149
+:file:`django/contrib/markup/templatetags/markup.py`.
148 150
 
149 151
 .. _Textile: http://en.wikipedia.org/wiki/Textile_%28markup_language%29
150 152
 .. _Markdown: http://en.wikipedia.org/wiki/Markdown
151 153
 .. _ReST (ReStructured Text): http://en.wikipedia.org/wiki/ReStructuredText
  154
+.. _PyTextile: http://loopcore.com/python-textile/
  155
+.. _Python-markdown: http://www.freewisdom.org/projects/python-markdown
  156
+.. _doc-utils: http://docutils.sf.net/
152 157
 
153 158
 redirects
154 159
 =========

0 notes on commit 87e40f8

Please sign in to comment.
Something went wrong with that request. Please try again.