Index: docs/templates.txt
===================================================================
--- docs/templates.txt	(revision 5559)
+++ docs/templates.txt	(working copy)
@@ -950,7 +950,7 @@
 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
 ~~~~~~~
@@ -1179,8 +1179,12 @@
 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).
 
+Note that unlike the ``now`` tag, the ``time`` filter only accepts parameters
+in the format string that refer to the *time of day*, not parameters referring
+to the date. For date formatting, use the `date`_ filter.
+
 timesince
 ~~~~~~~~~
 
