dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 712
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2-docbook-docs
timestamp: Thu 2013-03-21 13:29:03 +0100
message:
  Minor
modified:
  src/docbkx/en/dhis2_implementation_guide_installation.xml
  src/docbkx/en/dhis2_user_man_data_entry.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 'src/docbkx/en/dhis2_implementation_guide_installation.xml'
--- src/docbkx/en/dhis2_implementation_guide_installation.xml	2013-02-27 11:35:50 +0000
+++ src/docbkx/en/dhis2_implementation_guide_installation.xml	2013-03-21 12:29:03 +0000
@@ -28,7 +28,7 @@
     <para><emphasis role="bold">Install Java</emphasis></para>
     <para>Install Java by invoking the following:</para>
     <screen>sudo apt-get install openjdk-7-jdk</screen>
-    <para>Please check that the path the Java binaries are correct as they might vary from system to system, e.g. on AMD systems you might see <emphasis role="italic">../java-7-openjdk-amd64/..</emphasis> Check that your installation is okay by invoking <code>java -version</code></para>
+    <para>Check that your installation is okay by invoking <code>java -version</code></para>
     <para><emphasis role="bold">Install PostgreSQL</emphasis></para>
     <para>To install PostgreSQL version 9.2 we first need to add a Ubuntu package repository to our system.</para>
     <screen>sudo apt-get install python-software-properties
@@ -80,7 +80,13 @@
     <para><emphasis role="bold">Install Tomcat</emphasis></para>
     <para>Download the Tomcat binary distribution from  <emphasis role="italic">http://tomcat.apache.org/download-70.cgi</emphasis> A useful tool for downloading files from the web is <emphasis role="italic">wget</emphasis>. Extract to a convenient location. This guide assumes that you have navigated to the root directory of the extracted archive.</para>
     <para>Clear the pre-installed web applications by invoking <code>rm -rf webapps/*</code> Download the latest DHIS 2 WAR file from <emphasis role="italic">http://dhis2.org/download</emphasis>, move it to the <emphasis role="italic">webapps</emphasis> directory and rename it to <emphasis role="italic">ROOT.war</emphasis></para>
-    <para>Create a  file <emphasis role="italic">bin/setenv.sh</emphasis> and add the lines below. The first will set the location of your Java Runtime Environment, the second will dedicate memory to Tomcat and the third will set the location for where DHIS 2 will search for the <emphasis role="italic">hibernate.properties</emphasis> configuration file. Please check that the path to the JDK location is correct. Note that you should adjust this to your environment:</para>
+    <para>Create a file <emphasis role="italic">bin/setenv.sh</emphasis> and add the lines below.
+      The first will set the location of your Java Runtime Environment, the second will dedicate
+      memory to Tomcat and the third will set the location for where DHIS 2 will search for the
+        <emphasis role="italic">hibernate.properties</emphasis> configuration file. Please check
+      that the path the Java binaries are correct as they might vary from system to system, e.g. on
+      AMD systems you might see <emphasis role="italic">/java-7-openjdk-amd64</emphasis> Note that
+      you should adjust this to your environment:</para>
     <para><screen>export JAVA_HOME=&apos;/usr/lib/jvm/java-7-openjdk&apos;
 export JAVA_OPTS=&apos;-Xmx6000m -Xms3000m -XX:MaxPermSize=500m -XX:PermSize=300m&apos;
 export DHIS2_HOME=&apos;/home/dhis/config&apos;</screen></para>
@@ -145,7 +151,12 @@
     proxy_set_header  X-Forwarded-Proto  http;
   }
 }]]></screen></para>
-      <para>You can now access your DHIS instance at <emphasis role="italic">http://localhost</emphasis>. Since  the reverse proxy has been set up we can improve security by making Tomcat only listen for local connections. In <emphasis role="italic">/conf/server.xml</emphasis> you can add an <emphasis role="italic">address</emphasis> attribute with the value <emphasis role="italic">localhost</emphasis> to the Connetor element for HTTP 1.1 like this:</para>
+      <para>You can now access your DHIS instance at <emphasis role="italic"
+          >http://localhost</emphasis>. Since the reverse proxy has been set up we can improve
+        security by making Tomcat only listen for local connections. In <emphasis role="italic"
+          >/conf/server.xml</emphasis> you can add an <emphasis role="italic">address</emphasis>
+        attribute with the value <emphasis role="italic">localhost</emphasis> to the Connector
+        element for HTTP 1.1 like this:</para>
       <para><screen>&lt;Connector address=&quot;localhost&quot; protocol=&quot;HTTP/1.1&quot; ... &gt;</screen></para>
       <important>
         <para>The location block for static content is essential as web browsers will not cache static content by default over SSL. It will only cache such content on the client side if told explicitly by the web server.</para>

=== modified file 'src/docbkx/en/dhis2_user_man_data_entry.xml'
--- src/docbkx/en/dhis2_user_man_data_entry.xml	2013-03-20 08:57:30 +0000
+++ src/docbkx/en/dhis2_user_man_data_entry.xml	2013-03-21 12:29:03 +0000
@@ -153,7 +153,9 @@
         organisation unit forms" setting. Then, in data entry, select the organisation unit
         immediately above the organisation unit you want to enter for in the hierarchy. Note that
         this only work for the "section" based forms. You should now see the data elements appearing
-        as columns and the organisation units appearing as rows in the form.</para>
+        as columns and the organisation units appearing as rows in the form. Note that the data
+        entry forms should still be assigned to the facilities that you actually enter data for,
+        i.e. the organisation units now appearing in the form.</para>
     </section>
   </section>
 </chapter>