=== modified file 'src/docbkx/en/dhis2_technical_architechture_guide.xml'
--- src/docbkx/en/dhis2_technical_architechture_guide.xml	2010-05-11 14:57:30 +0000
+++ src/docbkx/en/dhis2_technical_architechture_guide.xml	2010-05-13 08:46:48 +0000
@@ -54,7 +54,7 @@
     <para>Dependencies between the projects are structured in five layers. The support modules provide support functionality for the core and service modules, related to Hibernate, testing, JDBC, and the file system. The core module provides the core functionality in the system, like persistence and business logic for the central domain objects. The service modules provide business logic for services related to reporting, import-export, mapping, and administration. The web modules are self-contained web modules. The portal is a wrapper web module which assembles all the web modules. Modules from each layer can only have dependencies to modules at the same layer or the  layer right below.</para>
     <mediaobject>
       <imageobject>
-        <imagedata width="95%" align="center" fileref="resources/images/dhis2_technical_architecture/dependency_structure.jpg"/>
+        <imagedata width="60%" align="center" fileref="resources/images/dhis2_technical_architecture/dependency_structure.jpg"/>
       </imageobject>
     </mediaobject>
   </section>

=== modified file 'src/docbkx/en/dhis2_user_man_data_administration.xml'
--- src/docbkx/en/dhis2_user_man_data_administration.xml	2010-02-24 11:27:27 +0000
+++ src/docbkx/en/dhis2_user_man_data_administration.xml	2010-05-13 08:46:48 +0000
@@ -25,7 +25,7 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata width="70%" align="center" fileref="resources/images/maintainence/data_browser1.png" format="PNG"/>
+            <imagedata width="60%" align="center" fileref="resources/images/maintainence/data_browser1.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -33,7 +33,7 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/maintainence/data_browsing_data_sets.png" format="PNG"/>
+            <imagedata width="60%" align="center" fileref="resources/images/maintainence/data_browsing_data_sets.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -41,7 +41,7 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/maintainence/data_browser_dataset_detail.png" format="PNG"/>
+            <imagedata width="60%" align="center" fileref="resources/images/maintainence/data_browser_dataset_detail.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -232,7 +232,7 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/maintainence/data_stats.png" format="PNG"/>
+            <imagedata width="60%" align="center" fileref="resources/images/maintainence/data_stats.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -245,7 +245,7 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/maintainence/data_locking_select1.png" format="PNG"/>
+            <imagedata width="60%" align="center" fileref="resources/images/maintainence/data_locking_select1.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -254,7 +254,7 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/maintainence/data_locking_select2.png" format="PNG"/>
+            <imagedata width="60%" align="center" fileref="resources/images/maintainence/data_locking_select2.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -263,7 +263,7 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/maintainence/data_locking_select3.png" format="PNG"/>
+            <imagedata width="60%" align="center" fileref="resources/images/maintainence/data_locking_select3.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>

=== modified file 'src/docbkx/en/dhis2_user_man_data_dimensions.xml'
--- src/docbkx/en/dhis2_user_man_data_dimensions.xml	2010-04-14 09:41:52 +0000
+++ src/docbkx/en/dhis2_user_man_data_dimensions.xml	2010-05-13 08:46:48 +0000
@@ -370,7 +370,7 @@
 <screenshot>
           <mediaobject>
             <imageobject>
-              <imagedata width="80%" align="center" fileref="resources/images/data_dimensions/dhis_input_output.JPG" format="JPG"/>
+              <imagedata width="60%" align="center" fileref="resources/images/data_dimensions/dhis_input_output.JPG" format="JPG"/>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -384,7 +384,7 @@
 <screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/data_dimensions/Ex_table1.jpg" format="JPG"/>
+            <imagedata width="60%" align="center" fileref="resources/images/data_dimensions/Ex_table1.jpg" format="JPG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -395,7 +395,7 @@
         <screeninfo>DHIS2 Login screen</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" fileref="resources/images/data_dimensions/Ex_table2.jpg" format="JPG"/>
+            <imagedata width="60%" fileref="resources/images/data_dimensions/Ex_table2.jpg" format="JPG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -413,7 +413,7 @@
 <screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/data_dimensions/pivot_overview_1.jpg" format="JPG"/>
+            <imagedata width="60%" align="center" fileref="resources/images/data_dimensions/pivot_overview_1.jpg" format="JPG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -425,7 +425,7 @@
         <screeninfo>DHIS2 Login screen</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata width="80" align="center" fileref="resources/images/data_dimensions/pivot_diagnoses.jpg" format="JPG"/>
+            <imagedata width="60" align="center" fileref="resources/images/data_dimensions/pivot_diagnoses.jpg" format="JPG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -435,7 +435,7 @@
 <screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/data_dimensions/pivot_dataelements.jpg" format="JPG"/>
+            <imagedata width="60%" align="center" fileref="resources/images/data_dimensions/pivot_dataelements.jpg" format="JPG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -455,7 +455,7 @@
         <screeninfo>DHIS2 Login screen</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/data_dimensions/pivot_diagnoses_all.jpg" format="JPG"/>
+            <imagedata width="60%" align="center" fileref="resources/images/data_dimensions/pivot_diagnoses_all.jpg" format="JPG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -486,7 +486,7 @@
     <para><screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/data_dimensions/pivot_morb_age.jpg"/>
+            <imagedata width="60%" align="center" fileref="resources/images/data_dimensions/pivot_morb_age.jpg"/>
           </imageobject>
         </mediaobject>
       </screenshot></para>
@@ -494,7 +494,7 @@
     <para><screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/data_dimensions/pivot_hiv_age.jpg"/>
+            <imagedata width="60%" align="center" fileref="resources/images/data_dimensions/pivot_hiv_age.jpg"/>
           </imageobject>
         </mediaobject>
       </screenshot>  </para>
@@ -502,7 +502,7 @@
     <para><screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources\images\data_dimensions\pivot_hiv_age_gender.jpg" format="JPG"/>
+            <imagedata width="60%" align="center" fileref="resources\images\data_dimensions\pivot_hiv_age_gender.jpg" format="JPG"/>
           </imageobject>
         </mediaobject>
       </screenshot></para>
@@ -544,7 +544,7 @@
       <para><screenshot>
           <mediaobject>
             <imageobject>
-              <imagedata width="80%" align="center" fileref="resources\images\data_dimensions\PHUF3.jpg" format="JPG"/>
+              <imagedata width="60%" align="center" fileref="resources\images\data_dimensions\PHUF3.jpg" format="JPG"/>
             </imageobject>
           </mediaobject>
         </screenshot> </para>

=== modified file 'src/docbkx/en/dhis2_user_man_data_elements_and_indicators.xml'
--- src/docbkx/en/dhis2_user_man_data_elements_and_indicators.xml	2010-03-08 14:03:50 +0000
+++ src/docbkx/en/dhis2_user_man_data_elements_and_indicators.xml	2010-05-13 08:46:48 +0000
@@ -6,7 +6,7 @@
   <screenshot>
     <mediaobject>
       <imageobject>
-        <imagedata width="80%" align="center" fileref="resources/images/maintainence/data_element_main.png" format="PNG"/>
+        <imagedata width="60%" align="center" fileref="resources/images/maintainence/data_element_main.png" format="PNG"/>
       </imageobject>
     </mediaobject>
   </screenshot>
@@ -50,7 +50,7 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/maintainence/data_element_main2.png" format="PNG"/>
+            <imagedata width="60%" align="center" fileref="resources/images/maintainence/data_element_main2.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -137,7 +137,7 @@
         <screenshot>
           <mediaobject>
             <imageobject>
-              <imagedata width="70%" align="center" fileref="resources/images/maintainence/data_element_translate.png" format="PNG"/>
+              <imagedata width="60%" align="center" fileref="resources/images/maintainence/data_element_translate.png" format="PNG"/>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -161,7 +161,7 @@
         <screenshot>
           <mediaobject>
             <imageobject>
-              <imagedata width="80%" align="center" fileref="resources/images/maintainence/data_element_delete.png" format="PNG"/>
+              <imagedata width="60%" align="center" fileref="resources/images/maintainence/data_element_delete.png" format="PNG"/>
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -177,7 +177,7 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata width="70%" align="center" fileref="resources/images/maintainence/data_element_groups_main.png" format="PNG"/>
+            <imagedata width="60%" align="center" fileref="resources/images/maintainence/data_element_groups_main.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -185,7 +185,7 @@
       <para>To add a new data element group, click the <guibutton>&quot;Add new&quot;</guibutton> button. <screenshot>
           <mediaobject>
             <imageobject>
-              <imagedata width="80%" align="center" fileref="resources/images/maintainence/data_element_group_add.png" format="PNG"/>
+              <imagedata width="60%" align="center" fileref="resources/images/maintainence/data_element_group_add.png" format="PNG"/>
             </imageobject>
           </mediaobject>
         </screenshot></para>
@@ -196,7 +196,7 @@
       <para>The data element group  editor provides advanced functionality to the administrator to allow multiple data elements to be added or removed from a group. It is also possible to create new data element groups, rename existing groups, and delete groups entirely. To access the data element group editor, press <guimenu>&quot;Maintainers-&gt;Data elements and indicators-&gt;Data element group editor&quot;</guimenu> from the main DHIS2 menu. The following screen will appear. <screenshot>
           <mediaobject>
             <imageobject>
-              <imagedata width="80%" align="center" fileref="resources/images/maintainence/data_element_group_editor_start.png" format="PNG"/>
+              <imagedata width="60%" align="center" fileref="resources/images/maintainence/data_element_group_editor_start.png" format="PNG"/>
             </imageobject>
           </mediaobject>
         </screenshot></para>
@@ -204,7 +204,7 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/maintainence/data_element_group_editor_select.png" format="PNG"/>
+            <imagedata width="60%" align="center" fileref="resources/images/maintainence/data_element_group_editor_select.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -215,14 +215,14 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata width="70%" align="center" fileref="resources/images/maintainence/data_element_group_set_start.png" format="PNG"/>
+            <imagedata width="60%" align="center" fileref="resources/images/maintainence/data_element_group_set_start.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
       <para>Existing data element group  set members can be edited by clicking the &quot;Edit&quot; button <inlinegraphic fileref="resources/images/dhis2_images/edit.png" align="center"/> of the desired data element group set as seen below.</para>
       <mediaobject>
         <imageobject>
-          <imagedata width="70%" align="center" fileref="resources/images/maintainence/data_element_group_set.png" format="PNG"/>
+          <imagedata width="60%" align="center" fileref="resources/images/maintainence/data_element_group_set.png" format="PNG"/>
         </imageobject>
       </mediaobject>
       <para>Available data element groups are displayed in the left panel. They can be moved into the selected data element group set by pressing the &quot;Move right&quot; <inlinegraphic fileref="resources/images/dhis2_images/move_right.png" align="center"/> button. Data element groups that are currently members of the data element group set are displayed in the right hand panel. They can be removed from the data element group set by clicking the desired data element group and pressing the &quot;Move left&quot;<inlinegraphic fileref="resources/images/dhis2_images/move_left.png" align="center"/> button.  The ordering of the data element groups can be set with the &quot;Move Up&quot; <inlinegraphic fileref="resources/images/dhis2_images/move_up.png" align="center"/> and &quot;Move Down&quot; <inlinegraphic fileref="resources/images/dhis2_images/move_down.png" align="center"/>arrows. This ordering will be used in the datamart and reports to order the data element groups.  Press the <guibutton>&quot;Update&quot;</guibutton> button to save any changes and the <guibutton>&quot;Cancel&quot;</guibutton> button to discard all changes. </para>
@@ -250,7 +250,7 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata width="70%" align="center" fileref="resources/images/maintainence/data_element_categories_start.png" format="PNG"/>
+            <imagedata width="60%" align="center" fileref="resources/images/maintainence/data_element_categories_start.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -283,7 +283,7 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/maintainence/data_element_category_combo_add_new.png"/>
+            <imagedata width="60%" align="center" fileref="resources/images/maintainence/data_element_category_combo_add_new.png"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -412,7 +412,7 @@
       <screenshot>
         <mediaobject>
           <imageobject>
-            <imagedata width="70%" align="center" fileref="resources/images/maintainence/indicator_group_sets.png" format="PNG"/>
+            <imagedata width="60%" align="center" fileref="resources/images/maintainence/indicator_group_sets.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -425,7 +425,7 @@
     <screenshot>
       <mediaobject>
         <imageobject>
-          <imagedata width="80%" align="center" fileref="resources/images/maintainence/data_dictionary.png" format="PNG"/>
+          <imagedata width="60%" align="center" fileref="resources/images/maintainence/data_dictionary.png" format="PNG"/>
         </imageobject>
       </mediaobject>
     </screenshot>

=== modified file 'src/docbkx/en/dhis2_user_man_getting_started.xml'
--- src/docbkx/en/dhis2_user_man_getting_started.xml	2010-03-24 21:56:04 +0000
+++ src/docbkx/en/dhis2_user_man_getting_started.xml	2010-05-13 08:46:48 +0000
@@ -153,7 +153,7 @@
       <screeninfo>DHIS2 Login screen</screeninfo>
       <mediaobject>
         <imageobject>
-          <imagedata width="80%" fileref="resources/images/dhis2UserManual/dhis2_login_screen.jpg" format="JPG"/>
+          <imagedata width="60%" fileref="resources/images/dhis2UserManual/dhis2_login_screen.jpg" format="JPG"/>
         </imageobject>
       </mediaobject>
     </screenshot>
@@ -173,7 +173,7 @@
         <screeninfo>Select Users menu item</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/dhis2UserManual/select_user_menu.jpg"/>
+            <imagedata width="60%" align="center" fileref="resources/images/dhis2UserManual/select_user_menu.jpg"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -181,7 +181,7 @@
         <screeninfo>Search by user name</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/dhis2UserManual/search_user_by_name.jpg"/>
+            <imagedata width="60%" align="center" fileref="resources/images/dhis2UserManual/search_user_by_name.jpg"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -198,7 +198,7 @@
         <screeninfo>Create new user role</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/dhis2UserManual/select_user_role.jpg"/>
+            <imagedata width="60%" align="center" fileref="resources/images/dhis2UserManual/select_user_role.jpg"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -208,7 +208,7 @@
         <screeninfo>Add new user role</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/dhis2UserManual/add_user_role.jpg"/>
+            <imagedata width="60%" align="center" fileref="resources/images/dhis2UserManual/add_user_role.jpg"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -221,7 +221,7 @@
         <screeninfo>Role maintenance page</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/dhis2UserManual/role_maintainence_page.jpg"/>
+            <imagedata width="60%" align="center" fileref="resources/images/dhis2UserManual/role_maintainence_page.jpg"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -236,7 +236,7 @@
         <screeninfo>Adding a dataset to a user role</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/dhis2UserManual/assign_one_dataset_user_role.png" format="PNG"/>
+            <imagedata width="60%" align="center" fileref="resources/images/dhis2UserManual/assign_one_dataset_user_role.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -248,7 +248,7 @@
         <screeninfo>Adding multiple datasets to user roles</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/dhis2UserManual/assign_multiple_datasets_user_role.png" format="PNG"/>
+            <imagedata width="60%" align="center" fileref="resources/images/dhis2UserManual/assign_multiple_datasets_user_role.png" format="PNG"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -266,7 +266,7 @@
         <screeninfo>Add new user</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata width="80%" align="center" fileref="resources/images/dhis2UserManual/add_new_user.png"/>
+            <imagedata width="60%" align="center" fileref="resources/images/dhis2UserManual/add_new_user.png"/>
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -302,7 +302,7 @@
             <screeninfo>Add or edit users</screeninfo>
             <mediaobject>
               <imageobject>
-                <imagedata width="80%" align="center" fileref="resources/images/dhis2UserManual/add_edit_users.jpg"/>
+                <imagedata width="60%" align="center" fileref="resources/images/dhis2UserManual/add_edit_users.jpg"/>
               </imageobject>
             </mediaobject>
           </screenshot>
@@ -310,7 +310,7 @@
             <screeninfo>User management screen</screeninfo>
             <mediaobject>
               <imageobject>
-                <imagedata width="80%" align="center" fileref="resources/images/dhis2UserManual/user_management.jpg"/>
+                <imagedata width="60%" align="center" fileref="resources/images/dhis2UserManual/user_management.jpg"/>
               </imageobject>
             </mediaobject>
           </screenshot>
@@ -326,7 +326,7 @@
       <screeninfo>Logging off of DHIS 2</screeninfo>
       <mediaobject>
         <imageobject>
-          <imagedata width="80%" align="center" fileref="resources/images/dhis2UserManual/dhis2_logoff.jpg"/>
+          <imagedata width="60%" align="center" fileref="resources/images/dhis2UserManual/dhis2_logoff.jpg"/>
         </imageobject>
       </mediaobject>
     </screenshot>

=== modified file 'src/docbkx/en/dhis2_user_man_gis.xml'
--- src/docbkx/en/dhis2_user_man_gis.xml	2010-04-14 09:41:52 +0000
+++ src/docbkx/en/dhis2_user_man_gis.xml	2010-05-13 08:46:48 +0000
@@ -172,7 +172,7 @@
       <screeninfo>Register Geodata Panel</screeninfo>
       <mediaobject>
         <imageobject>
-          <imagedata width="270px" align="center" fileref="resources/images/GIS/register_geodata.png"/>
+          <imagedata width="60%" align="center" fileref="resources/images/GIS/register_geodata.png"/>
         </imageobject>
       </mediaobject>
     </screenshot>

=== modified file 'src/docbkx/en/dhis2_user_man_introduction.xml'
--- src/docbkx/en/dhis2_user_man_introduction.xml	2010-02-18 18:52:03 +0000
+++ src/docbkx/en/dhis2_user_man_introduction.xml	2010-05-13 08:46:48 +0000
@@ -197,7 +197,7 @@
       <title>The health information cycle</title>
       <mediaobject>
         <imageobject>
-          <imagedata width="80%" align="center" fileref="resources/images/dhis2UserManual/dhis2_information_cycle.png"/>
+          <imagedata width="60%" align="center" fileref="resources/images/dhis2UserManual/dhis2_information_cycle.png"/>
         </imageobject>
       </mediaobject>
     </figure>