From cdc8c61bc3b7ba3e9b7316ae7ab1a65756ef79a2 Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Mon, 23 Mar 2009 23:20:40 +0000 Subject: [PATCH] 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 --- django/conf/global_settings.py | 2 +- docs/ref/settings.txt | 7 +++---- docs/topics/http/middleware.txt | 1 - 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index aed3b3a21b..26b95117be 100644 --- a/django/conf/global_settings.py +++ b/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', ) ############ diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 7652249514..e631909995 100644 --- a/docs/ref/settings.txt +++ b/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`. diff --git a/docs/topics/http/middleware.txt b/docs/topics/http/middleware.txt index 54d4c42194..fe05909a4f 100644 --- a/docs/topics/http/middleware.txt +++ b/docs/topics/http/middleware.txt @@ -30,7 +30,6 @@ created by :djadmin:`django-admin.py 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`