From 58a66e44e2f23704c1f7ee6819bd5e40cac18c0f Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 26 Oct 2011 00:56:27 +0200 Subject: Correct documentation --- docs/conf/apache-wsgi.conf | 4 ++-- docs/source/install.rst | 4 ++-- docs/source/upgrade.rst | 32 ++++++++++++++++++++++++++++++-- 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/docs/conf/apache-wsgi.conf b/docs/conf/apache-wsgi.conf index a5277e6..c462022 100644 --- a/docs/conf/apache-wsgi.conf +++ b/docs/conf/apache-wsgi.conf @@ -1,7 +1,7 @@ ServerName papillon.example.com - WSGIDaemonProcess ishtar processes=2 maximum-requests=500 threads=1 - WSGIProcessGroup ishtar + WSGIDaemonProcess papillon processes=2 maximum-requests=500 threads=1 + WSGIProcessGroup papillon WSGIScriptAlias / /var/local/django/papillon/apache/django.wsgi ErrorLog ${APACHE_LOG_DIR}/papillon/error.log 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