Accepting merge (branches/carpenter->trunk). Incorporates update svn ignore property...

[osqa.git] / settings_local.py.dist

diff --git a/settings_local.py.dist b/settings_local.py.dist
index 3b1cd458a2c1a85dd96baf2040de95c29a056b5f..9768cfaf3b6fe0a024f3299fe11c9100f5d433dc 100644 (file)
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -13,7 +13,7 @@ logging.basicConfig(
 )
 
 #ADMINS and MANAGERS
 )
 
 #ADMINS and MANAGERS

-ADMINS = (('Forum Admin', 'forum@example.com'),)
+ADMINS = ()

 MANAGERS = ADMINS
 
 DEBUG = False
 MANAGERS = ADMINS
 
 DEBUG = False


@@ -23,6 +23,7 @@ DEBUG_TOOLBAR_CONFIG = {
 TEMPLATE_DEBUG = DEBUG
 INTERNAL_IPS = ('127.0.0.1',)
 
 TEMPLATE_DEBUG = DEBUG
 INTERNAL_IPS = ('127.0.0.1',)
 

+

 DATABASE_NAME = ''             # Or path to database file if using sqlite3.
 DATABASE_USER = ''               # Not used with sqlite3.
 DATABASE_PASSWORD = ''               # Not used with sqlite3.
 DATABASE_NAME = ''             # Or path to database file if using sqlite3.
 DATABASE_USER = ''               # Not used with sqlite3.
 DATABASE_PASSWORD = ''               # Not used with sqlite3.


@@ -34,27 +35,19 @@ CACHE_BACKEND = 'file://%s' % os.path.join(os.path.dirname(__file__),'cache').re
 #CACHE_BACKEND = 'dummy://'
 SESSION_ENGINE = 'django.contrib.sessions.backends.db'
 
 #CACHE_BACKEND = 'dummy://'
 SESSION_ENGINE = 'django.contrib.sessions.backends.db'
 

-APP_URL = 'http://' #used by email notif system and RSS
+# This should be equal to your domain name, plus the web application context.
+# This shouldn't be followed by a trailing slash.
+# I.e., http://www.yoursite.com or http://www.hostedsite.com/yourhostapp
+APP_URL = 'http://'

 
 #LOCALIZATIONS
 TIME_ZONE = 'America/New_York'
 
 
 #LOCALIZATIONS
 TIME_ZONE = 'America/New_York'
 

-###########################
-#
-#   this will allow running your forum with url like http://site.com/forum
-#
-#   FORUM_SCRIPT_ALIAS = 'forum/'
-#
-FORUM_SCRIPT_ALIAS = '' #no leading slash, default = '' empty string
-
-

 #OTHER SETTINGS
 
 USE_I18N = True
 LANGUAGE_CODE = 'en'
 
 #OTHER SETTINGS
 
 USE_I18N = True
 LANGUAGE_CODE = 'en'
 

-EMAIL_VALIDATION = 'off' #string - on|off
-

 DJANGO_VERSION = 1.1
 OSQA_DEFAULT_SKIN = 'default'
 
 DJANGO_VERSION = 1.1
 OSQA_DEFAULT_SKIN = 'default'