resolving conflict in the email settings file

[osqa.git] / osqa.wsgi.dist

diff --git a/osqa.wsgi.dist b/osqa.wsgi.dist
index c3a269da0a91aafa27f3795d93c6477cf45ab0a7..70c0da874023f2cee532916ab63dcbd59150e517 100644 (file)
--- a/osqa.wsgi.dist
+++ b/osqa.wsgi.dist
@@ -2,6 +2,10 @@ import os
 import sys
 sys.path.append('/path/to_dir_above')
 sys.path.append('/path/to_dir_above/osqa')
+# The first part of this module name should be identical to the directory name
+# of the OSQA source.  For instance, if the full path to OSQA is
+# /home/osqa/osqa-server, then the DJANGO_SETTINGS_MODULE should have a value
+# of 'osqa-server.settings'.
 os.environ['DJANGO_SETTINGS_MODULE'] = 'osqa.settings'
 import django.core.handlers.wsgi
 application = django.core.handlers.wsgi.WSGIHandler()