=== modified file 'src/docbkx/en/dhis2_user_man_datasets_forms.xml'
--- src/docbkx/en/dhis2_user_man_datasets_forms.xml	2013-06-12 09:41:29 +0000
+++ src/docbkx/en/dhis2_user_man_datasets_forms.xml	2013-06-25 07:12:17 +0000
@@ -46,9 +46,9 @@
       <listitem>
         <para>Allow future periods: Defines whether it should be possible to enter data for future
           periods for this data set in data entry. The default behavior is to allow data entry only
-          for periods which have passed, i.e. the end date is after today's date. If set to yes you
+          for periods which have passed, i.e. the end date is after today&apos;s date. If set to yes you
           can enter data for future periods, which is useful e.g. for population, target and
-          planning data.'</para>
+          planning data.&apos;</para>
       </listitem>
       <listitem>
         <para>All fields for data elements required: Defines whether it is mandatory to fill all
@@ -65,7 +65,7 @@
       </listitem>
       <listitem>
         <para>Skip Offline: Controls whether this data entry form should be downloaded and saved in
-          the user's web browser. Normally you should leave this on no, which is the default
+          the user&apos;s web browser. Normally you should leave this on no, which is the default
           behavior. If  you have forms which are rarely used and are very big you can consider
           setting it to yes to speed up initial loading of the data entry module.</para>
       </listitem>
@@ -95,8 +95,7 @@
           <para>Add new: Adds a new data set. When pressing this button, you can create a new data
             set. You need to provide a name, shortname and frequency. The &quot;Code&quot; attribute
             is optional. Data elements can be added to the &quot;Selected data element&quot; list by
-            selecting them individually. and pressing the <inlinegraphic
-              fileref="resources/images/dhis2_images/move_right.png"/> button. Indicators can also
+            selecting them individually. and pressing the <inlinegraphic fileref="resources/images/dhis2_images/move_right.png"/> button. Indicators can also
             be added to data sets and will be available to be placed in custom data entry forms when
             they need to be shown along with data elements on the same data entry form. Press
             &quot;Save&quot; to add the new data set. </para>
@@ -176,8 +175,7 @@
             data element&quot; list on the left to the &quot;Selected data elements&quot; list on
             the right. Data elements can be sorted within the section with the use of the &quot;Move
             up&quot; <inlinegraphic fileref="resources/images/dhis2_images/move_up.png"/> and
-            &quot;Move down&quot; <inlinegraphic
-              fileref="resources/images/dhis2_images/move_down.png"/> buttons. Be sure to press
+            &quot;Move down&quot; <inlinegraphic fileref="resources/images/dhis2_images/move_down.png"/> buttons. Be sure to press
             &quot;Save&quot; once you have finished.<note>
               <para>You can only use one data element category combination per section. </para>
             </note></para>
@@ -199,7 +197,7 @@
           <screenshot>
             <mediaobject>
               <imageobject>
-                <imagedata fileref="resources/images/datasets/grey_field_management.png" align="center" width="60%"/>
+                <imagedata width="60%" align="center" fileref="resources/images/datasets/grey_field_management.png"/>
               </imageobject>
             </mediaobject>
           </screenshot>
@@ -285,5 +283,11 @@
       <para>The data set assignment editor is a tool for adding and removing many data sets to organisation units in batch style. Start by selecting an organisation unit from the selection tree. In the area below the tree a grid will be displayed showing all data sets as columns and the child organisation units as rows.</para>
       <para>From the grid you can now assign or unassign data sets simply by clicking on of the corresponding icons in the grid. If you want to assign or unassign an organisation unit to all data sets you can check or uncheck the checkbox next to the organisation unit. Your changes will automatically be saved.</para>
     </section>
+    <section id="dataSetPDFDataEntry">
+      <title>Data Sets as PDFs for data entry</title>
+      <para>A fillable PDF can be generated, which allows data collection on a completed disconnected environment, using a free PDF reader. The PDF downloaded will present all Data Elements and associated Cat Combos, organized by Sections.</para>
+      <para>The PDF file can be distributed to multiple reporting entities for use on a tablet or notebook. Each reporting entity should complete one file for each period. Once completed the PDF file can be imported – see <xref linkend="importPDFdata"/>.</para>
+      <para>The layout of the PDF can be edited using a PDF. All fields properties should be kept, otherwise the information wouldn’t not be recognized during the import process. Fields can be reorganized, and new labels and text can be added into the PDF.</para>
+    </section>
   </section>
 </chapter>

=== modified file 'src/docbkx/en/dhis2_user_man_import_export.xml'
--- src/docbkx/en/dhis2_user_man_import_export.xml	2013-06-23 17:04:29 +0000
+++ src/docbkx/en/dhis2_user_man_import_export.xml	2013-06-25 07:12:17 +0000
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+
<?xml version='1.0' encoding='UTF-8'?>
 <!-- This document was created with Syntext Serna Free. --><!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "docbookV4.4/docbookx.dtd" []>
 <chapter>
   <title>Import and export</title>
@@ -354,4 +354,14 @@
       and potential conflicts.</para>
     <para>If you need to manually produce such XML files please refer to the Web API chapter where you can find detailed documentation of the DXF format.</para>
   </section>
+    <section>
+    <title id="importPDFdata">Importing PDF data</title>
+    <para>DHIS 2 supports import of data in the PDF format. This can be used to import data produced by offline PDF data entry form.</para>
+    <para>To import a PDF data  file, navigate to the <emphasis role="italic">PDF Data Import </emphasis>item in the left-side menu. Upload the file and click <emphasis role="italic">Import</emphasis>.</para>
+    <para>After the import
+      process is finished you can follow the link to the import summary, which will inform you about
+      the outcome of the import process in terms of number of records imported, updated and ignored
+      and potential conflicts.</para>
+  </section>
 </chapter>
+

=== modified file 'src/docbkx/en/dhis2_user_manual_en.xml'
--- src/docbkx/en/dhis2_user_manual_en.xml	2013-06-08 16:38:49 +0000
+++ src/docbkx/en/dhis2_user_manual_en.xml	2013-06-25 07:12:17 +0000
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!-- This document was created with Syntext Serna Free. -->
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+<!-- This document was created with Syntext Serna Free. --><!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 <!ENTITY version '2.X'>
 <!ENTITY title 'DHIS2 User Manual'>
  ]>
@@ -35,10 +34,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_web_api.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_integration.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_apps.xml"/>
-  <!--
+<!--
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_excel_reports.xml" encoding="UTF-8"/>
-  -->
-  <appendix>
+  -->  <appendix>
     <title> DHIS 2 Documentation Guide</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_documentation_guide.xml" encoding="UTF-8" xpointer="docs_1"/>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_documentation_guide.xml" encoding="UTF-8" xpointer="docs_2"/>
@@ -60,12 +58,12 @@
   <appendix>
     <title>R and DHIS 2 Integration</title>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_r.xml" encoding="UTF-8" xpointer="dhis2_r_intro"/>
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_r.xml" encoding="UTF-8" xpointer="dhis2_r_odbc"/>
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_r.xml" encoding="UTF-8" xpointer="dhis2_r_mydatamart"/>
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_r.xml" encoding="UTF-8" xpointer="dhis2_r_maps"/>
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_r.xml" encoding="UTF-8" xpointer="dhis2_r_google_vis"/>
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_r.xml" encoding="UTF-8" xpointer="dhis2_r_plr"/>
-	<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_r.xml" encoding="UTF-8" xpointer="dhis2_r_web_api"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_r.xml" encoding="UTF-8" xpointer="dhis2_r_odbc"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_r.xml" encoding="UTF-8" xpointer="dhis2_r_mydatamart"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_r.xml" encoding="UTF-8" xpointer="dhis2_r_maps"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_r.xml" encoding="UTF-8" xpointer="dhis2_r_google_vis"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_r.xml" encoding="UTF-8" xpointer="dhis2_r_plr"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_r.xml" encoding="UTF-8" xpointer="dhis2_r_web_api"/>
   </appendix>
   <appendix>
     <title> DHIS Technical Architecture Guide</title>