moved some files and directories inside forum from root

56 files changed, 30 insertions, 11 deletions

diff --git a/README b/README
index 62064c76..56da61c5 100644
--- a/README
+++ b/README
@@ -2,6 +2,8 @@ This is Askbot project - open source Q&A system
 
 Demo site is http://askbot.org/meta
 
+All documentation is in the directory forum/documentation
+
 askbot-devel repository is open to anyone who wants to help develop Askbot - just drop us a note
 
 Askbot is based on code of CNPROG, originally created by Mike Chen and Sailing Cai and some code written for OSQA
diff --git a/LICENSE b/forum/LICENSE
index 803781c5..803781c5 100644
--- a/LICENSE
+++ b/forum/LICENSE
diff --git a/cron/README b/forum/cron/README
index d5573150..d5573150 100644
--- a/cron/README
+++ b/forum/cron/README
diff --git a/cron/multi_award_badges b/forum/cron/multi_award_badges
index 3d768772..3d768772 100755
--- a/cron/multi_award_badges
+++ b/forum/cron/multi_award_badges
diff --git a/cron/multi_award_badges_virtualenv b/forum/cron/multi_award_badges_virtualenv
index 4230fb22..4230fb22 100755
--- a/cron/multi_award_badges_virtualenv
+++ b/forum/cron/multi_award_badges_virtualenv
diff --git a/cron/once_award_badges b/forum/cron/once_award_badges
index 069656ca..069656ca 100755
--- a/cron/once_award_badges
+++ b/forum/cron/once_award_badges
diff --git a/cron/once_award_badges_virtualenv b/forum/cron/once_award_badges_virtualenv
index 0011981c..0011981c 100755
--- a/cron/once_award_badges_virtualenv
+++ b/forum/cron/once_award_badges_virtualenv
diff --git a/cron/send_email_alerts b/forum/cron/send_email_alerts
index 7581a88c..7581a88c 100644
--- a/cron/send_email_alerts
+++ b/forum/cron/send_email_alerts
diff --git a/cron/send_email_alerts_virtualenv b/forum/cron/send_email_alerts_virtualenv
index 2f1b64d0..2f1b64d0 100644
--- a/cron/send_email_alerts_virtualenv
+++ b/forum/cron/send_email_alerts_virtualenv
diff --git a/HOW_TO_DEBUG b/forum/documentation/HOW_TO_DEBUG
index ba36198a..ba36198a 100644
--- a/HOW_TO_DEBUG
+++ b/forum/documentation/HOW_TO_DEBUG
diff --git a/INSTALL b/forum/documentation/INSTALL
index 1eb9607c..c1a41544 100644
--- a/INSTALL
+++ b/forum/documentation/INSTALL
@@ -108,9 +108,12 @@ DATABASE_PASSWORD
 DATABASE_ENGINE
 
 If you set these up, and your database is ready (see section 2),
-run:
+run (note that application 'forum' is under control of south migration system:
 
-python manage.py syncdb
+python manage.py syncdb #create tables for anything not under control of migration system
+python manage.py migrate forum #run migration command - will apply all migrations in sequence
+
+Now you are ready to test your installation:
 python manage.py runserver `hostname -i`:8000
 (choose another port number if you wish)
 
@@ -121,10 +124,20 @@ please post them at http://askbot.org/meta
 
 Prepare your database by using the same database/account
 configuration from above.
-e.g,
+
+If your host has database manager in the control panel - you 
+can use that or you can create database by typing commands manually
+
+on MySQL the commands are:
+
 create database askbot DEFAULT CHARACTER SET UTF8 COLLATE utf8_general_ci;
 grant all on askbot.* to 'askbot'@'localhost';
-And then run "python manage.py syncdb" to synchronize your database.
+
+And then run :
+
+python manage.py syncdb
+python manage.py migrate
+
 
 3. Running Askbot on the development server
 
@@ -241,10 +254,10 @@ WSGIPythonEggs /var/python/eggs #must be readable and writable by apache
 
    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
+   edit paths in the file forum/cron/send_email_alerts
+   set up a cron job to call forum/cron/send_email_alerts once or twice a day
    subscription sender may be tested manually in shell
-   by calling cron/send_email_alerts
+   by calling foru/cron/send_email_alerts
 
 7. Sitemap
 Sitemap will be available at /<settings_local.FORUM_SCRIPT_ALIAS>sitemap.xml
@@ -258,7 +271,7 @@ https://www.google.com/webmasters/tools/
 
 8. Miscellaneous
 
-There are some demo scripts under sql_scripts folder,
+There are some demo scripts under foru/sql_scripts folder,
 including badges and test accounts for CNProg.com. You
 don't need them to run your sample.
 
diff --git a/INSTALL.pip b/forum/documentation/INSTALL.pip
index 92b1c7fa..92b1c7fa 100644
--- a/INSTALL.pip
+++ b/forum/documentation/INSTALL.pip
diff --git a/INSTALL.webfaction b/forum/documentation/INSTALL.webfaction
index 401971a0..401971a0 100644
--- a/INSTALL.webfaction
+++ b/forum/documentation/INSTALL.webfaction
diff --git a/ROADMAP.rst b/forum/documentation/ROADMAP.rst
index c79e0ae4..c79e0ae4 100644
--- a/ROADMAP.rst
+++ b/forum/documentation/ROADMAP.rst
diff --git a/TODO.rst b/forum/documentation/TODO.rst
index f202a3f7..f202a3f7 100644
--- a/TODO.rst
+++ b/forum/documentation/TODO.rst
diff --git a/WISH_LIST b/forum/documentation/WISH_LIST
index 3e383d3e..3e383d3e 100644
--- a/WISH_LIST
+++ b/forum/documentation/WISH_LIST
diff --git a/askbot-requirements.txt b/forum/documentation/askbot-requirements.txt
index 66a37fbe..66a37fbe 100644
--- a/askbot-requirements.txt
+++ b/forum/documentation/askbot-requirements.txt
diff --git a/stackexchange/__init__.py b/forum/importers/__init__.py
index e69de29b..e69de29b 100644
--- a/stackexchange/__init__.py
+++ b/forum/importers/__init__.py
diff --git a/stackexchange/ANOMALIES b/forum/importers/stackexchange/ANOMALIES
index 05a7dbdb..05a7dbdb 100644
--- a/stackexchange/ANOMALIES
+++ b/forum/importers/stackexchange/ANOMALIES
diff --git a/stackexchange/README b/forum/importers/stackexchange/README
index 64d8f5fb..64d8f5fb 100644
--- a/stackexchange/README
+++ b/forum/importers/stackexchange/README
diff --git a/stackexchange/management/__init__.py b/forum/importers/stackexchange/__init__.py
index e69de29b..e69de29b 100644
--- a/stackexchange/management/__init__.py
+++ b/forum/importers/stackexchange/__init__.py
diff --git a/stackexchange/management/commands/__init__.py b/forum/importers/stackexchange/management/__init__.py
index e69de29b..e69de29b 100644
--- a/stackexchange/management/commands/__init__.py
+++ b/forum/importers/stackexchange/management/__init__.py
diff --git a/forum/importers/stackexchange/management/commands/__init__.py b/forum/importers/stackexchange/management/commands/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/forum/importers/stackexchange/management/commands/__init__.py
diff --git a/stackexchange/management/commands/load_stackexchange.py b/forum/importers/stackexchange/management/commands/load_stackexchange.py
index 9cfc7192..ee22e33a 100644
--- a/stackexchange/management/commands/load_stackexchange.py
+++ b/forum/importers/stackexchange/management/commands/load_stackexchange.py
@@ -4,11 +4,11 @@ from django.template.defaultfilters import slugify #todo: adopt unicode-aware sl
 import os
 import re
 import sys
-import stackexchange.parse_models as se_parser
+import forum.importers.stackexchange.parse_models as se_parser
 from xml.etree import ElementTree as et
 from django.db import models
 import forum.models as askbot
-import stackexchange.models as se
+import forum.importers.stackexchange.models as se
 from forum.forms import EditUserEmailFeedsForm
 from forum.utils.html import sanitize_html
 from django.conf import settings
diff --git a/stackexchange/models.py b/forum/importers/stackexchange/models.py
index a30a9859..a30a9859 100644
--- a/stackexchange/models.py
+++ b/forum/importers/stackexchange/models.py
diff --git a/stackexchange/parse_models.py b/forum/importers/stackexchange/parse_models.py
index 64796e57..64796e57 100644
--- a/stackexchange/parse_models.py
+++ b/forum/importers/stackexchange/parse_models.py
diff --git a/forum/search/sphinx/README b/forum/search/sphinx/README
new file mode 100644
index 00000000..8c008a23
--- /dev/null
+++ b/forum/search/sphinx/README
@@ -0,0 +1,4 @@
+This directory contains sample configuration for sphinx search
+
+Sphinx is a full text search engine for MySQL (only) with full
+word stemming in English and Russion (other languages are not supported)
diff --git a/sphinx/sphinx.conf b/forum/search/sphinx/sphinx.conf
index bf4bdc8b..bf4bdc8b 100644
--- a/sphinx/sphinx.conf
+++ b/forum/search/sphinx/sphinx.conf
diff --git a/sql_scripts/091111_upgrade_evgeny.sql b/forum/sql_scripts/091111_upgrade_evgeny.sql
index cb76ec3c..cb76ec3c 100644
--- a/sql_scripts/091111_upgrade_evgeny.sql
+++ b/forum/sql_scripts/091111_upgrade_evgeny.sql
diff --git a/sql_scripts/091208_upgrade_evgeny.sql b/forum/sql_scripts/091208_upgrade_evgeny.sql
index d9c4289a..d9c4289a 100644
--- a/sql_scripts/091208_upgrade_evgeny.sql
+++ b/forum/sql_scripts/091208_upgrade_evgeny.sql
diff --git a/sql_scripts/091208_upgrade_evgeny_1.sql b/forum/sql_scripts/091208_upgrade_evgeny_1.sql
index b1b4107f..b1b4107f 100644
--- a/sql_scripts/091208_upgrade_evgeny_1.sql
+++ b/forum/sql_scripts/091208_upgrade_evgeny_1.sql
diff --git a/sql_scripts/100108_upgrade_ef.sql b/forum/sql_scripts/100108_upgrade_ef.sql
index 1c9a5c1c..1c9a5c1c 100644
--- a/sql_scripts/100108_upgrade_ef.sql
+++ b/forum/sql_scripts/100108_upgrade_ef.sql
diff --git a/sql_scripts/badges.sql b/forum/sql_scripts/badges.sql
index 5fd03d18..5fd03d18 100644
--- a/sql_scripts/badges.sql
+++ b/forum/sql_scripts/badges.sql
diff --git a/sql_scripts/cnprog.xml b/forum/sql_scripts/cnprog.xml
index 95f9b362..95f9b362 100644
--- a/sql_scripts/cnprog.xml
+++ b/forum/sql_scripts/cnprog.xml
diff --git a/sql_scripts/cnprog_new_install.sql b/forum/sql_scripts/cnprog_new_install.sql
index ac33a6ba..ac33a6ba 100644
--- a/sql_scripts/cnprog_new_install.sql
+++ b/forum/sql_scripts/cnprog_new_install.sql
diff --git a/sql_scripts/cnprog_new_install_2009_02_28.sql b/forum/sql_scripts/cnprog_new_install_2009_02_28.sql
index 80b9fced..80b9fced 100644
--- a/sql_scripts/cnprog_new_install_2009_02_28.sql
+++ b/forum/sql_scripts/cnprog_new_install_2009_02_28.sql
diff --git a/sql_scripts/cnprog_new_install_2009_03_31.sql b/forum/sql_scripts/cnprog_new_install_2009_03_31.sql
index c2c69f36..c2c69f36 100644
--- a/sql_scripts/cnprog_new_install_2009_03_31.sql
+++ b/forum/sql_scripts/cnprog_new_install_2009_03_31.sql
diff --git a/sql_scripts/cnprog_new_install_2009_04_07.sql b/forum/sql_scripts/cnprog_new_install_2009_04_07.sql
index ff9016fa..ff9016fa 100644
--- a/sql_scripts/cnprog_new_install_2009_04_07.sql
+++ b/forum/sql_scripts/cnprog_new_install_2009_04_07.sql
diff --git a/sql_scripts/cnprog_new_install_2009_04_09.sql b/forum/sql_scripts/cnprog_new_install_2009_04_09.sql
index f4424852..f4424852 100644
--- a/sql_scripts/cnprog_new_install_2009_04_09.sql
+++ b/forum/sql_scripts/cnprog_new_install_2009_04_09.sql
diff --git a/sql_scripts/drop-all-tables.sh b/forum/sql_scripts/drop-all-tables.sh
index 1e55cb1f..1e55cb1f 100644
--- a/sql_scripts/drop-all-tables.sh
+++ b/forum/sql_scripts/drop-all-tables.sh
diff --git a/sql_scripts/drop-auth.sql b/forum/sql_scripts/drop-auth.sql
index bc17dce3..bc17dce3 100644
--- a/sql_scripts/drop-auth.sql
+++ b/forum/sql_scripts/drop-auth.sql
diff --git a/sql_scripts/pg_fts_install.sql b/forum/sql_scripts/pg_fts_install.sql
index d0655134..d0655134 100644
--- a/sql_scripts/pg_fts_install.sql
+++ b/forum/sql_scripts/pg_fts_install.sql
diff --git a/sql_scripts/update_2009_01_13_001.sql b/forum/sql_scripts/update_2009_01_13_001.sql
index 165d1125..165d1125 100644
--- a/sql_scripts/update_2009_01_13_001.sql
+++ b/forum/sql_scripts/update_2009_01_13_001.sql
diff --git a/sql_scripts/update_2009_01_13_002.sql b/forum/sql_scripts/update_2009_01_13_002.sql
index c223cb8c..c223cb8c 100644
--- a/sql_scripts/update_2009_01_13_002.sql
+++ b/forum/sql_scripts/update_2009_01_13_002.sql
diff --git a/sql_scripts/update_2009_01_18_001.sql b/forum/sql_scripts/update_2009_01_18_001.sql
index 6f29fa32..6f29fa32 100644
--- a/sql_scripts/update_2009_01_18_001.sql
+++ b/forum/sql_scripts/update_2009_01_18_001.sql
diff --git a/sql_scripts/update_2009_01_24.sql b/forum/sql_scripts/update_2009_01_24.sql
index 45b83935..45b83935 100644
--- a/sql_scripts/update_2009_01_24.sql
+++ b/forum/sql_scripts/update_2009_01_24.sql
diff --git a/sql_scripts/update_2009_01_25_001.sql b/forum/sql_scripts/update_2009_01_25_001.sql
index 16c3487b..16c3487b 100644
--- a/sql_scripts/update_2009_01_25_001.sql
+++ b/forum/sql_scripts/update_2009_01_25_001.sql
diff --git a/sql_scripts/update_2009_02_26_001.sql b/forum/sql_scripts/update_2009_02_26_001.sql
index a6af5931..a6af5931 100644
--- a/sql_scripts/update_2009_02_26_001.sql
+++ b/forum/sql_scripts/update_2009_02_26_001.sql
diff --git a/sql_scripts/update_2009_04_10_001.sql b/forum/sql_scripts/update_2009_04_10_001.sql
index 8148632a..8148632a 100644
--- a/sql_scripts/update_2009_04_10_001.sql
+++ b/forum/sql_scripts/update_2009_04_10_001.sql
diff --git a/sql_scripts/update_2009_07_05_EF.sql b/forum/sql_scripts/update_2009_07_05_EF.sql
index 43c7c2f0..43c7c2f0 100644
--- a/sql_scripts/update_2009_07_05_EF.sql
+++ b/forum/sql_scripts/update_2009_07_05_EF.sql
diff --git a/sql_scripts/update_2009_12_24_001.sql b/forum/sql_scripts/update_2009_12_24_001.sql
index 3d082c2f..3d082c2f 100644
--- a/sql_scripts/update_2009_12_24_001.sql
+++ b/forum/sql_scripts/update_2009_12_24_001.sql
diff --git a/sql_scripts/update_2009_12_27_001.sql b/forum/sql_scripts/update_2009_12_27_001.sql
index e2da7d4d..e2da7d4d 100644
--- a/sql_scripts/update_2009_12_27_001.sql
+++ b/forum/sql_scripts/update_2009_12_27_001.sql
diff --git a/sql_scripts/update_2009_12_27_002.sql b/forum/sql_scripts/update_2009_12_27_002.sql
index a36470bf..a36470bf 100644
--- a/sql_scripts/update_2009_12_27_002.sql
+++ b/forum/sql_scripts/update_2009_12_27_002.sql
diff --git a/sql_scripts/update_2010_01_23.sql b/forum/sql_scripts/update_2010_01_23.sql
index 621207be..621207be 100755
--- a/sql_scripts/update_2010_01_23.sql
+++ b/forum/sql_scripts/update_2010_01_23.sql
diff --git a/sql_scripts/update_2010_02_22.sql b/forum/sql_scripts/update_2010_02_22.sql
index 2778885a..2778885a 100644
--- a/sql_scripts/update_2010_02_22.sql
+++ b/forum/sql_scripts/update_2010_02_22.sql
diff --git a/settings.py b/settings.py
index b80eb4f2..a26d666b 100644
--- a/settings.py
+++ b/settings.py
@@ -74,7 +74,7 @@ INSTALLED_APPS = (
     'forum',
     'django_authopenid',
     'debug_toolbar' ,
-    #'stackexchange', #se loader
+    #'forum.importers.stackexchange', #se loader
     'south',
 )