diff -r 97361ddaf342 -r 843e0b1bf991 doc/book/en/C011-installation.en.txt
--- a/doc/book/en/C011-installation.en.txt	Mon Dec 22 19:06:36 2008 +0100
+++ b/doc/book/en/C011-installation.en.txt	Mon Dec 22 19:10:38 2008 +0100
@@ -5,21 +5,29 @@
 Installation
 ============
 
-Installation of `Cubicweb` and its dependancies
+Installation of `Cubicweb` and its dependencies
 -----------------------------------------------
 
-`CubicWeb` is available as a debian package as well as an archive.
-We will detail here the two easiest way to set-up `CubciWeb` 
-environment.
+`CubicWeb` is packaged for Debian and Ubuntu, but can be installed from source
+using a tarball or the Mercurial version control system.
 
 Debian and Ubuntu packages
 ```````````````````````````
 Depending on the distribution you are using, add the appropriate line to your list
-of sources (for example by editing ``/etc/apt/sources.list``) ::
+of sources (for example by editing ``/etc/apt/sources.list``).
+
+For Debian Lenny::
 
   deb http://ftp.logilab.org/dists/ lenny/
+
+For Debian Sid::
+
+  deb http://ftp.logilab.org/dists/ sid/
+
+For Ubuntu Hardy::
+
   deb http://ftp.logilab.org/dists/ hardy/
-  deb http://ftp.logilab.org/dists/ sid/
+
 
 You can now install the required packages with the following command: ::
 
@@ -27,29 +35,28 @@
 
 This is it!
 
-``tar.gz`` archive
-``````````````````
+Install from source
+```````````````````
 
-You can download our sources at: ::
+You can download the archive containing the sources from our `ftp site`_ at: ::
 
   http://ftp.logilab.org/pub/cubicweb/
 
-Unpack the sources
-
-
-
+.. _`ftp site`: http://ftp.logilab.org/pub/cubicweb/
 
-.. note::
-  `CubicWeb` is also available as a Mercurial repository using the forest
-  extension (see :ref:`MercurialForestInstall` for more details).
+or keep up to date with on-going development by using Mercurial and its forest
+extension::
 
+  hg fclone http://www.logilab.org/hg/forests/cubicweb
+
+See :ref:`MercurialPresentation` for more details about Mercurial.
 
 Postgres installation
 `````````````````````
 
-Please refer to the project online documentation Postgres_.
+Please refer to the `Postgresql project online documentation`_.
 
-.. _Postgres: http://www.postgresql.org/
+.. _`Postgres project online documentation`: http://www.postgresql.org/
 
 You need to install the three following packages: `postgres-8.3`,
 `postgres-contrib-8.3` and `postgresql-plpython-8.3`.