merge jambazov -> trunk

[osqa.git] / settings_local.py.dist

diff --git a/settings_local.py.dist b/settings_local.py.dist
index 8f997e5253a1c2082b6790ec867d87f936fcf8ef..9768cfaf3b6fe0a024f3299fe11c9100f5d433dc 100644 (file)
--- a/settings_local.py.dist
+++ b/settings_local.py.dist
@@ -35,20 +35,14 @@ CACHE_BACKEND = 'file://%s' % os.path.join(os.path.dirname(__file__),'cache').re
 #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'
 
-###########################
-#
-#   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