Author: lukeplant
Date: 2009-03-23 18:20:40 -0500 (Mon, 23 Mar 2009)
New Revision: 10129

Modified:
   django/trunk/django/conf/global_settings.py
   django/trunk/docs/ref/settings.txt
   django/trunk/docs/topics/http/middleware.txt
Log:
Made default MIDDLEWARE_CLASSES same as in project_template.

And updated docs, and also corrected them about middleware by removing
'XViewMiddleware'



Modified: django/trunk/django/conf/global_settings.py
===================================================================
--- django/trunk/django/conf/global_settings.py 2009-03-23 23:02:46 UTC (rev 
10128)
+++ django/trunk/django/conf/global_settings.py 2009-03-23 23:20:40 UTC (rev 
10129)
@@ -301,11 +301,11 @@
 # this middleware classes will be applied in the order given, and in the
 # response phase the middleware will be applied in reverse order.
 MIDDLEWARE_CLASSES = (
+    'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
 #     'django.middleware.http.ConditionalGetMiddleware',
 #     'django.middleware.gzip.GZipMiddleware',
-    'django.middleware.common.CommonMiddleware',
 )
 
 ############

Modified: django/trunk/docs/ref/settings.txt
===================================================================
--- django/trunk/docs/ref/settings.txt  2009-03-23 23:02:46 UTC (rev 10128)
+++ django/trunk/docs/ref/settings.txt  2009-03-23 23:20:40 UTC (rev 10129)
@@ -760,10 +760,9 @@
 
 Default::
 
-    ("django.contrib.sessions.middleware.SessionMiddleware",
-     "django.contrib.auth.middleware.AuthenticationMiddleware",
-     "django.middleware.common.CommonMiddleware",
-     "django.middleware.doc.XViewMiddleware")
+    ('django.middleware.common.CommonMiddleware',
+     'django.contrib.sessions.middleware.SessionMiddleware',
+     'django.contrib.auth.middleware.AuthenticationMiddleware',)
 
 A tuple of middleware classes to use. See :ref:`topics-http-middleware`.
 

Modified: django/trunk/docs/topics/http/middleware.txt
===================================================================
--- django/trunk/docs/topics/http/middleware.txt        2009-03-23 23:02:46 UTC 
(rev 10128)
+++ django/trunk/docs/topics/http/middleware.txt        2009-03-23 23:20:40 UTC 
(rev 10129)
@@ -30,7 +30,6 @@
         'django.middleware.common.CommonMiddleware',
         'django.contrib.sessions.middleware.SessionMiddleware',
         'django.contrib.auth.middleware.AuthenticationMiddleware',
-        'django.middleware.doc.XViewMiddleware',
     )
 
 During the request phases (:meth:`process_request` and :meth:`process_view`


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to 
[email protected]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to