i18n: merged to [931] from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@932 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 4 insertions, 4 deletions

diff --git a/docs/templates.txt b/docs/templates.txt
index 215b663634..5c52371c8a 100644
--- a/docs/templates.txt
+++ b/docs/templates.txt
@@ -399,13 +399,13 @@ Built-in tag reference
     block are output::
 
         {% if athlete_list %}
-            Number of athletes: {{ athlete_list|count }}
+            Number of athletes: {{ athlete_list|length }}
         {% else %}
             No athletes.
         {% endif %}
 
     In the above, if ``athlete_list`` is not empty, the number of athletes will be
-    displayed by the ``{{ athlete_list|count }}`` variable.
+    displayed by the ``{{ athlete_list|length }}`` variable.
 
     As you can see, the ``if`` tag can take an option ``{% else %}`` clause that
     will be displayed if the test fails.
@@ -432,8 +432,8 @@ Built-in tag reference
 
         {% if athlete_list %}
             {% if coach_list %}
-                Number of athletes: {{ athlete_list|count }}.
-                Number of coaches: {{ coach_list|count }}.
+                Number of athletes: {{ athlete_list|length }}.
+                Number of coaches: {{ coach_list|length }}.
             {% endif %}
         {% endif %}