=== modified file 'src/docbkx/en/dhis2_user_man_import_export.xml'
--- src/docbkx/en/dhis2_user_man_import_export.xml	2014-04-25 13:43:18 +0000
+++ src/docbkx/en/dhis2_user_man_import_export.xml	2014-05-14 10:23:58 +0000
@@ -144,7 +144,7 @@
             <row>
               <entry>Column</entry>
               <entry>Required</entry>
-              <entry>Value</entry>
+              <entry>Value (default first)</entry>
               <entry>Description</entry>
             </row>
           </thead>
@@ -241,7 +241,7 @@
             <row>
               <entry>Column</entry>
               <entry>Required</entry>
-              <entry>Value</entry>
+              <entry>Value (default first)</entry>
               <entry>Description</entry>
             </row>
           </thead>
@@ -346,18 +346,64 @@
         </tgroup>
       </table>
       <table frame="all">
+        <title>Option Set CSV Format</title>
+        <tgroup cols="4">
+          <colspec colnum="1" colname="c1" colwidth="1.27*"/>
+          <colspec colnum="2" colname="c2" colwidth="1*"/>
+          <colspec colnum="3" colname="c3" colwidth="1.36*"/>
+          <colspec colnum="4" colname="c4" colwidth="5.43*"/>
+          <thead>
+            <row>
+              <entry>Column</entry>
+              <entry>Required</entry>
+              <entry>Value (default first)</entry>
+              <entry>Description</entry>
+            </row>
+          </thead>
+          <tbody>
+            <row>
+              <entry>Name</entry>
+              <entry>Yes</entry>
+              <entry/>
+              <entry>Name. Max 230 characters. Unique. The option set values should be repeated for
+                each option.</entry>
+            </row>
+            <row>
+              <entry>UID</entry>
+              <entry>No</entry>
+              <entry>System generated</entry>
+              <entry>Stable identifier. Max 11 char. Will be generated by system if not
+                specified.</entry>
+            </row>
+            <row>
+              <entry>Code</entry>
+              <entry>No</entry>
+              <entry/>
+              <entry>Stable code. Max 50 char.</entry>
+            </row>
+            <row>
+              <entry>Option</entry>
+              <entry>Yes</entry>
+              <entry/>
+              <entry>Option. Free text. The option set values should be repeated for each
+                option.</entry>
+            </row>
+          </tbody>
+        </tgroup>
+      </table>
+      <table frame="all">
         <title>Data Element Group, Category Option, Category Option Group, Organisation Unit Group
           CSV Format</title>
         <tgroup cols="4">
           <colspec colnum="1" colname="c1" colwidth="1.33*"/>
           <colspec colnum="2" colname="c2" colwidth="1*"/>
-          <colspec colnum="3" colname="c3" colwidth="1.28*"/>
-          <colspec colnum="4" colname="c4" colwidth="5.72*"/>
+          <colspec colnum="3" colname="c3" colwidth="1.41*"/>
+          <colspec colnum="4" colname="c4" colwidth="5.59*"/>
           <thead>
             <row>
               <entry>Column</entry>
               <entry>Required</entry>
-              <entry>Value</entry>
+              <entry>Value (default first)</entry>
               <entry>Description</entry>
             </row>
           </thead>
@@ -372,7 +418,8 @@
               <entry>UID</entry>
               <entry>No</entry>
               <entry>System generated</entry>
-              <entry>Stable identifier. Max 11 char. Will be generated by system if not specified.</entry>
+              <entry>Stable identifier. Max 11 char. Will be generated by system if not
+                specified.</entry>
             </row>
             <row>
               <entry>Code</entry>
@@ -383,12 +430,19 @@
           </tbody>
         </tgroup>
       </table>
-      <para>An example of a CSV file for data elements can be seen below. The first row will always be
-      ignored. Notice how you can skip columns and rely on default values or simply leave columns
-      blank.</para>
+      <para>An example of a CSV file for data elements can be seen below. The first row will always
+        be ignored. Notice how you can skip columns and rely on default values or simply leave
+        columns blank:</para>
       <screen>name,uid,code,shortname,description,formname,domaintype,type,numbertype,texttype,aggregationoperator,url,zero
 &quot;Women participated in skill development training&quot;,&quot;&quot;,&quot;D0001&quot;,&quot;Women participated development training&quot;
 &quot;Women participated in community organizations&quot;,&quot;&quot;,&quot;D0002&quot;,&quot;Women participated community organizations&quot;</screen>
+      <para>The format for option sets is special. One record represents an option, and the three
+        first values representing the option set should be repeated for each option (record):</para>
+      <screen>name,uid,code,option
+"Color",,,"Blue"
+"Color",,,"Green"
+"Gender",,,"Female"
+"Gender",,,"Male"</screen>
     </section>
     <section>
       <title>GML data import</title>

=== modified file 'src/docbkx/en/resources/css/docbook_bsd.css'
--- src/docbkx/en/resources/css/docbook_bsd.css	2014-05-11 11:42:49 +0000
+++ src/docbkx/en/resources/css/docbook_bsd.css	2014-05-14 10:23:58 +0000
@@ -39,13 +39,12 @@
   
 HTML BODY {  
 	margin: 1em 8% 1em 10%;  
-	line-height: 1.4;
+	line-height: 1.5;
 	font-family: Arial, Sans-serif;
 	color: #333;
 }  
   
 .LEGALNOTICE {  
-	font-size: small;  
 	font-variant: small-caps;  
 }