[1.0.X] Fixed a small reST header glitch in docs/ref/templates/builtins.txt. This was [9529] on trunk.

Also updated svnmerge.py metadata; all non bugfix changesets from trunk have been applied to 1.0.X.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Karen Tracey 2008-12-10 16:13:14 +00:00
parent 6ff50eb24c
commit 08d47a16e3
1 changed files with 4 additions and 4 deletions

View File

@ -1584,20 +1584,20 @@ Value Argument Outputs
========== ====================== ==================================
Other tags and filter libraries
===============================
-------------------------------
Django comes with a couple of other template-tag libraries that you have to
enable explicitly in your ``INSTALLED_APPS`` setting and enable in your
template with the ``{% load %}`` tag.
django.contrib.humanize
-----------------------
~~~~~~~~~~~~~~~~~~~~~~~
A set of Django template filters useful for adding a "human touch" to data. See
:ref:`ref-contrib-humanize`.
django.contrib.markup
---------------------
~~~~~~~~~~~~~~~~~~~~~
A collection of template filters that implement these common markup languages:
@ -1608,7 +1608,7 @@ A collection of template filters that implement these common markup languages:
See :ref:`ref-contrib-markup`.
django.contrib.webdesign
------------------------
~~~~~~~~~~~~~~~~~~~~~~~~
A collection of template tags that can be useful while designing a website,
such as a generator of Lorem Ipsum text. See :ref:`ref-contrib-webdesign`.