[MERGE] forward port branch 11.0 up to d82c0d133ed

7 files changed, 90 insertions, 8 deletions

diff --git a/doc/cla/corporate/martronic-sa.md b/doc/cla/corporate/martronic-sa.md
new file mode 100644
index 00000000000..1925eb67b7f
--- /dev/null
+++ b/doc/cla/corporate/martronic-sa.md
@@ -0,0 +1,15 @@
+Switzerland, 20.12.2018
+
+Martronic SA agrees to the terms of the Odoo Corporate Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Fabien Moret info@martronic.ch https://github.com/Martronic-SA
+
+List of contributors:
+
+Fabien Moret info@martronic.ch https://github.com/Martronic-SA
diff --git a/doc/cla/corporate/opensourceintegrators.md b/doc/cla/corporate/opensourceintegrators.md
new file mode 100644
index 00000000000..fb4b98e0e73
--- /dev/null
+++ b/doc/cla/corporate/opensourceintegrators.md
@@ -0,0 +1,25 @@
+The United States of America, 2018-12-04
+
+Open Source Integrators agrees to the terms of the Odoo Corporate Contributor License
+Agreement v1.0.
+
+I declare that I am authorized and able to make this agreement and sign this
+declaration.
+
+Signed,
+
+Greg Mader gmader@opensourceintegrators.com https://github.com/gmader
+
+List of contributors:
+
+Greg Mader gmader@opensourceintegrators.com https://github.com/gmader
+Antonio Yamuta ayamuta@opensourceintegrators.com https://github.com/agyamuta
+Balaji Kannan bkannan@opensourceintegrators.com https://github.com/b-kannan
+Bhavesh Odedra bodedra@opensourceintegrators.com https://github.com/bodedra
+Mayank Gosai mgosai@opensourceintegrators.com https://github.com/mgosai
+Maxime Chambreuil mchambreuil@opensourceintegrators.com https://github.com/max3903
+Michael Allen mallen@opensourceintegrators.com https://github.com/osimallen
+Sandeep Magukiya smangukiya@opensourceintegrators.com https://github.com/smangukiya
+Steven Campbell scampbell@opensourceintegrators.com https://github.com/osi-scampbell
+Sudarshan Kadalazhi skadalazhi@opensourceintegrators.com https://github.com/sudarshan1607
+Wolfgang Hall shall@opensourceintegrators.com https://github.com/wolfhall
diff --git a/doc/cla/individual/anandkansagra.md b/doc/cla/individual/anandkansagra.md
new file mode 100644
index 00000000000..514874860b8
--- /dev/null
+++ b/doc/cla/individual/anandkansagra.md
@@ -0,0 +1,11 @@
+India, 2018-11-28
+
+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,
+
+Anand Kansagra kansagraanand@hotmail.com https://github.com/anandkansagra
diff --git a/doc/cla/individual/darshan-odoo.md b/doc/cla/individual/darshan-odoo.md
new file mode 100644
index 00000000000..e038416121a
--- /dev/null
+++ b/doc/cla/individual/darshan-odoo.md
@@ -0,0 +1,9 @@
+India, 2018-12-20
+
+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,
+
+Darshan Patel darshan.barcelona@gmail.com https://github.com/darshan-odoo
diff --git a/doc/cla/individual/doun.md b/doc/cla/individual/doun.md
new file mode 100644
index 00000000000..9e318b22a03
--- /dev/null
+++ b/doc/cla/individual/doun.md
@@ -0,0 +1,11 @@
+China, 2018-11-20
+
+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,
+
+doun doun@163.com https://github.com/doun
diff --git a/doc/cla/individual/etobella.md b/doc/cla/individual/etobella.md
new file mode 100644
index 00000000000..d2d7c711a36
--- /dev/null
+++ b/doc/cla/individual/etobella.md
@@ -0,0 +1,11 @@
+Spain, 2018-09-19
+
+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,
+
+Enric Tobella etobella@creublanca.es https://github.com/etobella
diff --git a/doc/howtos/profilecode.rst b/doc/howtos/profilecode.rst
index 840181ae43b..ed6d2640648 100644
--- a/doc/howtos/profilecode.rst
+++ b/doc/howtos/profilecode.rst
@@ -12,8 +12,8 @@ Graph a method
 
 Odoo embeds a profiler of code. This embeded profiler output can be used to
 generate a graph of calls triggered by the method, number of queries, percentage
-of time taken in the method itself as well as time taken in method and it's
-sub-called methods.
+of time taken in the method itself as well as the time that the method took and
+its sub-called methods.
 
 .. code:: python
 
@@ -23,7 +23,7 @@ sub-called methods.
     @api.multi
     def mymethod(...)
 
-This produce a file called /temp/prof.profile
+This produces a file called /temp/prof.profile
 
 A tool called *gprof2dot* will produce a graph with this result:
 
@@ -37,7 +37,7 @@ A tool called *xdot* will display the resulting graph:
     
     xdot /temp/prof.xdot
     
-The profiler can be also used without saving data in a file.
+The profiler can be also used without saving data in a file:
 
 .. code:: python
 
@@ -78,7 +78,7 @@ completely reviewed.
 Dump stack
 ==========
 
-Sending the SIGQUIT signal to an odoo process (only available on POSIX) makes
+Sending the SIGQUIT signal to an Odoo process (only available on POSIX) makes
 this process output the current stack trace to log, with info level. When an
 odoo process seems stucked, sending this signal to the process permit to know
 what the process is doing, and letting the process continue his job.
@@ -86,8 +86,8 @@ what the process is doing, and letting the process continue his job.
 Tracing code execution
 ======================
 
-Instead of sending the SIGQUIT signal to an odoo process often enough, to check
-where processes is performing worse than expected, we can use pyflame tool to
+Instead of sending the SIGQUIT signal to an Odoo process often enough, to check
+where the processes are performing worse than expected, we can use the pyflame tool to
 do it for us.
 
 Install pyflame and flamegraph
@@ -118,7 +118,7 @@ Once done, we'll display them as an execution graph.
 
 where <PID> is the process ID of the odoo process you want to graph. This will
 wait until the dead of the process, with a maximum of one hour, and and get 5
-traces a second. With the output of pyflame, we can produce an svg graph with
+traces a second. With the output of pyflame, we can produce an SVG graph with
 the flamegraph tool:
 
 .. code:: bash