clean the input xml so that xmllint doesn't complain

diff --git a/org.glite.jp.ws-interface/src/JobProvenanceIS.xml b/org.glite.jp.ws-interface/src/JobProvenanceIS.xml
index 702b127..c0f1651 100644 (file)
--- a/org.glite.jp.ws-interface/src/JobProvenanceIS.xml
+++ b/org.glite.jp.ws-interface/src/JobProvenanceIS.xml
@@ -4,8 +4,7 @@
        typeNs="http://glite.org/wsdl/types/jp"
        typePrefix="jpt"
        elemNs="http://glite.org/wsdl/elements/jp"
-       elemPrefix="jpe"
-       xmlns:jpt="http://glite.org/wsdl/types/jp">
+       elemPrefix="jpe">
 
        <version>CVS revision: <![CDATA[ $Header$ ]]></version>
 
@@ -13,18 +12,16 @@
 
        <doc>
                <para>
-                       The Job Provenance (JP) Index Server is a volatile counterpart to the
-                       permanent JP Primary Storage.
-                       Index servers are populated with subsets of data from Primary storage(s)
-                       and indexed according to particular user needs.
+               The Job Provenance (JP) Index Server is a volatile counterpart to the
+               permanent JP Primary Storage. Index servers are populated with subsets 
+               of data from Primary storage(s) and indexed according to particular user needs.
                </para>
+
                <para>
-                       The interface to Index server contains three logical parts: administraive
-                       (control), system and user.
-                       The administrative part is used by run-time index server configuration
-                       tool, 
-                       the system one allows Primary storage(s) to feed data into the Index server,
-                       and the user one is available to users for queries.
+               The interface to Index server contains three logical parts: administraive
+               (control), system and user. The administrative part is used by run-time index
+               server configuration tool, the system one allows Primary storage(s) to feed 
+               data into the Index server, and the user one is available to users for queries.
                </para>
        </doc>
 

diff --git a/org.glite.jp.ws-interface/src/JobProvenancePS.xml b/org.glite.jp.ws-interface/src/JobProvenancePS.xml
index 611e939..8a59640 100644 (file)
--- a/org.glite.jp.ws-interface/src/JobProvenancePS.xml
+++ b/org.glite.jp.ws-interface/src/JobProvenancePS.xml
@@ -4,8 +4,7 @@
        typeNs="http://glite.org/wsdl/types/jp"
        typePrefix="jpt"
        elemNs="http://glite.org/wsdl/elements/jp"
-       elemPrefix="jpe"
-       xmlns:jpt="http://glite.org/wsdl/types/jp">
+       elemPrefix="jpe">
 
        <version>CVS revision: <![CDATA[ $Header$ ]]></version>
 
@@ -13,22 +12,16 @@
 
        <doc>
                <para>
-               The Job Provenance (JP) Primary Storage Service is responsible
-               to keep the JP data
-               (definition of submitted jobs, execution conditions and environment,
-               and important points of the job life cycle) in a compact and
-               economic form.
+               The Job Provenance (JP) Primary Storage Service is responsible to keep the JP data 
+               (definition of submitted jobs, execution conditions and environment, and important 
+               points of the job life cycle) in a compact and economic form.
                </para>
 
                <para>
-               The JP Primary storage, as described in section 8.4 of
-               the 
-               <ulink url="https://edms.cern.ch/document/594698/">
-               Architecture deliverable DJRA1.1 
-               </ulink>
-               provides public interfaces for data storing,
-               retrieval based on basic metadata, and registration of Index servers for
-               incremental feed.
+               The JP Primary storage, as described in section 8.4 of the 
+               <ulink url="https://edms.cern.ch/document/594698/">Architecture deliverable DJRA1.1 </ulink>
+               provides public interfaces for data storing, retrieval based on basic metadata, 
+               and registration of Index servers for incremental feed.
                </para>
 
                <para>

diff --git a/org.glite.jp.ws-interface/src/puke-ug.xsl b/org.glite.jp.ws-interface/src/puke-ug.xsl
index 8ce605b..d3dbdd4 100644 (file)
--- a/org.glite.jp.ws-interface/src/puke-ug.xsl
+++ b/org.glite.jp.ws-interface/src/puke-ug.xsl
@@ -5,7 +5,7 @@
 <xsl:stylesheet version="1.0"
        xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
-<xsl:output indent="yes" doctype-public="-//OASIS//DTD DocBook XML V4.4//EN"
+<xsl:output indent="yes" doctype-public="-//OASIS//DTD DocBook XML V4.2//EN"
       doctype-system="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"/>
 
 <xsl:template match="book">