Author: kmtracey
Date: 2008-12-10 10:13:14 -0600 (Wed, 10 Dec 2008)
New Revision: 9640
Modified:
django/branches/releases/1.0.X/
django/branches/releases/1.0.X/docs/ref/templates/builtins.txt
Log:
[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.
Property changes on: django/branches/releases/1.0.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9523,9535,9543-9544,9546,9548,9550,9559-9560,9562-9563,9610
+
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9526,9529,9533-9536,9539-9550,9556-9557,9559-9560,9562-9568,9570-9591,9595-9619,9621-9624,9626-9636,9638-9639
Modified: django/branches/releases/1.0.X/docs/ref/templates/builtins.txt
===================================================================
--- django/branches/releases/1.0.X/docs/ref/templates/builtins.txt
2008-12-10 15:50:42 UTC (rev 9639)
+++ django/branches/releases/1.0.X/docs/ref/templates/builtins.txt
2008-12-10 16:13:14 UTC (rev 9640)
@@ -1584,20 +1584,20 @@
========== ====================== ==================================
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 @@
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`.
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
