=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2009-10-10 14:26:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2009-11-02 21:31:07 +0000
@@ -116,3 +116,9 @@
 validation_rules_without_groups										= Validation rules without groups
 aggregated_data_values												= Aggregated data values
 aggregated_indicator_values											= Aggregated indicator values
+intro_data_locking													= Deny data to be entered or imported for data sets.
+intro_data_browser													= Browse the database and get an overview of which data sets, organisation units and periods it exist data for.
+intro_data_integrity												= Run data integrity checks and unveil anomalies and problems in the meta data setup.
+intro_maintenance													= Perform maintenance tasks such as pruning of data values and periods and clearing of database resource tables.
+intro_resource_table												= Generate resource database tables for the organisation unit hierarchy and group set structure among others.
+intro_data_statistics												= Browse the number of objects in the database.

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2009-10-10 14:26:24 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml	2009-11-02 21:31:07 +0000
@@ -8,8 +8,10 @@
   	
   <package name="dhis-web-maintenance-dataadmin" extends="dhis-web-commons" namespace="/dhis-web-maintenance-dataadmin">
 	
-    <action name="index" class="org.hisp.dhis.commons.action.NoAction">
-      <result name="success" type="redirect">displayLockingForm.action</result>
+    <action name="index" class="org.hisp.dhis.dataadmin.action.NoAction">
+      <result name="success" type="velocity">/main.vm</result>
+      <param name="page">/dhis-web-maintenance-dataadmin/index.vm</param>
+      <param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
     </action>
     
     <!-- Locking -->

=== added file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/index.vm	2009-11-02 21:31:07 +0000
@@ -0,0 +1,12 @@
+
+<h3>$i18n.getString( "data_administration" )</h3>
+
+<ul class="introList">
+    #introListItem( "displayLockingForm.action" "data_locking" )
+    #introListItem( "displayDataBrowserForm.action" "data_browser" )
+    #introListItem( "displayDataIntegrityForm.action" "data_integrity" )
+    #introListItem( "displayMaintenanceForm.action" "maintenance" )
+    #introListItem( "displayResourceTableForm.action" "resource_table" )
+    #introListItem( "viewStatistics.action" "data_statistics" )
+</ul>
+    
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm	2009-11-02 18:13:58 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/index.vm	2009-11-02 21:31:07 +0000
@@ -1,5 +1,5 @@
 
-<h3>$i18n.getString("dhis-web-maintenance-datadictionary")</h3>
+<h3>$i18n.getString( "dhis-web-maintenance-datadictionary" )</h3>
 
 <ul class="introList">
 	#introListItem( "dataElement.action" "data_element" )