[MERGE] from trunk

[odoo/odoo.git] / addons / knowledge / installer.py

diff --git a/addons/knowledge/installer.py b/addons/knowledge/installer.py
index f3ee456..0f6b295 100644 (file)
--- a/addons/knowledge/installer.py
+++ b/addons/knowledge/installer.py
@@ -21,15 +21,14 @@
 from osv import fields, osv
 
 class knowledge_installer(osv.osv_memory):
-    _name = 'knowledge.installer'
-    _inherit = 'res.config.installer'
+    _inherit = 'base.setup.installer'
 
     _columns = {
         # Knowledge Management
         'document_ftp':fields.boolean('Shared Repositories (FTP)',
-            help="Provides an FTP access to your OpenERP's Document "
-                 "Management System. Lets you access attachments and "
-                 "virtual documents through a standard FTP client."),
+            help="Provides an FTP access to your OpenERP's "
+                "Document Management System. It lets you access attachments "
+                "and virtual documents through a standard FTP client."),
         'document_webdav':fields.boolean('Shared Repositories (WebDAV)',
             help="Provides a WebDAV access to your OpenERP's Document "
                  "Management System. Lets you access attachments and "
@@ -38,12 +37,12 @@ class knowledge_installer(osv.osv_memory):
             help="Lets you create wiki pages and page groups in order "
                  "to keep track of business knowledge and share it with "
                  "and  between your employees."),
-        # Templates of Content
-        'wiki_faq':fields.boolean('Internal FAQ',
+        # Content templates
+        'wiki_faq':fields.boolean('Template: Internal FAQ',
             help="Creates a skeleton internal FAQ pre-filled with "
                  "documentation about OpenERP's Document Management "
                  "System."),
-        'wiki_quality_manual':fields.boolean('Quality Manual',
+        'wiki_quality_manual':fields.boolean('Template: Quality Manual',
             help="Creates an example skeleton for a standard quality manual."),
         }
     _defaults = {