diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py
index 620d677a5bf..50b280d2c32 100644
--- a/addons/pad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -14,6 +14,7 @@ pads (by default, http://ietherpad.com/).
'website': 'http://openerp.com',
'depends': ['base'],
'data': ['res_company.xml'],
+ 'demo': ['pad_demo.xml'],
'installable': True,
'auto_install': False,
'web': True,
diff --git a/addons/pad/pad_demo.xml b/addons/pad/pad_demo.xml
new file mode 100644
index 00000000000..407f90e8242
--- /dev/null
+++ b/addons/pad/pad_demo.xml
@@ -0,0 +1,9 @@
+
+
+
+
+ pad.openerp.com
+
+
+
+
diff --git a/addons/pad/res_company.xml b/addons/pad/res_company.xml
index 5a9164db2f4..1e2184c61a3 100644
--- a/addons/pad/res_company.xml
+++ b/addons/pad/res_company.xml
@@ -7,11 +7,12 @@
-
+
+
diff --git a/addons/pad/static/src/xml/pad.xml b/addons/pad/static/src/xml/pad.xml
index e84414dd4e8..ce79df52684 100644
--- a/addons/pad/static/src/xml/pad.xml
+++ b/addons/pad/static/src/xml/pad.xml
@@ -11,7 +11,6 @@
- Please configure your etherpad server.
- OpenERP Entreprise customers may safely use pad.openerp.com
+ You must configure the etherpad through the menu Setting > Companies > Companies, in the configuration tab of your company.