Skip to content

Commit 2881da9

Browse files
committed
Fixed #13202 -- Documented required libraries for markup template tags, based on patch from steveed.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12860 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1 parent 8f3d6b9 commit 2881da9

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

docs/ref/contrib/index.txt

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ gis
118118
A world-class geospatial framework built on top of Django, that enables
119119
storage, manipulation and display of spatial data.
120120

121-
See the :ref:`ref-contrib-gis` documentation for more.
121+
See the :ref:`ref-contrib-gis` documentation for more.
122122

123123
humanize
124124
========
@@ -143,22 +143,27 @@ markup
143143

144144
A collection of template filters that implement common markup languages:
145145

146-
* ``textile`` -- implements `Textile`_
147-
* ``markdown`` -- implements `Markdown`_
146+
* ``textile`` -- implements `Textile`_ -- requires `PyTextile`_
147+
* ``markdown`` -- implements `Markdown`_ -- requires `Python-markdown`_
148148
* ``restructuredtext`` -- implements `ReST (ReStructured Text)`_
149+
-- requires `doc-utils`_
149150

150151
In each case, the filter expects formatted markup as a string and returns a
151152
string representing the marked-up text. For example, the ``textile`` filter
152153
converts text that is marked-up in Textile format to HTML.
153154

154155
To activate these filters, add ``'django.contrib.markup'`` to your
155-
:setting:`INSTALLED_APPS` setting. Once you've done that, use ``{% load markup %}`` in
156-
a template, and you'll have access to these filters. For more documentation,
157-
read the source code in django/contrib/markup/templatetags/markup.py.
156+
:setting:`INSTALLED_APPS` setting. Once you've done that, use
157+
``{% load markup %}`` in a template, and you'll have access to these filters.
158+
For more documentation, read the source code in
159+
:file:`django/contrib/markup/templatetags/markup.py`.
158160

159161
.. _Textile: http://en.wikipedia.org/wiki/Textile_%28markup_language%29
160162
.. _Markdown: http://en.wikipedia.org/wiki/Markdown
161163
.. _ReST (ReStructured Text): http://en.wikipedia.org/wiki/ReStructuredText
164+
.. _PyTextile: http://loopcore.com/python-textile/
165+
.. _Python-markdown: http://www.freewisdom.org/projects/python-markdown
166+
.. _doc-utils: http://docutils.sf.net/
162167

163168
messages
164169
========

0 commit comments

Comments
 (0)