[MERGE] forward port branch 10.0 up to 11270336fa7

4 files changed, 37 insertions, 2 deletions

diff --git a/doc/cla/corporate/tawasta.md b/doc/cla/corporate/tawasta.md
new file mode 100644
index 00000000000..130e6adf0f2
--- /dev/null
+++ b/doc/cla/corporate/tawasta.md
@@ -0,0 +1,14 @@
+Finland, 2017-07-17
+
+Oy Tawasta OS Technologies Ltd. agrees to the terms of the Odoo Corporate Contributor License Agreement v1.0.
+
+We declare that we are authorized and able to make this agreement and sign this declaration.
+
+Signed,
+
+    Jarmo Kortetjärvi jarmo.kortetjarvi@tawasta.fi https://github.com/jarmokortetjarvi
+
+List of contributors:
+
+    Aleksi Savijoki aleksi.savijoki@tawasta.fi https://github.com/savijoki
+    Jarmo Kortetjärvi jarmo.kortetjarvi@tawasta.fi https://github.com/jarmokortetjarvi
diff --git a/doc/cla/individual/sindhav.md b/doc/cla/individual/sindhav.md
new file mode 100644
index 00000000000..876d54b2475
--- /dev/null
+++ b/doc/cla/individual/sindhav.md
@@ -0,0 +1,10 @@
+India, 2017-07-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,
+
+Rakesh Sindhav sindhav21591@gmail.com https://github.com/sindhav
+
diff --git a/doc/cla/individual/timotalvitie.md b/doc/cla/individual/timotalvitie.md
new file mode 100644
index 00000000000..1268e38225e
--- /dev/null
+++ b/doc/cla/individual/timotalvitie.md
@@ -0,0 +1,11 @@
+Finland, 2017-07-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,
+
+Timo Talvitie timo.talvitie@vizucom.com https://github.com/timotalvitie
diff --git a/doc/reference/module.rst b/doc/reference/module.rst
index 76200fbc9a1..aecb8de8a8f 100644
--- a/doc/reference/module.rst
+++ b/doc/reference/module.rst
@@ -30,11 +30,11 @@ dictionary, where each key specifies module metadatum.
         """,
         # data files always loaded at installation
         'data': [
-            'mymodule_view.xml',
+            'views/mymodule_view.xml',
         ],
         # data files containing optionally loaded demonstration data
         'demo': [
-            'demo_data.xml',
+            'demo/demo_data.xml',
         ],
     }