merged to trunk r1143

git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1153 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/core/cache.py

@@ -336,7 +336,7 @@ class _FileCache(_SimpleCache):
         return os.path.exists(self._key_to_file(key))
 
     def _cull(self, filelist):
-        if self.cull_frequency == 0:
+        if self._cull_frequency == 0:
             doomed = filelist
         else:
             doomed = [k for (i, k) in enumerate(filelist) if i % self._cull_frequency == 0]

django/core/rss.py

@@ -14,7 +14,7 @@ class FeedDoesNotExist(ObjectDoesNotExist):
 
 class Feed:
     item_pubdate = None
-    enclosure_url = None
+    item_enclosure_url = None
 
     def item_link(self, item):
         try:
@@ -67,12 +67,12 @@ class Feed:
         for item in self.__get_dynamic_attr('items', obj):
             link = add_domain(current_site.domain, self.__get_dynamic_attr('item_link', item))
             enc = None
-            enc_url = self.__get_dynamic_attr('enclosure_url', item)
+            enc_url = self.__get_dynamic_attr('item_enclosure_url', item)
             if enc_url:
                 enc = feedgenerator.Enclosure(
                     url = enc_url.decode('utf-8'),
-                    length = str(self.__get_dynamic_attr('enclosure_length', item)).decode('utf-8'),
-                    mime_type = self.__get_dynamic_attr('enclosure_mime_type', item).decode('utf-8'),
+                    length = str(self.__get_dynamic_attr('item_enclosure_length', item)).decode('utf-8'),
+                    mime_type = self.__get_dynamic_attr('item_enclosure_mime_type', item).decode('utf-8'),
                 )
             feed.add_item(
                 title = title_template.render(Context({'obj': item, 'site': current_site})).decode('utf-8'),

docs/authentication.txt

@@ -474,3 +474,8 @@ messages are made available in the `template context`_ as the template variable
 
 Note that ``DjangoContext`` calls ``get_and_delete_messages`` behind the
 scenes, so any messages will be deleted even if you don't display them.
+
+Finally, note that this messages framework only works with users in the user
+database. To send messages to anonymous users, use the `session framework`_.
+
+.. _session framework: http://www.djangoproject.com/documentation/sessions/

docs/settings.txt

@@ -416,7 +416,11 @@ Example: ``"http://media.lawrence.com"``
 MIDDLEWARE_CLASSES
 ------------------
 
-Default: ``("django.middleware.sessions.SessionMiddleware", "django.middleware.common.CommonMiddleware", "django.middleware.doc.XViewMiddleware")``
+Default::
+
+    ("django.middleware.sessions.SessionMiddleware",
+     "django.middleware.common.CommonMiddleware",
+     "django.middleware.doc.XViewMiddleware")
 
 A tuple of middleware classes to use. See the `middleware docs`_.