=== modified file 'src/docbkx/en/dhis2_user_man_mobile_J2ME_sms_transport.xml'
--- src/docbkx/en/dhis2_user_man_mobile_J2ME_sms_transport.xml	2012-07-21 10:38:26 +0000
+++ src/docbkx/en/dhis2_user_man_mobile_J2ME_sms_transport.xml	2013-05-28 03:41:23 +0000
@@ -237,75 +237,91 @@
   <section>
     <title>Using the system</title>
     <para>Navigate to the Mobile module via Services -&gt; Mobiles</para>
-    <section>
-      <title>Start the SMS Service</title>
-      <para>From the start-page DHIS2, go to Maintenance &gt;&gt; Mobile Configuration:</para>
-      <para><screenshot>
+    <section><title>Start the SMS Service</title><para>From the start-page DHIS2, go to Maintenance &gt;&gt; Mobile Configuration:</para><para><screenshot>
           <mediaobject>
             <imageobject>
               <imagedata width="40%" align="center" fileref="resources/images/dhis2_mobile_sms/mobile-sms-startup-link.png"/>
             </imageobject>
           </mediaobject>
-        </screenshot></para>
-      <para>Then choosing the &quot;SMS Service Configuration&quot;:</para>
-      <para><screenshot>
+        </screenshot></para><para>Then choosing the &quot;SMS Service Configuration&quot;:</para><para><screenshot>
           <mediaobject>
             <imageobject>
               <imagedata width="40%" align="center" fileref="resources/images/dhis2_mobile_sms/mobile-sms-startup-link-server-config.png"/>
             </imageobject>
           </mediaobject>
-        </screenshot></para>
-      <para>The SMS Service Configuration main-page with descriptions:</para>
-      <para><screenshot>
+        </screenshot></para><para>The SMS Service Configuration main-page with descriptions:</para><para><screenshot>
           <mediaobject>
             <imageobject>
               <imagedata width="40%" align="center" fileref="resources/images/dhis2_mobile_sms/mobile-sms-configuration-form.png"/>
             </imageobject>
           </mediaobject>
-        </screenshot></para>
-      <para>(The above screen-shot example with no gateway in the Gateways list)</para>
-      <para>If having no gateway registered, clicking on the &quot;Reload Configuration&quot; or &quot;Start SMS Service&quot; will have no use and a warning message appeared, see this screen-shot example:</para>
-      <para><screenshot>
+        </screenshot></para><para>(The above screen-shot example with no gateway in the Gateways list)</para><para>If having no gateway registered, clicking on the &quot;Reload Configuration&quot; or &quot;Start SMS Service&quot; will have no use and a warning message appeared, see this screen-shot example:</para><para><screenshot>
           <mediaobject>
             <imageobject>
               <imagedata width="40%" align="center" fileref="resources/images/dhis2_mobile_sms/mobile-sms-configuration-nogateway.png"/>
             </imageobject>
           </mediaobject>
-        </screenshot></para>
-      <para>Add or Update Gateway:</para>
-      <para><screenshot>
+        </screenshot></para><para>Add or Update Gateway:</para><para><screenshot>
           <mediaobject>
             <imageobject>
               <imagedata width="40%" align="center" fileref="resources/images/dhis2_mobile_sms/mobile-sms-configuration-addgateway.png"/>
             </imageobject>
           </mediaobject>
-        </screenshot></para>
-      <para>Currently, there are 4 gateway types:</para>
-      <para><screenshot>
+        </screenshot></para><para>Currently, there are 5 gateway types:</para><para><screenshot>
           <mediaobject>
             <imageobject>
               <imagedata width="40%" align="center" fileref="resources/images/dhis2_mobile_sms/mobile-sms-configuration-gatewaytypes.png"/>
             </imageobject>
           </mediaobject>
-        </screenshot></para>
-      <para>Then fill in the information for the gateway (the screen-shot example with BulkSMS Gateway):</para>
-      <para><screenshot>
-          <mediaobject>
-            <imageobject>
-              <imagedata width="40%" align="center" fileref="resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway.png"/>
-            </imageobject>
-          </mediaobject>
-        </screenshot></para>
-      <para>(The information for the gateway is from the Gateway providers)</para>
-      <para>After adding successfully the gateway, the service will automatically started.</para>
-      <para><screenshot>
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="resources/images/dhis2_mobile_sms/mobile-sms-configuration-gatewaystarted.png" align="center" width="40%"/>
-            </imageobject>
-          </mediaobject>
-        </screenshot></para>
-    </section>
+        </screenshot></para>Here is how to configurate those gateway:<para><emphasis role="bold">Bulk SMS Gateway:</emphasis></para><para><screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata width="40%" align="center" fileref="resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-bulk.png"/>
+            </imageobject>
+          </mediaobject>
+        </screenshot></para><para>(The information for the gateway is from the Gateway providers)</para><para><emphasis role="bold">Clickatell SMS Gateway:</emphasis></para><para><screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata width="40%" align="center" fileref="resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-clickatell.png"/>
+            </imageobject>
+          </mediaobject>
+        </screenshot></para><para>How to get API ID? Access www.clickatell.com -&gt; Login -&gt; Manage my Products -&gt; HTTP API -&gt; Save Changes</para><para><emphasis role="bold">Generic HTTP SMS gateway:</emphasis></para><para><screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata width="40%" align="center" fileref="resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-genericHTTP.png"/>
+            </imageobject>
+          </mediaobject>
+        </screenshot></para><para>The URL above is for Bulk SMS provider, you can also use other provider such as Clickatell. The URL format may different from different providers. Please contact you SMS gateway provider to have the correct format. </para><para><emphasis role="bold">GSM Modem gateway:</emphasis></para><para>Please refer 4.2 where &quot;Install the GSM modem&quot; guide is. Below is more details by screen shots:</para><para><screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata width="40%" align="center" fileref="resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-modem-1.png"/>
+            </imageobject>
+          </mediaobject>
+        </screenshot></para><para><screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata width="40%" align="center" fileref="resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-modem-2.png"/>
+            </imageobject>
+          </mediaobject>
+        </screenshot></para><para><screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata width="40%" align="center" fileref="resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-modem-3.png"/>
+            </imageobject>
+          </mediaobject>
+        </screenshot></para><para>After adding successfully the gateway, the service will automatically started.</para><para><screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata width="40%" align="center" fileref="resources/images/dhis2_mobile_sms/mobile-sms-configuration-gatewaystarted.png"/>
+            </imageobject>
+          </mediaobject>
+        </screenshot></para><para>If system have more than one gateway configuration, please choose one of them as the default gateway, then system will use that desired gateway to send SMS later on.</para><para><screenshot>
+          <mediaobject>
+            <imageobject>
+              <imagedata width="40%" align="center" fileref="resources/images/dhis2_mobile_sms/mobile-sms-configuration-gatewaydefault.png"/>
+            </imageobject>
+          </mediaobject>
+        </screenshot></para></section>
     <section>
       <title>Sending SMS</title>
       <para>From the start-page DHIS2, go to Maintenance &gt;&gt; Mobile Configuration. Then navigate to &quot;Show send SMS form&quot;:</para>
@@ -316,9 +332,9 @@
             </imageobject>
           </mediaobject>
         </screenshot></para>
-      <para>At this moment (DHIS version 2.8), this is the one-way sending out the SMS messages from the servers to the recipients (with mobile phone numbers).</para>
+      <para>At this moment (DHIS version 2.1), this is the one-way sending out the SMS messages from the servers to the recipients (with mobile phone numbers).</para>
       <para>See the below example form to send out the messages to the recipients&apos; numbers individuals or mobile number of registered Organisation Unit or by mobile number of the users assigned with Organisation Unit.</para>
-      <para>Below is an example screen-shot with listing of phone numbers (using &quot;;&quot; between the numbers in the list):</para>
+      <para>Below is an example screen-shot with listing of phone numbers (using &quot;;&quot; to seperate numbers):</para>
       <para><screenshot>
           <mediaobject>
             <imageobject>
@@ -326,7 +342,6 @@
             </imageobject>
           </mediaobject>
         </screenshot></para>
-      <para/>
     </section>
     <section>
       <title>Receive Data and Import</title>

=== modified file 'src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-addgateway.png'
Binary files src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-addgateway.png	2012-04-27 09:21:00 +0000 and src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-addgateway.png	2013-05-28 03:41:23 +0000 differ
=== added file 'src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-bulk.png'
Binary files src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-bulk.png	1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-bulk.png	2013-05-28 03:41:23 +0000 differ
=== added file 'src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-clickatell.png'
Binary files src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-clickatell.png	1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-clickatell.png	2013-05-28 03:41:23 +0000 differ
=== added file 'src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-genericHTTP.png'
Binary files src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-genericHTTP.png	1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-genericHTTP.png	2013-05-28 03:41:23 +0000 differ
=== added file 'src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-modem-1.png'
Binary files src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-modem-1.png	1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-modem-1.png	2013-05-28 03:41:23 +0000 differ
=== added file 'src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-modem-2.png'
Binary files src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-modem-2.png	1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-modem-2.png	2013-05-28 03:41:23 +0000 differ
=== added file 'src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-modem-3.PNG'
Binary files src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-modem-3.PNG	1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway-modem-3.PNG	2013-05-28 03:41:23 +0000 differ
=== removed file 'src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway.png'
Binary files src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway.png	2012-04-27 09:21:00 +0000 and src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-fillinggateway.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-form.png'
Binary files src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-form.png	2012-04-27 09:21:00 +0000 and src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-form.png	2013-05-28 03:41:23 +0000 differ
=== added file 'src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-gatewaydefault.png'
Binary files src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-gatewaydefault.png	1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-gatewaydefault.png	2013-05-28 03:41:23 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-gatewaystarted.png'
Binary files src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-gatewaystarted.png	2012-04-27 09:21:00 +0000 and src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-gatewaystarted.png	2013-05-28 03:41:23 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-gatewaytypes.png'
Binary files src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-gatewaytypes.png	2012-04-27 09:21:00 +0000 and src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-gatewaytypes.png	2013-05-28 03:41:23 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-nogateway.png'
Binary files src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-nogateway.png	2012-04-27 09:21:00 +0000 and src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-configuration-nogateway.png	2013-05-28 03:41:23 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-sendingSMS-form.png'
Binary files src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-sendingSMS-form.png	2012-04-27 09:21:00 +0000 and src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-sendingSMS-form.png	2013-05-28 03:41:23 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-sendingSMS.png'
Binary files src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-sendingSMS.png	2012-04-27 09:21:00 +0000 and src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-sendingSMS.png	2013-05-28 03:41:23 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-startup-link-server-config.png'
Binary files src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-startup-link-server-config.png	2012-04-27 09:21:00 +0000 and src/docbkx/en/resources/images/dhis2_mobile_sms/mobile-sms-startup-link-server-config.png	2013-05-28 03:41:23 +0000 differ