# HG changeset patch
# User Sandrine Ribeau <sandrine.ribeau@logilab.fr>
# Date 1238601192 25200
# Node ID 3a5d622f166fc787ec8daef73857c76a7d9c33ac
# Parent  ef2715330b92f68b70b7acfd9793159b5e26ee00# Parent  0d12d4371d11b87d525131242915a12ef2d3dacd
merge

diff -r 0d12d4371d11 -r 3a5d622f166f doc/book/en/C011-installation.en.txt
--- a/doc/book/en/C011-installation.en.txt	Wed Apr 01 17:26:36 2009 +0200
+++ b/doc/book/en/C011-installation.en.txt	Wed Apr 01 08:53:12 2009 -0700
@@ -29,7 +29,7 @@
   deb http://ftp.logilab.org/dists/ hardy/
 
 
-You can now install the required packages with the following command::
+You can now install the required packages with the following command: ::
 
   apt-get update 
   apt-get install cubicweb
@@ -41,7 +41,7 @@
 Install from source
 ```````````````````
 
-You can download the archive containing the sources from our `ftp site`_ at::
+You can download the archive containing the sources from our `ftp site`_ at: ::
 
   http://ftp.logilab.org/pub/cubicweb/
 
@@ -92,8 +92,8 @@
 Your new cubes will be placed in `/usr/share/cubicweb/cubes` and
 your applications will be placed in `/etc/cubicweb.d`.
 
-To use other directories you will have to configure the
-following environment variables as follows::
+To use others directories then you will have to configure the
+following environment variables as follows: ::
 
     export CW_CUBES_PATH=~/lib/cubes
     export CW_REGISTRY=~/etc/cubicweb.d/
@@ -111,7 +111,7 @@
 
 .. note::
     If you already have an existing cluster and postgres server
-    running you do not require to execute the initilization step
+    running, you do not require to execute the initilization step
     of your Postgres database.
 
 * First you have to initialize the database Postgres with the command ``initdb``.
@@ -120,7 +120,7 @@
     $ initdb -D /path/to/pgsql
 
   Once initialized, you can launch the database server Postgres 
-  with the command::
+  with the command: ::
   
     $ postgres -D /path/to/psql
 
@@ -130,20 +130,30 @@
  
     $ chown username /path/to/pgsql
 
-* Create a superuser for `CubicWeb` instance::
+* The database authentication can be either set to `ident sameuser`
+  or `md5`. 
+  If set to `md5`, make sure to use an existing user
+  of your database.
+  If set to `ident sameuser`, make sure that your
+  client's operating system user name has a matching user in
+  the database. If not, please do as follow to create a user: ::
     
     $ su
     $ su - postgres
     $ createuser -s username
 
-  Initialize the password of the superuser you just created for your
-  database::
+  If created with the options -P (for password prompt, 
+  ``createuser -s -P username``), the password will be encrypted with
+  the method set in the configuration file ``pg_hba.conf``. 
+  If you do not use this option, then the default value will be null
+  and this require to set the password in the database itself.
+  To do so: ::
     
     $ su 
     $ su - postgres
     $ psql
 
-  And then execute de following query::
+  And then execute de following query: ::
     
     ALTER USER username WITH PASSWORD `password`
 
@@ -151,7 +161,10 @@
   instance with `cubicweb-ctl create` to initialize the database of
   your application.
 
-.. FIXME Are these steps really necessary? It seemed to work without.
+.. note::
+    The authentication method can be configured in ``pg_hba.conf``.
+
+.. [XXX] Est-ce que ces etapes sont vraiment necessaires?  sand : lors de l'installation de ma bdd cela n'a pas ete fait et il semble que tout aille bien. Doit etre verifie avec les experts.
 
 * installation of plain-text index extension ::