Djangoization - Major refactoring (step 1)

1 files changed, 19 insertions, 35 deletions

diff --git a/docs/source/installation.rst b/docs/source/installation.rst
index 7cfa6c5d4..604e1fe15 100644
--- a/docs/source/installation.rst
+++ b/docs/source/installation.rst
@@ -17,35 +17,20 @@ Requirements
 ------------
 
  - `apache <http://www.apache.org/>`_ version 2.x
-
  - `python <http://www.python.org/>`_ versions 2.6 or superior
-
- - `django <http://www.djangoproject.com/>`_ version 1.2
-
- - `postgresql <http://www.postgresql.org/>`_ version 8.x or 9.x
-
+ - `django <http://www.djangoproject.com/>`_ version 1.4
+ - `postgresql <http://www.postgresql.org/>`_ 9.1
+ - `posgis <http://postgis.refractions.net/>`_
  - `gettext <http://www.gnu.org/software/gettext/>`_
-
  - `psycopg2 <http://freshmeat.net/projects/psycopg/>`_
-
  - `python-pisa <http://pypi.python.org/pypi/pisa/>`_
-
  - `django-registration <https://bitbucket.org/ubernostrum/django-registration/>`_
-
- - `django-formwizard <http://django-formwizard.readthedocs.org/en/latest/>`_
-
  - `django-simple-history <https://bitbucket.org/q/django-simple-history/src>`_ version 1.0
-
  - `jquery <http://jquery.com/>`_
-
  - `jquery-ui <http://jqueryui.com/>`_
-
  - `xhtml2odt <http://xhtml2odt.org/>`_
-
  - `python-utidylib <http://developer.berlios.de/projects/utidylib>`_
-
  - `python-lxml <http://lxml.de/>`_
-
  - `python-imaging <http://www.pythonware.com/products/pil/>`_
 
 Optionaly:
@@ -54,29 +39,24 @@ Optionaly:
 
 
 The easier way to obtain most these packages is to get them from your favorite Linux distribution repositories.
-For instance the packages for Debian squeeze are get with::
+For instance the packages for Debian wheezy are get with::
 
-    $ apt-get install apache2 python python-django python-psycopg2 gettext postgresql-8.4 libjs-jquery libjs-jquery-ui
-    $ apt-get install python-pisa python-django-registration python-utidylib python-lxml python-imaging
+    $ apt-get install apache2 python python-django python-psycopg2 gettext \
+          postgresql-9.1 postgresql-9.1-postgis libjs-jquery libjs-jquery-ui \
+          python-pisa python-django-registration python-utidylib python-lxml \
+          python-imaging
 
 If these packages do not exist in your distribution's repository, please refer to applications websites.
 
-django-simple-history, django-formwizard and xhtml2odt are usually not packaged.
+django-simple-history and xhtml2odt are usually not packaged.
 
-To install django-simple-history (mercurial package is needed)::
+To install django-simple-history (git package is needed)::
 
-    $ hg clone -r 1.0 http://bitbucket.org/q/django-simple-history
+    $ git clone https://github.com/treyhunner/django-simple-history.git
     $ cd django-simple-history
     $ python setup.py install
 
-To install django-formwizard (git package is needed)::
-
-    $ git clone https://github.com/stephrdev/django-formwizard.git
-    $ cd django-formwizard
-    $ git checkout 0.5
-    $ python setup.py install
-
-To install django-formwizard (git package is needed)::
+To install xhtml2odt (git package is needed)::
 
     $ git clone git://gitorious.org/xhtml2odt/xhtml2odt.git
 
@@ -95,7 +75,7 @@ Now that postgres is installed, you need to create a new user for your ishtar in
 Then, you have to create the database::
 
 
-    $ createdb --echo --owner ishtar-user --encoding UNICODE ishtar "My Ishtar database"
+    $ createdb --echo --owner ishtar-user --encoding UNICODE ishtar "My Ishtar database" -T 'template_postgis'
 
 Getting the sources
 -------------------
@@ -179,10 +159,14 @@ If a file "initial_data.json" exists copy it to a "fixtures" directory in the is
 
 Create the appropriate tables (still being in ishtar application directory)::
 
-    $ ./manage.py syncdb
+    ./manage.py syncdb --migrate --noinput
+
+
+Then you'll need to create an administrator account (administration can be found
+at: http://where_is_ishtar/admin)::
 
+    ./manage.py createsuperuser
 
-You will be prompted for the creation of an administrator account (administration can be found at: http://where_is_ishtar/admin).
 Then create database views (not automatically created by the admin)::
 
     $ cd $ISHTAR_DIR