XEP-0061–XEP-097: DTD fixes

xep-0061.xml

@@ -13,7 +13,7 @@
   <status>Deferred</status>
   <type>Informational</type>
   <sig>Standards</sig>
-  <dependencies>XMPP Core</dependencies>
+  <dependencies><spec>XMPP Core</spec></dependencies>
   <supersedes/>
   <supersededby/>
   <shortname>Not yet assigned</shortname>

xep-0062.xml

@@ -16,7 +16,10 @@
   <status>Deferred</status>
   <type>Informational</type>
   <sig>Standards</sig>
-  <dependencies>XMPP Core, XEP-0030</dependencies>
+  <dependencies>
+    <spec>XMPP Core</spec>
+    <spec>XEP-0030</spec>
+  </dependencies>
   <supersedes/>
   <supersededby/>
   <shortname>Not yet assigned</shortname>
@@ -30,7 +33,7 @@
     <version>0.2</version>
     <date>2003-09-30</date>
     <initials>psa</initials>
-    <remark>At the request of the author, changed the status of this document to Deferred pending development of an implementation; also changed the type to Informational.</remark> 
+    <remark>At the request of the author, changed the status of this document to Deferred pending development of an implementation; also changed the type to Informational.</remark>
   </revision>
   <revision>
     <version>0.1</version>
@@ -90,7 +93,6 @@
   <p>A rule is processed by applying its condition to the packet. If the condition is true, then the action is taken. The "description" attribute is provided so a rule generator can assign a meaningful and user-readable description of a rule.</p>
 
   <p>A ruleset is be expressed in XML like so:</p>
- 
   <example caption='XML representation of a ruleset'><![CDATA[
 <ruleset>
   <rule description='rule description'>
@@ -108,7 +110,7 @@
 </ruleset>
 ]]></example>
 
-  <p>A ruleset is processed by applying each rule to the packet, one at a time. Processing of the ruleset stops after the first matching rule is found and its action taken, <emphasis>unless</emphasis> the "continue" attribute is found on the matched rule, in which case the remaining rules get processed as though the current rule did not match. If no rules match, packet processing continues as though no rules were specified.</p>
+  <p>A ruleset is processed by applying each rule to the packet, one at a time. Processing of the ruleset stops after the first matching rule is found and its action taken, <em>unless</em> the "continue" attribute is found on the matched rule, in which case the remaining rules get processed as though the current rule did not match. If no rules match, packet processing continues as though no rules were specified.</p>
 
   <p>If the &lt;condition/> element contains no condition expression, then the rule matches all packets.</p>
 
@@ -136,7 +138,7 @@
   <p>The above example is equivalent to "conditionexpr1 AND conditionexpr2 AND (conditionexpr3 OR conditionexpr4)".</p>
 
   <p>No such aggregation exists for actions - only a single action expression may be included within an &lt;action/> element.</p>
- 
+
 </section1>
 
 <section1 topic='Filter modules'>

xep-0063.xml

@@ -16,7 +16,7 @@
   <status>Deferred</status>
   <type>Informational</type>
   <sig>Standards</sig>
-  <dependencies>XEP-0062</dependencies>
+  <dependencies><spec>XEP-0062</spec></dependencies>
   <supersedes/>
   <supersededby/>
   <shortname>Not yet assigned</shortname>

xep-0064.xml

@@ -16,7 +16,7 @@
   <status>Deferred</status>
   <type>Informational</type>
   <sig>Standards</sig>
-  <dependencies>XEP-0062</dependencies>
+  <dependencies><spec>XEP-0062</spec></dependencies>
   <supersedes/>
   <supersededby/>
   <shortname>Not yet assigned</shortname>

xep-0067.xml

@@ -5,42 +5,43 @@
 ]>
 <?xml-stylesheet type='text/xsl' href='xep.xsl'?>
 <xep>
-<header>
-<title>Stock Data Transmission</title>
-<abstract>This document specifies a data format for stock data distribution in the Jabber community.</abstract>
-&LEGALNOTICE;
-<number>0067</number>
-<status>Deferred</status>
-<type>Standards Track</type>
-<sig>Standards</sig>
-<dependencies>XEP-0060</dependencies>
-<author>
-<firstname>Ulrich</firstname>
-<surname>Staudinger</surname>
-<email>chicago5@gmx.de</email>
-<jid>uls@jabber.org</jid>
-</author>
-<revision>
-<version>0.3</version>
-<date>2003-07-19</date>
-<initials>uls</initials>
-<remark>Added transmission in messages</remark>
-</revision>
-<revision>
-<version>0.2</version>
-<date>2003-01-26</date>
-<initials>uls</initials>
-<remark>Added ISO-8601 time scheme, added symbols, fixed typos.</remark>
-</revision>
-
-<revision>
-<version>0.1</version>
-<date>2003-01-12</date>
-<initials>uls</initials>
-<remark>Initial Release</remark>
-</revision>
-
-</header>
+  <header>
+    <title>Stock Data Transmission</title>
+    <abstract>This document specifies a data format for stock data distribution in the Jabber community.</abstract>
+    &LEGALNOTICE;
+    <number>0067</number>
+    <status>Deferred</status>
+    <type>Standards Track</type>
+    <sig>Standards</sig>
+    <dependencies><spec>XEP-0060</spec></dependencies>
+    <supersedes/>
+    <supersededby/>
+    <shortname>NOT_YET_ASSIGNED</shortname>
+    <author>
+      <firstname>Ulrich</firstname>
+      <surname>Staudinger</surname>
+      <email>chicago5@gmx.de</email>
+      <jid>uls@jabber.org</jid>
+    </author>
+    <revision>
+      <version>0.3</version>
+      <date>2003-07-19</date>
+      <initials>uls</initials>
+      <remark>Added transmission in messages</remark>
+    </revision>
+    <revision>
+      <version>0.2</version>
+      <date>2003-01-26</date>
+      <initials>uls</initials>
+      <remark>Added ISO-8601 time scheme, added symbols, fixed typos.</remark>
+    </revision>
+    <revision>
+      <version>0.1</version>
+      <date>2003-01-12</date>
+      <initials>uls</initials>
+      <remark>Initial Release</remark>
+    </revision>
+  </header>
 
 <section1 topic='Introduction'>
 <p>

xep-0069.xml

@@ -13,6 +13,10 @@
   <status>Deferred</status>
   <type>SIG Formation</type>
   <sig>None</sig>
+  <dependencies/>
+  <supersedes/>
+  <supersededby/>
+  <shortname>N/A</shortname>
   &stpeter;
   <revision>
     <version>0.1</version>

xep-0074.xml

@@ -13,11 +13,10 @@
     <status>Retracted</status>
     <type>Standards Track</type>
     <sig>Standards</sig>
-    <dependencies>XEP-0030</dependencies>
+    <dependencies><spec>XEP-0030</spec></dependencies>
     <supersedes/>
     <supersededby/>
     <shortname>sac</shortname>
-    <schemaloc>Not yet assigned</schemaloc>
     <author>
       <firstname>Justin</firstname>
       <surname>Kirby</surname>

xep-0075.xml

@@ -18,8 +18,8 @@
     <type>Standards Track</type>
     <sig>Standards</sig>
     <dependencies/>
-    <supersededby/>
     <supersedes/>
+    <supersededby/>
     <shortname>N/A</shortname>
     <author>
       <firstname>Evan</firstname>

xep-0087.xml

@@ -13,9 +13,9 @@
   <status>Retracted</status>
   <type>Standards Track</type>
   <sig>Standards</sig>
-  <dependencies>XEP-0030</dependencies>
+  <dependencies><spec>XEP-0030</spec></dependencies>
   <supersedes/>
-  <supersededby>XEP-0095</supersededby>
+  <supersededby><spec>XEP-0095</spec></supersededby>
   <shortname>si</shortname>
   <author>
     <firstname>Thomas</firstname>

xep-0097.xml

@@ -8,12 +8,12 @@
   <header>
     <title>iCal Envelope</title>
     <abstract>A simple mechanism to transport iCal data over the jabber protocol</abstract>
-  &LEGALNOTICE;
+    &LEGALNOTICE;
     <number>0097</number>
     <status>Deferred</status>
     <type>Standards Track</type>
     <sig>Standards</sig>
-    <dependencies>XEP-0030</dependencies>
+    <dependencies><spec>XEP-0030</spec></dependencies>
     <supersedes/>
     <supersededby/>
     <shortname>ice</shortname>
@@ -31,7 +31,7 @@
     </revision>
   </header>
   <section1 topic='Introduction'>
-    <p>This will be the first, in a series (hopefully), of specifications which will define how to utilize GroupWare over jabber. While GroupWare is extremely broad subject, this document will focus on iCal<note>iCalendar <link uri='http://www.ietf.org/html.charters/calsch-charter.html'>http://www.ietf.org/html.charters/calsch-charter.html</link></note>. Since iCal is a defined standard which is transport-agnostic, all this document will do is define how iCal will be transported over Jabber.</p>
+    <p>This will be the first, in a series (hopefully), of specifications which will define how to utilize GroupWare over jabber. While GroupWare is extremely broad subject, this document will focus on iCal<note>iCalendar <link url='http://www.ietf.org/html.charters/calsch-charter.html'>http://www.ietf.org/html.charters/calsch-charter.html</link></note>. Since iCal is a defined standard which is transport-agnostic, all this document will do is define how iCal will be transported over Jabber.</p>
     <p>What this document will cover:</p>
     <ul>
       <li>Sending iCal data</li>
@@ -40,20 +40,16 @@
   </section1>
   <section1 topic='Disco'>
     <p>Before sending iCal messages to a jabber entity, a disco query should be performed in order to discover whether or not that entity supports iCal Envelopes.</p>
-    <example>
-      <![CDATA[
+    <example><![CDATA[
 <iq
   type='get'
   from='romeo@montague.net/orchard'
   to='juliet@capulet.com/balconey'
   id='info1'>
   <query xmlns='http://jabber.org/protocol/disco#info'/>
-</iq>
-	]]>
-    </example>
+</iq>]]></example>
     <p>If the jabber entity supports iCal Envelopes, then it MUST respond with http://jabber.org/protocol/gw/ical as a feature.</p>
-    <example>
-      <![CDATA[
+    <example><![CDATA[
 <iq
   type='result'
   from='juliet@capulet.com/balconey'
@@ -62,15 +58,12 @@
   <query xmlns='http://jabber.org/protocol/disco#info'>
     <feature var='http://jabber.org/protocol/gw/ical'/>
   </query>
-</iq>
-	]]>
-    </example>
+</iq>]]></example>
   </section1>
   <section1 topic='Sending iCal Data'>
     <p>To send iCal, all that needs to be done is wrap the iCal data in a ical element. All iCal data sent MUST be in the ical element in the http://jabber.org/protocol/gw/ical namespace. The CDATA section is optional and is used here simply to make it readable.</p>
-    <p>Other than wrapping iCal in XML, the data itself MUST follow the ietf 2445 RFC<note>2445 RFC <link uri='http://www.ietf.org/rfc/rfc2445.txt'>http://www.ietf.org/rfc/rfc2445.txt</link></note></p>
-    <example>
-      <![CDATA[
+    <p>Other than wrapping iCal in XML, the data itself MUST follow the ietf 2445 RFC<note>2445 RFC <link url='http://www.ietf.org/rfc/rfc2445.txt'>http://www.ietf.org/rfc/rfc2445.txt</link></note></p>
+    <example><![CDATA[
 <message to="jdev@jabber.org" from="calendar.jabber.org" type="normal">
   <body>
     Protocol gathering every Tuesday at 22:00 UTC 
@@ -98,9 +91,7 @@
       END:VEVENT
       END:VCALENDAR
   </ical>
-</message> 
-	]]>
-    </example>
+</message>]]></example>
     <p>As a convenience for users which do not have ical support the sender may want to place human readable information in the &lt;body/&gt; for the receiver to read.</p>
   </section1>
   <section1 topic='Receiving iCal Data'>