diff --git a/addons/web/doc/index.rst b/addons/web/doc/index.rst
index 7127bb975ed..650c12f55ec 100644
--- a/addons/web/doc/index.rst
+++ b/addons/web/doc/index.rst
@@ -6,32 +6,49 @@
 Welcome to OpenERP Web's documentation!
 =======================================
 
-Contents:
+Basics
+------
 
 .. toctree::
     :maxdepth: 1
 
     module
-    widget
+    changelog-7.0
 
+Server-Side Web Framework
+-------------------------
 
-    async
-    rpc
-    qweb
-    client_action
+.. toctree::
+    :maxdepth: 1
+
+    web_controllers
+
+Javascript
+----------
+
+.. toctree::
+    :maxdepth: 1
 
     guidelines
-
+    widget
+    rpc
+    async
+    qweb
+    client_action
     testing
 
+Views
+-----
+
+.. toctree::
+    :maxdepth: 1
+
     search_view
     list_view
     form_view
 
-    changelog-7.0
-
 Indices and tables
-==================
+------------------
 
 * :ref:`genindex`
 * :ref:`modindex`
diff --git a/addons/web/doc/web_controllers.rst b/addons/web/doc/web_controllers.rst
new file mode 100644
index 00000000000..4694b72070f
--- /dev/null
+++ b/addons/web/doc/web_controllers.rst
@@ -0,0 +1,85 @@
+
+Web Controllers
+===============
+
+Web controllers are classes in OpenERP able to catch the http requests sent by any browser. They allow to generate
+html pages to be served like any web server, implement new methods to be used by the Javascript client, etc...
+
+Controllers File
+----------------
+
+By convention the controllers should be placed in the controllers directory of the module. Example:
+
+.. code-block:: text
+
+    web_example
+    ├── controllers
+    │   ├── __init__.py
+    │   └── my_controllers.py
+    ├── __init__.py
+    └── __openerp__.py
+
+In ``__init__.py`` you must add:
+
+::
+
+    import controllers
+
+And here is the content of ``controllers/__init__.py``:
+
+::
+    
+    import my_controllers
+
+Now you can put the following content in ``controllers/my_controllers.py``:
+
+::
+
+    import openerp.addons.web.http as http
+    from openerp.addons.web.http import request
+
+
+Controller Declaration
+----------------------
+
+In your controllers file, you can now declare a controller this way:
+
+::
+
+    class MyController(http.Controller):
+        _cp_path = '/my_url'
+
+        @http.httprequest
+        def some_html(self):
+            return "<h1>This is a test</h1>"
+
+        @http.jsonrequest
+        def some_json(self):
+            return {"sample_dictionary": "This is a sample JSON dictionary"}
+
+A controller must inherit from ``http.Controller``. When defining a controller, you must define the url it will match.
+This is the ``_cp_path`` class attribute.
+
+Each time you define a method with ``@http.httprequest`` or ``@http.jsonrequest`` it defines a new part of url to
+match. As example, the ``some_html()`` method will be called a client query the ``/my_url/some_html`` url.
+
+If you want to match precisely the ``/my_url`` url, you must a define a method called ``index``. This is an exception
+compared to other methods:
+
+::
+
+    @http.httprequest
+    def index(self):
+        return "<div>This is the /my_url</div>"
+
+Pure HTTP Requests
+------------------
+
+You can define methods to get any requests using the ``@http.httprequest`` decorator. When doing so, you get the
+HTTP parameters as named parameters of the method:
+
+::
+
+    @http.httprequest
+    def some_html(self, name):
+        return "<h1>You name is %s</h1>" % name