diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index d83d1b6b60e..2872491129d 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -54,9 +54,8 @@ class document_directory(osv.osv):
             'Type', required=True, select=1,
             help="Defines directory's behaviour."),
         
-        'ressource_type_id': fields.many2one('ir.model', 'Directories Mapped to Objects',
-            help="Select an object here and Open ERP will create a mapping for each of these " \
-                 "objects, using the given domain, when browsing through FTP."),
+        'ressource_type_id': fields.many2one('ir.model', 'Resource model',
+            help="Select an object here and there will be one folder per record of that resource."),
         'resource_field': fields.many2one('ir.model.fields', 'Name field', help='Field to be used as name on resource directories. If empty, the "name" will be used.'),
         'ressource_parent_type_id': fields.many2one('ir.model', 'Parent Model',
             help="If you put an object here, this directory template will appear bellow all of these objects. " \
diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml
index 714c6d2c107..36e89074d94 100644
--- a/addons/document/document_view.xml
+++ b/addons/document/document_view.xml
@@ -75,23 +75,31 @@
         <field name="arch" type="xml">
             <form string="Directories">
                 <field name="name" select="1" colspan="4"/>
-                <field name="user_id"/>
                 <field name="parent_id"/>
                 <field name="storage_id" />
+                <field name="user_id"/>
                 <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                 <notebook colspan="4">
                 <page string="Definition">
                     <separator string="Directory Type" colspan="4"/>
                     <field name="type"/>
-                    <field name="ressource_type_id"  on_change="onchange_content_id(ressource_type_id)" attrs="{'required': [('type','=','ressource')], 'readonly': [('type','=','static')]}"/>
-                    <newline/>
-                    <field name="domain" attrs="{'required': [('type','=','ressource')], 'readonly': [('type','=','static')]}"/>
-                    <field name="ressource_tree"/>
-                    <field name="resource_field"     domain="[('model_id','=',ressource_type_id), ('ttype', 'in', ('char', 'selection', 'date', 'datetime'))]"/>
-                    <field name="ressource_id" select="2" readonly="1"/>
-                    <field name="ressource_parent_type_id"/>
+                    <group colspan="4" col="4" attrs="{'invisible': [('type','!=','ressource')]}">
+			<field name="ressource_type_id"  on_change="onchange_content_id(ressource_type_id)" 
+			    attrs="{'required': [('type','=','ressource')] }"/>
+			<newline/>
+			<field name="resource_field"     domain="[('model_id','=',ressource_type_id), ('ttype', 'in', ('char', 'selection', 'date', 'datetime'))]"/>
+			<field name="ressource_tree"/>
+                    </group>
+                    <group colspan="4" col="4" attrs="{'invisible': [('type','!=','at_record')]}">
+			<field name="ressource_parent_type_id"/>
+			<field name="ressource_id" select="2" readonly="1"/>
+		    </group>
+                    
+                    <group colspan="4" col="4">
+			<field name="domain" attrs="{'required': [('type','=','ressource')], 'readonly': [('type','=','static')]}"/>
+                    </group>
                 </page>
-                <page string="Generated Files">
+                <page string="Generated Files" groups="base.group_extended">
                     <label colspan="4" string="For each entry here, virtual files will appear in this folder." />
                     <field name="content_ids" nolabel="1" colspan="4" attrs="{'readonly': [('ressource_type_id','=',False)]}">
                         <form string="Contents">
@@ -113,6 +121,7 @@
                     </field>
                 </page>
                 <page string="Dynamic context" groups="base.group_extended">
+		    <label colspan="4" string="Define words in the context, for all child directories and files" />
                     <field name="dctx_ids" nolabel="1" colspan="4">
                         <tree string="Fields" editable="bottom">
                             <field name="field"/>
@@ -125,6 +134,8 @@
                     </field>
                 </page>
                 <page string="Security">
+		    <label colspan="4" string="Only members of these groups will have access to this directory and its files." />
+		    <label colspan="4" string="These groups, however, do NOT apply to children directories, which must define their own ones." />
                     <field name="group_ids" colspan="4" nolabel="1"/>
                 </page>
                 </notebook>