=== modified file 'pom.xml'
--- pom.xml	2009-12-08 18:21:43 +0000
+++ pom.xml	2009-12-09 07:07:19 +0000
@@ -16,7 +16,7 @@
     <plugins>
       <plugin>
         <groupId>com.agilejava.docbkx</groupId>
-
+        <!-- <version>2.0.10-SNAPSHOT</version> -->
         <artifactId>docbkx-maven-plugin</artifactId>
 
         <executions>
@@ -42,7 +42,7 @@
 	 <xincludeSupported>true</xincludeSupported>
           <includes>*.xml</includes>
           <htmlStylesheet>resources/css/docbook_bsd.css</htmlStylesheet>
-          <!-- <htmlCustomization>${basedir}/src/docbkx/en/resources/xsl/docbook-fo.xsl</htmlCustomization> -->
+          <glossaryCollection>resources/glossary_en.xml</glossaryCollection>
           <postProcess>
             <copy todir="target/site/en">
               <fileset dir="target/docbkx/">

=== modified file 'src/docbkx/en/dhis2_user_man_mod1.xml'
--- src/docbkx/en/dhis2_user_man_mod1.xml	2009-12-08 18:15:27 +0000
+++ src/docbkx/en/dhis2_user_man_mod1.xml	2009-12-09 07:07:19 +0000
@@ -34,7 +34,7 @@
           HMIS</para>
         </listitem>
         <listitem>
-          <para>What is the difference between patient based and <glossterm baseform="aggregate data">aggregate data</glossterm>.</para>
+          <para>What is the difference between patient based and <glossterm baseform="aggregateData">aggregate data</glossterm>.</para>
         </listitem>
         <listitem>
           <para>What are the different modules in DHIS 2.</para>

=== modified file 'src/docbkx/en/dhis2_user_man_mod11.xml'
--- src/docbkx/en/dhis2_user_man_mod11.xml	2009-12-08 18:15:27 +0000
+++ src/docbkx/en/dhis2_user_man_mod11.xml	2009-12-09 07:07:19 +0000
@@ -1,6 +1,5 @@
 <?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" []>
+<!-- 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>
@@ -61,27 +60,34 @@
       <title>Dimensions of aggregation</title>
       <section>
         <title>Orgunits and levels</title>
+        <para/>
       </section>
       <section>
         <title>Period</title>
+        <para/>
       </section>
       <section>
         <title>Data Element Categories</title>
+        <para/>
       </section>
     </section>
     <section>
       <title>Aggregation operators, methods for aggregation</title>
       <section>
         <title>Sum</title>
+        <para/>
       </section>
       <section>
         <title>Average</title>
+        <para/>
       </section>
       <section>
         <title>Count</title>
+        <para/>
       </section>
       <section>
         <title>Where to specify </title>
+        <para/>
       </section>
     </section>
     <section>

=== modified file 'src/docbkx/en/dhis2_user_manual_en.xml'
--- src/docbkx/en/dhis2_user_manual_en.xml	2009-12-08 18:15:27 +0000
+++ src/docbkx/en/dhis2_user_manual_en.xml	2009-12-09 07:07:19 +0000
@@ -5,7 +5,7 @@
     <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_mod11.xml" encoding="UTF-8"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_mod11.xml" encoding="UTF-8"/> 
   <appendix>
     <title>DHIS2 GIS Module User Manual</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_gis_user_manual_en.xml" xpointer="gis_1" encoding="UTF-8"/>
@@ -48,12 +48,13 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_technical_architechture_guide.xml" xpointer="arch_7" encoding="UTF-8"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_technical_architechture_guide.xml" xpointer="arch_8" encoding="UTF-8"/>
   </appendix>
- <!-- <glossary role="auto">
+  <!-- <glossary role="auto">
     <glossentry>
       <glossterm>Bogus</glossterm>
       <glossdef>
         <para>If you see this, the  <parameter>glossary.collection</parameter> was not set. </para>
       </glossdef>
     </glossentry>
-  </glossary> -->
+  </glossary> --> 
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="resources/glossary/glossary_en.xml" encoding="UTF-8"/> 
 </book>