--- a/README.txt	Thu Feb 27 23:19:13 2014 +0100
+++ b/README.txt	Fri Feb 28 09:55:12 2014 +0100
@@ -42,7 +42,7 @@
 (all other python dependencies will be downloaded by buildout)
 
 Installation (development install)
-============
+==================================
 1. Install python2.5+ and all required libraries
 	(ubuntu users : 'sudo apt-get install python python-magic python-setuptools python-uno libyaml-0-1 python-yaml python-dev git-core python-utidylib python-pexpect python-cssutils')
 2. Install pandoc
@@ -85,8 +85,50 @@
    - `./bin/django runserver --settings=settings`
 11. Access your Comt instance by pointing your browser to http://127.0.0.1:8000/
 
+Installation (Vagrant development box)
+======================================
+
+The second option is to use the vagrant virtual machine defined in the `dev` folder.
+For this you need first to install Vagrant for your platform (c.f. http://www.vagrantup.com/), open a terminal in the `dev` folder and launch the command
+<code>
+$ vagrant up
+</code>
+This will create a virtual box, using the private address 172.16.1.2. An instance of comt can be reached at the following url http://172.16.1.2.
+
+The installation have the following parameters:
+  - The root of the project is mapped on `/srv/comt` on the dev box.
+  - The web server is nginx (http://nginx.org/).
+  - The web pages are served as a wsgi application with gunicorn (http://gunicorn.org/).
+  - The gunicorn processes are monitored by supervisor (http://supervisord.org/).
+  - Openoffice is installed but is not launched as an headless instance (althought it could be easily setup with supervisor).
+  - The dev box uses a virtual network with the ip 172.16.1.2 (this can be changed in the Vagrant config).
+  - The box is provisioned using puppet (http://puppetlabs.com/).
+  - Most of the configuration is don in the sysconfig module found in `dev/modules/sysconfig`.
+  - All the other subdirectories of `dev/modules` are puppet modules used during the box provisioning. All the folders are sub-repositories and are checked-out using git.
+
+Moreover, the following parameters are set :
+
+  | var name       | default     |
+  |----------------|-------------|
+  | db_name        | coment      |
+  | db_user        | coment_user |
+  | db_pw          | coment      |
+  | db_host        | 127.0.0.1   |
+  | db_port        | 5432        |
+  | superuser_name | admin       |
+  | superuser_pw   | dev@co-ment |
+
+These values can be overriden by creating a `custom.yaml` file in the `dev` folder. The file `custom.yaml.tmpl` gives a template for the format of this file.
+if the db_host is empty or 'localhost', or '127.0.0.1', the database is considered local to the box and a postgresql server is installed in the virtual server.
+Otherwise, the server is considered remote and only the postgresql client libraries are installed on the dev box.
+Also in this case, the database (db_name) and user (db_user) are not created automatically.
+You must ensure that they are already created on the postgresql server with the adequate authorizations, and that the user can connect on the 'remote' server from the dev box.
+
+Please refer to the available online documentation for more details on the various tools used here.
+
+
 Installation (production environment)
-=============
+=====================================
 This README.txt does not cover in details a production environment because this kind of setup is too platform dependant for us to provide a guide.
 A few tips thought:
 - recommended way to install it is using apache and wsgi, check out django installation guide at http://www.djangoproject.com/documentation/modpython/
@@ -116,7 +158,7 @@
 To use openoffice, on a development setup, you should make sure no openoffice process is left and launch `soffice -headless "-accept=socket,port=2002;urp;"` to start openoffice in background mode.
 
 Comt uses
-============
+=========
 
 Javascript libs used (and license) / shipped with the distribution
 ------------------------------------------------------------------