summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2012-04-29 21:44:31 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2012-04-29 21:44:31 +0200
commitaf71ce06ead0c42e3c352c4f0afd77abbc3b907d (patch)
tree4ee6bd2768741424638198648bd1f7f5194625d9 /docs
parent3904b74a3f2f92fefe1d39281ed683c52f2fef03 (diff)
Minor fixes in the custom template tags docs.
Diffstat (limited to 'docs')
-rw-r--r--docs/howto/custom-template-tags.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/docs/howto/custom-template-tags.txt b/docs/howto/custom-template-tags.txt
index 751411c446..ffac791ae4 100644
--- a/docs/howto/custom-template-tags.txt
+++ b/docs/howto/custom-template-tags.txt
@@ -143,9 +143,10 @@ You can use ``register.filter()`` as a decorator instead:
If you leave off the ``name`` argument, as in the second example above, Django
will use the function's name as the filter name.
-Finally, ``register.filter()`` also accepts two keyword arguments, ``is_safe``
-and ``needs_autoescape``, described in :ref:`filters and auto-escaping
-<filters-auto-escaping>` below.
+Finally, ``register.filter()`` also accepts three keyword arguments,
+``is_safe``, ``needs_autoescape``, and ``expects_localtime``. These arguments
+are described in :ref:`filters and auto-escaping <filters-auto-escaping>` and
+:ref:`filters and time zones <filters-timezones>` below.
Template filters that expect strings
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -369,7 +370,7 @@ objects, you'll usually register it with the ``expects_localtime`` flag set to
When this flag is set, if the first argument to your filter is a time zone
aware datetime, Django will convert it to the current time zone before passing
-to your filter when appropriate, according to :ref:`rules for time zones
+it to your filter when appropriate, according to :ref:`rules for time zones
conversions in templates <time-zones-in-templates>`.
Writing custom template tags