Riallineato con il branch principale

settings_local.py

@@ -35,16 +35,13 @@ DATABASES = {
     }
 }
 
+#this is the default setting
 #CACHE_BACKEND = 'file://%s' % os.path.join(os.path.dirname(__file__),'cache').replace('\\','/')
 #CACHE_BACKEND = 'dummy://'
-CACHE_BACKEND = 'memcached://<server-address>:<port>/'
-SESSION_ENGINE = 'django.contrib.sessions.backends.db'
-
-SPHINX_API_VERSION = 0x113 #refer to djangosphinx documentation
-SPHINX_SEARCH_INDICES=('osqa',)
-SPHINX_SERVER='localhost'
-SPHINX_PORT=3312
 
+#custom setting
+#CACHE_BACKEND = 'memcached://<server-address>:<port>/'
+SESSION_ENGINE = 'django.contrib.sessions.backends.db'
 
 # This should be equal to your domain name, plus the web application context.
 # This shouldn't be followed by a trailing slash.
@@ -62,4 +59,5 @@ LANGUAGE_CODE = 'it'
 DJANGO_VERSION = 1.3
 OSQA_DEFAULT_SKIN = 'default'
 
+# disable mysqlfulltxt and local authentication (registrations users)
 DISABLED_MODULES = ['books', 'recaptcha', 'project_badges', 'mysqlfulltxt', 'localauth']