[MERGE] forward port branch saas-11 up to 7ae5121

4 files changed, 25 insertions, 13 deletions

diff --git a/doc/cla/corporate/acsone.md b/doc/cla/corporate/acsone.md
index 8e41f328f83..1e64c996e74 100644
--- a/doc/cla/corporate/acsone.md
+++ b/doc/cla/corporate/acsone.md
@@ -23,3 +23,4 @@ Laurent Mignon laurent.mignon@acsone.eu https://github.com/lmignon
 Olivier Laurent olivier.laurent@acsone.eu https://github.com/Olivier-LAURENT
 Philippe Schmidt philippe.schmidt@acsone.eu https://github.com/phschmidt
 Stéphane Bidoul stephane.bidoul@acsone.eu https://github.com/sbidoul
+Thomas Binsfeld thomas.binsfeld@acsone.eu https://github.com/ThomasBinsfeld
diff --git a/doc/cla/individual/kutyel.md b/doc/cla/individual/kutyel.md
new file mode 100644
index 00000000000..5674374d92e
--- /dev/null
+++ b/doc/cla/individual/kutyel.md
@@ -0,0 +1,11 @@
+Spain, 2016-07-21
+
+I hereby agree to the terms of the Odoo Individual Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Flavio Corpa <flaviocorpa@gmail.com> https://github.com/kutyel
diff --git a/doc/reference/javascript.rst b/doc/reference/javascript.rst
index d7dd2f70b70..342d8484b67 100644
--- a/doc/reference/javascript.rst
+++ b/doc/reference/javascript.rst
@@ -428,9 +428,9 @@ High-level API: calling into Odoo models
 -------------------------------------------
 
 Access to Odoo object methods (made available through XML-RPC from the server)
-is done via :class:`Model` (exported in ``web.Model``). It maps onto the Odoo server objects via
-two primary methods, :func:`~Model.call` and
-:func:`~Model.query`.
+is done via :class:`Model`. It maps onto the Odoo server objects via two primary
+methods, :func:`~Model.call` (exported in ``web.Model``) and :func:`~Model.query`
+(exported in ``web.DataModel``, only available in the backend client).
 
 :func:`~Model.call` is a direct mapping to the corresponding method of
 the Odoo server object. Its usage is similar to that of the Odoo Model API,
@@ -784,15 +784,15 @@ Here is a description of the current file structure:
 * the ``framework/`` folder contains all basic low level modules.  The
   modules here are supposed to be generic.  Some of them are:
 
-    * ``web.ajax`` implements rpc calls
-    * ``web.core`` is a generic modules.  It exports various useful
-      objects and functions, such as ``qweb``, ``_t`` or the main bus.
-    * ``web.Widget`` contains the widget class
-    * ``web.Model`` is an abstraction over ``web.ajax`` to make
-      calls to the server model methods
-    * ``web.session`` is the former ``openerp.session``
-    * ``web.utils`` for useful code snippets
-    * ``web.time`` for every time-related generic functions
+  * ``web.ajax`` implements rpc calls
+  * ``web.core`` is a generic modules.  It exports various useful
+    objects and functions, such as ``qweb``, ``_t`` or the main bus.
+  * ``web.Widget`` contains the widget class
+  * ``web.Model`` is an abstraction over ``web.ajax`` to make
+    calls to the server model methods
+  * ``web.session`` is the former ``openerp.session``
+  * ``web.utils`` for useful code snippets
+  * ``web.time`` for every time-related generic functions
 * the ``views/`` folder contains all view definitions
 * ``widgets/`` is for standalone widgets
 
diff --git a/doc/reference/reports.rst b/doc/reference/reports.rst
index 64545fd5729..854ee58677b 100644
--- a/doc/reference/reports.rst
+++ b/doc/reference/reports.rst
@@ -282,7 +282,7 @@ named :samp:`report.{module.report_name}`. If it exists, it will use it to
 call the QWeb engine; otherwise a generic function will be used. If you wish
 to customize your reports by including more things in the template (like
 records of others models, for example), you can define this model, overwrite
-the function ``render_html`` and pass objects in the ``docargs`` dictionnary:
+the function ``render_html`` and pass objects in the ``docargs`` dictionary:
 
 .. code-block:: python