← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 447: Moved docbkx files in /implementation_guide folder back to root folder, not sure about the ration...

 

------------------------------------------------------------
revno: 447
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2-docbook-docs
timestamp: Wed 2012-02-08 23:35:01 +0100
message:
  Moved docbkx files in /implementation_guide folder back to root folder, not sure about the rationale for moving them there but it caused all relative references to images/resources to break as all docbkx files are put in same folder under target when built.
removed:
  src/docbkx/en/implementation_guide/
renamed:
  src/docbkx/en/implementation_guide/dhis2_implementation_guide_as_a_platform.xml => src/docbkx/en/dhis2_implementation_guide_as_a_platform.xml
  src/docbkx/en/implementation_guide/dhis2_implementation_guide_conceptual_design_principles.xml => src/docbkx/en/dhis2_implementation_guide_conceptual_design_principles.xml
  src/docbkx/en/implementation_guide/dhis2_implementation_guide_data_analysis_tools_overview.xml => src/docbkx/en/dhis2_implementation_guide_data_analysis_tools_overview.xml
  src/docbkx/en/implementation_guide/dhis2_implementation_guide_data_elements_and_custom_dimensions.xml => src/docbkx/en/dhis2_implementation_guide_data_elements_and_custom_dimensions.xml
  src/docbkx/en/implementation_guide/dhis2_implementation_guide_data_quality.xml => src/docbkx/en/dhis2_implementation_guide_data_quality.xml
  src/docbkx/en/implementation_guide/dhis2_implementation_guide_data_sets_and_forms.xml => src/docbkx/en/dhis2_implementation_guide_data_sets_and_forms.xml
  src/docbkx/en/implementation_guide/dhis2_implementation_guide_data_warehouse.xml => src/docbkx/en/dhis2_implementation_guide_data_warehouse.xml
  src/docbkx/en/implementation_guide/dhis2_implementation_guide_deployment_strategies.xml => src/docbkx/en/dhis2_implementation_guide_deployment_strategies.xml
  src/docbkx/en/implementation_guide/dhis2_implementation_guide_enduser_training.xml => src/docbkx/en/dhis2_implementation_guide_enduser_training.xml
  src/docbkx/en/implementation_guide/dhis2_implementation_guide_indicators.xml => src/docbkx/en/dhis2_implementation_guide_indicators.xml
  src/docbkx/en/implementation_guide/dhis2_implementation_guide_installation.xml => src/docbkx/en/dhis2_implementation_guide_installation.xml
  src/docbkx/en/implementation_guide/dhis2_implementation_guide_installation_detailed.xml => src/docbkx/en/dhis2_implementation_guide_installation_detailed.xml
  src/docbkx/en/implementation_guide/dhis2_implementation_guide_integration.xml => src/docbkx/en/dhis2_implementation_guide_integration.xml
  src/docbkx/en/implementation_guide/dhis2_implementation_guide_organisation_units.xml => src/docbkx/en/dhis2_implementation_guide_organisation_units.xml
  src/docbkx/en/implementation_guide/dhis2_implementation_guide_pivot_tables_and_mydatamart.xml => src/docbkx/en/dhis2_implementation_guide_pivot_tables_and_mydatamart.xml
  src/docbkx/en/implementation_guide/dhis2_implementation_guide_recommendations.xml => src/docbkx/en/dhis2_implementation_guide_recommendations.xml
  src/docbkx/en/implementation_guide/dhis2_implementation_guide_setting_up_new_database.xml => src/docbkx/en/dhis2_implementation_guide_setting_up_new_database.xml
  src/docbkx/en/implementation_guide/dhis2_implementation_guide_short.xml => src/docbkx/en/dhis2_implementation_guide_short.xml
  src/docbkx/en/implementation_guide/dhis2_implementation_guide_support.xml => src/docbkx/en/dhis2_implementation_guide_support.xml
  src/docbkx/en/implementation_guide/dhis2_implementation_guide_users_and_user_roles.xml => src/docbkx/en/dhis2_implementation_guide_users_and_user_roles.xml
modified:
  src/docbkx/en/dhis2_implementation_guide_en.xml
  src/docbkx/en/dhis2_implementation_guide_as_a_platform.xml
  src/docbkx/en/dhis2_implementation_guide_conceptual_design_principles.xml
  src/docbkx/en/dhis2_implementation_guide_data_warehouse.xml
  src/docbkx/en/dhis2_implementation_guide_installation_detailed.xml
  src/docbkx/en/dhis2_implementation_guide_integration.xml
  src/docbkx/en/dhis2_implementation_guide_organisation_units.xml
  src/docbkx/en/dhis2_implementation_guide_pivot_tables_and_mydatamart.xml


--
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
=== renamed file 'src/docbkx/en/implementation_guide/dhis2_implementation_guide_as_a_platform.xml' => 'src/docbkx/en/dhis2_implementation_guide_as_a_platform.xml'
--- src/docbkx/en/implementation_guide/dhis2_implementation_guide_as_a_platform.xml	2012-01-20 07:34:34 +0000
+++ src/docbkx/en/dhis2_implementation_guide_as_a_platform.xml	2012-02-08 22:35:01 +0000
@@ -17,7 +17,7 @@
       <para>All data including meta-data, reports, maps and charts, known as resources in REST terminology, can be retrieved in most of the popular representation formats of the Web of today, such as HTML, XML, JSON, PDF and PNG. These formats are widely supported in applications and programming languages and gives third-party developers a wide range of implementation options.</para>
     </listitem>
   </itemizedlist>
-  <graphic fileref="../resources/images/implementation_guide/dhis_platform.png" width="80%" format="PNG" align="center"/>
+  <graphic fileref="resources/images/implementation_guide/dhis_platform.png" width="80%" format="PNG" align="center"/>
   <para>There are several scenarios where additional software artifacts may connect to the DHIS Web API.</para>
   <section>
     <title>Web portals</title>

=== renamed file 'src/docbkx/en/implementation_guide/dhis2_implementation_guide_conceptual_design_principles.xml' => 'src/docbkx/en/dhis2_implementation_guide_conceptual_design_principles.xml'
--- src/docbkx/en/implementation_guide/dhis2_implementation_guide_conceptual_design_principles.xml	2012-01-20 07:34:34 +0000
+++ src/docbkx/en/dhis2_implementation_guide_conceptual_design_principles.xml	2012-02-08 22:35:01 +0000
@@ -40,13 +40,13 @@
     <title>Data input != Data output</title>
     <para>In DHIS 2 there are three dimensions that describe the aggregated data being collected and stored in the database; the where - organisation unit, the what - data element, and the when - period. The organisation unit, data element and period make up the three core dimensions that are needed to describe any data value in the DHIS 2, whether it is a in a data collection form, a chart, on a map, or in an aggregated summary report. When data is collected in an electronic data entry form, sometimes through a mirror image of the paper forms used at facility level, each entry field in the form can be described using these three dimensions. The form itself is just a tool to organise the data collection and is not describing the individual data values being collected and stored in the database. Being able to describe each data value independently through a Data Element definition (e.g. ‘Measles doses given &lt;1 year’) provides important flexibility when processing, validating, and analysing the data, and allows for comparison of data across collection forms and health programs. </para>
     <para>This design or data model approach separates DHIS from many of the traditional HIS software applications which threat the data collection forms as the key unit of analysis. This is typical for systems tailored to vertical programs’ needs and the traditional conceptualisation of the collection form as also being the report or the analysis output. The figure below illustrates how the more fine-grained DHIS design built around the concept of Data Elements is different and how the input (data collection) is separated from the output (data analysis), supporting more flexible and varied data analysis and dissemination. The data element ‘Measles doses given &lt;1 y’ is collected as part of a Child Immunisation collection form, but can be used individually to build up an Indicator (a formula) called  ‘Measles coverage &lt;1y’ where it is combined with the data element called ‘Population &lt;1y’, being collected through another collection form. This calculated Indicator value can then be used in data analysis in various reporting tools in DHIS 2, e.g. custom designed reports with charts, pivot tables, or on a map in the GIS module.</para>
-    <graphic width="100%" format="PNG" fileref="../resources/images/implementation_guide/data_input_output.png" align="center"/>
+    <graphic width="100%" format="PNG" fileref="resources/images/implementation_guide/data_input_output.png" align="center"/>
   </section>
   <section>
     <title>Indicator-driven data analysis and reporting</title>
     <para>What is referred to as a Data Element above, the key dimension that describes what is being collected, is sometimes referred to as an indicator in other settings. In DHIS 2 we distinguish between Data Elements who describe the the raw data, e.g. the counts being collected, and Indicators, which are formula-based and describe calculated values, e.g. coverage or incidence rates that are used for data analysis. Indicator values are not collected like the data (element) values, but instead calculated by the application based on formulas defined by the users. These formulas are made up of a factor (e.g. 1, 100, 100, 100 000), a numerator and a denominator, the two latter are both expressions based on one or more data elements. E.g. the indicator &quot;Measles coverage &lt;1 year&quot; is defined a formula with a factor 100, a numerator (&quot;Measles doses given to children under 1 year&quot;) and a denominator (&quot;Target population under 1 year&quot;). The indicator &quot;DPT1 to DPT3 drop out rate&quot; is a formula of 100 % x (&quot;DPT1 doses given&quot;- &quot;DPT3doses given&quot;) / (&quot;DPT1 doses given&quot;). These formulas can be added and edited through the user interface by a user with limited training, as they are quite easy to set up and do not interfere with the data values stored in the database (so adding or modifying an indicator is not a critical operation).</para>
     <para>Indicators represent perhaps the most powerful data analysis feature of the DHIS 2, and all reporting tools support the use of indicators, e.g. as displayed in the custom report in the figure above. Being able to use population data in the denominator enables comparisons of health performance across geographical areas with different target populations, which is more useful than only looking at the raw numbers. The table below uses both the raw data values (Doses) and indicator values (Cov) for the different vaccines. Comparing e.g. the two first orgunits in the list, Taita Taveta County and Kilifi County, on DPT-1 immunisation, we can see that while the raw numbers (659 vs 2088)  indicate many more doses are given in Kilifi, the coverage rates (92.2 % vs 47.5 %) show that Taita Taveta are doing a better job immunising their target population under 1 year. Looking at the final column (Immuniz. Compl. %) which indicates the completeness of reporting of the immunisation form for the same period, we can see that the numbers are more or less the same in the two counties we compared, which tells us that the coverage rates are comparable across the two counties.   </para>
-    <graphic width="100%" format="PNG" fileref="../resources/images/implementation_guide/indicator_report.png" align="center"/>
+    <graphic width="100%" format="PNG" fileref="resources/images/implementation_guide/indicator_report.png" align="center"/>
   </section>
   <section>
     <title>Maintain disaggregated facility-data in the database</title>

=== renamed file 'src/docbkx/en/implementation_guide/dhis2_implementation_guide_data_analysis_tools_overview.xml' => 'src/docbkx/en/dhis2_implementation_guide_data_analysis_tools_overview.xml'
=== renamed file 'src/docbkx/en/implementation_guide/dhis2_implementation_guide_data_elements_and_custom_dimensions.xml' => 'src/docbkx/en/dhis2_implementation_guide_data_elements_and_custom_dimensions.xml'
=== renamed file 'src/docbkx/en/implementation_guide/dhis2_implementation_guide_data_quality.xml' => 'src/docbkx/en/dhis2_implementation_guide_data_quality.xml'
=== renamed file 'src/docbkx/en/implementation_guide/dhis2_implementation_guide_data_sets_and_forms.xml' => 'src/docbkx/en/dhis2_implementation_guide_data_sets_and_forms.xml'
=== renamed file 'src/docbkx/en/implementation_guide/dhis2_implementation_guide_data_warehouse.xml' => 'src/docbkx/en/dhis2_implementation_guide_data_warehouse.xml'
--- src/docbkx/en/implementation_guide/dhis2_implementation_guide_data_warehouse.xml	2012-01-20 07:34:34 +0000
+++ src/docbkx/en/dhis2_implementation_guide_data_warehouse.xml	2012-02-08 22:35:01 +0000
@@ -7,7 +7,7 @@
     <title>Data warehouses and operational systems</title>
     <para>A <emphasis role="italic">data warehouse</emphasis> is commonly understood as a database used for analysis. Typically data is uploaded from various operational / transactional systems. Before data is loaded into the data warehouse it usually goes through various stages where it is cleaned for anomalies and redundancy and transformed to conform with the overall structure of the integrated database. Data is then made available for use by analysis, also known under terms such as<emphasis role="italic"> data mining </emphasis>and <emphasis role="italic">online analytical processing</emphasis>. The data warehouse design is optimized for speed of data retrieval and analysis. To improve performance the data storage is often redundant in the sense that the data is stored both in its most granular form and in an aggregated (summarized) form.</para>
     <para>A <emphasis role="italic">transactional system</emphasis> (or <emphasis role="italic">operational system</emphasis> from a data warehouse perspective) is a system that collects, stores and modifies low level data. This system is typically used on a day-to-day basis for data entry and validation. The design is optimized for fast insert and update performance.</para>
-    <graphic fileref="../resources/images/implementation_guide/data_warehouse.png" width="80%" format="PNG" align="center"/>
+    <graphic fileref="resources/images/implementation_guide/data_warehouse.png" width="80%" format="PNG" align="center"/>
     <para>There are several benefits of maintaining a data warehouse, some of them being:</para>
     <itemizedlist>
       <listitem>
@@ -43,7 +43,7 @@
         <para>OpenELIS: Laboratory enterprise information system. This system can generate and export data on number and outcome of laboratory tests.</para>
       </listitem>
     </itemizedlist>
-    <graphic fileref="../resources/images/implementation_guide/dhis_data_warehouse.png" format="PNG" width="80%" align="center"/>
+    <graphic fileref="resources/images/implementation_guide/dhis_data_warehouse.png" format="PNG" width="80%" align="center"/>
   </section>
   <section>
     <title>Aggregation strategies in DHIS 2</title>

=== renamed file 'src/docbkx/en/implementation_guide/dhis2_implementation_guide_deployment_strategies.xml' => 'src/docbkx/en/dhis2_implementation_guide_deployment_strategies.xml'
=== modified file 'src/docbkx/en/dhis2_implementation_guide_en.xml'
--- src/docbkx/en/dhis2_implementation_guide_en.xml	2012-01-23 05:19:30 +0000
+++ src/docbkx/en/dhis2_implementation_guide_en.xml	2012-02-08 22:35:01 +0000
@@ -6,23 +6,23 @@
 <book>
  <title>&title;</title>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="resources/bookinfo/bookinfo.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="implementation_guide/dhis2_implementation_guide_recommendations.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="implementation_guide/dhis2_implementation_guide_conceptual_design_principles.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="implementation_guide/dhis2_implementation_guide_setting_up_new_database.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="implementation_guide/dhis2_implementation_guide_deployment_strategies.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="implementation_guide/dhis2_implementation_guide_data_warehouse.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="implementation_guide/dhis2_implementation_guide_enduser_training.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="implementation_guide/dhis2_implementation_guide_integration.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="implementation_guide/dhis2_implementation_guide_installation.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="implementation_guide/dhis2_implementation_guide_support.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="implementation_guide/dhis2_implementation_guide_installation_detailed.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="implementation_guide/dhis2_implementation_guide_organisation_units.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="implementation_guide/dhis2_implementation_guide_data_elements_and_custom_dimensions.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="implementation_guide/dhis2_implementation_guide_data_sets_and_forms.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="implementation_guide/dhis2_implementation_guide_data_quality.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="implementation_guide/dhis2_implementation_guide_indicators.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="implementation_guide/dhis2_implementation_guide_users_and_user_roles.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="implementation_guide/dhis2_implementation_guide_data_analysis_tools_overview.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="implementation_guide/dhis2_implementation_guide_pivot_tables_and_mydatamart.xml" encoding="UTF-8"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="implementation_guide/dhis2_implementation_guide_as_a_platform.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_recommendations.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_conceptual_design_principles.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_setting_up_new_database.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_deployment_strategies.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_data_warehouse.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_enduser_training.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_integration.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_installation.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_support.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_installation_detailed.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_organisation_units.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_data_elements_and_custom_dimensions.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_data_sets_and_forms.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_data_quality.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_indicators.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_users_and_user_roles.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_data_analysis_tools_overview.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_pivot_tables_and_mydatamart.xml" encoding="UTF-8"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_as_a_platform.xml" encoding="UTF-8"/>
 </book>

=== renamed file 'src/docbkx/en/implementation_guide/dhis2_implementation_guide_enduser_training.xml' => 'src/docbkx/en/dhis2_implementation_guide_enduser_training.xml'
=== renamed file 'src/docbkx/en/implementation_guide/dhis2_implementation_guide_indicators.xml' => 'src/docbkx/en/dhis2_implementation_guide_indicators.xml'
=== renamed file 'src/docbkx/en/implementation_guide/dhis2_implementation_guide_installation.xml' => 'src/docbkx/en/dhis2_implementation_guide_installation.xml'
=== renamed file 'src/docbkx/en/implementation_guide/dhis2_implementation_guide_installation_detailed.xml' => 'src/docbkx/en/dhis2_implementation_guide_installation_detailed.xml'
--- src/docbkx/en/implementation_guide/dhis2_implementation_guide_installation_detailed.xml	2012-01-20 07:34:34 +0000
+++ src/docbkx/en/dhis2_implementation_guide_installation_detailed.xml	2012-02-08 22:35:01 +0000
@@ -15,7 +15,7 @@
       <screeninfo>Java license agreement</screeninfo>
       <mediaobject>
         <imageobject>
-          <imagedata width="67%" fileref="../resources/images/dhis2_ubuntu_installation/Java-agreement.png" format="PNG"/>
+          <imagedata width="67%" fileref="resources/images/dhis2_ubuntu_installation/Java-agreement.png" format="PNG"/>
         </imageobject>
       </mediaobject>
     </screenshot>
@@ -30,7 +30,7 @@
       <screeninfo>Type Y when you&apos;re asked if you want to continue</screeninfo>
       <mediaobject>
         <imageobject>
-          <imagedata width="75%" fileref="../resources/images/dhis2_ubuntu_installation/Continue-Yes.png" format="PNG"/>
+          <imagedata width="75%" fileref="resources/images/dhis2_ubuntu_installation/Continue-Yes.png" format="PNG"/>
         </imageobject>
       </mediaobject>
     </screenshot>
@@ -42,7 +42,7 @@
         <screeninfo>Set password for the system user</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata width="50%" fileref="../resources/images/dhis2_ubuntu_installation/edit_password-unix.png" format="PNG"/>
+            <imagedata width="50%" fileref="resources/images/dhis2_ubuntu_installation/edit_password-unix.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -78,7 +78,7 @@
         <screeninfo>Create a new database user and database</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata width="50%" fileref="../resources/images/dhis2_ubuntu_installation/postgres.png" format="PNG"/>
+            <imagedata width="50%" fileref="resources/images/dhis2_ubuntu_installation/postgres.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -101,7 +101,7 @@
         <screeninfo>Modify the postgresql.conf file to open the server for connections</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata width="75%" fileref="../resources/images/dhis2_ubuntu_installation/Postgresql.conf.png" format="PNG"/>
+            <imagedata width="75%" fileref="resources/images/dhis2_ubuntu_installation/Postgresql.conf.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -121,7 +121,7 @@
         <screeninfo>Edit the pg_hba.conf file to define authorizations</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata width="75%" fileref="../resources/images/dhis2_ubuntu_installation/Pg_hba.conf.png" format="PNG"/>
+            <imagedata width="75%" fileref="resources/images/dhis2_ubuntu_installation/Pg_hba.conf.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -148,7 +148,7 @@
             <screenshot>
               <mediaobject>
                 <imageobject>
-                  <imagedata width="30%" align="center" fileref="../resources/images/odbc/odbc_screen_1.PNG"/>
+                  <imagedata width="30%" align="center" fileref="resources/images/odbc/odbc_screen_1.PNG"/>
                 </imageobject>
               </mediaobject>
             </screenshot>
@@ -184,7 +184,7 @@
             <screenshot>
               <mediaobject>
                 <imageobject>
-                  <imagedata width="30%" align="center" fileref="../resources/images/odbc/odbc_screen_2.PNG"/>
+                  <imagedata width="30%" align="center" fileref="resources/images/odbc/odbc_screen_2.PNG"/>
                 </imageobject>
               </mediaobject>
             </screenshot>
@@ -194,7 +194,7 @@
             <screenshot>
               <mediaobject>
                 <imageobject>
-                  <imagedata width="20%" align="center" fileref="../resources/images/odbc/odbc_screen_3.PNG"/>
+                  <imagedata width="20%" align="center" fileref="resources/images/odbc/odbc_screen_3.PNG"/>
                 </imageobject>
               </mediaobject>
             </screenshot>
@@ -292,7 +292,7 @@
         <screeninfo>Click the button with the plug to create a server connection</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata width="75%" fileref="../resources/images/dhis2_ubuntu_installation/PgAdmin-Add-Server.png" format="PNG"/>
+            <imagedata width="75%" fileref="resources/images/dhis2_ubuntu_installation/PgAdmin-Add-Server.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -322,7 +322,7 @@
         <screeninfo>Enter the credentials for the server connection</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata width="50%" fileref="../resources/images/dhis2_ubuntu_installation/PgAdmin_NewServerRegistration.png" format="PNG"/>
+            <imagedata width="50%" fileref="resources/images/dhis2_ubuntu_installation/PgAdmin_NewServerRegistration.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -331,7 +331,7 @@
         <screeninfo>The warning message when you choose to save the password</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata width="75%" fileref="../resources/images/dhis2_ubuntu_installation/PgAdmin-Guru Hint - Saving passwords.png" format="PNG"/>
+            <imagedata width="75%" fileref="resources/images/dhis2_ubuntu_installation/PgAdmin-Guru Hint - Saving passwords.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -346,7 +346,7 @@
         <screeninfo>The warning message when you choose to save the password</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata width="33%" fileref="../resources/images/dhis2_ubuntu_installation/pgAdmin-Restore.png" format="PNG"/>
+            <imagedata width="33%" fileref="resources/images/dhis2_ubuntu_installation/pgAdmin-Restore.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -356,7 +356,7 @@
         <screeninfo>Open your bakup file</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata width="33%" fileref="../resources/images/dhis2_ubuntu_installation/pgAdmin_FindBackup.png" format="PNG"/>
+            <imagedata width="33%" fileref="resources/images/dhis2_ubuntu_installation/pgAdmin_FindBackup.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -383,7 +383,7 @@
           <screeninfo>Select your database and click the SQL button</screeninfo>
           <mediaobject>
             <imageobject>
-              <imagedata width="33%" fileref="../resources/images/dhis2_ubuntu_installation/pgAdmin-SQL.png" format="PNG"/>
+              <imagedata width="33%" fileref="resources/images/dhis2_ubuntu_installation/pgAdmin-SQL.png" format="PNG"/>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -393,7 +393,7 @@
           <screeninfo>SQL open icon</screeninfo>
           <mediaobject>
             <imageobject>
-              <imagedata width="5%" fileref="../resources/images/dhis2_ubuntu_installation/pgAdmin-SQL-open.png" format="PNG"/>
+              <imagedata width="5%" fileref="resources/images/dhis2_ubuntu_installation/pgAdmin-SQL-open.png" format="PNG"/>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -403,7 +403,7 @@
           <screeninfo>Open your plain text backup file</screeninfo>
           <mediaobject>
             <imageobject>
-              <imagedata width="75%" fileref="../resources/images/dhis2_ubuntu_installation/pgAdmin-SQL-file.png" format="PNG"/>
+              <imagedata width="75%" fileref="resources/images/dhis2_ubuntu_installation/pgAdmin-SQL-file.png" format="PNG"/>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -413,7 +413,7 @@
           <screeninfo>Click the leftmost green arrow to execute the query</screeninfo>
           <mediaobject>
             <imageobject>
-              <imagedata width="10%" fileref="../resources/images/dhis2_ubuntu_installation/pgAdmin-SQL-run.png" format="PNG"/>
+              <imagedata width="10%" fileref="resources/images/dhis2_ubuntu_installation/pgAdmin-SQL-run.png" format="PNG"/>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -423,7 +423,7 @@
           <screeninfo>It will say &quot;Query running&quot; while the query is running</screeninfo>
           <mediaobject>
             <imageobject>
-              <imagedata width="10%" fileref="../resources/images/dhis2_ubuntu_installation/pgAdmin-SQL-Query-running.png" format="PNG"/>
+              <imagedata width="10%" fileref="resources/images/dhis2_ubuntu_installation/pgAdmin-SQL-Query-running.png" format="PNG"/>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -686,7 +686,7 @@
         <screenshot>
           <mediaobject>
             <imageobject>
-              <imagedata width="60%" align="center" fileref="../resources/images/aws/create_instance.png"/>
+              <imagedata width="60%" align="center" fileref="resources/images/aws/create_instance.png"/>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -697,7 +697,7 @@
         <screenshot>
           <mediaobject>
             <imageobject>
-              <imagedata width="60%" align="center" fileref="../resources/images/aws/instance_size.png"/>
+              <imagedata width="60%" align="center" fileref="resources/images/aws/instance_size.png"/>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -713,7 +713,7 @@
         <screenshot>
           <mediaobject>
             <imageobject>
-              <imagedata width="60%" align="center" fileref="../resources/images/aws/create_key_pairs.png"/>
+              <imagedata width="60%" align="center" fileref="resources/images/aws/create_key_pairs.png"/>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -723,7 +723,7 @@
         <screenshot>
           <mediaobject>
             <imageobject>
-              <imagedata width="50%" align="center" fileref="../resources/images/aws/security_groups.png"/>
+              <imagedata width="50%" align="center" fileref="resources/images/aws/security_groups.png"/>
             </imageobject>
           </mediaobject>
         </screenshot>

=== renamed file 'src/docbkx/en/implementation_guide/dhis2_implementation_guide_integration.xml' => 'src/docbkx/en/dhis2_implementation_guide_integration.xml'
--- src/docbkx/en/implementation_guide/dhis2_implementation_guide_integration.xml	2012-01-20 07:34:34 +0000
+++ src/docbkx/en/dhis2_implementation_guide_integration.xml	2012-02-08 22:35:01 +0000
@@ -70,6 +70,6 @@
     <para>Since there are many different use-cases for health information, such as monitoring and evaluation, budgeting, patient management and tracking, logistics management, insurance, human resource management, etc, there will be many different types of software applications functioning within the health sector. Above the issue of interoperability has been addressed, and a plan or overview of the various interoperable software applications and their specific uses, along with what data should be shared between them, is termed an architecture for health information. </para>
     <para>The role of the architecture is to function as a plan to coordinate the development and interoperability of various sub-systems within the larger health information system. It is advisable to develop a plan for the various components even if they are not currently running any software, to be able to adequately see the requirements in terms of data sharing. These requirements should then be part of any specification for the software when such is developed or procured.</para>
     <para>Below is a simple illustration of an architecture, with a focus on the data warehouse for aggregate data. The various boxes represent use cases, such as managing logistics, tracking TB patients, general patient management, etc. All of these will share aggregate data with DHIS2. Note that the arrows are two-way, because there is also a synchronization of meta-data (definitions) involved, to make sure that the right data is shared. Also, an example of the logistics and financial data applications sharing data is also shown, as there are strong links between procuring drugs and handling the budget for this. There will be many such instances of sharing data; the architecture helps us to plan better for this being implemented as the ecosystem of software applications grow.</para>
-    <graphic width="100%" format="PNG" fileref="../resources/images/implementation_guide/interoperable_his.png" align="center"/>
+    <graphic width="100%" format="PNG" fileref="resources/images/implementation_guide/interoperable_his.png" align="center"/>
   </section>
 </chapter>

=== renamed file 'src/docbkx/en/implementation_guide/dhis2_implementation_guide_organisation_units.xml' => 'src/docbkx/en/dhis2_implementation_guide_organisation_units.xml'
--- src/docbkx/en/implementation_guide/dhis2_implementation_guide_organisation_units.xml	2012-01-20 07:34:34 +0000
+++ src/docbkx/en/dhis2_implementation_guide_organisation_units.xml	2012-02-08 22:35:01 +0000
@@ -30,7 +30,7 @@
     <title>Organisation unit groups and group sets</title>
     <para>In DHIS 2, organisation units can be grouped in organisation unit groups, and these groups can be further organised into group sets. Together they can mimic an alternative organisational hierarchy which can be used when creating reports and other data output. In addition to representing alternative geographical locations not part of the main hierarchy, these groups are useful for assigning classification schemes to health facilities, e.g. based on the type or ownership of the facilities. Any number of group sets and groups can be defined in the application through the user interface, and all these are defined locally for each DHIS 2 database. </para>
     <para>An example illustrates this best: Typically one would want to provide analysis based on the ownership of the facilities. In that case one would create a group for each ownership type, for instance “MoH”, “Private” and “NGO”. All facilities in the database must then be classified and assigned to one and only one of these three groups. Next one would create a group set called “Ownership” to which the three groups above are assigned, as illustrated in the figure below. </para>
-    <graphic fileref="../resources/images/implementation_guide/organisation_unit_hiearchy.png" format="PNG" width="100%" align="center"/>
+    <graphic fileref="resources/images/implementation_guide/organisation_unit_hiearchy.png" format="PNG" width="100%" align="center"/>
     <para>In a similar way one can create a group set for an additional administrative level, e.g. local councils. All local councils must be defined as organisation unit groups and then assigned to a group set called “Local Council”. The final step is then to assign all health facilities to one and only one of the local council groups. This  enables the DHIS 2 to produce aggregate reports by each local council (adding together  data for all assigned health facilities) without having to include the local council level in the main organisational hierarchy. The same approach can be followed for any additional administrative or geographical level that is needed, with one group set per additional level. Before going ahead and designing this in DHIS 2, a mapping between the areas of the additional geographical level and the health facilities  in each area is needed.</para>
     <para>A key property of the group set concept in DHIS 2 to understand is <emphasis role="italic">exclusivity</emphasis>, which implies that an organisation unit can be member of exactly one of the groups in a group set. A violation of this rule would lead to duplication of data when aggregating health facility data by the different groups, as a facility assigned to two groups in the same group set would be counted twice.</para>
     <para>With this structure in place, DHIS 2 can provide aggregated data for each of the organisation unit ownership types through the “Organisation unit group set report” in “Reporting” module or through the Excel pivot table third-party tool. For instance one can view and compare utilisation rates aggregated by the different types of ownership (e.g. MoH, Private, NGO). In addition, DHIS 2 can provide statistics of the distribution of facilities in “Organisation unit distribution report” in “Reporting” module. For instance one can view how many facilities exist under any given organisation unit in the hierarchy for each of the various ownership types. In the GIS module, given that health facility coordinates have been registered in the system, one can view the locations of the different types of health facilities (with different symbols for each type), and also combine this information with a other map layer showing indicators e.g. by district.</para>

=== renamed file 'src/docbkx/en/implementation_guide/dhis2_implementation_guide_pivot_tables_and_mydatamart.xml' => 'src/docbkx/en/dhis2_implementation_guide_pivot_tables_and_mydatamart.xml'
--- src/docbkx/en/implementation_guide/dhis2_implementation_guide_pivot_tables_and_mydatamart.xml	2012-01-20 07:34:34 +0000
+++ src/docbkx/en/dhis2_implementation_guide_pivot_tables_and_mydatamart.xml	2012-02-08 22:35:01 +0000
@@ -4,7 +4,7 @@
 <chapter>
   <title>Pivot Tables and the MyDataMart tool</title>
   <para>Excel Pivot Table (see screenshot below) is a powerful and dynamic data analysis tool that can be automatically linked to the DHIS 2 data. While most reporting tools in DHIS 2 are limited in how much data they can present at the same time, the pivot tables are designed to give nice overviews with multiple data elements or indicators, and organisation units and periods (see example below). Furthermore, the dynamic features in pivoting and drill-down are very different from static spreadsheets or many web reports, and his makes it a useful tool for information users that want to do more in-depth analysis and to manipulate the views on the data more dynamically. This combined with the well-known charting capabilities of Excel, the Pivot Table tool has made it a popular analysis tool among the more advanced DHIS users for a long time. </para>
-  <graphic width="100%" format="PNG" fileref="../resources/images/implementation_guide/pivot_table.png" align="center"/>
+  <graphic width="100%" format="PNG" fileref="resources/images/implementation_guide/pivot_table.png" align="center"/>
   <para>With the recent shift towards online deployments, the offline pivot tables in Excel also provide a useful alternative to the online reporting tools as they allow for local data analysis without Internet connectivity, which can be an advantage on unstable or expensive connections. Internet is only needed to download new data from the online server, and as soon as the data exists locally, working with the pivot tables require no connectivity. The MyDatamart tool, which is explained in detail further down, helps the users to maintain a local data mart file (small database) which is updated over the Internet against the online server, and then used as an offline data source that feeds the pivot tables with data. </para>
   <section>
     <title>Pivot table design</title>
@@ -27,7 +27,7 @@
     <para>With online deployments and the use of one single central server (and database) the local use of pivot tables becomes more difficult as Excel connects to the database directly to fetch the data. This means that Excel (and every local computer using DHIS2) would need connection details and access to the database on the server, which is not always wanted. Furthermore,
 the refresh (update the pivot table) operation in Excel completely empties the table before reloading all the data again (new and old), which leads to big and duplicated data downloads over the Internet when connecting to an online server. The solution to these problems has been to build up and maintain an updated  &quot;copy&quot; of the central database in each local office where they use Excel pivot tables. These local databases are called data marts and are built specifically for serving as data sources for data analysis tools like Excel. The MyDatamart tool is a newly developed (May 2011) tool that creates a datamart file on a local computer and helps the users to update this against a central server. The pivot tables in Excel connect only to the local datamart and do not need to know about the central server at all.</para>
     <para>The use of MyDatamart dramatically reduces the download size when routinely updating the local Excel files against the central server compared to a direct connection from Excel. It also brings comfort to the local level users to have a copy of their data on their local computer and not to rely on a Internet connection or server up-time to access it. The figure below explains how the linking between the central online server (in the clouds) and the local offices works.</para>
-    <graphic width="100%" format="PNG" fileref="../resources/images/implementation_guide/mydatamart.png" align="center"/>
+    <graphic width="100%" format="PNG" fileref="resources/images/implementation_guide/mydatamart.png" align="center"/>
   </section>
   <section>
     <title>Using Excel pivot tables and MyDatamart - a work-flow example</title>

=== renamed file 'src/docbkx/en/implementation_guide/dhis2_implementation_guide_recommendations.xml' => 'src/docbkx/en/dhis2_implementation_guide_recommendations.xml'
=== renamed file 'src/docbkx/en/implementation_guide/dhis2_implementation_guide_setting_up_new_database.xml' => 'src/docbkx/en/dhis2_implementation_guide_setting_up_new_database.xml'
=== renamed file 'src/docbkx/en/implementation_guide/dhis2_implementation_guide_short.xml' => 'src/docbkx/en/dhis2_implementation_guide_short.xml'
=== renamed file 'src/docbkx/en/implementation_guide/dhis2_implementation_guide_support.xml' => 'src/docbkx/en/dhis2_implementation_guide_support.xml'
=== renamed file 'src/docbkx/en/implementation_guide/dhis2_implementation_guide_users_and_user_roles.xml' => 'src/docbkx/en/dhis2_implementation_guide_users_and_user_roles.xml'
=== removed directory 'src/docbkx/en/implementation_guide'