summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2007-07-12 14:11:41 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2007-07-12 14:11:41 +0000
commit0f10867519938b88332d2e43803ec15874e8400f (patch)
tree7301fedaf3e3a4e01ba3d6e7fee06f1fc7054637 /docs
parent53a06763c51f91b5fc5d1639793207f2d0136ea5 (diff)
Fixed #4522 -- Clarified the allowed filter arguments on the time and date filters. Thanks for the suggestion, admackin@gmail.com.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5674 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/templates.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/docs/templates.txt b/docs/templates.txt
index f5ed1fe74b..7628e02474 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -950,7 +950,7 @@ Removes all values of arg from the given string.
date
~~~~
-Formats a date according to the given format (same as the ``now`` tag).
+Formats a date according to the given format (same as the `now`_ tag).
default
~~~~~~~
@@ -1189,7 +1189,10 @@ Strips all [X]HTML tags.
time
~~~~
-Formats a time according to the given format (same as the ``now`` tag).
+Formats a time according to the given format (same as the `now`_ tag).
+The time filter will only accept parameters in the format string that relate
+to the time of day, not the date (for obvious reasons). If you need to
+format a date, use the `date`_ filter.
timesince
~~~~~~~~~