queryset-refactor: Merged to [6190]

git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6334 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 9 insertions, 5 deletions

diff --git a/docs/templates_python.txt b/docs/templates_python.txt
index 150aa70fdf..3399639611 100644
--- a/docs/templates_python.txt
+++ b/docs/templates_python.txt
@@ -642,12 +642,12 @@ your function. Example::
         "Converts a string into all lowercase"
         return value.lower()
 
-Template filters which expect strings
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Template filters that expect strings
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-If you're writing a template filter which only expects a string as the first
-argument, you should use the included decorator ``stringfilter``. This will
-convert an object to it's string value before being passed to your function::
+If you're writing a template filter that only expects a string as the first
+argument, you should use the decorator ``stringfilter``. This will
+convert an object to its string value before being passed to your function::
 
     from django.template.defaultfilters import stringfilter
 
@@ -655,6 +655,10 @@ convert an object to it's string value before being passed to your function::
     def lower(value):
         return value.lower()
 
+This way, you'll be able to pass, say, an integer to this filter, and it
+won't cause an ``AttributeError`` (because integers don't have ``lower()``
+methods).
+
 Registering a custom filters
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~