[MERGE] foward port of 10.0 up to revision 84a650e33aadb29661121410813e3de37a5ad3e9

8 files changed, 77 insertions, 4 deletions

diff --git a/doc/_extensions/odoo_ext/sub-menu_list.html b/doc/_extensions/odoo_ext/sub-menu_list.html
index 16677c10e39..3b4d21620f3 100644
--- a/doc/_extensions/odoo_ext/sub-menu_list.html
+++ b/doc/_extensions/odoo_ext/sub-menu_list.html
@@ -1,8 +1,8 @@
 {# note: if odoo.com/page/docs sub-menu's structure change, these links have to change as well #}
 
-<li><a href="http://www.odoo.com/documentation/user/9.0/index.html">User</a></li>
-<li><a href="http://www.odoo.com/documentation/9.0/index.html">Developer</a></li>
-<li><a href="http://www.odoo.com/documentation/9.0/api_integration.html">API</a></li>
-<li><a href="http://www.odoo.com/documentation/9.0/setup/install.html">Installation</a></li>
+<li><a href="http://www.odoo.com/documentation/user/10.0/index.html">User</a></li>
+<li><a href="http://www.odoo.com/documentation/10.0/index.html">Developer</a></li>
+<li><a href="http://www.odoo.com/documentation/10.0/api_integration.html">API</a></li>
+<li><a href="http://www.odoo.com/documentation/10.0/setup/install.html">Installation</a></li>
 <li><a href="http://www.odoo.com/page/odoo-white-paper">White Papers</a></li>
 <li><a href="http://www.odoo.com/page/legal">Legal</a></li>
diff --git a/doc/cla/corporate/x8bit.md b/doc/cla/corporate/x8bit.md
new file mode 100644
index 00000000000..acf69f5ffdd
--- /dev/null
+++ b/doc/cla/corporate/x8bit.md
@@ -0,0 +1,15 @@
+México, 2016-07-19
+
+X8BIT 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,
+
+Juan Carlos del Valle juan@x8bit.com https://github.com/imekinox
+
+List of contributors:
+
+Juan Carlos del Valle juan@x8bit.com https://github.com/imekinox
\ No newline at end of file
diff --git a/doc/cla/individual/hhgabelgaard.md b/doc/cla/individual/hhgabelgaard.md
new file mode 100644
index 00000000000..e873ef3f5e4
--- /dev/null
+++ b/doc/cla/individual/hhgabelgaard.md
@@ -0,0 +1,11 @@
+Denmark, 2016-05-06
+
+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,
+
+Hans Henrik Gabelgaard hhg@gabelgaard.org https://github.com/hhgabelgaard
\ No newline at end of file
diff --git a/doc/cla/individual/iluque.md b/doc/cla/individual/iluque.md
new file mode 100644
index 00000000000..3395caeb182
--- /dev/null
+++ b/doc/cla/individual/iluque.md
@@ -0,0 +1,9 @@
+Spain, 25/10/2016
+
+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,
+
+Iker LuqueMichel luquemichel@gmail.com https://github.com/iluque
diff --git a/doc/cla/individual/jlzhou.md b/doc/cla/individual/jlzhou.md
new file mode 100644
index 00000000000..121bbe225ff
--- /dev/null
+++ b/doc/cla/individual/jlzhou.md
@@ -0,0 +1,9 @@
+China, 2016-10-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,
+
+Henry Zhou zhouhenry@live.com https://github.com/jlzhou
diff --git a/doc/cla/individual/liujianyun.md b/doc/cla/individual/liujianyun.md
new file mode 100644
index 00000000000..16dc33cf91d
--- /dev/null
+++ b/doc/cla/individual/liujianyun.md
@@ -0,0 +1,9 @@
+China, 2016-10-12
+
+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,
+
+Liu Jianyun lnkdel@gmail.com https://github.com/lnkdel
diff --git a/doc/cla/individual/salvatoretrimarchi.md b/doc/cla/individual/salvatoretrimarchi.md
new file mode 100644
index 00000000000..51758066b69
--- /dev/null
+++ b/doc/cla/individual/salvatoretrimarchi.md
@@ -0,0 +1,9 @@
+Honduras, 2016-12-08
+
+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,
+
+Salvatore Josué Trimarchi Pinto salvatore.trimarchi@gmail.com https://github.com/salvatoretrimarchi
diff --git a/doc/cla/individual/smartupdo.md b/doc/cla/individual/smartupdo.md
new file mode 100644
index 00000000000..92a0d943313
--- /dev/null
+++ b/doc/cla/individual/smartupdo.md
@@ -0,0 +1,11 @@
+Dominican Republic, October 26, 2016
+
+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,
+
+Richard Aquino richard@smartup.do https://github.com/smartupdo