[MERGE] forward port branch 10.0 up to ffd4442b06b

3 files changed, 30 insertions, 2 deletions

diff --git a/doc/cla/corporate/somko.md b/doc/cla/corporate/somko.md
new file mode 100644
index 00000000000..0c864ab8d24
--- /dev/null
+++ b/doc/cla/corporate/somko.md
@@ -0,0 +1,17 @@
+Belgium, 30/01/2017
+
+Somko 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,
+
+Frederik Santens info@somko.be https://github.com/somko
+
+List of contributors:
+
+Frederik Santens info@somko.be https://github.com/somko
+Thomas Vanmellaerts thomas.vanmellaerts@somko.be https://github.com/thomassomko
+Kasper Declercq kasper.declercq@somko.be https://github.com/kasperdeclercq
\ No newline at end of file
diff --git a/doc/cla/individual/yueqin.md b/doc/cla/individual/yueqin.md
new file mode 100644
index 00000000000..972acd4fa8f
--- /dev/null
+++ b/doc/cla/individual/yueqin.md
@@ -0,0 +1,11 @@
+
+
+China, 2017-02-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,
+
+Yue Qin 602559817@qq.com https://github.com/yueqin
diff --git a/doc/setup/install.rst b/doc/setup/install.rst
index 9d90fef01d7..3a8d45afa89 100644
--- a/doc/setup/install.rst
+++ b/doc/setup/install.rst
@@ -207,9 +207,9 @@ RPM
 
 .. warning::
 
-    with RHEL-based distributions (RHEL, CenOS, Scientific Linux), EPEL_ must
+    with RHEL-based distributions (RHEL, CentOS, Scientific Linux), EPEL_ must
     be added to the distribution's repositories for all of Odoo's
-    dependencies to be available. For CenOS:
+    dependencies to be available. For CentOS:
 
     .. code-block:: console