← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-documenters/dhis2/dhis2-docbook-docs] Rev 437: Bit of housekeeping.

 

------------------------------------------------------------
revno: 437
committer: Jason P. Pickering <jason.p.pickering@xxxxxxxxx>
branch nick: dhis2-docbook-docs
timestamp: Fri 2012-01-20 08:52:44 +0200
message:
  Bit of housekeeping.
added:
  src/docbkx/en/resources/bookinfo/
  src/docbkx/en/resources/bookinfo/authorgroup.xml
  src/docbkx/en/resources/bookinfo/bookinfo.xml
  src/docbkx/en/resources/bookinfo/copyright.xml
  src/docbkx/en/resources/bookinfo/keywordset.xml
  src/docbkx/en/resources/bookinfo/legalnotice.xml
modified:
  src/docbkx/en/dhis2_end_user_manual.xml
  src/docbkx/en/dhis2_implementation_guide_en.xml
  src/docbkx/en/dhis2_user_manual_en.xml
  src/docbkx/en/resources/xsl/fop-cust.xsl


--
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_end_user_manual.xml'
--- src/docbkx/en/dhis2_end_user_manual.xml	2011-12-09 09:59:49 +0000
+++ src/docbkx/en/dhis2_end_user_manual.xml	2012-01-20 06:52:44 +0000
@@ -1,43 +1,9 @@
 <?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"; []>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; [
+       <!ENTITY title 'DHIS 2 End-user Manual'>]>
 <book>
-  <bookinfo>
-    <title>DHIS 2 End-user Manual</title>
-    <releaseinfo>
-<?eval ${project.version}?>    </releaseinfo>
-    <keywordset>
-      <keyword>DHIS2</keyword>
-      <keyword>HMIS</keyword>
-      <keyword>aggregate data</keyword>
-      <keyword>Health Management Information System</keyword>
-      <keyword>Integrated data repository</keyword>
-      <keyword>Health Information System</keyword>
-    </keywordset>
-    <copyright>
-      <year>2006-2011</year>
-    </copyright>
-    <authorgroup>
-      <author>
-        <firstname>DHIS2</firstname>
-        <surname>Documentation Team</surname>
-      </author>
-    </authorgroup>
-    <legalnotice>
-      <formalpara id="warranty">
-        <title>Warranty:</title>
-        <para> THIS DOCUMENT IS PROVIDED BY  THE AUTHORS &apos;&apos;AS IS&apos;&apos; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS MANUAL AND PRODUCTS MENTIONED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</para>
-      </formalpara>
-      <formalpara id="license">
-        <title>License:</title>
-        <para> Permission is granted to copy, distribute and/or modify this document
-    under the terms of the GNU Free Documentation License, Version 1.3
-    or any later version published by the Free Software Foundation;
-    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-    A copy of the license is included in the source of this documentation, and is available <ulink url="http://www.gnu.org/licenses/fdl.html";>here</ulink>.</para>
-      </formalpara>
-    </legalnotice>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="../build.properties" encoding="UTF-8"/>
-  </bookinfo>
+ <title>&title;</title>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="resources/bookinfo/bookinfo.xml" encoding="UTF-8"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_user_man_getting_started_enduser.xml" encoding="UTF-8"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_user_man_data_entry.xml" encoding="UTF-8"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_user_man_using_data_quality.xml" encoding="UTF-8"/>

=== modified file 'src/docbkx/en/dhis2_implementation_guide_en.xml'
--- src/docbkx/en/dhis2_implementation_guide_en.xml	2011-12-26 10:56:40 +0000
+++ src/docbkx/en/dhis2_implementation_guide_en.xml	2012-01-20 06:52:44 +0000
@@ -1,45 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!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 version '2.X'>
+  <!ENTITY title 'DHIS2 Implementation Guide'>
  ]>
 <book>
-  <bookinfo>
-    <title>DHIS2 Implementation Guide</title>
-    <releaseinfo><?eval ${project.version}?></releaseinfo>
-    <keywordset>
-      <keyword>DHIS2</keyword>
-      <keyword>HMIS</keyword>
-      <keyword>aggregate data</keyword>
-      <keyword>Health Management Information System</keyword>
-      <keyword>Integrated data repository</keyword>
-      <keyword>Health Information System</keyword>
-    </keywordset>
-    <copyright>
-      <year>2006-2011</year>
-    </copyright>
-    <authorgroup>
-      <author>
-        <firstname>DHIS2</firstname>
-        <surname>Documentation Team</surname>
-      </author>
-    </authorgroup>
-    <legalnotice>
-      <formalpara id="warranty">
-        <title>Warranty:</title>
-        <para> THIS DOCUMENT IS PROVIDED BY  THE AUTHORS &apos;&apos;AS IS&apos;&apos; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS MANUAL AND PRODUCTS MENTIONED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</para>
-      </formalpara>
-      <formalpara id="license">
-        <title>License:</title>
-        <para> Permission is granted to copy, distribute and/or modify this document
-    under the terms of the GNU Free Documentation License, Version 1.3
-    or any later version published by the Free Software Foundation;
-    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-    A copy of the license is included in the source of this documentation, and is available here online:<ulink url="http://www.gnu.org/licenses/fdl.html";> http://www.gnu.org/licenses/fdl.html</ulink>.</para>
-      </formalpara>
-    </legalnotice>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="../build.properties" encoding="UTF-8"/>
-  </bookinfo>
+ <title>&title;</title>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="resources/bookinfo/bookinfo.xml" encoding="UTF-8"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_recommendations.xml" encoding="UTF-8"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_conceptual_design_principles.xml" encoding="UTF-8"/> 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_implementation_guide_setting_up_new_database.xml" encoding="UTF-8"/>

=== modified file 'src/docbkx/en/dhis2_user_manual_en.xml'
--- src/docbkx/en/dhis2_user_manual_en.xml	2011-12-09 12:31:10 +0000
+++ src/docbkx/en/dhis2_user_manual_en.xml	2012-01-20 06:52:44 +0000
@@ -2,44 +2,11 @@
 <!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'>
  ]>
 <book>
-  <bookinfo>
-    <title>DHIS 2 User Manual</title>
-    <releaseinfo><?eval ${project.version}?></releaseinfo>
-    <keywordset>
-      <keyword>DHIS2</keyword>
-      <keyword>HMIS</keyword>
-      <keyword>aggregate data</keyword>
-      <keyword>Health Management Information System</keyword>
-      <keyword>Integrated data repository</keyword>
-      <keyword>Health Information System</keyword>
-    </keywordset>
-    <copyright>
-      <year>2006-2011</year>
-    </copyright>
-    <authorgroup>
-      <author>
-        <firstname>DHIS2</firstname>
-        <surname>Documentation Team</surname>
-      </author>
-    </authorgroup>
-    <legalnotice>
-      <formalpara id="warranty">
-        <title>Warranty:</title>
-        <para> THIS DOCUMENT IS PROVIDED BY  THE AUTHORS &apos;&apos;AS IS&apos;&apos; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS MANUAL AND PRODUCTS MENTIONED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</para>
-      </formalpara>
-      <formalpara id="license">
-        <title>License:</title>
-        <para> Permission is granted to copy, distribute and/or modify this document
-    under the terms of the GNU Free Documentation License, Version 1.3
-    or any later version published by the Free Software Foundation;
-    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-    A copy of the license is included in the source of this documentation, and is available here online:<ulink url="http://www.gnu.org/licenses/fdl.html";> http://www.gnu.org/licenses/fdl.html</ulink>.</para>
-      </formalpara>
-    </legalnotice>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="../build.properties" encoding="UTF-8"/>
-  </bookinfo>
+  <title>&title;</title>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="resources/bookinfo/bookinfo.xml" encoding="UTF-8"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_preface.xml" encoding="UTF-8"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_user_man_introduction.xml" encoding="UTF-8"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="dhis2_user_man_getting_started.xml" encoding="UTF-8"/>

=== added directory 'src/docbkx/en/resources/bookinfo'
=== added file 'src/docbkx/en/resources/bookinfo/authorgroup.xml'
--- src/docbkx/en/resources/bookinfo/authorgroup.xml	1970-01-01 00:00:00 +0000
+++ src/docbkx/en/resources/bookinfo/authorgroup.xml	2012-01-20 06:52:44 +0000
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<authorgroup>
+    <author>
+        <firstname>DHIS2</firstname>
+        <surname>Documentation Team</surname>
+    </author>
+</authorgroup>
\ No newline at end of file

=== added file 'src/docbkx/en/resources/bookinfo/bookinfo.xml'
--- src/docbkx/en/resources/bookinfo/bookinfo.xml	1970-01-01 00:00:00 +0000
+++ src/docbkx/en/resources/bookinfo/bookinfo.xml	2012-01-20 06:52:44 +0000
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<bookinfo>
+    <releaseinfo><?eval ${project.version}?></releaseinfo>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="keywordset.xml" encoding="UTF-8"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="copyright.xml" encoding="UTF-8"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="authorgroup.xml" encoding="UTF-8"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="legalnotice.xml" encoding="UTF-8"/>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="../../../build.properties" encoding="UTF-8"/>
+</bookinfo>
+
+
+

=== added file 'src/docbkx/en/resources/bookinfo/copyright.xml'
--- src/docbkx/en/resources/bookinfo/copyright.xml	1970-01-01 00:00:00 +0000
+++ src/docbkx/en/resources/bookinfo/copyright.xml	2012-01-20 06:52:44 +0000
@@ -0,0 +1,4 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<copyright>
+    <year>2006-2012</year>
+</copyright>
\ No newline at end of file

=== added file 'src/docbkx/en/resources/bookinfo/keywordset.xml'
--- src/docbkx/en/resources/bookinfo/keywordset.xml	1970-01-01 00:00:00 +0000
+++ src/docbkx/en/resources/bookinfo/keywordset.xml	2012-01-20 06:52:44 +0000
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<keywordset>
+    <keyword>DHIS2</keyword>
+    <keyword>HMIS</keyword>
+    <keyword>aggregate data</keyword>
+    <keyword>Health Management Information System</keyword>
+    <keyword>Integrated data repository</keyword>
+    <keyword>Health Information System</keyword>
+</keywordset>
\ No newline at end of file

=== added file 'src/docbkx/en/resources/bookinfo/legalnotice.xml'
--- src/docbkx/en/resources/bookinfo/legalnotice.xml	1970-01-01 00:00:00 +0000
+++ src/docbkx/en/resources/bookinfo/legalnotice.xml	2012-01-20 06:52:44 +0000
@@ -0,0 +1,14 @@
+<legalnotice>
+    <formalpara id="warranty">
+        <title>Warranty:</title>
+        <para> THIS DOCUMENT IS PROVIDED BY  THE AUTHORS &apos;&apos;AS IS&apos;&apos; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS MANUAL AND PRODUCTS MENTIONED HEREIN, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</para>
+    </formalpara>
+    <formalpara id="license">
+        <title>License:</title>
+        <para> Permission is granted to copy, distribute and/or modify this document
+            under the terms of the GNU Free Documentation License, Version 1.3
+            or any later version published by the Free Software Foundation;
+            with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+            A copy of the license is included in the source of this documentation, and is available here online:<ulink url="http://www.gnu.org/licenses/fdl.html";> http://www.gnu.org/licenses/fdl.html</ulink>.</para>
+    </formalpara>
+</legalnotice>
\ No newline at end of file

=== modified file 'src/docbkx/en/resources/xsl/fop-cust.xsl'
--- src/docbkx/en/resources/xsl/fop-cust.xsl	2011-09-14 11:02:00 +0000
+++ src/docbkx/en/resources/xsl/fop-cust.xsl	2012-01-20 06:52:44 +0000
@@ -1,10 +1,9 @@
 <!-- 
-
-    This is the XSL FO (PDF) stylesheet for the Spring reference
+     This is the XSL FO (PDF) stylesheet for the DHIS2 reference
     documentation.
-    
+
     Thanks are due to Christian Bauer of the Hibernate project
-    team for writing the original stylesheet upon which this one
+    team  and Spring project for writing the original stylesheet upon which this one
     is based.
 -->
 
@@ -58,7 +57,7 @@
                    Custom Title Page
     ################################################### --> 
     
-	<xsl:template name="book.titlepage.before.recto"></xsl:template>
+	<xsl:template name="book.titlepage.before.recto"/>
     <xsl:template name="book.titlepage.recto">
         <fo:block padding-before="5mm">
             <fo:table table-layout="fixed" width="175mm">
@@ -67,7 +66,7 @@
 					<fo:table-row >
 						<fo:table-cell text-align="center">
 							<fo:block text-align="center" font-size="22pt" font-weight="bold" padding-before="70mm">
-								<xsl:value-of select="db:bookinfo/db:title" />
+								<xsl:value-of select="db:title" />
 							</fo:block>
 						</fo:table-cell>
 					</fo:table-row>