summaryrefslogtreecommitdiff
path: root/docs/en
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2013-01-30 01:37:08 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2013-01-30 01:37:08 +0100
commit76264f3f3547771c669875a72cae0aa3c4a0f6f5 (patch)
treef938e75a15465925ae65ca4e0774595267095482 /docs/en
parent7d2b053eb79b5ffa81d8b2664b5bb3e510fcc6d8 (diff)
parent280be78a03391ae134bd4b009c648f8217d01bcb (diff)
downloadChimère-76264f3f3547771c669875a72cae0aa3c4a0f6f5.tar.bz2
Chimère-76264f3f3547771c669875a72cae0aa3c4a0f6f5.zip
Merge branch 'master' of ssh://etienne@daenerys.peacefrogs.net/var/local/git/chimere
Diffstat (limited to 'docs/en')
-rw-r--r--docs/en/install.rst4
-rw-r--r--docs/en/upgrade.rst2
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/en/install.rst b/docs/en/install.rst
index 3c2f54b..7ba376b 100644
--- a/docs/en/install.rst
+++ b/docs/en/install.rst
@@ -276,8 +276,8 @@ Create and edit a configuration for Chimère::
mkdir /var/log/apache2/chimere/
chown www-data /var/log/apache2/chimere/
-Adapt the files *mydjango.wsgi* (with the correct sys path and the correct
-module) and Apache *chimere* (with the correct servername and correct paths).
+Adapt the files *mydjango.wsgi* (with the correct module) and Apache
+*chimere* (with the correct servername and correct paths).
To activate the website, reload apache::
diff --git a/docs/en/upgrade.rst b/docs/en/upgrade.rst
index fc8dc0f..ef9d0d1 100644
--- a/docs/en/upgrade.rst
+++ b/docs/en/upgrade.rst
@@ -254,7 +254,7 @@ Django South is now used to manage database migrations.
.. code-block:: bash
cd $CHIMERE_APP_PATH
- ./manage.py syncdb
+ ./manage.py syncdb --noinput
./manage.py migrate chimere 0001 --fake # fake the database initialisation
./manage.py migrate chimere