diff --git a/README.rst b/README.rst
index d74ee39..ec370ab 100644
--- a/README.rst
+++ b/README.rst
@@ -18,7 +18,7 @@ version 3 for distribution.
 Features
 --------
 
- * Mapping / dispatching::
+ * Mappers / dispatching::
    With Mandaye you can define your own mapping files. This allows you to call your own filters
    on the right HTTP requests. See the config part for more details.
  * Filters::
@@ -28,8 +28,8 @@ Features
    Mandaye provide a sql local authentification but you can also implement your own
    local authentification.
  * Distant authentification::
-   At the moment Mandaye only support form replay for a distant authentification but we will provide
-   SAML 2.0, OpenID and CAS support.
+   At the moment Mandaye only support SAML 2.0 with password replay but we will provide
+   SAML 2.0, OAuth and CAS support.
 
 
 Installation
@@ -75,7 +75,7 @@ Quick Start
 
 First step is to create a mandaye project::
 
-    $ mandaye-admin --newproject PROJECT_NAME
+    $ mandaye-admin.py --newproject PROJECT_NAME
     $ cd PROJECT_NAME
 
 Configure your project (look configuration section)::
@@ -86,21 +86,21 @@ Configure your project (look configuration section)::
 Install your Mandaye project::
 
     $ python setup.py install
-    $ PROJECT_NAME_manager --createdb
+    $ ./manager.py --createdb
 
 Launch mandaye server::
 
-    $ PROJECT_NAME_server
+    $ ./server.py
 
-PROJECT_NAME_server uses gunicorn and gunicorn options (please read http://gunicorn.org/configure.html)
+server.py use gunicorn and gunicorn options (please read http://gunicorn.org/configure.html)
 
 You could also use gunicorn.conf.py-sample (in the mandaye files)::
 
- $ PROJECT_NAME_server -c PATH_TO_THE_FILE/gunicorn.conf.py
+ $ ./server.py -c PATH_TO_THE_FILE/gunicorn.conf.py
 
 or::
 
- $ PROJECT_NAME_server -c PATH_TO_THE_FILE/gunicorn.conf.py -b 0.0.0.0:4242
+ $ ./server.py -c PATH_TO_THE_FILE/gunicorn.conf.py -b 0.0.0.0:4242
 
 Upgrade Mandaye
 ---------------