dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 280
committer: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
branch nick: dhis2-docbook-docs
timestamp: Thu 2011-03-24 07:58:56 +0200
message:
  Altered pom to copy instead of move files. Minor grammatical fixes.
modified:
  pom.xml
  src/docbkx/en/dhis2_implementation_guide_installation_detailed.xml


--
lp:~dhis2-documenters/dhis2/dhis2-docbook-docs
https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs

Your team DHIS 2 developers is subscribed to branch lp:~dhis2-documenters/dhis2/dhis2-docbook-docs.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-documenters/dhis2/dhis2-docbook-docs/+edit-subscription

=== modified file 'pom.xml'
--- pom.xml	2011-03-15 11:54:33 +0000
+++ pom.xml	2011-03-24 05:58:56 +0000
@@ -36,11 +36,11 @@
               <chunkedOutput>true</chunkedOutput>
               <includes>dhis2_user_manual_en.xml</includes>
               <sourceDirectory>${docbook.source}/en/</sourceDirectory>
-              <targetDirectory>${docbook.target}/en/user/html</targetDirectory>
+              <targetDirectory>${docbook.target}/en/user/html/</targetDirectory>
 
               <postProcess>
-                <move file="${docbook.target}/en/user/html/dhis2_user_manual_en.html" tofile="${docbook.target}/en/user/html/index.html" />
-                <copy todir="${docbook.target}/en/user/html/resources/images">
+                <copy file="${docbook.target}/en/user/html/dhis2_user_manual_en.html" tofile="${docbook.target}/en/user/html/index.html" />
+                <copy todir="${docbook.ytarget}/en/user/html/resources/images">
                   <fileset dir="src/docbkx/en/resources/images">
                     <include name="**/*.png" />
                     <include name="**/*.gif" />
@@ -72,7 +72,7 @@
               <sourceDirectory>${docbook.source}/en/</sourceDirectory>
               <targetDirectory>${docbook.target}/en/end-user/html</targetDirectory>
               <postProcess>
-                <move file="${docbook.target}/en/end-user/html/dhis2_end_user_manual.html" tofile="${docbook.target}/en/end-user/html/index.html" />
+                <copy file="${docbook.target}/en/end-user/html/dhis2_end_user_manual.html" tofile="${docbook.target}/en/end-user/html/index.html" />
                 <copy todir="${docbook.target}/en/end-user/html/resources/images">
                   <fileset dir="src/docbkx/en/resources/images">
                     <include name="**/*.png" />
@@ -105,7 +105,7 @@
               <sourceDirectory>${docbook.source}/en/</sourceDirectory>
               <targetDirectory>${docbook.target}/en/implementer/html</targetDirectory>
               <postProcess>
-                <move file="${docbook.target}/en/implementer/html/dhis2_implementation_guide_en.html" tofile="${docbook.target}/en/implementer/html/index.html" />
+                <copy file="${docbook.target}/en/implementer/html/dhis2_implementation_guide_en.html" tofile="${docbook.target}/en/implementer/html/index.html" />
                 <copy todir="${docbook.target}/en/implementer/html/resources/images">
                   <fileset dir="src/docbkx/en/resources/images">
                     <include name="**/*.png" />
@@ -137,9 +137,9 @@
               <includes>dhis2_user_manual_en.xml,dhis2_end_user_manual.xml,dhis2_implementation_guide_en.xml</includes>
               <sourceDirectory>${docbook.source}/en/</sourceDirectory>
               <postProcess>
-                <move file="target/docbkx/html/dhis2_user_manual_en.html" tofile="${docbook.target}/en/user/html/full.html" />
-                <move file="target/docbkx/html/dhis2_end_user_manual.html" tofile="${docbook.target}/en/end-user/html/full.html" />
-                <move file="target/docbkx/html/dhis2_implementation_guide_en.html" tofile="${docbook.target}/en/implementer/html/full.html" />
+                <copy file="target/docbkx/html/dhis2_user_manual_en.html" tofile="${docbook.target}/en/user/html/full.html" />
+                <copy file="target/docbkx/html/dhis2_end_user_manual.html" tofile="${docbook.target}/en/end-user/html/full.html" />
+                <copy file="target/docbkx/html/dhis2_implementation_guide_en.html" tofile="${docbook.target}/en/implementer/html/full.html" />
               </postProcess>
             </configuration>
           </execution>
@@ -157,9 +157,9 @@
               <includes>*.xml</includes>
               <sourceDirectory>${docbook.source}/en/</sourceDirectory>
               <postProcess>
-                <move file="target/docbkx/pdf/dhis2_user_manual_en.pdf" todir="${docbook.target}/en/user" />
-                <move file="target/docbkx/pdf/dhis2_end_user_manual.pdf" todir="${docbook.target}/en/end-user" />
-                <move file="target/docbkx/pdf/dhis2_implementation_guide_en.pdf" todir="${docbook.target}/en/implementer" />
+                <copy file="target/docbkx/pdf/dhis2_user_manual_en.pdf" todir="${docbook.target}/en/user" />
+                <copy file="target/docbkx/pdf/dhis2_end_user_manual.pdf" todir="${docbook.target}/en/end-user" />
+                <copy file="target/docbkx/pdf/dhis2_implementation_guide_en.pdf" todir="${docbook.target}/en/implementer" />
               </postProcess>
             </configuration>
           </execution>

=== modified file 'src/docbkx/en/dhis2_implementation_guide_installation_detailed.xml'
--- src/docbkx/en/dhis2_implementation_guide_installation_detailed.xml	2011-03-23 08:04:11 +0000
+++ src/docbkx/en/dhis2_implementation_guide_installation_detailed.xml	2011-03-24 05:58:56 +0000
@@ -156,7 +156,7 @@
             <screenshot>
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="resources/images/odbc/odbc_screen_1.PNG" width="30%" align="center"/>
+                  <imagedata width="30%" align="center" fileref="resources/images/odbc/odbc_screen_1.PNG"/>
                 </imageobject>
               </mediaobject>
             </screenshot>
@@ -192,7 +192,7 @@
             <screenshot>
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="resources/images/odbc/odbc_screen_2.PNG" width="30%" align="center"/>
+                  <imagedata width="30%" align="center" fileref="resources/images/odbc/odbc_screen_2.PNG"/>
                 </imageobject>
               </mediaobject>
             </screenshot>
@@ -202,7 +202,7 @@
             <screenshot>
               <mediaobject>
                 <imageobject>
-                  <imagedata fileref="resources/images/odbc/odbc_screen_3.PNG" width="20%" align="center"/>
+                  <imagedata width="20%" align="center" fileref="resources/images/odbc/odbc_screen_3.PNG"/>
                 </imageobject>
               </mediaobject>
             </screenshot>
@@ -497,7 +497,7 @@
     </section>
     <section>
       <title>Reverse proxying with Tomcat and Apache</title>
-      <para>Tomcat should be run as a non-privileged user. Typically, it is run as &quot;tomcat6&quot; or &quot;tomcat&quot; . Since non-prviileged users are not able to run services on ports lower than port 1024, one must use the Apache HTTP server in order to &quot;reverse&quot; proxy Tomcat. </para>
+      <para>Tomcat should be run as a non-privileged user and the service will usually run on port 8080. If you want to run the DHIS 2 server on the nomal HTTP port (80), you will need to configure a reverse proxy using the Apache HTTPD server.   First we need to install a few necessary programs. </para>
       <para><screen>sudo apt-get install apache2 libapache2-mod-proxy-html libapache2-mod-jk
 a2enmod proxy proxy_ajp proxy_connect</screen></para>
       <para>The first command will install the necessary Tomcat modules and the second command will make them active. </para>