diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-11-20 02:52:28 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-11-20 02:52:28 +0100 |
| commit | 63afe4e84cd3be5284a7126264c06ce87d191bc0 (patch) | |
| tree | 1ba8afc27b5aee7cdfb1d4abcde142b260c635b0 /docs | |
| parent | f65df4be0383b60b6a500f76f6405a6c5621df23 (diff) | |
| parent | 00697996e885044314cc297b72aaa86d69d2a219 (diff) | |
| download | Chimère-63afe4e84cd3be5284a7126264c06ce87d191bc0.tar.bz2 Chimère-63afe4e84cd3be5284a7126264c06ce87d191bc0.zip | |
Merge branch 'master' into carte-ouverte
Conflicts:
.gitignore
chimere/main/actions.py
chimere/urls.py
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/en/INSTALL.t2t | 4 | ||||
| -rw-r--r-- | docs/en/UPGRADE.t2t | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/docs/en/INSTALL.t2t b/docs/en/INSTALL.t2t index 01ddd9a..9cfdd25 100644 --- a/docs/en/INSTALL.t2t +++ b/docs/en/INSTALL.t2t @@ -30,7 +30,7 @@ Optionaly (but recommanded): - [tinymce http://tinymce.moxiecode.com/] -The simpliest way to obtain these packages is to get them from your favorite Linux distribution repositories (for instance python, python-django, tinymce, apache2, libapache2-mod-python, libgeos-3.0.0, proj, gdal-bin, python-psycopg2, python-imaging, postgresql-8.3 and postgresql-8.3-postgis packages for Debian Lenny). If these packages do not exist in your distribution's repository, please refer to the applications' websites. +The simpliest way to obtain these packages is to get them from your favorite Linux distribution repositories (for instance python, python-django, tinymce, apache2, libapache2-mod-python, libgeos-3.2.0, proj, gdal-bin, python-psycopg2, python-imaging, postgresql-8.4 and postgresql-8.4-postgis packages for Debian Squeeze). If these packages do not exist in your distribution's repository, please refer to the applications' websites. +++ Database configuration +++ @@ -57,6 +57,8 @@ Another solution is to get the last git version: ``` git clone git://www.peacefrogs.net/git/chimere +git tag -l # list tagged versions +git checkout v1.0.0 # checkout the desired version ``` +++ Install the sources +++ diff --git a/docs/en/UPGRADE.t2t b/docs/en/UPGRADE.t2t index 1e874fe..0f5a068 100644 --- a/docs/en/UPGRADE.t2t +++ b/docs/en/UPGRADE.t2t @@ -119,7 +119,7 @@ In "settings.py" verify that "chimere.scripts" is in the INSTALLED_APPS. After that in the chimere directory just execute the script: ``` -python ./scripts/upgrade +$ python ./scripts/upgrade ``` + Point to the new installation + |