=== modified file 'src/docbkx/en/dhis2_user_man_data_entry.xml'
--- src/docbkx/en/dhis2_user_man_data_entry.xml	2010-02-18 16:42:46 +0000
+++ src/docbkx/en/dhis2_user_man_data_entry.xml	2010-02-18 18:52:03 +0000
@@ -15,7 +15,6 @@
   <title>Data entry with DHIS2</title>
   <section id="mod3_1">
     <title>Learning Objectives</title>
-    <highlights>
       <para>After reading this chapter you will be able to understand:</para>
       <itemizedlist>
         <listitem>
@@ -28,7 +27,6 @@
           <para>How to use standard and customised data entry screens</para>
         </listitem>
       </itemizedlist>
-    </highlights>
   </section>
   <section id="mod3_2">
     <title>Opening the “Data Entry” screen</title>

=== modified file 'src/docbkx/en/dhis2_user_man_data_quality.xml'
--- src/docbkx/en/dhis2_user_man_data_quality.xml	2010-02-18 17:19:53 +0000
+++ src/docbkx/en/dhis2_user_man_data_quality.xml	2010-02-18 18:52:03 +0000
@@ -6,7 +6,6 @@
   <section>
     <title>Learning Objectives</title>
     <para>After reading this module you will be able to understand:</para>
-    <highlights>
       <orderedlist>
         <listitem>
           <para>What is data quality and its importance for HMIS.</para>
@@ -24,12 +23,10 @@
           <para>How to analyze data status.</para>
         </listitem>
       </orderedlist>
-    </highlights>
   </section>
   <section>
     <title>Overview of data quality check</title>
     <para>Ensuring data quality is a key concern in building an effective HMIS. Data quality has different dimensions including:</para>
-    <highlights>
       <itemizedlist>
         <listitem>
           <para><emphasis>Correctness:</emphasis> Data should be within the normal range for data collected at that facility. There should be no gross discrepancies when compared with data from related data elements.</para>
@@ -44,7 +41,6 @@
           <para><emphasis>Timeliness:</emphasis> All data from all health facilities/blocks/Taluka/districts should be submitted at the appointed time.</para>
         </listitem>
       </itemizedlist>
-    </highlights>
   </section>
   <section>
     <title>Data quality checks</title>
@@ -94,7 +90,7 @@
     <para>The validation rule analysis function will test validation rules against the data in the system. Validation violations will be reported in cases where the condition defined through the validation rule expression is not met, ie. the condition is false. </para>
     <para>First, enter a start date and an end date for which data should be included in the analysis. The date picker widget may be used to select dates. Second, choose between including all validation rules or a single group. Third, choose between including the selected organisation unit only or the selected organisation unit with all children in the analysis. Fourth, select the organisation unit. Finally, click <emphasis role="italic">validate</emphasis>.</para>
     <para>The analysis process while run for a while dependending on the amount of data that is being anaylysed. If there were no violations of the validation rules a message saying <emphasis role="italic">validation passed successfully</emphasis> is displayed. If there were validation violations they will be presented in a list. The organisation unit, period, left side description and value, operator, and right side value and description for each validation violation are displayed. The show details icon can be clicked in order to get more information about a validation violation. This will open a popup screen that provides information about the data elements included in the validation rules and their corresponding data values. This information can be used in order to correct incorrect data.</para>
-    <para>The validation violations can be exported to  PDF document by clicking on the export to pdf button and to a Microsoft Excel workbook by clicking on the export to workbook button.</para>
+    <para>The validation violations can be exported to a PDF document by clicking on the export to PDF button and to a Microsoft Excel workbook by clicking on the export to workbook button.</para>
   </section>
   <section>
     <title>Std Dev Outlier Analysis</title>

=== modified file 'src/docbkx/en/dhis2_user_man_excel_reports.xml'
--- src/docbkx/en/dhis2_user_man_excel_reports.xml	2010-02-18 16:42:46 +0000
+++ src/docbkx/en/dhis2_user_man_excel_reports.xml	2010-02-18 18:52:03 +0000
@@ -1,32 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" []>
 <chapter>
-  <chapterinfo>
-    <title>DHIS 2 Excel Reporting User Manual</title>
-    <keywordset>
-      <keyword>DHIS</keyword>
-      <keyword>Excel</keyword>
-      <keyword>Report</keyword>
-    </keywordset>
-    <author>
-      <surname>Nguyen Tran Do Xuan </surname>
-      <firstname>Thuy</firstname>
-    </author>
-    <author>
-      <firstname>Tran</firstname>
-      <surname>Chau Thu</surname>
-    </author>
-    <revhistory>
-      <revision>
-        <revnumber> 1</revnumber>
-        <date>15/10/2009</date>
-        <authorinitials>JPP</authorinitials>
-        <revdescription>
-          <para>Edits to original document</para>
-        </revdescription>
-      </revision>
-    </revhistory>
-  </chapterinfo>
   <title>DHIS 2 Excel Reporting</title>
   <section id="excel_1">
     <title> Introduction </title>

=== modified file 'src/docbkx/en/dhis2_user_man_getting_started.xml'
--- src/docbkx/en/dhis2_user_man_getting_started.xml	2010-02-18 16:42:46 +0000
+++ src/docbkx/en/dhis2_user_man_getting_started.xml	2010-02-18 18:52:03 +0000
@@ -1,30 +1,9 @@
 <?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" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" []>
 <chapter>
-  <chapterinfo>
-    <date>17/09/09</date>
-    <title>Getting started with DHIS 2</title>
-    <author>
-      <surname>Unknown</surname>
-      <affiliation>
-        <orgname/>
-      </affiliation>
-    </author>
-    <revhistory>
-      <revision>
-        <revnumber>1</revnumber>
-        <date>17/09/09</date>
-        <authorinitials>JPP</authorinitials>
-        <revdescription>
-          <para>Initial conversion from MS Word format to DocBook</para>
-        </revdescription>
-      </revision>
-    </revhistory>
-  </chapterinfo>
   <title>Getting started with DHIS 2</title>
   <section id="mod2_1">
     <title>Getting started with DHIS2</title>
-    <highlights>
       <para>After reading this chapter you will be able to understand:</para>
       <itemizedlist>
         <listitem>
@@ -37,7 +16,6 @@
           <para>Create new users and user roles</para>
         </listitem>
       </itemizedlist>
-    </highlights>
     <section>
       <title>Prerequisites</title>
       <para>You must be sure that you have a current version of the Java Runtime installed on your machine. Depending on your operating system, there are different ways of installing Java. The reader is referred to this <ulink url="http://java.sun.com/javase/downloads/index.jsp">website</ulink> for detailed information on getting java installed. </para>

=== modified file 'src/docbkx/en/dhis2_user_man_gis.xml'
--- src/docbkx/en/dhis2_user_man_gis.xml	2010-02-18 16:42:46 +0000
+++ src/docbkx/en/dhis2_user_man_gis.xml	2010-02-18 18:52:03 +0000
@@ -1,32 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" []>
 <chapter>
-  <chapterinfo>
-    <title>DHIS 2 GIS User Manual</title>
-    <keywordset>
-      <keyword>DHIS</keyword>
-      <keyword>GIS</keyword>
-      <keyword>Mapping</keyword>
-    </keywordset>
-    <author>
-      <surname>Øverland</surname>
-      <firstname>Jan Henrik</firstname>
-    </author>
-    <author>
-      <surname>Pickering</surname>
-      <firstname>Jason Paul</firstname>
-    </author>
-    <revhistory>
-      <revision>
-        <revnumber>1</revnumber>
-        <date>12/09/2009</date>
-        <authorinitials>JPP</authorinitials>
-        <revdescription>
-          <para>Initial conversion of document to DocBook format</para>
-        </revdescription>
-      </revision>
-    </revhistory>
-  </chapterinfo>
   <title>DHIS 2 GIS User Manual</title>
   <section id="gis_1">
     <title>Conversion of geographical data to GeoJSON format</title>

=== modified file 'src/docbkx/en/dhis2_user_man_import_export.xml'
--- src/docbkx/en/dhis2_user_man_import_export.xml	2010-02-18 16:42:46 +0000
+++ src/docbkx/en/dhis2_user_man_import_export.xml	2010-02-18 18:52:03 +0000
@@ -1,20 +1,6 @@
 <?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.4/docbookx.dtd" []>
 <chapter>
-  <chapterinfo>
-    <revhistory>
-      <revision>
-        <revnumber>1</revnumber>
-        <date>10/12/2009</date>
-        <revdescription>
-          <para>Initial revision from Indian documentation. </para>
-        </revdescription>
-      </revision>
-    </revhistory>
-    <author>
-      <othername>DHIS2 Documentation Team</othername>
-    </author>
-  </chapterinfo>
   <title>Import and export of data with DHIS2</title>
   <highlights>
     <para><emphasis>Learning objectives:</emphasis></para>

=== modified file 'src/docbkx/en/dhis2_user_man_introduction.xml'
--- src/docbkx/en/dhis2_user_man_introduction.xml	2010-02-18 16:42:46 +0000
+++ src/docbkx/en/dhis2_user_man_introduction.xml	2010-02-18 18:52:03 +0000
@@ -1,26 +1,6 @@
 <?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" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" []>
 <chapter>
-  <chapterinfo>
-    <date>12/09/09</date>
-    <title>What is DHIS 2?</title>
-    <author>
-      <surname>Unknown</surname>
-      <affiliation>
-        <orgname/>
-      </affiliation>
-    </author>
-    <revhistory>
-      <revision>
-        <revnumber>1</revnumber>
-        <date>12/09/09</date>
-        <authorinitials>JPP</authorinitials>
-        <revdescription>
-          <para>Initial conversion from MS Word format to DocBook</para>
-        </revdescription>
-      </revision>
-    </revhistory>
-  </chapterinfo>
   <title>What is DHIS 2?</title>
   <section id="mod1_1">
     <title>Background of The District Health Information Software – Version 2 (DHIS 2)</title>

=== modified file 'src/docbkx/en/dhis2_user_man_reporting.xml'
--- src/docbkx/en/dhis2_user_man_reporting.xml	2010-02-18 16:42:46 +0000
+++ src/docbkx/en/dhis2_user_man_reporting.xml	2010-02-18 18:52:03 +0000
@@ -1,17 +1,6 @@
 <?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" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" []>
 <chapter>
-  <chapterinfo>
-    <title>Reporting</title>
-    <author>
-      <firstname>Ola</firstname>
-      <surname>Titlestad</surname>
-      <affiliation>
-        <orgname>HISP</orgname>
-      </affiliation>
-    </author>
-    <pubdate>2009-11-14</pubdate>
-  </chapterinfo>
   <title>Reporting</title>
   <section>
     <title>An overview of how reporting and aggregation works</title>

=== modified file 'src/docbkx/en/dhis2_user_manual_en.xml'
--- src/docbkx/en/dhis2_user_manual_en.xml	2010-02-18 17:19:53 +0000
+++ src/docbkx/en/dhis2_user_manual_en.xml	2010-02-18 18:52:03 +0000
@@ -7,7 +7,7 @@
     <authorgroup>
       <author>
         <firstname>DHIS2</firstname>
-        <surname> Documentation Team</surname>
+        <surname>Documentation Team</surname>
       </author>
     </authorgroup>
     <legalnotice>