merged with master branch

1 files changed, 23 insertions, 23 deletions

diff --git a/INSTALL b/INSTALL
index f70b3ec7..bd3ac60d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -56,7 +56,7 @@ Notice that you will need to register with recaptcha.net and receive
 recaptcha public and private keys that need to be saved in your
 settings_local.py file
 
-NOTES: django_authopenid is included into OSQA code 
+NOTES: django_authopenid is included into OSQA code
 and is significantly modified.  http://code.google.com/p/django-authopenid/
 no need to install this library
 
@@ -66,7 +66,7 @@ B. INSTALLATION
 
    make osqa installation server-readable on Linux command might be:
    chown -R yourlogin:apache /path/to/OSQA
-   
+
    directories templates/upfiles and log must be server writable
 
    on Linux type chmod
@@ -77,28 +77,28 @@ B. INSTALLATION
 
 1. Settings file
 
-Copy settings_local.py.dist to settings_local.py and 
-update all your settings. Check settings.py and update 
+Copy settings_local.py.dist to settings_local.py and
+update all your settings. Check settings.py and update
 it as well if necessory.
 Section C explains configuration paramaters.
 
 2. Database
 
-Prepare your database by using the same database/account 
+Prepare your database by using the same database/account
 configuration from above.
 e.g,
 create database osqa DEFAULT CHARACTER SET UTF8 COLLATE utf8_general_ci;
 grant all on osqa.* to 'osqa'@'localhost';
 And then run "python manage.py syncdb" to synchronize your database.
 
-3. Running OSQA on the development server 
+3. Running OSQA on the development server
 
-Run "python manage.py runserver" to startup django 
+Run "python manage.py runserver" to startup django
 development environment.
 (Under Linux you can use command "python manage.py runserver `hostname -i`:8000",
 where you can use any other available number for the port)
 
-you might want to have DEBUG=True in the beginning of settings.py 
+you might want to have DEBUG=True in the beginning of settings.py
 when using the test server
 
 4. Installation under Apache/WSGI
@@ -118,7 +118,7 @@ import django.core.handlers.wsgi
 application = django.core.handlers.wsgi.WSGIHandler()
 -----------
 
-insert method is used for path because if the forum directory name 
+insert method is used for path because if the forum directory name
 is by accident the same as some other python module
 you wull see strange errors - forum won't be found even though
 it's in the python path. for example using name "test" is
@@ -133,7 +133,7 @@ WSGISocketPrefix /path/to/socket/sock #must be readable and writable by apache
 WSGIPythonHome /usr/local #must be readable by apache
 WSGIPythonEggs /var/python/eggs #must be readable and writable by apache
 
-#NOTE: all urs below will need to be adjusted if 
+#NOTE: all urs below will need to be adjusted if
 #settings.FORUM_SCRIPT_ALIAS !='' (e.g. = 'forum/')
 #this allows "rooting" forum at http://example.com/forum, if you like
 <VirtualHost ...your ip...:80>
@@ -144,8 +144,8 @@ WSGIPythonEggs /var/python/eggs #must be readable and writable by apache
     #run mod_wsgi process for django in daemon mode
     #this allows avoiding confused timezone settings when
     #another application runs in the same virtual host
-    WSGIDaemonProcess OSQA 
-    WSGIProcessGroup OSQA 
+    WSGIDaemonProcess OSQA
+    WSGIProcessGroup OSQA
 
     #force all content to be served as static files
     #otherwise django will be crunching images through itself wasting time
@@ -213,42 +213,42 @@ WSGIPythonEggs /var/python/eggs #must be readable and writable by apache
 
    in settings_local.py set
    USE_SPHINX_SEARCH=True
-   adjust other settings that have SPHINX_* prefix accordingly 
+   adjust other settings that have SPHINX_* prefix accordingly
    remember that there must be trailing comma in parentheses for
    SHPINX_SEARCH_INDICES tuple - particlarly with just one item!
-   
+
    in settings.py look for INSTALLED_APPS
    and uncomment #'djangosphinx',
-   
+
 
 6. Email subscriptions
-   
+
    This function at the moment requires Django 1.1
 
    edit paths in the file cron/send_email_alerts
    set up a cron job to call cron/send_email_alerts once or twice a day
-   subscription sender may be tested manually in shell 
+   subscription sender may be tested manually in shell
    by calling cron/send_email_alerts
 
 7. Sitemap
 Sitemap will be available at /<settings_local.FORUM_SCRIPT_ALIAS>sitemap.xml
 e.g yoursite.com/forum/sitemap.xml
 
-google will be pinged each time question, answer or 
+google will be pinged each time question, answer or
 comment is saved or a question deleted
 
-for this to be useful - do register you sitemap with Google at 
+for this to be useful - do register you sitemap with Google at
 https://www.google.com/webmasters/tools/
 
 8. Miscellaneous
 
-There are some demo scripts under sql_scripts folder, 
-including badges and test accounts for CNProg.com. You 
+There are some demo scripts under sql_scripts folder,
+including badges and test accounts for CNProg.com. You
 don't need them to run your sample.
 
 C. CONFIGURATION PARAMETERS
 
-#the only parameter that needs to be touched in settings.py is 
+#the only parameter that needs to be touched in settings.py is
 DEBUG=False #set to True to enable debug mode
 
 #all forum parameters are set in file settings_local.py
@@ -269,7 +269,7 @@ EMAIL_USE_TLS=False
 TIME_ZONE = 'America/Tijuana'
 APP_TITLE = u'OSQA Q&A Forum' #title of your forum
 APP_KEYWORDS = u'OSQA,forum,community' #keywords for search engines
-APP_DESCRIPTION = u'Ask and answer questions.' #site description for searche engines 
+APP_DESCRIPTION = u'Ask and answer questions.' #site description for searche engines
 APP_INTRO = u'<p>Ask and answer questions, make the world better!</p>' #slogan that goes to front page in logged out mode
 APP_COPYRIGHT = '' #copyright message