diff --git a/django/middleware/cache.py b/django/middleware/cache.py index 58800b24da..a88b4956b2 100644 --- a/django/middleware/cache.py +++ b/django/middleware/cache.py @@ -10,7 +10,7 @@ class CacheMiddleware(object): Only parameter-less GET or HEAD-requests with status code 200 are cached. If CACHE_MIDDLEWARE_ANONYMOUS_ONLY is set to True, only anonymous requests - (i.e., those node made by a logged-in user) will be cached. This is a + (i.e., those not made by a logged-in user) will be cached. This is a simple and effective way of avoiding the caching of the Django admin (and any other user-specific content). diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py index b18fa1dce7..ed11f2c1ae 100644 --- a/django/template/defaulttags.py +++ b/django/template/defaulttags.py @@ -595,8 +595,8 @@ def do_if(parser, token): :: - {% if althlete_list %} - Number of athletes: {{ althete_list|count }} + {% if athlete_list %} + Number of athletes: {{ athlete_list|count }} {% else %} No athletes. {% endif %}