dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #03997
[Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 82: Modified pom.xml for chunked HTML output. Further modfications to data element maintainence. Fixe...
------------------------------------------------------------
revno: 82
committer: Jason Pickering <jason@jason-laptop>
branch nick: dhis2-docbook-docs
timestamp: Thu 2010-01-21 18:51:36 +0200
message:
Modified pom.xml for chunked HTML output. Further modfications to data element maintainence. Fixed a number of spelling and grammar errors.
added:
src/docbkx/en/resources/images/dhis2_images/move_left.png
src/docbkx/en/resources/images/maintainence/data_element_group_editor_select.png
src/docbkx/en/resources/images/maintainence/data_element_group_editor_start.png
src/docbkx/en/resources/images/maintainence/data_element_group_set_start.png
modified:
pom.xml
src/docbkx/en/dhis2_documentation_guide.xml
src/docbkx/en/dhis2_user_man_data_elements.xml
src/docbkx/en/dhis2_user_man_mod1.xml
src/docbkx/en/dhis2_user_man_mod11.xml
src/docbkx/en/dhis2_user_man_mod2.xml
src/docbkx/en/dhis2_user_man_mod7.xml
src/docbkx/en/resources/glossary/glossary_en.xml
src/docbkx/en/resources/images/dhis2_images/move_right.png
--
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 2010-01-14 18:52:06 +0000
+++ pom.xml 2010-01-21 16:51:36 +0000
@@ -19,25 +19,23 @@
<!-- <version>2.0.10-SNAPSHOT</version> -->
<artifactId>docbkx-maven-plugin</artifactId>
<configuration>
- <includes>*.xml</includes>
+ <includes>dhis2_user_manual_en.xml</includes>
<sourceDirectory>${basedir}/src/docbkx/en/</sourceDirectory>
<xincludeSupported>true</xincludeSupported>
</configuration>
<executions>
<execution>
<id>html-docs</id>
- <phase>package</phase>
- <goals>
- <goal>generate-html</goal>
- </goals>
-
-
- <configuration>
- <htmlStylesheet>resources/css/docbook_bsd.css</htmlStylesheet>
- <glossaryCollection>resources/glossary_en.xml</glossaryCollection>
- <sectionAutolabel>1</sectionAutolabel>
- <sectionLabelIncludesComponentLabel>1</sectionLabelIncludesComponentLabel>
-
+ <phase>package</phase>
+ <goals>
+ <goal>generate-html</goal>
+ </goals>
+ <configuration>
+ <htmlStylesheet>resources/css/docbook_bsd.css</htmlStylesheet>
+ <glossaryCollection>resources/glossary_en.xml</glossaryCollection>
+ <sectionAutolabel>1</sectionAutolabel>
+ <sectionLabelIncludesComponentLabel>1</sectionLabelIncludesComponentLabel>
+ <chunkedOutput>true</chunkedOutput>
<postProcess>
<copy todir="target/site/en">
<fileset dir="target/docbkx/">
@@ -48,9 +46,7 @@
<copy todir="target/site/en/html/resources/images">
<fileset dir="src/docbkx/en/resources/images">
<include name="**/*.png" />
-
<include name="**/*.gif" />
-
<include name="**/*.jpg" />
</fileset>
</copy>
@@ -72,27 +68,28 @@
<argLine>-Xmx1024m</argLine>
<foCustomization>${basedir}/src/docbkx/en/resources/xsl/fop-cust.xsl</foCustomization>
<doubleSided>1</doubleSided>
- <postProcess>
- <copy todir="target/site/en">
- <fileset dir="target/docbkx/">
- <include name="**/*.pdf" />
- </fileset>
- </copy>
- </postProcess>
- </configuration>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.docbook</groupId>
- <artifactId>docbook-xml</artifactId>
- <version>4.4</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </plugin>
-
+ <includes>*.xml</includes>
+ <sourceDirectory>${basedir}/src/docbkx/en/</sourceDirectory>
+
+ <postProcess>
+ <copy todir="target/site/en">
+ <fileset dir="target/docbkx/">
+ <include name="**/*.pdf" />
+ </fileset>
+ </copy>
+ </postProcess>
+ </configuration>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.docbook</groupId>
+ <artifactId>docbook-xml</artifactId>
+ <version>4.4</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
</build>
-
</project>
=== modified file 'src/docbkx/en/dhis2_documentation_guide.xml'
--- src/docbkx/en/dhis2_documentation_guide.xml 2009-12-10 14:21:14 +0000
+++ src/docbkx/en/dhis2_documentation_guide.xml 2010-01-21 16:51:36 +0000
@@ -63,22 +63,22 @@
printed as well as online formats such as HTML or integrated help systems
within the application itself. Therefore, there are wide range of
possibilities in terms of which editor can be used for the creation of
- DocBook files. A fairly complete list of possibilities is located <ulink url="http://wiki.docbook.org/topic/DocBookAuthoringTools";>here</ulink>. It is currently recommended to use <ulink url="http://www.syntext.com/products/serna-free/ ">Syntext Serna Free</ulink> for editing DocBook source files as WYSIWYG. It is not recommended to use the editor XMLmind XML Editor Personal Edition (also known as XXE Personal), as the editor "silently" places uneeded whitspace and other ornementation to the DocBook source which makes collaborative editing of documents very difficult. </para>
+ DocBook files. A fairly complete list of possibilities is located <ulink url="http://wiki.docbook.org/topic/DocBookAuthoringTools";>here</ulink>. It is currently recommended to use <ulink url="http://www.syntext.com/products/serna-free/ ">Syntext Serna Free</ulink> for editing DocBook source files as WYSIWYG. It is not recommended to use the editor XMLmind XML Editor Personal Edition (also known as XXE Personal), as the editor "silently" places unneeded whitspace and other ornamentation to the DocBook source which makes collaborative editing of documents very difficult. </para>
<para>One of the key concepts to keep in mind when authoring documentation
in DocBook, or other presentation neutral formats, is that the <emphasis role="bold">content </emphasis>of the document should be considered in the
first instance. The <emphasis role="bold">presentation </emphasis>of the
document will take place in a separate step, where it will be rendered
into different formats, such as HTML and PDF. It is therefore important
- that the document is will organized and structured, with appropriate
+ that the document is will organised and structured, with appropriate
DocBook tags and structural elements being considered.</para>
- <para>It is good practice to break your document in to various sections
+ <para>It is good practise to break your document in to various sections
using the "sect", or section element. Section elements can also be nested
within each other, such as "Section 1" and "Section 2". This concept is
essentially the same as <productname>Microsoft Word</productname> or other word processing programs.
DocBook will automatically take care of numbering the sections for you
when the document is produced. Two other important elements are the
"itemizedlist" and "numberedlist". These are quite similar, but an
- itemized list corresponds to a bulleted list, which a numbered list will
+ itemised list corresponds to a bulleted list, which a numbered list will
be rendered with each element being numbered sequentially. Other key
elements are "screenshot" and "table" which should be
self-explanatory.</para>
@@ -114,7 +114,7 @@
<para>Make sure you have Bazaar installed.</para>
</listitem>
<listitem>
- <para>Start Bazzar by right-clicking a folder if you are using <productname>Windows</productname>
+ <para>Start Bazaar by right-clicking a folder if you are using <productname>Windows</productname>
and selecting <command>Bzr Here</command>. If you use Linux, you can
just create a folder to hold the document sources. You can place the
document source in any folder you like.</para>
@@ -145,7 +145,7 @@
<section id="docs_6">
<title>Using images</title>
<para>Screenshots are very useful for providing information to users on how particular actions should be performed. DocBook has no intrinsic mechanisms to know exactly how an image should be rendered in the final document. Therefore, it is necessary to provide instructions through element attributes.
- The following XML code fragment demonstrates how an image can be specified to occupy 80% of the available page width. For screenshots in landscape format, this seems to be an appropriate amount. You may need to experiment a bit to obtain a proper widht for your image. Alternatively, you can edit the resolution of the image itself, in order to obtain a proper size during rendering. </para>
+ The following XML code fragment demonstrates how an image can be specified to occupy 80% of the available page width. For screenshots in landscape format, this seems to be an appropriate amount. You may need to experiment a bit to obtain a proper width for your image. Alternatively, you can edit the resolution of the image itself, in order to obtain a proper size during rendering. </para>
<literallayout><screenshot>
<screeninfo>DHIS2 Login screen</screeninfo>
<mediaobject>
@@ -158,7 +158,7 @@
</section>
<section id="docs_7">
<title>Linking documents together</title>
- <para>DocBook provides a modular framework where many seperate documents can be linked together into a master document. Fragments from different documents can also be reused in different contexts. It is therefore important to consider whether your document should be constructed as an article or a chapter. Chapters are essentially portions of a book, and can therefore be linked together into a larger document very easily. Articles are essentially standalone documents, but they can also be assembled together into a larger document at the component level. </para>
+ <para>DocBook provides a modular framework where many separate documents can be linked together into a master document. Fragments from different documents can also be reused in different contexts. It is therefore important to consider whether your document should be constructed as an article or a chapter. Chapters are essentially portions of a book, and can therefore be linked together into a larger document very easily. Articles are essentially standalone documents, but they can also be assembled together into a larger document at the component level. </para>
<para>Should you wish to link several articles together into a book, DocBook provides a mechanism to assign an id to a section. In the example below, a section has been assigned an id. This id must be unique within the document. </para>
<para><literallayout> <section id="mod2_1">
<title>Getting started with DHIS2</title>
@@ -168,12 +168,12 @@
<title>Getting started with DHIS2</title>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_mod2.xml" xpointer="mod2_1" encoding="UTF-8"/>
</literallayout></para>
- <para>Note that the filename and id have been assigned in the parent document, referring to the actual file (href) and particular fragment of the child document that should be referenced in the parent document (xpointer). </para>
+ <para>Note that the file name and id have been assigned in the parent document, referring to the actual file (href) and particular fragment of the child document that should be referenced in the parent document (xpointer). </para>
<para>Including chapters in a book is very simple. The example below illustrates how: </para>
<para><literallayout> <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dhis2_user_man_
mod1.xml" encoding="UTF-8"/>
</literallayout></para>
- <para>In this case, there is no need to explicity reference a part of the document, unless you only want to include a portion of the chapter. If you want to use a section of the chapter, you can assign an id to that section, and then reference that section through an xpointer. </para>
+ <para>In this case, there is no need to explicitly reference a part of the document, unless you only want to include a portion of the chapter. If you want to use a section of the chapter, you can assign an id to that section, and then reference that section through an xpointer. </para>
</section>
<section id="docs_8">
<title>Handling multilingual documentation</title>
@@ -181,7 +181,7 @@
</section>
<section id="docs_9">
<title>Building the documentation</title>
- <para>One of the key advantages of the DocBook format is that the source documentation can be transformed into a wide variety of formats, including HTML, chunked HTML, XHTML, PDF, and a number of other formats. There are a wide variety of tools that are capable of performing this task. Basically the XML source of the document is transformed using the standard DocBook XSL stylesheets into the desired format. The complete list of tools capable of transforming DocBook will not be listed here, but a few examples are provided below. </para>
+ <para>One of the key advantages of the DocBook format is that the source documentation can be transformed into a wide variety of formats, including HTML, chunked HTML, XHTML, PDF, and a number of other formats. There are a wide variety of tools that are capable of performing this task. Basically the XML source of the document is transformed using the standard DocBook XSL style sheets into the desired format. The complete list of tools capable of transforming DocBook will not be listed here, but a few examples are provided below. </para>
<para>Latest builds of the documentation are available </para>
<section>
<title>Building the documentation with Apache maven</title>
@@ -202,7 +202,7 @@
</section>
<section>
<title>Building with xmlto</title>
- <para><command>xmlto</command> is a useful utility available on Linux platforms for transforming DocBook documents into many different formats. More informtion on the package can be found <ulink url="http://cyberelk.net/tim/software/xmlto/";>here</ulink>. If you do not want to use Apache Maven for some reason, you can install <command>xmlto</command> through your package manager. Once you have installed <command>xmlto</command> you can just execute <command>xmlto <parameter>html</parameter><parameter>file_to_transform</parameter></command> where the <parameter>file_to_transform</parameter> paramater is the name of the file you wish to transform. There are many other formats available, such as PDF, PS, JavaHelp and others. </para>
+ <para><command>xmlto</command> is a useful utility available on Linux platforms for transforming DocBook documents into many different formats. More informtion on the package can be found <ulink url="http://cyberelk.net/tim/software/xmlto/";>here</ulink>. If you do not want to use Apache Maven for some reason, you can install <command>xmlto</command> through your package manager. Once you have installed <command>xmlto</command> you can just execute <command>xmlto <parameter>html</parameter><parameter>file_to_transform</parameter></command> where the <parameter>file_to_transform</parameter> parameter is the name of the file you wish to transform. There are many other formats available, such as PDF, PS, JavaHelp and others. </para>
</section>
</section>
<section id="docs_10">
=== modified file 'src/docbkx/en/dhis2_user_man_data_elements.xml'
--- src/docbkx/en/dhis2_user_man_data_elements.xml 2010-01-19 19:29:45 +0000
+++ src/docbkx/en/dhis2_user_man_data_elements.xml 2010-01-21 16:51:36 +0000
@@ -188,7 +188,7 @@
<screenshot>
<mediaobject>
<imageobject>
- <imagedata fileref="resources/images/maintainence/data_element_groups_main.png" align="center" format="PNG" width="70%"/>
+ <imagedata width="70%" align="center" fileref="resources/images/maintainence/data_element_groups_main.png" format="PNG"/>
</imageobject>
</mediaobject>
</screenshot>
@@ -196,11 +196,33 @@
<para>To add a new data element group, click the <guibutton>"Add new"</guibutton> button. <screenshot>
<mediaobject>
<imageobject>
- <imagedata fileref="resources/images/maintainence/data_element_group_add.png" align="center" width="80%" format="PNG"/>
- </imageobject>
- </mediaobject>
- </screenshot></para>
- <para>Fill in the "Name" field and then select all data elements that should belong to the group from the left panel. Click the "Move selected" <inlinegraphic fileref="resources/images/dhis2_images/move_right.png" align="center"/>button to add the selected data elements to the data element group. Finally, click the "Add" button to save changes, or the "Cancel" button to discard any changes. </para>
+ <imagedata width="80%" align="center" fileref="resources/images/maintainence/data_element_group_add.png" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </screenshot></para>
+ <para>Fill in the "Name" field and then select all data elements that should belong to the group from the left panel. Click the "Move selected" <inlinegraphic fileref="resources/images/dhis2_images/move_right.png" align="center"/>button to add the selected data elements to the data element group. Click the "Remove selected" button to remove all data elements from the group that have been selected in the right panel. Finally, click the "Add" button to save changes, or the "Cancel" button to discard any changes. </para>
+ </section>
+ <section>
+ <title>Data element group editor</title>
+ <para>The data element group editor provides advanced functionality to the administrator to allow multiple data elements to be added or removed from a group. It is also possible to create new data element groups, rename existing groups, and delete groups entirely. To access the data element group editor, press <guimenu>"Maintaience->Data elements and indicators->Data element group editor"</guimenu> from the main DHIS2 menu. The following screen will appear. <screenshot>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="resources/images/maintainence/data_element_group_editor_start.png" align="center" width="80%" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </screenshot></para>
+ <para>Data element groups area listed alphabetically in the leftmost panel. By clicking on a data element group, the current members of that group (data elements) are listed in the center panel. Available data elements that can be added to the data element group appear are listed alphabetically in the rightmost panel. To remove an existing data element from the group, click the name of the data element in the center panel, and then press the "Move right" <inlinegraphic fileref="resources/images/dhis2_images/move_right.png" align="center"/> button. To add data elements to the group, select them from the leftmost panel, and click the "Move left" <inlinegraphic fileref="resources/images/dhis2_images/move_left.png" align="center"/> button. Press the <guibutton>"Update data element group member"</guibutton> button to save your changes. </para>
+ <screenshot>
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="resources/images/maintainence/data_element_group_editor_select.png" align="center" width="80%" format="PNG"/>
+ </imageobject>
+ </mediaobject>
+ </screenshot>
+ </section>
+ <section>
+ <title>Data element group sets</title>
+ <para>Data element group sets allow multiple data element groups to be categorized into a set. </para>
</section>
</section>
</chapter>
=== modified file 'src/docbkx/en/dhis2_user_man_mod1.xml'
--- src/docbkx/en/dhis2_user_man_mod1.xml 2010-01-14 14:47:26 +0000
+++ src/docbkx/en/dhis2_user_man_mod1.xml 2010-01-21 16:51:36 +0000
@@ -40,7 +40,7 @@
</listitem>
<listitem>
<para>What is Free and Open Source Software (FOSS), platform
- (in)dependency, and itsimplications for HMIS.</para>
+ (in)dependency, and its implications for HMIS.</para>
</listitem>
<listitem>
<para>What is FOSS, platform (in)dependency, and their implications
@@ -79,7 +79,7 @@
validation.</para>
</listitem>
<listitem>
- <para>Allows immediate online transmission of data / reports as and
+ <para>Allows immediate on-line transmission of data / reports as and
when required by the user</para>
</listitem>
</itemizedlist>
@@ -100,7 +100,7 @@
Version 2 of DHIS, which used DHIS 1.4 as the basis for the functional
requirements. Using a modular structure DHIS 2 was developed based on data
warehousing principles. DHIS 2 is built on Java based frameworks. It is
- platform independent, can run on both online and offline modes, is multi
+ platform independent, can run on both on-line and offline modes, is multi
language enabled and integrated with various other applications such as
Geographic Information Systems and Excel.</para>
<para>The WHO and HMN (Health Metrics Network) are currently using DHIS 2
@@ -306,14 +306,14 @@
the block level computers. The disadvantage of a standalone
application is that of platform dependency – where the application
needs to be configured to the platform on each of the respective
- machines. A thick client requires a local runtime environment. For
+ machines. A thick client requires a local run-time environment. For
example a Windows Form application will only run on a Windows platform
with the .Net framework installed. The major advantage of the offline
version is that it can run without any dependency on the Internet.
This allows the application to run in remote locations where there is
limited or no Internet connectivity.</para>
<para>The main advantage of a web based solution is that it is
- centralized, which enables easy, online updation and deployment of the
+ centralized, which enables easy, on-line updating and deployment of the
application. The only requirements on the clients’ side are to have
web browser installed on the used computer and have an Internet
connection. The hardware on the server is often more powerful than the
@@ -329,7 +329,7 @@
for district-state-national level processing, and a standalone
deployment at lower levels where connectivity is limited. The
advantage of such an approach is that it is flexible, inclusive, and
- scaleable because as facilities get internet connectivity they can be
+ scalable because as facilities get Internet connectivity they can be
hooked up to the network.</para>
</section>
<section>
=== modified file 'src/docbkx/en/dhis2_user_man_mod11.xml'
--- src/docbkx/en/dhis2_user_man_mod11.xml 2009-12-09 07:07:19 +0000
+++ src/docbkx/en/dhis2_user_man_mod11.xml 2010-01-21 16:51:36 +0000
@@ -16,7 +16,7 @@
<section>
<title>An overview of how aggregation takes place and rules of the system</title>
<para>
-In the bigger picture of HIS terminology all data in DHIS are usually called aggregated as they are aggregates (e.g. monthly summaries) of medical records or some kind of service regiters reported from the health facilities. Aggregation inside DHIS however, which is the topic here, is concerned with how the raw data captured in DHIS (through data entry or import)are further aggregated over time (e.g. from monthly to quarterly values) or up the organisational hierarchy (e.g. from facility to district values).
+In the bigger picture of HIS terminology all data in DHIS are usually called aggregated as they are aggregates (e.g. monthly summaries) of medical records or some kind of service registers reported from the health facilities. Aggregation inside DHIS however, which is the topic here, is concerned with how the raw data captured in DHIS (through data entry or import)are further aggregated over time (e.g. from monthly to quarterly values) or up the organisational hierarchy (e.g. from facility to district values).
</para>
<section>
<title>Terminology</title>
@@ -143,7 +143,7 @@
</section>
<section>
<title>Define and run the report in DHIS</title>
- <para>(the very first time you need to configure where the BIRT report viewer is installed, go to Reports→Report→Configure report) In DHIS 2 you can define a report in the Reports module that you link to a report table and provide with a name. Then the report is ready to be generated and displayed, and this can be done in two ways, 1) run report with new data or run report with existing data. This all depends on whether your report table is populated already or not. Most likely you will have to run it with new data and then you are asked to provide values for the report parameters (if defined in the report table) and then the table will be populated in teh background and a new window will show the report as soon as it is ready. The new window will actually be generated by the BIRT report viewer, which is a separate web application running on the same tomcat instance.</para>
+ <para>(the very first time you need to configure where the BIRT report viewer is installed, go to Reports→Report→Configure report) In DHIS 2 you can define a report in the Reports module that you link to a report table and provide with a name. Then the report is ready to be generated and displayed, and this can be done in two ways, 1) run report with new data or run report with existing data. This all depends on whether your report table is populated already or not. Most likely you will have to run it with new data and then you are asked to provide values for the report parameters (if defined in the report table) and then the table will be populated in the background and a new window will show the report as soon as it is ready. The new window will actually be generated by the BIRT report viewer, which is a separate web application running on the same tomcat instance.</para>
</section>
</section>
</section>
=== modified file 'src/docbkx/en/dhis2_user_man_mod2.xml'
--- src/docbkx/en/dhis2_user_man_mod2.xml 2009-12-04 07:31:44 +0000
+++ src/docbkx/en/dhis2_user_man_mod2.xml 2010-01-21 16:51:36 +0000
@@ -40,8 +40,8 @@
</highlights>
<section>
<title>Downloading and installing the desktop version</title>
- <para>The easist way to get started with the application is to download
- the DHIS2 Live package. This version of the applicaiton comes
+ <para>The easiest way to get started with the application is to download
+ the DHIS2 Live package. This version of the application comes
prepackaged, and requires on a single download. You can get the latest
version <ulink url="http://hispkerala.org/dhis2/release/dhis2-live-2.0.2.zip"; type="" userlevel="">here</ulink>.</para>
</section>
@@ -50,10 +50,10 @@
<para>As described in the previous module, DHIS2 functions both as a
desktop application, as well as a web-enabled client-server application.
For larger, production installations with many users and large volumes
- of data (for instance as a national level server) it is reccomended to
+ of data (for instance as a national level server) it is recommended to
install the server version. The latest version of the application can be
found <ulink url="http://code.launchpad.net/dhis2/2.0.2/2.0.2-release/+download/dhis.war";>here</ulink>.
- A seperate guide describing the installation and setup of the server
+ A separate guide describing the installation and setup of the server
version can be found is also available.</para>
</section>
<section>
@@ -64,10 +64,10 @@
<section id="mod2_2">
<title>Logging on to DHIS2</title>
<para>Regardless of whether you have installed the server version of the
- desktop Live version, you will use a web-browser to logon to the
+ desktop Live version, you will use a web-browser to log on to the
application. DHIS 2 should be compatible with most modern web-browsers,
- although you will need to ensure that JavaScript is enabled.</para>
- <para>To logon to the application just enter <ulink url="http://localhost:8080/dhis"; type="">http://localhost:8080/dhis</ulink> if you
+ although you will need to ensure that Java Script is enabled.</para>
+ <para>To log on to the application just enter <ulink url="http://localhost:8080/dhis"; type="">http://localhost:8080/dhis</ulink> if you
are using the DHIS2 live package, or replace localhost with the name or IP
address of the server where the server version is installed.</para>
<para>Once you have started DHIS2, either online or offline, the displayed
@@ -92,7 +92,7 @@
<para>To create or find a user begin with clicking on the ‘user’ module
displayed in the drop down menu of the Maintenance module located on the
main tool bar on the top part of the displayed screen. User names
- already registered will appear as a list as seen in the screenshot
+ already registered will appear as a list as seen in the screen shot
below.</para>
<screenshot>
<screeninfo>Select Users menu item</screeninfo>
@@ -150,7 +150,7 @@
</imageobject>
</mediaobject>
</screenshot>
- <para>Next you will specify the particular dataset(s) that are to be
+ <para>Next you will specify the particular data set(s) that are to be
made available to the particular role. You will also need to specify the
type of ‘authority’ to be given to the particular user. For each of the
three options namely Datasets, Reports and Authorities user can select
=== modified file 'src/docbkx/en/dhis2_user_man_mod7.xml'
--- src/docbkx/en/dhis2_user_man_mod7.xml 2010-01-18 15:58:42 +0000
+++ src/docbkx/en/dhis2_user_man_mod7.xml 2010-01-21 16:51:36 +0000
@@ -36,7 +36,7 @@
</highlights>
<section>
<title>What is import and export?</title>
- <para>In a primary health system, the HMIS typically involves a distributed application, where the same application is running in different geographical locations (PHCs,CHCs, hospitals, districts, and state). Most of these physical locations do not have Internet connectivity, and hence they work offline. At some point (normally at the district level), the data needs to be synchronized in order to have a consolidated database for the a particular geographical region. For this, it is important to be able to export data from one location (which is working offline, say at the health facility level) to another one say at the district level where the data would need to be imported. This feature of exporting and importing is thus a crucial function of a HMIS. This feature also helps us overcome the dependency on Internet to some degree, as data updates can be transferred via USB key where there is no connectivity, or through email where there is limited Internet connectivity. DHIS 2 provides robust export-import functionality to fulfill these needs.
+ <para>In a primary health system, the HMIS typically involves a distributed application, where the same application is running in different geographical locations (PHCs,CHCs, hospitals, districts, and state). Most of these physical locations do not have Internet connectivity, and hence they work offline. At some point (normally at the district level), the data needs to be synchronised in order to have a consolidated database for the a particular geographical region. For this, it is important to be able to export data from one location (which is working offline, say at the health facility level) to another one say at the district level where the data would need to be imported. This feature of exporting and importing is thus a crucial function of a HMIS. This feature also helps us overcome the dependency on Internet to some degree, as data updates can be transferred via USB key where there is no connectivity, or through email where there is limited Internet connectivity. DHIS 2 provides robust export-import functionality to fulfil these needs.
</para>
</section>
<section>
@@ -46,8 +46,8 @@
<section>
<title>Exporting from DHIS2</title>
<para>The export option can be made use of by selecting it as follows.
-The import or export is available only when the selected organization (source/destination) has defined datasets. This is because datasets help to define which data is to be or is being exported. Further, which specific data elements get exported is determined by the composition of the dataset being exported.
-If there are no datasets defined for an organization unit, it indicates that no data values are registered for this level of organization or lower.
+The import or export is available only when the selected organisation (source/destination) has defined datasets. This is because datasets help to define which data is to be or is being exported. Further, which specific data elements get exported is determined by the composition of the dataset being exported.
+If there are no datasets defined for an organisation unit, it indicates that no data values are registered for this level of organisation or lower.
To access the main Import-Export module, choose <guimenu>Services->Import-Export</guimenu></para>
<screenshot>
<mediaobject>
@@ -56,12 +56,12 @@
</imageobject>
</mediaobject>
</screenshot>
- <para>The exported data values are stored in an ‘xml file’. The file name is defined by the name of the source organization unit and the period to allow the receiving organization unit to identify the source and the period of the export file. The xml is placed in your home directory (On Windows this is normally <filename>C:\Documents and Settings\</filename> under the subdirectories <filename>/dhis / import-export</filename>.
+ <para>The exported data values are stored in an ‘xml file’. The file name is defined by the name of the source organisation unit and the period to allow the receiving organisation unit to identify the source and the period of the export file. The XML is placed in your home directory (On Windows this is normally <filename>C:\Documents and Settings\</filename> under the sub-directories <filename>/dhis / import-export</filename>.
</para>
<section>
<title>Exporting data to other DHIS2 systems</title>
<para>Once the data export screen is displayed, select the Organisation unit, period and dataset for which data export should be selected.Finally click on the export option that will be available on the lower left side of displayed screen.
-If there are no datasets defined for an organization unit, it indicates that no data values are registered for this level of organization or lower.
+If there are no datasets defined for an organisation unit, it indicates that no data values are registered for this level of organisation or lower.
</para>
<screenshot>
<mediaobject>
@@ -70,7 +70,7 @@
</imageobject>
</mediaobject>
</screenshot>
- <para>A popup save option will appear on the displayed screen (see picture below) prompting the saving of the exported data. You may save the export folder on your desktop or any other folder by selecting the ‘Save to Disk’ option from the popup prompt.
+ <para>A pop-up save option will appear on the displayed screen (see picture below) prompting the saving of the exported data. You may save the export folder on your desktop or any other folder by selecting the ‘Save to Disk’ option from the pop-up prompt.
</para>
<screenshot>
<mediaobject>
@@ -108,7 +108,7 @@
</section>
<section>
<title>IXF data export</title>
- <para>DHIS2 support export to the Indicator Exchange Format 2 developed by UNAIDS. The IXF data exchange standard has been implented ,with various levels of compatibility, between several information management systems including CRIS version 2, DevInfo version 5, KIDS developed by FAO, DHIS 1.4, DHIS2, and HealthMapper version 4 developed by WHO. A more detailed discussion on the use of the IXF data exchange format is discussed in depth <ulink url="http://data.unaids.org/pub/BaseDocument/2007/cris_de_web_final_en.pdf";>here</ulink>. </para>
+ <para>DHIS2 support export to the Indicator Exchange Format 2 developed by UNAIDS. The IXF data exchange standard has been implemented ,with various levels of compatibility, between several information management systems including CRIS version 2, DevInfo version 5, KIDS developed by FAO, DHIS 1.4, DHIS2, and HealthMapper version 4 developed by WHO. A more detailed discussion on the use of the IXF data exchange format is discussed in depth <ulink url="http://data.unaids.org/pub/BaseDocument/2007/cris_de_web_final_en.pdf";>here</ulink>. </para>
<para>The IXF data export is essentially the same as a standard DHIS 2 DXF export, but results in a file format that is compatible with IXF 2. </para>
</section>
<section>
@@ -130,13 +130,13 @@
</section>
<section>
<title>Importing data </title>
- <para>The import option allows differnt instance of DHIS2 to receive standardized set of data in the absence of a networked system. Typically, a data set is exported from one DHIS instance (e.g. a district level system) to another system (e.g. a provincial level system). DHIS2 is capable of importing data from other systems that either support the DXF of IXF formats. DHIS2 is capable of importing data directly from a DHIS 1.4 Access database. Each of these options will be discussed in the following sections. </para>
+ <para>The import option allows differnt instance of DHIS2 to receive standardised set of data in the absence of a networked system. Typically, a data set is exported from one DHIS instance (e.g. a district level system) to another system (e.g. a provincial level system). DHIS2 is capable of importing data from other systems that either support the DXF of IXF formats. DHIS2 is capable of importing data directly from a DHIS 1.4 Access database. Each of these options will be discussed in the following sections. </para>
<para>DHIS2 is also capable of importing data through the Excel reporting module. The reader is referred to the appropriate chapter for detailed information. </para>
<section>
<title>Importing data from other DHIS2 systems</title>
<para>Data can be imported into different instances of DHIS2 through the use of the DXF data exchange format. There are two screens that are used to import data, with default and advanced options. </para>
<para>The default data import menu can be accessed by clicking the <guimenuitem>"Import"</guimenuitem> from the main <guimenuitem>Import-Export</guimenuitem> screen. By clicking the <guibutton>"Browse"</guibutton> button, you can select a file from you local file system. This file may have been received by email, copied from another users system, or received on a CD for example. Simply select the file that you wish to import. </para>
- <para>There are three seperate options for importing data. </para>
+ <para>There are three separate options for importing data. </para>
<table frame="all">
<title/>
<tgroup cols="2">
=== modified file 'src/docbkx/en/resources/glossary/glossary_en.xml'
--- src/docbkx/en/resources/glossary/glossary_en.xml 2010-01-18 15:58:42 +0000
+++ src/docbkx/en/resources/glossary/glossary_en.xml 2010-01-21 16:51:36 +0000
@@ -37,7 +37,7 @@
<glossentry>
<glossterm>Category option</glossterm>
<glossdef>
- <para>Category options are atomic elements that are grouped into cagtegories. Category options are used during data entry to disaggregate data elements into atomic pieces of information. </para>
+ <para>Category options are atomic elements that are grouped into categories. Category options are used during data entry to disaggregate data elements into atomic pieces of information. </para>
</glossdef>
</glossentry>
</glossdiv>
@@ -68,6 +68,18 @@
</glossdef>
</glossentry>
<glossentry>
+ <glossterm>Data element group</glossterm>
+ <glossdef>
+ <para>Data element groups are used to categorize multiple data elements according to a common theme, such as "Immunization" or "ART". Typically, they are used during reporting and analysis to allow related data elements to be analyzed together. </para>
+ </glossdef>
+ </glossentry>
+ <glossentry>
+ <glossterm>Data element group sets</glossterm>
+ <glossdef>
+ <para>Data element groups are used to categorize multiple data element groups into a common theme. </para>
+ </glossdef>
+ </glossentry>
+ <glossentry>
<glossterm>Dimension</glossterm>
<glossdef>
<para>A dimension is used to categorize data elements during analysis. Dimensions provide a mechanism to group and filter data based on common characteristics. Typically, related data elements may be aggregated or filtered during analysis with the use of dimensions. Dimensions may be a member of a hierarchy. For instance the "Period" dimension may be broken down into "Day->Month->Quarter->Year". </para>
=== added file 'src/docbkx/en/resources/images/dhis2_images/move_left.png'
Binary files src/docbkx/en/resources/images/dhis2_images/move_left.png 1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/dhis2_images/move_left.png 2010-01-21 16:51:36 +0000 differ
=== modified file 'src/docbkx/en/resources/images/dhis2_images/move_right.png'
Binary files src/docbkx/en/resources/images/dhis2_images/move_right.png 2010-01-19 19:29:45 +0000 and src/docbkx/en/resources/images/dhis2_images/move_right.png 2010-01-21 16:51:36 +0000 differ
=== added file 'src/docbkx/en/resources/images/maintainence/data_element_group_editor_select.png'
Binary files src/docbkx/en/resources/images/maintainence/data_element_group_editor_select.png 1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/maintainence/data_element_group_editor_select.png 2010-01-21 16:51:36 +0000 differ
=== added file 'src/docbkx/en/resources/images/maintainence/data_element_group_editor_start.png'
Binary files src/docbkx/en/resources/images/maintainence/data_element_group_editor_start.png 1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/maintainence/data_element_group_editor_start.png 2010-01-21 16:51:36 +0000 differ
=== added file 'src/docbkx/en/resources/images/maintainence/data_element_group_set_start.png'
Binary files src/docbkx/en/resources/images/maintainence/data_element_group_set_start.png 1970-01-01 00:00:00 +0000 and src/docbkx/en/resources/images/maintainence/data_element_group_set_start.png 2010-01-21 16:51:36 +0000 differ
