[MERGE] forward port branch saas-12.1 up to 6d4940675f1

7 files changed, 63 insertions, 1 deletions

diff --git a/doc/cla/corporate/business-solutions-for-africa.md b/doc/cla/corporate/business-solutions-for-africa.md
new file mode 100644
index 00000000000..7619f7e2471
--- /dev/null
+++ b/doc/cla/corporate/business-solutions-for-africa.md
@@ -0,0 +1,15 @@
+The Democratic Republic of Congo, April 3rd 2019
+
+Business Solutions For Africa 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,
+
+Vincent Luba vincent@biz-4-africa.com https://github.com/BIZ4Africa
+
+List of contributors:
+
+Vincent Luba vincent@biz-4-africa.com https://github.com/BIZ4Africa
diff --git a/doc/cla/corporate/xoe-corp.md b/doc/cla/corporate/xoe-corp.md
index ef449e25d72..cb0e7d5eb42 100644
--- a/doc/cla/corporate/xoe-corp.md
+++ b/doc/cla/corporate/xoe-corp.md
@@ -13,3 +13,4 @@ David Arnold dar@xoe.solutions https://github.com/blaggacao
 List of contributors:
 
 David Arnold dar@devco.co https://github.com/blaggacao
+Deiber Rincon dri@xoe.solutions https://github.com/deiber
diff --git a/doc/cla/individual/andriisem.md b/doc/cla/individual/andriisem.md
new file mode 100644
index 00000000000..da69e5db958
--- /dev/null
+++ b/doc/cla/individual/andriisem.md
@@ -0,0 +1,9 @@
+Ukraine, 2019-04-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,
+
+Andrii Semko semko.andrey.i@gmail.com https://github.com/andriisem
\ No newline at end of file
diff --git a/doc/cla/individual/bletourmy.md b/doc/cla/individual/bletourmy.md
new file mode 100644
index 00000000000..1d51fcaf71d
--- /dev/null
+++ b/doc/cla/individual/bletourmy.md
@@ -0,0 +1,11 @@
+Switzerland, 2019-03-25
+
+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,
+
+Bernard Letourmy bernard.letourmy@gmail.com  https://github.com/bletourmy
diff --git a/doc/cla/individual/matthewdwatkins.md b/doc/cla/individual/matthewdwatkins.md
new file mode 100644
index 00000000000..75f773aa5a4
--- /dev/null
+++ b/doc/cla/individual/matthewdwatkins.md
@@ -0,0 +1,11 @@
+USA, 2019-04-04
+
+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,
+
+Matthew Watkins mwatkins.bulk@gmail.com https://github.com/matthewdwatkins
diff --git a/doc/cla/individual/mmahgoub.md b/doc/cla/individual/mmahgoub.md
new file mode 100644
index 00000000000..e74845bff23
--- /dev/null
+++ b/doc/cla/individual/mmahgoub.md
@@ -0,0 +1,11 @@
+Sudan, 2019-03-15
+
+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,
+
+Mohammed Mahgoub mmahgoub@gmail.com https://github.com/mmahgoub
diff --git a/doc/howtos/themes.rst b/doc/howtos/themes.rst
index f4f18dff759..89695326b7d 100644
--- a/doc/howtos/themes.rst
+++ b/doc/howtos/themes.rst
@@ -277,7 +277,11 @@ Installing your theme
 
 To install your theme, you just place your theme folder inside addons in your Odoo installation.
 
-After that, navigate to the Settings page, look for your theme and click on the install button.
+After that, navigate to the Odoo **Website** module, go to
+:menuselection:`Configuration --> Settings`.
+
+Under **Website** section click the **Choose a theme** button, then hover over
+your theme and click **Use this theme**.
 
 Structure of an Odoo page
 =========================