=== modified file 'src/docbkx/en/dhis2_user_man_persons_and_programs.xml'
--- src/docbkx/en/dhis2_user_man_persons_and_programs.xml	2012-10-29 07:29:52 +0000
+++ src/docbkx/en/dhis2_user_man_persons_and_programs.xml	2012-10-30 09:33:33 +0000
@@ -399,7 +399,7 @@
         </section>
       </section>
       <section id="patient_aggregation_query_builder">
-        <title>Aggregation query builder management</title>
+        <title>Aggregation query builder</title>
         <para>This is the core functionality for linking data between tracker module and aggregate management module by defining the linking/aggregating rules. The purpose  is to produce aggregated data / statistics based on the low-level case based data. It is based around flexible aggregation query definitions which maps the data elements used for case based data management to data elements used for aggregate data.</para>
         <para>This provides two functions - </para>
         <itemizedlist>
@@ -691,13 +691,24 @@
               <para><emphasis role="italic">Identifier / Attribute</emphasis> tab - Load identifier-types and person-attributes which belong to the selected program for users to enter values for this program.</para>
             </listitem>
             <listitem>
-              <para><emphasis role="italic">Reschedule and set status</emphasis> tab provides function for re-scheduling, setting status and sending messages/comments or deleting for each events.</para>
-            </listitem>
-            <listitem>
-              <para><emphasis role="italic">Comments and messages</emphasis> tab displays a comment/message list of the program</para>
-            </listitem>
-            <listitem>
-              <para><emphasis role="italic">Program report </emphasis>tab is summary report for the program</para>
+              <para><emphasis role="italic">Reschedule and set status</emphasis> tab - Provides function for re-scheduling, setting status and sending messages/comments or deleting for each events.</para>
+              <screenshot>
+                <mediaobject>
+                  <imageobject>
+                    <imagedata width="80%" fileref="resources/images/patients_programs/program_management.png" format="PNG"/>
+                  </imageobject>
+                </mediaobject>
+              </screenshot>
+              <para>After entering a  message in the field, click on (+) button in <emphasis role="italic">Message</emphasis> column to add a comment for the event. For sending a reminder message, click on (&gt;&gt;) button.</para>
+              <note>
+                <para>Only allow to edit due dates of events with status as overdue or scheduled in future.</para>
+              </note>
+            </listitem>
+            <listitem>
+              <para><emphasis role="italic">Comments and messages</emphasis> tab displays a comment/message list of the program.</para>
+            </listitem>
+            <listitem>
+              <para><emphasis role="italic">Program report </emphasis>tab is summary report for the program.</para>
             </listitem>
           </orderedlist>
           <para>The <emphasis role="italic">Active programs</emphasis> section consists of active programs of the person. Click on a program to show detail information below. Besides, there are two link in this tab - </para>
@@ -751,17 +762,10 @@
             </listitem>
             <listitem>
               <para>Click  the <emphasis role="italic">Enroll</emphasis> button to complete the enrollment process.</para>
-              <para>The system will automatically calculate  due-date for each event of program and will show it in the <emphasis role="italic">Re-schedule and set status</emphasis> tab below. In  health programme, a person  registered and enrolled, needs to be checked from time to time by health providers.
+              <para>The system will automatically calculate  due-date for each event of program and will show it in the <emphasis role="italic">Re-schedule and set status</emphasis> tab. In  health programme, a person  registered and enrolled, needs to be checked from time to time by health providers.
 The case update  is designed in the same manner so that services which are received by the persons can be updated from time to time  when they visit the facility  or  whenever the health providers need to <emphasis role="italic">track</emphasis>.</para>
               <para>The system will automatically calculate  due-date for each the program stage  and will show same the below enrollment. In  health program, a person  registered and enrolled, needs to be checked from time to time by health providers.
 The case update  is designed in the same manner so that services which are received by the persons can be updated from time to time  when they visit the facility  or  whenever the health providers need to track.</para>
-              <screenshot>
-                <mediaobject>
-                  <imageobject>
-                    <imagedata width="70%" fileref="resources/images/patients_programs/program_management.PNG" format="PNG"/>
-                  </imageobject>
-                </mediaobject>
-              </screenshot>
             </listitem>
           </orderedlist>
         </section>
@@ -782,7 +786,7 @@
         </section>
         <section>
           <title>Adding relationship</title>
-          <para>Now you can add relationships for person. To do that, you have to click on the <emphasis>Relationship management</emphasis> icon under <emphasis>Operations</emphasis> Or click on the Management link on Relationships section in Dashboard. Then, the management page appears...</para>
+          <para>Now you can add relationships for person. To do that, you have to click on the <emphasis>Relationship management</emphasis> icon under <emphasis>Operations</emphasis> or click on the <emphasis role="italic">Management</emphasis> link on <emphasis role="italic">Relationships</emphasis> section in Dashboard. Then, the management page appears...</para>
           <screenshot>
             <mediaobject>
               <imageobject>
@@ -818,7 +822,7 @@
               </imageobject>
             </mediaobject>
           </screenshot>
-          <para>After selecting search type, entering keyword and clicking on <emphasis role="italic">Search</emphasis> button. The search result will display on the screen, and then user can interact with these persons.</para>
+          <para>After selecting search type, entering keyword and clicking on <emphasis role="italic">Search</emphasis> button, the search result will display on the screen, and then user can interact with these persons.</para>
           <screenshot>
             <mediaobject>
               <imageobject>
@@ -852,8 +856,8 @@
           <title>Program Tracking</title>
           <para>This function supports the work practices around tracking persons within a health program that have not shown up for a scheduled visit (stage), e.g. that are lost to follow-up.</para>
           <para>After selecting organisation unit on the left panel,  select a program in list. And click on List All Person button to load all over-due events of persons.</para>
-          <para>Click on person&apos;s name to open his/her dashboard.</para>
-          <para>Click on an event to re-schedule and set status for the selected event or see all tracking history for this event.<screenshot>
+          <para>Click on <emphasis role="italic">person&apos;s name</emphasis> to open his/her dashboard.</para>
+          <para>Click on an <emphasis role="italic">event box</emphasis> to re-schedule and set status for the selected event or see all tracking history for this event.<screenshot>
               <mediaobject>
                 <imageobject>
                   <imagedata width="70%" depth="" fileref="resources/images/patients_programs/tracking_program.png" format="PNG"/>
@@ -864,7 +868,7 @@
           <screenshot>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="resources/images/patients_programs/program_tracking_search_function.png" width="70%" format="PNG"/>
+                <imagedata width="70%" fileref="resources/images/patients_programs/program_tracking_search_function.png" format="PNG"/>
               </imageobject>
             </mediaobject>
           </screenshot>
@@ -931,7 +935,7 @@
           <para>To update an event -</para>
           <orderedlist>
             <listitem>
-              <para>Click <emphasis role="italic">Search</emphasis> button. Then enter criterion for searching events. The list events are displayed below.</para>
+              <para>Click <emphasis role="italic">Search</emphasis> button. Then enter criterion for searching person. The person list are displayed below.</para>
             </listitem>
             <listitem>
               <para>Click on <emphasis role="italic">Data entry</emphasis> icon - the first icon, to update value for the event.</para>
@@ -1088,7 +1092,7 @@
             <para>Click <emphasis role="italic">Save all values</emphasis> button to save all aggregated data values .</para>
           </listitem>
           <listitem>
-            <para><emphasis role="italic"><emphasis role="italic">Click</emphasis> Orange arrow</emphasis> next to period name for showing list of aggregated data values at this period. Select only necessary data values and click <emphasis role="italic">Save</emphasis> selected values to save them</para>
+            <para><emphasis role="italic"><emphasis role="italic">Click</emphasis> Orange arrow</emphasis> icon next to period name for showing list of aggregated data values at this period. Select only necessary data values and click <emphasis role="italic">Save</emphasis> selected values to save them</para>
           </listitem>
           <listitem>
             <para><emphasis><emphasis role="italic">Click </emphasis>Show details</emphasis> icon  to view detail  information which aggregated.</para>

=== modified file 'src/docbkx/en/resources/images/patients_programs/example_query.png'
Binary files src/docbkx/en/resources/images/patients_programs/example_query.png	2012-10-29 07:29:52 +0000 and src/docbkx/en/resources/images/patients_programs/example_query.png	2012-10-30 09:33:33 +0000 differ
=== modified file 'src/docbkx/en/resources/images/patients_programs/multi_program_validation.png'
Binary files src/docbkx/en/resources/images/patients_programs/multi_program_validation.png	2012-10-23 07:49:47 +0000 and src/docbkx/en/resources/images/patients_programs/multi_program_validation.png	2012-10-30 09:33:33 +0000 differ
=== modified file 'src/docbkx/en/resources/images/patients_programs/scheduling_aggregation_query_builder.png'
Binary files src/docbkx/en/resources/images/patients_programs/scheduling_aggregation_query_builder.png	2012-10-29 07:29:52 +0000 and src/docbkx/en/resources/images/patients_programs/scheduling_aggregation_query_builder.png	2012-10-30 09:33:33 +0000 differ
=== modified file 'src/docbkx/en/resources/images/patients_programs/single_program_validation.png'
Binary files src/docbkx/en/resources/images/patients_programs/single_program_validation.png	2012-10-23 07:49:47 +0000 and src/docbkx/en/resources/images/patients_programs/single_program_validation.png	2012-10-30 09:33:33 +0000 differ