Browse Source

Made default MIDDLEWARE_CLASSES same as in project_template.

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



git-svn-id: http://code.djangoproject.com/svn/django/trunk@10129 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Luke Plant 16 years ago
parent
commit
cdc8c61bc3
3 changed files with 4 additions and 6 deletions
  1. 1 1
      django/conf/global_settings.py
  2. 3 4
      docs/ref/settings.txt
  3. 0 1
      docs/topics/http/middleware.txt

+ 1 - 1
django/conf/global_settings.py

@@ -301,11 +301,11 @@ DEFAULT_INDEX_TABLESPACE = ''
 # 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',
 )
 
 ############

+ 3 - 4
docs/ref/settings.txt

@@ -760,10 +760,9 @@ MIDDLEWARE_CLASSES
 
 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`.
 

+ 0 - 1
docs/topics/http/middleware.txt

@@ -30,7 +30,6 @@ created by :djadmin:`django-admin.py startproject <startproject>`::
         '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`