Author: adrian
Date: 2006-05-25 23:05:02 -0500 (Thu, 25 May 2006)
New Revision: 2980
Modified:
django/trunk/django/conf/global_settings.py
django/trunk/django/conf/project_template/settings.py
django/trunk/docs/cache.txt
django/trunk/docs/csrf.txt
django/trunk/docs/middleware.txt
django/trunk/docs/sessions.txt
django/trunk/docs/transactions.txt
Log:
Fixed #1998 -- Changed double quotes to single quotes
Modified: django/trunk/django/conf/global_settings.py
===================================================================
--- django/trunk/django/conf/global_settings.py 2006-05-25 05:29:27 UTC (rev
2979)
+++ django/trunk/django/conf/global_settings.py 2006-05-26 04:05:02 UTC (rev
2980)
@@ -219,12 +219,12 @@
# 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.contrib.sessions.middleware.SessionMiddleware",
- "django.contrib.auth.middleware.AuthenticationMiddleware",
-# "django.middleware.http.ConditionalGetMiddleware",
-# "django.middleware.gzip.GZipMiddleware",
- "django.middleware.common.CommonMiddleware",
- "django.middleware.doc.XViewMiddleware",
+ 'django.contrib.sessions.middleware.SessionMiddleware',
+ 'django.contrib.auth.middleware.AuthenticationMiddleware',
+# 'django.middleware.http.ConditionalGetMiddleware',
+# 'django.middleware.gzip.GZipMiddleware',
+ 'django.middleware.common.CommonMiddleware',
+ 'django.middleware.doc.XViewMiddleware',
)
############
Modified: django/trunk/django/conf/project_template/settings.py
===================================================================
--- django/trunk/django/conf/project_template/settings.py 2006-05-25
05:29:27 UTC (rev 2979)
+++ django/trunk/django/conf/project_template/settings.py 2006-05-26
04:05:02 UTC (rev 2980)
@@ -51,10 +51,10 @@
)
MIDDLEWARE_CLASSES = (
- "django.middleware.common.CommonMiddleware",
- "django.contrib.sessions.middleware.SessionMiddleware",
- "django.contrib.auth.middleware.AuthenticationMiddleware",
- "django.middleware.doc.XViewMiddleware",
+ 'django.middleware.common.CommonMiddleware',
+ 'django.contrib.sessions.middleware.SessionMiddleware',
+ 'django.contrib.auth.middleware.AuthenticationMiddleware',
+ 'django.middleware.doc.XViewMiddleware',
)
ROOT_URLCONF = '{{ project_name }}.urls'
Modified: django/trunk/docs/cache.txt
===================================================================
--- django/trunk/docs/cache.txt 2006-05-25 05:29:27 UTC (rev 2979)
+++ django/trunk/docs/cache.txt 2006-05-26 04:05:02 UTC (rev 2980)
@@ -209,12 +209,12 @@
==================
Once the cache is set up, the simplest way to use caching is to cache your
-entire site. Just add ``django.middleware.cache.CacheMiddleware`` to your
+entire site. Just add ``'django.middleware.cache.CacheMiddleware'`` to your
``MIDDLEWARE_CLASSES`` setting, as in this example::
MIDDLEWARE_CLASSES = (
- "django.middleware.cache.CacheMiddleware",
- "django.middleware.common.CommonMiddleware",
+ 'django.middleware.cache.CacheMiddleware',
+ 'django.middleware.common.CommonMiddleware',
)
(The order of ``MIDDLEWARE_CLASSES`` matters. See "Order of MIDDLEWARE_CLASSES"
Modified: django/trunk/docs/csrf.txt
===================================================================
--- django/trunk/docs/csrf.txt 2006-05-25 05:29:27 UTC (rev 2979)
+++ django/trunk/docs/csrf.txt 2006-05-26 04:05:02 UTC (rev 2980)
@@ -17,7 +17,7 @@
How to use it
=============
-Add the middleware ``"django.contrib.csrf.middleware.CsrfMiddleware"`` to
+Add the middleware ``'django.contrib.csrf.middleware.CsrfMiddleware'`` to
your list of middleware classes, ``MIDDLEWARE_CLASSES``. It needs to process
the response after the SessionMiddleware, so must come before it in the
list. It also must process the response before things like compression
Modified: django/trunk/docs/middleware.txt
===================================================================
--- django/trunk/docs/middleware.txt 2006-05-25 05:29:27 UTC (rev 2979)
+++ django/trunk/docs/middleware.txt 2006-05-26 04:05:02 UTC (rev 2980)
@@ -23,10 +23,10 @@
``django-admin.py startproject``::
MIDDLEWARE_CLASSES = (
- "django.middleware.common.CommonMiddleware",
- "django.contrib.sessions.middleware.SessionMiddleware",
- "django.contrib.auth.middleware.AuthenticationMiddleware",
- "django.middleware.doc.XViewMiddleware",
+ 'django.middleware.common.CommonMiddleware',
+ 'django.contrib.sessions.middleware.SessionMiddleware',
+ 'django.contrib.auth.middleware.AuthenticationMiddleware',
+ 'django.middleware.doc.XViewMiddleware',
)
Django applies middleware in the order it's defined in ``MIDDLEWARE_CLASSES``,
Modified: django/trunk/docs/sessions.txt
===================================================================
--- django/trunk/docs/sessions.txt 2006-05-25 05:29:27 UTC (rev 2979)
+++ django/trunk/docs/sessions.txt 2006-05-26 04:05:02 UTC (rev 2980)
@@ -14,7 +14,7 @@
Turn session functionality on and off by editing the ``MIDDLEWARE_CLASSES``
setting. To activate sessions, make sure ``MIDDLEWARE_CLASSES`` contains
-``"django.contrib.sessions.middleware.SessionMiddleware"``.
+``'django.contrib.sessions.middleware.SessionMiddleware'``.
The default ``settings.py`` created by ``django-admin.py startproject`` has
``SessionMiddleware`` activated.
Modified: django/trunk/docs/transactions.txt
===================================================================
--- django/trunk/docs/transactions.txt 2006-05-25 05:29:27 UTC (rev 2979)
+++ django/trunk/docs/transactions.txt 2006-05-26 04:05:02 UTC (rev 2980)
@@ -32,10 +32,10 @@
your ``MIDDLEWARE_CLASSES`` setting::
MIDDLEWARE_CLASSES = (
- "django.contrib.sessions.middleware.SessionMiddleware",
- "django.middleware.common.CommonMiddleware",
- "django.middleware.cache.CacheMiddleware",
- "django.middleware.transaction.TransactionMiddleware",
+ 'django.contrib.sessions.middleware.SessionMiddleware',
+ 'django.middleware.common.CommonMiddleware',
+ 'django.middleware.cache.CacheMiddleware',
+ 'django.middleware.transaction.TransactionMiddleware',
)
The order is quite important. The transaction middleware applies not only to
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
