Correct documentation

2 files changed, 32 insertions, 4 deletions

diff --git a/docs/source/install.rst b/docs/source/install.rst
index 48f098d..1defe38 100644
--- a/docs/source/install.rst
+++ b/docs/source/install.rst
@@ -112,7 +112,7 @@ If your Papillon is going to be used by many people, it is recommanded to use a
 In the directory Papillon, put up a symbolic link to the basic styles django (change the path depending on your installation of django)::
 
     $ cd $PAPILLON_PATH
-    $ ln -s /usr/share/python-support/python-django/django/contrib/admin/media/ .
+    $ ln -s  .
 
 
 Database initialisation
@@ -199,7 +199,7 @@ Install mod_wsgi for apache::
 Copy and adapt the apache configuration file for Papillon::
 
     $ cd $INSTALL_PATH
-    $ sudo cp papillon/docs/conf/apache-wsgi.conf /etc/apache2/sites-available/papillon
+    $ sudo cp docs/conf/apache-wsgi.conf /etc/apache2/sites-available/papillon
     $ sudo nano /etc/apache2/sites-available/papillon
 
 Copy and adapt the wsgi configuration file for Papillon::
diff --git a/docs/source/upgrade.rst b/docs/source/upgrade.rst
index 61c2c30..24f7d44 100644
--- a/docs/source/upgrade.rst
+++ b/docs/source/upgrade.rst
@@ -38,12 +38,12 @@ Get the new sources. Extract the tarball (from the download `directory <http://w
 Copy updated files to your installation (be careful to put trailing slash)::
 
     $ PAPILLON_PATH=/var/local/django/papillon/
-    $ rsync -raP /tmp/papillon/ $PAPILLON_PATH
+    $ sudo rsync -raP /tmp/papillon/ $PAPILLON_PATH
 
 As the Git is now used you can remove (if any) Subversion directory in your new installation::
 
     $ cd $PAPILLON_PATH
-    $ find . -name ".svn" -exec rm -rf {} \;
+    $ sudo find . -name ".svn" -exec rm -rf {} \;
 
 New dependencies
 ****************
@@ -68,6 +68,21 @@ Change the manualy set definition of the project path by the lines::
     import os.path
     PROJECT_PATH = os.path.dirname(os.path.abspath(__file__))
 
+Be careful: PROJECT_PATH has no trailing slash. So for every variable
+using PROJECT_PATH don't forget (if necessary) to add a slash.
+
+For instance if you have::
+
+    TEMPLATE_DIRS = (
+        PROJECT_PATH + 'templates',
+    )
+
+Change it to::
+
+    TEMPLATE_DIRS = (
+        PROJECT_PATH + '/templates',
+    )
+
 Migrate to new version of db configuration. The lines::
 
     DATABASE_ENGINE = 'sqlite3'           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
@@ -103,6 +118,19 @@ You have to change MEDIA_URL and ADMIN_MEDIA_PREFIX. If there is no EXTRA_URL an
 
 Otherwise set the full URL.
 
+Add South to the list of installed applications (before papillon.polls)::
+
+    INSTALLED_APPS = (
+    'django.contrib.auth',
+    'django.contrib.admin',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.sites',
+    'django.contrib.markup',
+    'south',
+    'papillon.polls',
+    )
+
 
 Update database
 ***************