diff --git a/addons/wiki/__init__.py b/addons/wiki/__init__.py
index 98cdc450bae..608266dc774 100644
--- a/addons/wiki/__init__.py
+++ b/addons/wiki/__init__.py
@@ -1,2 +1,3 @@
 
 import wiki
+import wizard
\ No newline at end of file
diff --git a/addons/wiki/__terp__.py b/addons/wiki/__terp__.py
index e458cfdc1a5..2919e1bbf50 100755
--- a/addons/wiki/__terp__.py
+++ b/addons/wiki/__terp__.py
@@ -1,9 +1,15 @@
 {
-    "name" : "Wiki System",
+    "name" : "Document Management - Wiki",
     "version" : "1.0",
-    "author" : "Tiny ERP",
+    "author" : "Tiny",
+    "description": """
+    The base module to manage documents(wiki) 
+    
+    keep track for the wiki groups, pages, and history
+    """,
     "category" : "Generic Modules/Others",
     "depends" : ["base"],
+    "website" : "http://openerp.com",
     "init_xml" : [],
     "demo_xml" : [],
     "update_xml" : [
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index baed3b37d02..bb26a8b1fb2 100755
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -31,21 +31,33 @@ import time
 from StringIO import StringIO
 from HTMLParser import HTMLParser
 
+class WikiGroup(osv.osv):
+    _name = "wiki.groups"
+    _description="Wiki Groups"
+    _order = 'name'
+    _columns={
+       'name':fields.char('Name', size=256, select=True, required=True),
+       'notes':fields.text("Description", select=True),
+       'create_date':fields.datetime("Created on", select=True),
+    }
+WikiGroup()
+
 class Wiki(osv.osv):
     _name="wiki.wiki"
     _description="Wiki"
     _order = 'name'
     _columns={
-       'name':fields.char('Title', size=128, select=True, required=True),
-       'write_uid':fields.many2one('res.users',"Last Modify By"),
-       'text_area':fields.text("Content", select=True),
-       'create_uid':fields.many2one('res.users','Authour', select=True),
-       'create_date':fields.datetime("Created on", select=True),
-       'write_date':fields.datetime("Last modified", select=True),
-       'tags':fields.char('Tags', size=1024),
-       'history_id':fields.one2many('wiki.wiki.history','history_wiki_id','History Lines'),
-       'minor_edit':fields.boolean('Thisd is a minor edit', select=True),
-       'summary':fields.char('Summary',size=256, select=True),
+        'group_id':fields.many2one('wiki.groups', 'Group'),
+        'name':fields.char('Title', size=256, select=True, required=True),
+        'write_uid':fields.many2one('res.users',"Last Modify By"),
+        'text_area':fields.text("Content", select=True),
+        'create_uid':fields.many2one('res.users','Authour', select=True),
+        'create_date':fields.datetime("Created on", select=True),
+        'write_date':fields.datetime("Last modified", select=True),
+        'tags':fields.char('Tags', size=1024),
+        'history_id':fields.one2many('wiki.wiki.history','history_wiki_id','History Lines'),
+        'minor_edit':fields.boolean('Thisd is a minor edit', select=True),
+        'summary':fields.char('Summary',size=256, select=True),
     }
 
     def __init__(self, cr, pool):
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index 8ebb38b72e8..477d6a4f670 100755
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -1,105 +1,131 @@
 <?xml version="1.0"?>
-	<terp>
-		<data>
-			<record model="ir.ui.view" id="view_wiki_tree">
-				<field name="name">wiki.wiki.tree</field>
-				<field name="model">wiki.wiki</field>
-				<field name="type">tree</field>
-				<field name="arch" type="xml">
-					<tree string="Wiki">
-						<field name="name"/>
-						<field name="create_uid" string="Authour"/>
-						<field name="create_date" string="Created on"/>
-					</tree>
-				</field>
-			</record>
-
-			<record model="ir.ui.view" id="view_wiki_form">
-				<field name="name">wiki.wiki.form</field>
-				<field name="model">wiki.wiki</field>
-				<field name="type">form</field>
-				<field name="arch" type="xml">
-					<form string="Wiki">
-						<field name="name" colspan="4" search="1"/>
-						<field name="write_date" readonly="1" search="1"/>
-						<field name="write_uid" readonly="1" search="1"/>
-						<notebook colspan="4">
-							<page string="Article">
-								<separator string="Wiki Content" colspan="4"/>
-								<field name="text_area" nolabel="1" colspan="4" search="1" widget="text_wiki"/>
-								
-								<separator string="Tags" colspan="4" />
-								<field name="tags" nolabel="1" colspan="4" search="1"/>
-								<field name="minor_edit" search="1"/>
-								<field name="summary" search="1"/>
-							</page>
-							<page string="History">
-								<field name="history_id" mode="tree,form" colspan="4" nolabel="1" select="1">
-									<tree string="History">
-										<field name="text_area" />
-										<field name="modify_by" />
-									</tree>
-									<form string="History">
-										<field name="text_area" colspan="4"/>
-										<field name="modify_by" />
-										<field name="minor_edit" />
-										<field name="summary" colspan="4"/>
-									</form>
-								</field>
-							</page>
-						</notebook>
-					</form>
-				</field>
-			</record>
-
-			<record model="ir.actions.act_window" id="action_wiki">
-				<field name="name">Wiki Pages</field>
-				<field name="res_model">wiki.wiki</field>
-				<field name="view_type">form</field>
-				<field name="view_mode">form,tree</field>
-				<field name="view_id" ref="view_wiki_tree"/>
-			</record>
-
-			<menuitem name="Wiki System/Wiki Pages" id="menu_action_wiki_wiki" action="action_wiki"/>
-
-			<record model="ir.ui.view" id="view_wiki_history_tree">
-				<field name="name">wiki.wiki.history.tree</field>
-				<field name="model">wiki.wiki.history</field>
-				<field name="type">tree</field>
-				<field name="arch" type="xml">
-					<tree srting="Wiki History">
-						<field name="date_time"/>
-						<field name="text_area"/>
-						<field name="minor_edit"/>
-						<field name="summary"/>
-					</tree>
-				</field>
-			</record>
+<openerp>
+	<data>
+	
+		<wizard
+			id="wizard_group_menu_create"
+			string="Create Menu"
+			name="wiki.create.menu"/>
 			
-			<record model="ir.ui.view" id="wiki_history_form">
-				<field name="name">wiki.wiki.history.form</field>
-				<field name="model">wiki.wiki.history</field>
-				<field name="type">form</field>
-				<field name="arch" type="xml">
-					<form srting="Wiki History">
-						<field name="summary" select="1" colspan="4"/>
-						<field name="text_area" select="1" colspan="4"/>
-						<field name="date_time" select="1"/>
-						<field name="minor_edit" select="1"/>
-						<field name="history_wiki_id"/>
-					</form>
-				</field>
-			</record>
+		<record model="ir.ui.view" id="wiki_group_tree">
+			<field name="name">wiki.groups.tree</field>
+			<field name="model">wiki.groups</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree srting="Wiki Groups">
+					<field name="name"/>
+					<field name="create_date"/>
+				</tree>
+			</field>
+		</record>
+		
+		<record model="ir.ui.view" id="wiki_group_form">
+			<field name="name">wiki.groups.form</field>
+			<field name="model">wiki.groups</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form srting="Wiki Groups">
+					<field name="name" select="1"/>
+					<field name="create_date" readonly="1"/>
+					<field name="notes" colspan="4"/>
+					<group col="2" colspan="2">
+                        <button colspan="2" name="%(wizard_group_menu_create)d" string="Create a Menu" type="action" target="new"/>
+                    </group>
+				</form>
+			</field>
+		</record>
 
-			<record model="ir.actions.act_window" id="action_history">
-				<field name="name">Wiki History</field>
-				<field name="res_model">wiki.wiki.history</field>
-				<field name="view_type">form</field>
-				<field name="view_mode">form,tree</field>
-				<field name="view_id" ref="wiki_history_form"/>
-			</record>
+		<record model="ir.actions.act_window" id="action_wiki_groups">
+			<field name="name">Wiki Groups</field>
+			<field name="res_model">wiki.groups</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form,tree</field>
+			<field name="view_id" ref="wiki_group_tree"/>
+		</record>
 
-			<menuitem name="Wiki System/History" id="menu_action_history" action="action_history"/>
+		<menuitem name="Document Management/Configuration/Groups" id="menu_action_wiki_groups" action="action_wiki_groups"/>
+		
+		<record model="ir.ui.view" id="view_wiki_tree">
+			<field name="name">wiki.wiki.tree</field>
+			<field name="model">wiki.wiki</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree string="Wiki">
+					<field name="name"/>
+					<field name="create_uid" string="Authour"/>
+					<field name="create_date" string="Created on"/>
+				</tree>
+			</field>
+		</record>
 
-		</data>
-	</terp>
\ No newline at end of file
+		<record model="ir.ui.view" id="view_wiki_form">
+			<field name="name">wiki.wiki.form</field>
+			<field name="model">wiki.wiki</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form string="Wiki">
+					<field name="name" search="1"/>
+					<field name="group_id" search="1"/>
+					<field name="write_date" readonly="1" search="1"/>
+					<field name="write_uid" readonly="1" search="1"/>
+					<separator string="Wiki Content" colspan="4"/>
+					<field name="text_area" nolabel="1" colspan="4" search="1" widget="text_wiki"/>
+					<separator string="Tags" colspan="4" />
+					<field name="tags" nolabel="1" colspan="4" search="1"/>
+					<field name="minor_edit" search="1" groups="base.group_extended"/>
+					<field name="summary" search="1" groups="base.group_extended"/>
+				</form>
+			</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="action_wiki">
+			<field name="name">Wiki Pages</field>
+			<field name="res_model">wiki.wiki</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form,tree</field>
+			<field name="view_id" ref="view_wiki_tree"/>
+		</record>
+
+		<menuitem name="Document Management/Wiki Pages" id="menu_action_wiki_wiki" action="action_wiki"/>
+
+		<record model="ir.ui.view" id="view_wiki_history_tree">
+			<field name="name">wiki.wiki.history.tree</field>
+			<field name="model">wiki.wiki.history</field>
+			<field name="type">tree</field>
+			<field name="arch" type="xml">
+				<tree srting="Wiki History">
+					<field name="date_time"/>
+					<field name="text_area"/>
+					<field name="minor_edit"/>
+					<field name="summary"/>
+				</tree>
+			</field>
+		</record>
+		
+		<record model="ir.ui.view" id="wiki_history_form">
+			<field name="name">wiki.wiki.history.form</field>
+			<field name="model">wiki.wiki.history</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
+				<form srting="Wiki History">
+					<field name="summary" select="1" colspan="4"/>
+					<field name="text_area" select="1" colspan="4"/>
+					<field name="date_time" select="1"/>
+					<field name="minor_edit" select="1"/>
+					<field name="history_wiki_id"/>
+				</form>
+			</field>
+		</record>
+
+		<record model="ir.actions.act_window" id="action_history">
+			<field name="name">Wiki History</field>
+			<field name="res_model">wiki.wiki.history</field>
+			<field name="view_type">form</field>
+			<field name="view_mode">form,tree</field>
+			<field name="view_id" ref="wiki_history_form"/>
+		</record>
+
+		<menuitem name="Document Management/History" id="menu_action_history" action="action_history"/>
+	
+	</data>
+</openerp>
\ No newline at end of file