Small fixes in documentation

1 files changed, 21 insertions, 20 deletions

diff --git a/docs/install.rst b/docs/install.rst
index 8c4a517..163c980 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -9,7 +9,7 @@ Chimère installation
 :Copyright: CC-BY 3.0
 
 This documents presents the installation of Chimère.
-The version has been updated for installation of version 2.0-RC3.
+The version has been updated for installation of version 2.0-RC4.
 
 -----------------
 Base installation
@@ -88,9 +88,11 @@ chimere::
 Then, you have to create the database and initialize the geographic types (adapt
 the paths accordingly to your needs)::
 
+    PG_VERSION=9.1 # 8.4 for debian Squeeze
     createdb --echo --owner chimere-user --encoding UNICODE chimere "My Chimère database"
-    psql -d chimere -f /usr/share/postgresql/9.1/contrib/postgis-1.5/postgis.sql
-    psql -d chimere -f /usr/share/postgresql/9.1/contrib/postgis-1.5/spatial_ref_sys.sql
+    createlang plpgsql chimere # only necessary on Debian Squeeze
+    psql -d chimere -f /usr/share/postgresql/$PG_VERSION/contrib/postgis-1.5/postgis.sql
+    psql -d chimere -f /usr/share/postgresql/$PG_VERSION/contrib/postgis-1.5/spatial_ref_sys.sql
 
 Install the sources
 *******************
@@ -98,7 +100,7 @@ Install the sources
 Choose a path to install your Chimère::
 
     INSTALL_PATH=/var/local/django
-    sudo mkdir $INSTALL_PATH
+    mkdir $INSTALL_PATH
 
 From an archive
 +++++++++++++++
@@ -121,8 +123,8 @@ Download, unpack and move the files in an apache user (www-data for Debian)
 readable directory::
 
     cd $INSTALL_PATH
-    sudo tar xvjf chimere-last.tar.bz2
-    sudo chown -R myusername:www-data chimere
+    tar xvjf chimere-last.tar.bz2
+    chown -R myusername:www-data chimere
 
 From the git repository
 +++++++++++++++++++++++
@@ -167,7 +169,6 @@ settings are initialized in settings.py. ::
     * PROJECT_NAME: name of the project
     * ROOT_URLCONF: url configuration for your project something like:
       'mychimere_project.urls'
-    * ROOT_PATH: path to the installation of Chimère
     * EMAIL_HOST: smtp of an email server to send emails
     * TINYMCE_URL: url to tinymce path (default is appropriate
       for a Debian installation with tinymce activated)
@@ -183,15 +184,15 @@ settings are initialized in settings.py. ::
 Manage media path permission::
 
     cd $INSTALL_PATH/chimere/mychimere_project
-    sudo chown -R user:www-data media
-    sudo chmod -R g+w media
+    chown -R user:www-data media
+    chmod -R g+w media
 
 Create log file::
 
     mkdir /var/log/django
     touch /var/log/django/chimere.log
-    sudo chown -R root:www-data /var/log/django/
-    sudo chmod -R g+w /var/log/django/
+    chown -R root:www-data /var/log/django/
+    chmod -R g+w /var/log/django/
 
 Regroup static files in one path::
 
@@ -246,26 +247,26 @@ Apache configuration with mod_wsgi
 
 Install mod_wsgi for apache::
 
-    sudo apt-get install libapache2-mod-wsgi
+    apt-get install libapache2-mod-wsgi
 
 
 TODO: adapt apache-wsgi.conf
 Create and edit a configuration for Chimère::
 
-    sudo cp $INSTALL_PATH/chimere/apache/django.wsgi \
+    cp $INSTALL_PATH/chimere/apache/django.wsgi \
             $INSTALL_PATH/chimere/apache/mydjango.wsgi 
-    sudo vim $INSTALL_PATH/chimere/apache/mydjango.wsgi
-    sudo cp $INSTALL_PATH/chimere/apache/apache-wsgi.conf /etc/apache2/sites-available/chimere
-    sudo vim /etc/apache2/sites-available/chimere
+    vim $INSTALL_PATH/chimere/apache/mydjango.wsgi
+    cp $INSTALL_PATH/chimere/apache/apache-wsgi.conf /etc/apache2/sites-available/chimere
+    vim /etc/apache2/sites-available/chimere
     # create log dir
-    sudo mkdir /var/log/apache2/chimere/
+    mkdir /var/log/apache2/chimere/
 
-Adapt the files *mydjango.wsgi* (with the correct sys path) and *chimere*.
+Adapt the files *mydjango.wsgi* (with the correct sys path) and Apache *chimere*.
 
 To activate the website reload apache::
 
-    sudo a2ensite chimere
-    sudo /etc/init.d/apache2 reload
+    a2ensite chimere
+    /etc/init.d/apache2 reload
 
 ------------------
 Base configuration