dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 83: Modified pom for production of chunked and non-chunked HTML. Mogrified some images to try and red...

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Fri, 22 Jan 2010 09:36:20 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 83
committer: Jason Pickering <jason@jason-laptop>
branch nick: dhis2-docbook-docs
timestamp: Fri 2010-01-22 10:55:40 +0200
message:
  Modified pom for production of chunked and non-chunked HTML. Mogrified some images to try and reduce download size a bit.
removed:
  src/docbkx/en/resources/images/ExcelReportModule/Thumbs.db
modified:
  pom.xml
  src/docbkx/en/dhis2_user_man_mod2.xml
  src/docbkx/en/dhis2_user_manual_en.xml
  src/docbkx/en/resources/glossary/glossary_en.xml
  src/docbkx/en/resources/images/ExcelReportModule/NewReportItem.jpg
  src/docbkx/en/resources/images/ExcelReportModule/add_dataset.jpg
  src/docbkx/en/resources/images/ExcelReportModule/add_dataset1.jpg
  src/docbkx/en/resources/images/ExcelReportModule/add_new_report_button.jpg
  src/docbkx/en/resources/images/ExcelReportModule/administration_page.jpg
  src/docbkx/en/resources/images/ExcelReportModule/advanced_generate_report.jpg
  src/docbkx/en/resources/images/ExcelReportModule/assign_data_element_group.jpg
  src/docbkx/en/resources/images/ExcelReportModule/assign_org_unit_group.jpg
  src/docbkx/en/resources/images/ExcelReportModule/assign_user_role.jpg
  src/docbkx/en/resources/images/ExcelReportModule/association_org_unit.jpg
  src/docbkx/en/resources/images/ExcelReportModule/configure_directory.jpg
  src/docbkx/en/resources/images/ExcelReportModule/configure_directory1.jpg
  src/docbkx/en/resources/images/ExcelReportModule/copy_report_item.jpg
  src/docbkx/en/resources/images/ExcelReportModule/create_expression.jpg
  src/docbkx/en/resources/images/ExcelReportModule/create_expression1.jpg
  src/docbkx/en/resources/images/ExcelReportModule/create_item.jpg
  src/docbkx/en/resources/images/ExcelReportModule/create_new_report.jpg
  src/docbkx/en/resources/images/ExcelReportModule/create_report_item.jpg
  src/docbkx/en/resources/images/ExcelReportModule/data_entry_status.jpg
  src/docbkx/en/resources/images/ExcelReportModule/data_entry_status1.jpg
  src/docbkx/en/resources/images/ExcelReportModule/dataelement_category_report_template.jpg
  src/docbkx/en/resources/images/ExcelReportModule/edit_report.jpg
  src/docbkx/en/resources/images/ExcelReportModule/edit_user_role.jpg
  src/docbkx/en/resources/images/ExcelReportModule/enter_report_information.jpg
  src/docbkx/en/resources/images/ExcelReportModule/enter_report_item_infor.jpg
  src/docbkx/en/resources/images/ExcelReportModule/excel_report_left_menu.jpg
  src/docbkx/en/resources/images/ExcelReportModule/excel_template_file.jpg
  src/docbkx/en/resources/images/ExcelReportModule/excel_template_file_with_data_values.jpg
  src/docbkx/en/resources/images/ExcelReportModule/generate_individual_report.jpg
  src/docbkx/en/resources/images/ExcelReportModule/generate_individual_report1.jpg
  src/docbkx/en/resources/images/ExcelReportModule/generate_report.jpg
  src/docbkx/en/resources/images/ExcelReportModule/generate_report_introduce.jpg
  src/docbkx/en/resources/images/ExcelReportModule/import_data_from_excel.jpg
  src/docbkx/en/resources/images/ExcelReportModule/import_data_from_excel_file.jpg
  src/docbkx/en/resources/images/ExcelReportModule/list_of_reports.jpg
  src/docbkx/en/resources/images/ExcelReportModule/list_org_unit_group_report_template.jpg
  src/docbkx/en/resources/images/ExcelReportModule/list_time_period_report_template.jpg
  src/docbkx/en/resources/images/ExcelReportModule/main_feature_of_excel_report_module.jpg
  src/docbkx/en/resources/images/ExcelReportModule/navigate_to_list_of_report.jpg
  src/docbkx/en/resources/images/ExcelReportModule/new_report_item.jpg
  src/docbkx/en/resources/images/ExcelReportModule/note.jpg
  src/docbkx/en/resources/images/ExcelReportModule/one of data enetry form of reports.jpg
  src/docbkx/en/resources/images/ExcelReportModule/open_excel_report_module.jpg
  src/docbkx/en/resources/images/ExcelReportModule/operating_buttons.jpg
  src/docbkx/en/resources/images/ExcelReportModule/remove_report.jpg
  src/docbkx/en/resources/images/ExcelReportModule/report_association.jpg
  src/docbkx/en/resources/images/ExcelReportModule/report_item.jpg
  src/docbkx/en/resources/images/ExcelReportModule/report_item_function.jpg
  src/docbkx/en/resources/images/ExcelReportModule/select_excel_report.jpg
  src/docbkx/en/resources/images/ExcelReportModule/select_org_unit.jpg
  src/docbkx/en/resources/images/ExcelReportModule/select_org_unit_group.jpg
  src/docbkx/en/resources/images/ExcelReportModule/select_org_unit_group1.jpg
  src/docbkx/en/resources/images/ExcelReportModule/standard_report_template.jpg
  src/docbkx/en/resources/images/ExcelReportModule/steps_generate_report.jpg
  src/docbkx/en/resources/images/ExcelReportModule/view_data_entry_status.jpg
  src/docbkx/en/resources/images/ExcelReportModule/view_data_set_completed_report.jpg
  src/docbkx/en/resources/images/ExcelReportModule/view_data_set_completed_report_dataset.jpg
  src/docbkx/en/resources/images/ExcelReportModule/view_data_set_completed_report_period.jpg
  src/docbkx/en/resources/images/dhis2UserManual/add_edit_users.jpg
  src/docbkx/en/resources/images/dhis2UserManual/add_new_user.png
  src/docbkx/en/resources/images/dhis2UserManual/add_user_role.jpg
  src/docbkx/en/resources/images/dhis2UserManual/assign_multiple_datasets_user_role.png
  src/docbkx/en/resources/images/dhis2UserManual/assign_one_dataset_user_role.png
  src/docbkx/en/resources/images/dhis2UserManual/data_entry_screen_main.png
  src/docbkx/en/resources/images/dhis2UserManual/data_entry_screen_select_org_unit.png
  src/docbkx/en/resources/images/dhis2UserManual/data_entry_select_data_set.png
  src/docbkx/en/resources/images/dhis2UserManual/dhis2_information_cycle.png
  src/docbkx/en/resources/images/dhis2UserManual/dhis2_login_screen.jpg
  src/docbkx/en/resources/images/dhis2UserManual/dhis2_logoff.jpg
  src/docbkx/en/resources/images/dhis2UserManual/get_name_dbf.png
  src/docbkx/en/resources/images/dhis2UserManual/open_data_entry_screen.png
  src/docbkx/en/resources/images/dhis2UserManual/role_maintainence_page.jpg
  src/docbkx/en/resources/images/dhis2UserManual/search_user_by_name.jpg
  src/docbkx/en/resources/images/dhis2UserManual/select_user_menu.jpg
  src/docbkx/en/resources/images/dhis2UserManual/select_user_role.jpg
  src/docbkx/en/resources/images/dhis2UserManual/user_management.jpg


--
lp:~dhis2-documenters/dhis2/dhis2-docbook-docs
https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs

Your team DHIS 2 developers is subscribed to branch lp:~dhis2-documenters/dhis2/dhis2-docbook-docs.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs/+edit-subscription.

=== modified file 'pom.xml'
--- pom.xml	2010-01-21 16:51:36 +0000
+++ pom.xml	2010-01-22 08:55:40 +0000
@@ -12,6 +12,10 @@
 
   <description>DHIS 2 Documentation</description>
   <packaging>pom</packaging>
+  <properties>
+      <docbook.source>${project.basedir}/src/docbkx</docbook.source>
+      <docbook.target>${project.basedir}/target/site</docbook.target>
+   </properties>
   <build>
     <plugins>
       <plugin>
@@ -20,12 +24,12 @@
         <artifactId>docbkx-maven-plugin</artifactId>
         <configuration>
          <includes>dhis2_user_manual_en.xml</includes>
-         <sourceDirectory>${basedir}/src/docbkx/en/</sourceDirectory>
+         <sourceDirectory>${docbook.source}/en/</sourceDirectory>
          <xincludeSupported>true</xincludeSupported> 
         </configuration> 
         <executions>
           <execution>
-	    <id>html-docs</id>
+	    <id>chunked-html-docs</id>
              <phase>package</phase>
                <goals>
                 <goal>generate-html</goal>
@@ -37,23 +41,49 @@
                <sectionLabelIncludesComponentLabel>1</sectionLabelIncludesComponentLabel>
                <chunkedOutput>true</chunkedOutput>
           <postProcess>
-            <copy todir="target/site/en">
+            <copy todir="${docbook.target}/en/">
               <fileset dir="target/docbkx/">
                 <include name="**/*.html" />
               </fileset>
             </copy>
 
-            <copy todir="target/site/en/html/resources/images">
+            <copy todir="${docbook.target}/en/html/resources/images">
               <fileset dir="src/docbkx/en/resources/images">
                 <include name="**/*.png" />
                 <include name="**/*.gif" />
                 <include name="**/*.jpg" />
               </fileset>
             </copy>
-	    <copy todir="target/site/en/html/resources/css">
+	    <copy todir="${docbook.target}/en/html/resources/css">
               <fileset dir="src/docbkx/en/resources/css">
                 <include name="**/*.css" />
               </fileset>
+            </copy> 
+            <!-- delete the file to force the regeneration in the next phase -->
+            <delete file="target/docbkx/html/dhis2_user_manual_en.html" />
+          </postProcess>
+        </configuration>
+       </execution>
+        <execution>
+            <id>html-docs</id>
+             <phase>package</phase>
+               <goals>
+                <goal>generate-html</goal>
+               </goals>
+            <configuration>
+             <htmlStylesheet>resources/css/docbook_bsd.css</htmlStylesheet>
+              <glossaryCollection>resources/glossary_en.xml</glossaryCollection>
+               <sectionAutolabel>1</sectionAutolabel>
+               <sectionLabelIncludesComponentLabel>1</sectionLabelIncludesComponentLabel>
+               <chunkedOutput>false</chunkedOutput>
+          <postProcess>
+              <move
+                 file="target/docbkx/html/dhis2_user_manual_en.html"
+                 tofile="target/docbkx/html/dhis2_user_manual_full.html"/>
+            <copy todir="${docbook.target}/en/">
+              <fileset dir="target/docbkx/">
+                <include name="**/dhis2_user_manual_full.html" />
+              </fileset>
             </copy>
           </postProcess>
         </configuration>
@@ -66,10 +96,10 @@
                </goals>
                 <configuration>
                  <argLine>-Xmx1024m</argLine>
-                  <foCustomization>${basedir}/src/docbkx/en/resources/xsl/fop-cust.xsl</foCustomization> 
+                  <foCustomization>${docbook.source}/en/resources/xsl/fop-cust.xsl</foCustomization> 
                   <doubleSided>1</doubleSided>
                   <includes>*.xml</includes>
-                  <sourceDirectory>${basedir}/src/docbkx/en/</sourceDirectory>
+                  <sourceDirectory>${docbook.source}/en/</sourceDirectory>
 
            	  <postProcess>
             		<copy todir="target/site/en">

=== modified file 'src/docbkx/en/dhis2_user_man_mod2.xml'
--- src/docbkx/en/dhis2_user_man_mod2.xml	2010-01-21 16:51:36 +0000
+++ src/docbkx/en/dhis2_user_man_mod2.xml	2010-01-22 08:55:40 +0000
@@ -161,7 +161,7 @@
         <screeninfo>Adding a dataset to a user role</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="resources/images/dhis2UserManual/assign_one_dataset_user_role.png" width="80%" align="center"/>
+            <imagedata fileref="resources/images/dhis2UserManual/assign_one_dataset_user_role.jpg" width="80%" align="center"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -173,7 +173,7 @@
         <screeninfo>Adding multiple datasets to user roles</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="resources/images/dhis2UserManual/assign_multiple_datasets_user_role.png" width="80%" align="center"/>
+            <imagedata fileref="resources/images/dhis2UserManual/assign_multiple_datasets_user_role.jpg" width="80%" align="center"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -191,7 +191,7 @@
         <screeninfo>Add new user</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="resources/images/dhis2UserManual/add_new_user.png" width="80%" align="center"/>
+            <imagedata fileref="resources/images/dhis2UserManual/add_new_user.jpg" width="80%" align="center"/>
           </imageobject>
         </mediaobject>
       </screenshot>

=== modified file 'src/docbkx/en/dhis2_user_manual_en.xml'
--- src/docbkx/en/dhis2_user_manual_en.xml	2010-01-18 15:58:42 +0000
+++ src/docbkx/en/dhis2_user_manual_en.xml	2010-01-22 08:55:40 +0000
@@ -1,46 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
+<!-- This document was created with Syntext Serna Free. -->
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; []>
 <book>
   <title>DHIS 2 User Manual</title>
-    <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_maintainence.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_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_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_maintainence.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_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"/>
   <appendix>
     <title>DHIS2 Excel Report Module User Manual</title>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_report_excel_user_manual_en.xml" xpointer="excel_1" encoding="UTF-8"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_report_excel_user_manual_en.xml" xpointer="excel_2" encoding="UTF-8"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_report_excel_user_manual_en.xml" xpointer="excel_3" encoding="UTF-8"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_report_excel_user_manual_en.xml" xpointer="excel_4" encoding="UTF-8"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_report_excel_user_manual_en.xml" xpointer="excel_5" encoding="UTF-8"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_report_excel_user_manual_en.xml" encoding="UTF-8" xpointer="excel_1"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_report_excel_user_manual_en.xml" encoding="UTF-8" xpointer="excel_2"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_report_excel_user_manual_en.xml" encoding="UTF-8" xpointer="excel_3"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_report_excel_user_manual_en.xml" encoding="UTF-8" xpointer="excel_4"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_report_excel_user_manual_en.xml" encoding="UTF-8" xpointer="excel_5"/>
   </appendix>
   <appendix>
     <title> DHIS Documentation Guide</title>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_documentation_guide.xml" xpointer="docs_1" encoding="UTF-8"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_documentation_guide.xml" xpointer="docs_2" encoding="UTF-8"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_documentation_guide.xml" xpointer="docs_3" encoding="UTF-8"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_documentation_guide.xml" xpointer="docs_4" encoding="UTF-8"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_documentation_guide.xml" xpointer="docs_5" encoding="UTF-8"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_documentation_guide.xml" xpointer="docs_6" encoding="UTF-8"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_documentation_guide.xml" xpointer="docs_7" encoding="UTF-8"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_documentation_guide.xml" xpointer="docs_8" encoding="UTF-8"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_documentation_guide.xml" xpointer="docs_9" encoding="UTF-8"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_documentation_guide.xml" xpointer="docs_10" encoding="UTF-8"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_documentation_guide.xml" encoding="UTF-8" xpointer="docs_1"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_documentation_guide.xml" encoding="UTF-8" xpointer="docs_2"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_documentation_guide.xml" encoding="UTF-8" xpointer="docs_3"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_documentation_guide.xml" encoding="UTF-8" xpointer="docs_4"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_documentation_guide.xml" encoding="UTF-8" xpointer="docs_5"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_documentation_guide.xml" encoding="UTF-8" xpointer="docs_6"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_documentation_guide.xml" encoding="UTF-8" xpointer="docs_7"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_documentation_guide.xml" encoding="UTF-8" xpointer="docs_8"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_documentation_guide.xml" encoding="UTF-8" xpointer="docs_9"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_documentation_guide.xml" encoding="UTF-8" xpointer="docs_10"/>
   </appendix>
   <appendix>
     <title> DHIS Technical Architecture Guide</title>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_technical_architechture_guide.xml" xpointer="arch_1" encoding="UTF-8"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_technical_architechture_guide.xml" xpointer="arch_2" encoding="UTF-8"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_technical_architechture_guide.xml" xpointer="arch_3" encoding="UTF-8"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_technical_architechture_guide.xml" xpointer="arch_4" encoding="UTF-8"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_technical_architechture_guide.xml" xpointer="arch_5" encoding="UTF-8"/>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_technical_architechture_guide.xml" xpointer="arch_6" encoding="UTF-8"/>
-    <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"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_technical_architechture_guide.xml" encoding="UTF-8" xpointer="arch_1"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_technical_architechture_guide.xml" encoding="UTF-8" xpointer="arch_2"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_technical_architechture_guide.xml" encoding="UTF-8" xpointer="arch_3"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_technical_architechture_guide.xml" encoding="UTF-8" xpointer="arch_4"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_technical_architechture_guide.xml" encoding="UTF-8" xpointer="arch_5"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_technical_architechture_guide.xml" encoding="UTF-8" xpointer="arch_6"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_technical_architechture_guide.xml" encoding="UTF-8" xpointer="arch_7"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_technical_architechture_guide.xml" encoding="UTF-8" xpointer="arch_8"/>
   </appendix>
- <!-- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="resources/glossary/glossary_en.xml" encoding="UTF-8"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="resources/glossary/glossary_en.xml" encoding="UTF-8"/>
 </book>

=== modified file 'src/docbkx/en/resources/glossary/glossary_en.xml'
--- src/docbkx/en/resources/glossary/glossary_en.xml	2010-01-21 16:51:36 +0000
+++ src/docbkx/en/resources/glossary/glossary_en.xml	2010-01-22 08:55:40 +0000
@@ -1,7 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- This document was created with Syntext Serna Free. --><!DOCTYPE glossary PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml
+<!-- This document was created with Syntext Serna Free. -->
+<!DOCTYPE glossary PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml
 /4.4/docbookx.dtd" []>
-<glossary>
+<glossary id="dhis2_glossary">
   <glossaryinfo>
     <editor>
       <firstname>Jason</firstname>

=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/NewReportItem.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/NewReportItem.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/NewReportItem.jpg	2010-01-22 08:55:40 +0000 differ
=== removed file 'src/docbkx/en/resources/images/ExcelReportModule/Thumbs.db'
Binary files src/docbkx/en/resources/images/ExcelReportModule/Thumbs.db	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/Thumbs.db	1970-01-01 00:00:00 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/add_dataset.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/add_dataset.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/add_dataset.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/add_dataset1.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/add_dataset1.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/add_dataset1.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/add_new_report_button.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/add_new_report_button.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/add_new_report_button.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/administration_page.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/administration_page.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/administration_page.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/advanced_generate_report.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/advanced_generate_report.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/advanced_generate_report.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/assign_data_element_group.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/assign_data_element_group.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/assign_data_element_group.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/assign_org_unit_group.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/assign_org_unit_group.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/assign_org_unit_group.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/assign_user_role.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/assign_user_role.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/assign_user_role.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/association_org_unit.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/association_org_unit.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/association_org_unit.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/configure_directory.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/configure_directory.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/configure_directory.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/configure_directory1.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/configure_directory1.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/configure_directory1.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/copy_report_item.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/copy_report_item.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/copy_report_item.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/create_expression.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/create_expression.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/create_expression.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/create_expression1.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/create_expression1.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/create_expression1.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/create_item.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/create_item.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/create_item.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/create_new_report.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/create_new_report.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/create_new_report.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/create_report_item.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/create_report_item.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/create_report_item.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/data_entry_status.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/data_entry_status.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/data_entry_status.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/data_entry_status1.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/data_entry_status1.jpg	2009-11-05 06:02:14 +0000 and src/docbkx/en/resources/images/ExcelReportModule/data_entry_status1.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/dataelement_category_report_template.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/dataelement_category_report_template.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/dataelement_category_report_template.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/edit_report.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/edit_report.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/edit_report.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/edit_user_role.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/edit_user_role.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/edit_user_role.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/enter_report_information.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/enter_report_information.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/enter_report_information.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/enter_report_item_infor.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/enter_report_item_infor.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/enter_report_item_infor.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/excel_report_left_menu.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/excel_report_left_menu.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/excel_report_left_menu.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/excel_template_file.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/excel_template_file.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/excel_template_file.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/excel_template_file_with_data_values.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/excel_template_file_with_data_values.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/excel_template_file_with_data_values.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/generate_individual_report.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/generate_individual_report.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/generate_individual_report.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/generate_individual_report1.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/generate_individual_report1.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/generate_individual_report1.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/generate_report.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/generate_report.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/generate_report.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/generate_report_introduce.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/generate_report_introduce.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/generate_report_introduce.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/import_data_from_excel.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/import_data_from_excel.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/import_data_from_excel.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/import_data_from_excel_file.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/import_data_from_excel_file.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/import_data_from_excel_file.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/list_of_reports.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/list_of_reports.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/list_of_reports.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/list_org_unit_group_report_template.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/list_org_unit_group_report_template.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/list_org_unit_group_report_template.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/list_time_period_report_template.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/list_time_period_report_template.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/list_time_period_report_template.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/main_feature_of_excel_report_module.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/main_feature_of_excel_report_module.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/main_feature_of_excel_report_module.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/navigate_to_list_of_report.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/navigate_to_list_of_report.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/navigate_to_list_of_report.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/new_report_item.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/new_report_item.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/new_report_item.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/note.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/note.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/note.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/one of data enetry form of reports.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/one of data enetry form of reports.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/one of data enetry form of reports.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/open_excel_report_module.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/open_excel_report_module.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/open_excel_report_module.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/operating_buttons.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/operating_buttons.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/operating_buttons.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/remove_report.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/remove_report.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/remove_report.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/report_association.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/report_association.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/report_association.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/report_item.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/report_item.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/report_item.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/report_item_function.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/report_item_function.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/report_item_function.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/select_excel_report.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/select_excel_report.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/select_excel_report.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/select_org_unit.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/select_org_unit.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/select_org_unit.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/select_org_unit_group.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/select_org_unit_group.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/select_org_unit_group.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/select_org_unit_group1.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/select_org_unit_group1.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/select_org_unit_group1.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/standard_report_template.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/standard_report_template.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/standard_report_template.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/steps_generate_report.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/steps_generate_report.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/steps_generate_report.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/view_data_entry_status.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/view_data_entry_status.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/view_data_entry_status.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/view_data_set_completed_report.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/view_data_set_completed_report.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/ExcelReportModule/view_data_set_completed_report.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/view_data_set_completed_report_dataset.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/view_data_set_completed_report_dataset.jpg	2009-11-05 06:02:14 +0000 and src/docbkx/en/resources/images/ExcelReportModule/view_data_set_completed_report_dataset.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/ExcelReportModule/view_data_set_completed_report_period.jpg'
Binary files src/docbkx/en/resources/images/ExcelReportModule/view_data_set_completed_report_period.jpg	2009-11-05 06:02:14 +0000 and src/docbkx/en/resources/images/ExcelReportModule/view_data_set_completed_report_period.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2UserManual/add_edit_users.jpg'
Binary files src/docbkx/en/resources/images/dhis2UserManual/add_edit_users.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/dhis2UserManual/add_edit_users.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2UserManual/add_new_user.png'
Binary files src/docbkx/en/resources/images/dhis2UserManual/add_new_user.png	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/dhis2UserManual/add_new_user.png	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2UserManual/add_user_role.jpg'
Binary files src/docbkx/en/resources/images/dhis2UserManual/add_user_role.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/dhis2UserManual/add_user_role.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2UserManual/assign_multiple_datasets_user_role.png'
Binary files src/docbkx/en/resources/images/dhis2UserManual/assign_multiple_datasets_user_role.png	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/dhis2UserManual/assign_multiple_datasets_user_role.png	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2UserManual/assign_one_dataset_user_role.png'
Binary files src/docbkx/en/resources/images/dhis2UserManual/assign_one_dataset_user_role.png	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/dhis2UserManual/assign_one_dataset_user_role.png	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2UserManual/data_entry_screen_main.png'
Binary files src/docbkx/en/resources/images/dhis2UserManual/data_entry_screen_main.png	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/dhis2UserManual/data_entry_screen_main.png	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2UserManual/data_entry_screen_select_org_unit.png'
Binary files src/docbkx/en/resources/images/dhis2UserManual/data_entry_screen_select_org_unit.png	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/dhis2UserManual/data_entry_screen_select_org_unit.png	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2UserManual/data_entry_select_data_set.png'
Binary files src/docbkx/en/resources/images/dhis2UserManual/data_entry_select_data_set.png	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/dhis2UserManual/data_entry_select_data_set.png	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2UserManual/dhis2_information_cycle.png'
Binary files src/docbkx/en/resources/images/dhis2UserManual/dhis2_information_cycle.png	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/dhis2UserManual/dhis2_information_cycle.png	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2UserManual/dhis2_login_screen.jpg'
Binary files src/docbkx/en/resources/images/dhis2UserManual/dhis2_login_screen.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/dhis2UserManual/dhis2_login_screen.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2UserManual/dhis2_logoff.jpg'
Binary files src/docbkx/en/resources/images/dhis2UserManual/dhis2_logoff.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/dhis2UserManual/dhis2_logoff.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2UserManual/get_name_dbf.png'
Binary files src/docbkx/en/resources/images/dhis2UserManual/get_name_dbf.png	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/dhis2UserManual/get_name_dbf.png	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2UserManual/open_data_entry_screen.png'
Binary files src/docbkx/en/resources/images/dhis2UserManual/open_data_entry_screen.png	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/dhis2UserManual/open_data_entry_screen.png	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2UserManual/role_maintainence_page.jpg'
Binary files src/docbkx/en/resources/images/dhis2UserManual/role_maintainence_page.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/dhis2UserManual/role_maintainence_page.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2UserManual/search_user_by_name.jpg'
Binary files src/docbkx/en/resources/images/dhis2UserManual/search_user_by_name.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/dhis2UserManual/search_user_by_name.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2UserManual/select_user_menu.jpg'
Binary files src/docbkx/en/resources/images/dhis2UserManual/select_user_menu.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/dhis2UserManual/select_user_menu.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2UserManual/select_user_role.jpg'
Binary files src/docbkx/en/resources/images/dhis2UserManual/select_user_role.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/dhis2UserManual/select_user_role.jpg	2010-01-22 08:55:40 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2UserManual/user_management.jpg'
Binary files src/docbkx/en/resources/images/dhis2UserManual/user_management.jpg	2009-10-27 19:28:34 +0000 and src/docbkx/en/resources/images/dhis2UserManual/user_management.jpg	2010-01-22 08:55:40 +0000 differ