From 384a6157afe3172f7e42dd2ffb0dd22c2f939b2e Mon Sep 17 00:00:00 2001
From: Nawa <bellefeegore@follepensee.net>
Date: Fri, 30 Nov 2012 17:21:22 +0100
Subject: Documentation: new corrections, mainly on the french pages

---
 docs/install.rst | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'docs/install.rst')

diff --git a/docs/install.rst b/docs/install.rst
index 3b8fd38..ea27efc 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -5,7 +5,7 @@ Installation
 ============
 
 :Author: Étienne Loks
-:date: 2012-10-08
+:date: 2012-11-28
 :Copyright: CC-BY 3.0
 
 This document presents the installation of Chimère.
@@ -14,21 +14,21 @@ It has been updated for version 2.0.0.
 Prerequisites
 *************
 
- - `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/>`_
- - `postgres <http://www.postgresql.org/>`_ >= version 8.x
- - `gettext <http://www.gnu.org/software/gettext/>`_
- - `psycopg2 <http://freshmeat.net/projects/psycopg/>`_
+ - `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/>`_
+ - `Postgres <http://www.postgresql.org/>`_ >= version 8.x
+ - `Gettext <http://www.gnu.org/software/gettext/>`_
+ - `Psycopg2 <http://freshmeat.net/projects/psycopg/>`_
  - `Python Imaging Library <http://www.pythonware.com/products/pil/>`_
- - `pyexiv2 <http://tilloy.net/dev/pyexiv2/>`_
+ - `Pyexiv2 <http://tilloy.net/dev/pyexiv2/>`_
  - `Beautiful Soup <http://www.crummy.com/software/BeautifulSoup/>`_
  - python-simplejson
  - python-gdal
- - `lxml <http://lxml.de/>`_
- - `jquery <http://jquery.com/>`_ version 1.7.1 or better
- - `jquery-ui <http://jqueryui.com/>`_
+ - `Lxml <http://lxml.de/>`_
+ - `Jquery <http://jquery.com/>`_ version 1.7.1 or better
+ - `Jquery-ui <http://jqueryui.com/>`_
  - `Universal Feed Parser <https://code.google.com/p/feedparser/>`_
 
 geodjango is a part of django since version 1.0 but it has some specific
@@ -53,9 +53,9 @@ Linux distribution repositories. For instance on Debian Wheezy::
     apt-get install apache2 python python-django python-django-south \
         postgresql-9.1 gettext python-psycopg2 python-imaging \
         python-pyexiv2 python-beautifulsoup python-simplejson python-gdal \
-        javascript-common python-lxml libjs-jquery libjs-jquery-ui \
-        python-feedparser libgeos-3.3.3 proj-bin postgresql-9.1-postgis \
-        gdal-bin tinymce gpsbabel python-django-celery
+        python-lxml libjs-jquery libjs-jquery-ui python-feedparser \
+        libgeos-3.3.3 proj-bin postgresql-9.1-postgis gdal-bin \
+        tinymce gpsbabel python-django-celery javascript-common 
 
 
 On Debian Squeeze (you need to activate backports)::
@@ -65,9 +65,9 @@ On Debian Squeeze (you need to activate backports)::
     apt-get install apache2 python python-django python-django-south \
         postgresql-8.4 gettext python-psycopg2 python-imaging \
         python-pyexiv2 python-beautifulsoup python-simplejson python-gdal \
-        javascript-common python-lxml libjs-jquery libjs-jquery-ui \
-        python-feedparser libgeos-3.2.0 proj-bin postgresql-8.4-postgis \
-        gdal-bin tinymce gpsbabel
+        python-lxml libjs-jquery libjs-jquery-ui python-feedparser \
+        libgeos-3.2.0 proj-bin postgresql-8.4-postgis gdal-bin \
+        tinymce gpsbabel javascript-common 
 
 The package *python-django-celery* doesn't exist for Debian Squeeze.
 
-- 
cgit v1.2.3