Update DTD and XSD documents so that XML output from 12.0.x versions

validates

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>

diff --git a/xml/sysstat-3.8.dtd b/xml/sysstat-3.8.dtd
index e40de47f12a4970095c7ff59cbbf8c251168019c..1ca3c018af50f3740cd29f7ce4fe8789dcbe6f43 100644 (file)
--- a/xml/sysstat-3.8.dtd
+++ b/xml/sysstat-3.8.dtd
@@ -122,7 +122,7 @@
        vmeff-percent CDATA #REQUIRED
 >
 
-<!ELEMENT io (tps, io-reads, io-writes, io-discard)>
+<!ELEMENT io (tps, io-reads, io-writes, io-discard?)>
 <!ATTLIST io
        per CDATA #REQUIRED
 >

diff --git a/xml/sysstat.xsd b/xml/sysstat.xsd
index 61b281eb8121a312d6faaa9652dfa59e03672351..3f3d1623083663889e04e0f40d94a48f0be108c9 100644 (file)
--- a/xml/sysstat.xsd
+++ b/xml/sysstat.xsd
@@ -229,7 +229,7 @@
                <xs:element name="tps" type="tps-type"></xs:element>
                <xs:element name="io-reads" type="io-reads-type"></xs:element>
                <xs:element name="io-writes" type="io-writes-type"></xs:element>
-               <xs:element name="io-discard" type="io-discard-type"></xs:element>
+               <xs:element name="io-discard" type="io-discard-type" minOccurs="0"></xs:element>
        </xs:sequence>
        <xs:attribute name="per" type="per-type" use="required"></xs:attribute>
 </xs:complexType>