=== renamed file 'src/docbkx/en/dhis2_user_man_maintenance.xml' => 'src/docbkx/en/dhis2_user_man_data_administration.xml'
--- src/docbkx/en/dhis2_user_man_maintenance.xml	2010-02-17 16:54:04 +0000
+++ src/docbkx/en/dhis2_user_man_data_administration.xml	2010-02-18 16:42:46 +0000
@@ -1,37 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- This document was created with Syntext Serna Free. --><!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "docbookV4.5/docbookx.dtd" []>
 <chapter>
-  <title>Maintenance module</title>
-  <section>
-    <title>Introduction</title>
-    <para>When the cursor hovers on the ‘Maintenance’ module, a drop-down menu appears with the following options: </para>
-    <itemizedlist>
-      <listitem>
-        <para>Data administration </para>
-      </listitem>
-      <listitem>
-        <para>Data elements and indicators</para>
-      </listitem>
-      <listitem>
-        <para>Datasets</para>
-      </listitem>
-      <listitem>
-        <para>Configuration</para>
-      </listitem>
-      <listitem>
-        <para>Organisation units</para>
-      </listitem>
-      <listitem>
-        <para>Settings</para>
-      </listitem>
-      <listitem>
-        <para>Users</para>
-      </listitem>
-    </itemizedlist>
-    <para>Each of these options will be described in a dedicated section in the remainder of this document. </para>
-  </section>
-  <section>
-    <title>Data administration</title>
+  <title>Data Administration in DHIS 2</title>
     <para>The data administration module provides a range of functions to ensure that the data stored in the DHIS2 database is integral and that the database performance is optimised. These functions should be executed on a regular basis by a data administrator to ensure that the quality of the data stored is optimal. </para>
     <section>
       <title>Data browser</title>
@@ -303,5 +273,4 @@
       <title>Cache Statistics </title>
       <para>Cum nam pretium at, vel venenatis taciti sit et congue blandit. Elementum morbi quisque, integer orci ante curae cum nisi nam a. Tempor. Quis tincidunt mi, eu purus.</para>
     </section>
-  </section>
 </chapter>

=== renamed file 'src/docbkx/en/dhis2_user_man_data_elements.xml' => 'src/docbkx/en/dhis2_user_man_data_elements_and_indicators.xml'
=== renamed file 'src/docbkx/en/dhis2_user_man_mod3.xml' => 'src/docbkx/en/dhis2_user_man_data_entry.xml'
=== renamed file 'src/docbkx/en/dhis2_report_excel_user_manual_en.xml' => 'src/docbkx/en/dhis2_user_man_excel_reports.xml'
=== renamed file 'src/docbkx/en/dhis2_user_man_mod2.xml' => 'src/docbkx/en/dhis2_user_man_getting_started.xml'
=== renamed file 'src/docbkx/en/dhis2_gis_user_manual_en.xml' => 'src/docbkx/en/dhis2_user_man_gis.xml'
=== renamed file 'src/docbkx/en/dhis2_user_man_mod7.xml' => 'src/docbkx/en/dhis2_user_man_import_export.xml'
=== renamed file 'src/docbkx/en/dhis2_user_man_mod1.xml' => 'src/docbkx/en/dhis2_user_man_introduction.xml'
=== renamed file 'src/docbkx/en/dhis2_user_man_mod11.xml' => 'src/docbkx/en/dhis2_user_man_reporting.xml'
--- src/docbkx/en/dhis2_user_man_mod11.xml	2010-01-21 16:51:36 +0000
+++ src/docbkx/en/dhis2_user_man_reporting.xml	2010-02-18 16:42:46 +0000
@@ -2,7 +2,7 @@
 <!-- This document was created with Syntext Serna Free. --><!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" []>
 <chapter>
   <chapterinfo>
-    <title>Aggregation and reporting</title>
+    <title>Reporting</title>
     <author>
       <firstname>Ola</firstname>
       <surname>Titlestad</surname>
@@ -12,9 +12,9 @@
     </author>
     <pubdate>2009-11-14</pubdate>
   </chapterinfo>
-  <title>Aggregation and reporting</title>
+  <title>Reporting</title>
   <section>
-    <title>An overview of how aggregation takes place and rules of the system</title>
+    <title>An overview of how reporting and aggregation works</title>
     <para>
 In the bigger picture of HIS terminology all data in DHIS are usually called aggregated as they are aggregates (e.g. monthly summaries) of medical records or some kind of service registers reported from the health facilities. Aggregation inside DHIS however, which is the topic here, is concerned with how the raw data captured in DHIS (through data entry or import)are further aggregated over time (e.g. from monthly to quarterly values) or up the organisational hierarchy (e.g. from facility to district values). 
 </para>

=== modified file 'src/docbkx/en/dhis2_user_manual_en.xml'
--- src/docbkx/en/dhis2_user_manual_en.xml	2010-02-17 19:38:33 +0000
+++ src/docbkx/en/dhis2_user_manual_en.xml	2010-02-18 16:42:46 +0000
@@ -17,16 +17,17 @@
       </formalpara>
     </legalnotice>
   </bookinfo>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_mod1.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_mod2.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_mod3.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_maintenance.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_data_elements.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_introduction.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_getting_started.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_data_entry.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_data_administration.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_data_elements_and_indicators.xml" encoding="UTF-8"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_data_quality.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_mod7.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_mod11.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_gis_user_manual_en.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_report_excel_user_manual_en.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_mod4.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_import_export.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_reporting.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_gis.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_excel_reports.xml" encoding="UTF-8"/>
   <appendix>
     <title> DHIS Documentation Guide</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_documentation_guide.xml" encoding="UTF-8" xpointer="docs_1"/>