diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2015-02-14 21:42:27 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2015-02-14 21:42:27 +0100 |
| commit | 660ce29ac2cf781c8e9607a837b9832e1692e156 (patch) | |
| tree | dfc74f2056cfc9a1ce12eb17adf8bc3771510495 /docs | |
| parent | 3daa945c334f719e7edb086021bfcc93880eb7f7 (diff) | |
| parent | 57bbba43a75a72eeacd44f1ce5fcd6f203dc321c (diff) | |
| download | Chimère-660ce29ac2cf781c8e9607a837b9832e1692e156.tar.bz2 Chimère-660ce29ac2cf781c8e9607a837b9832e1692e156.zip | |
Merge branch 'master' into nef
Conflicts:
chimere/admin.py
chimere/forms.py
chimere/models.py
chimere/settings.sample.py
chimere/static/chimere/js/jquery.chimere-ol.js
chimere/templates/chimere/base.html
chimere/templates/chimere/blocks/head_chimere.html
chimere/templates/chimere/blocks/map.html
chimere/templates/chimere/main_map.html
chimere/templatetags/chimere_tags.py
chimere/tests.py
chimere/urls.py
chimere/views.py
chimere/widgets.py
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/en/install.rst | 9 | ||||
| -rw-r--r-- | docs/fr/install.rst | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/docs/en/install.rst b/docs/en/install.rst index 59884b7..b663dd2 100644 --- a/docs/en/install.rst +++ b/docs/en/install.rst @@ -17,7 +17,6 @@ If you want to install the Chimère package for Debian Wheezy dependencies are managed by the package. You can go to the next section of the documentation. - - `Apache <http://www.apache.org/>`_ version 2.x - `Python <http://www.python.org/>`_ versions 2.6 or 2.7 - `Django <http://www.djangoproject.com/>`_ >= version 1.4 - `South <http://south.aeracode.org/>`_ @@ -53,7 +52,7 @@ Optionaly (but recommanded): The simpliest way to obtain these packages is to get them from your favorite Linux distribution repositories. For instance on Debian Wheezy:: - apt-get install apache2 python python-django python-django-south \ + apt-get install python python-django python-django-south \ postgresql-9.1 gettext python-psycopg2 python-imaging \ python-pyexiv2 python-beautifulsoup python-simplejson python-gdal \ python-lxml libjs-jquery libjs-jquery-ui python-feedparser \ @@ -65,7 +64,7 @@ On Debian Squeeze (you need to activate backports):: apt-get install -t squeeze-backports python-django libjs-jquery - apt-get install apache2 python python-django python-django-south \ + apt-get install python python-django python-django-south \ postgresql-8.4 gettext python-psycopg2 python-imaging \ python-pyexiv2 python-beautifulsoup python-simplejson python-gdal \ python-lxml libjs-jquery libjs-jquery-ui python-feedparser \ @@ -139,7 +138,7 @@ the last version for the 1.0 branch is version 1.0.2).:: wget http://www.peacefrogs.net/download/chimere/chimere-1.0.2.tar.bz2 -Download, unpack and move the files in an apache user (www-data for Debian) +Download, unpack and move the files in an webserser user (www-data for Debian) readable directory:: cd $INSTALL_PATH @@ -285,7 +284,7 @@ Apache configuration with mod_wsgi Install *mod_wsgi* for Apache:: - apt-get install libapache2-mod-wsgi + apt-get install apache2 libapache2-mod-wsgi Create and edit a configuration for Chimère:: diff --git a/docs/fr/install.rst b/docs/fr/install.rst index 2fbd804..2deeeca 100644 --- a/docs/fr/install.rst +++ b/docs/fr/install.rst @@ -16,7 +16,6 @@ Si vous souhaitez installer le paquet Debian prévu pour Wheezy, les dépendance sont gérées par le paquet. Vous pouvez passer à la section suivante de la documentation. - - `Apache <http://www.apache.org/>`_ version 2.x - `Python <http://www.python.org/>`_ versions 2.6 ou 2.7 - `Django <http://www.djangoproject.com/>`_ >= version 1.4 - `South <http://south.aeracode.org/>`_ @@ -52,7 +51,7 @@ La manière la plus simple de satisfaire à ces pré-prequis est de les installe par le biais des dépôts de votre distribution Linux préférée. Par exemple pour Debian Wheezy : :: - apt-get install apache2 python python-django python-django-south \ + apt-get install python python-django python-django-south \ postgresql-9.1 gettext python-psycopg2 python-imaging \ python-pyexiv2 python-beautifulsoup python-simplejson python-gdal \ python-lxml libjs-jquery libjs-jquery-ui python-feedparser \ @@ -63,7 +62,7 @@ Pour Debian Squeeze (il est nécessaire d'activer les backports) : :: apt-get install -t squeeze-backports python-django libjs-jquery - apt-get install apache2 python python-django python-django-south \ + apt-get install python python-django python-django-south \ postgresql-8.4 gettext python-psycopg2 python-imaging \ python-pyexiv2 python-beautifulsoup python-simplejson python-gdal \ python-lxml libjs-jquery libjs-jquery-ui python-feedparser \ @@ -293,7 +292,7 @@ Configuration d'Apache avec mod_wsgi Installez *mod_wsgi* pour Apache : :: - apt-get install libapache2-mod-wsgi + apt-get install apache2 libapache2-mod-wsgi Créez et éditez la configuration de Chimère en fonction de votre installation :: |