Fix DTD check for 0017–0058

xep-0017.xml

@@ -13,6 +13,10 @@
 <status>Rejected</status>
 <type>Informational</type>
 <sig>Standards</sig>
+<dependencies/>
+<supersedes/>
+<supersededby/>
+<shortname>N/A</shortname>
 <author>
 <firstname>Mike</firstname>
 <surname>Lin</surname>

xep-0035.xml

@@ -17,7 +17,7 @@
   <sig>Standards</sig>
   <dependencies/>
   <supersedes/>
-  <supersededby>XMPP Core</supersededby>
+  <supersededby><spec>XMPP Core</spec></supersededby>
   <shortname>N/A</shortname>
   <author>
     <firstname>Robert</firstname>
@@ -29,7 +29,7 @@
     <version>0.2</version>
     <date>2003-11-05</date>
     <initials>psa</initials>
-    <remark>The status of this specification has been changed to Retracted since it has been superseded by &xmppcore;.</remark>
+    <remark>The status of this specification has been changed to Retracted since it has been superseded by XMPP Core.</remark>
   </revision>
   <revision>
     <version>0.1</version>

xep-0036.xml

@@ -13,8 +13,9 @@
   <status>Retracted</status>
   <type>Standards Track</type>
   <sig>Standards</sig>
+  <dependencies/>
   <supersedes/>
-  <supersededby>XEP-0060</supersededby>
+  <supersededby><spec>XEP-0060</spec></supersededby>
   <shortname>None</shortname>
   &pgmillard;
   &stpeter;

xep-0037.xml

@@ -13,6 +13,10 @@
   <status>Rejected</status>
   <type>Standards Track</type>
   <sig>Standards</sig>
+  <dependencies/>
+  <supersedes/>
+  <supersededby/>
+  <shortname>N/A</shortname>
   <author>
     <firstname>David</firstname>
     <surname>Sutton</surname>

xep-0038.xml

@@ -17,7 +17,6 @@
   <supersedes/>
   <supersededby/>
   <shortname>None</shortname>
-  <schemaloc>Not yet assigned</schemaloc>
   <author>
     <firstname>Adam</firstname>
     <surname>Theo</surname>
@@ -66,13 +65,13 @@
 <section1 topic='Requirements'>
   <p>The following issues must be solved for in this specification.</p>
   <ul>
-    <li><b>Here and Now</b>: The convention should not rely on technologies such as feature negotiation or generic pub/sub which do not exist yet in Jabber in order to work properly. The convention should be a "here and now" solution, relying only on the current Jabber protocol.</li>
-    <li><b>Meaningful</b>: The convention for creating the icons must be meaningful to users of clients without icon support, or even users on the other side of transports. Whatever method is used, it should not be cryptic or difficult to understand in text-only mode, in case the user does not have or want the capability to view the icons.</li>
-    <li><b>Component Friendly</b>: In order for gateways, bots, and other "semi-intelligent" components to be able to convert or otherwise use the specification (such as to and from the MSN icon style, or use icons in conversations with Artificially Intelligent bots), a specific list of icons must be possible. Since these bots do not have an intelligent human behind them deciding their every action, they cannot deal with unlimited possibilities.</li>
-    <li><b>Protect Privacy</b>: Sender-defined external data must not be required to properly display the icons because it can be used by the sender to track the user, circumventing their privacy. When the sender can define their own graphics or sounds to be used for the icons, they can use unique URLs and monitor when these unique URLs are accessed. External data may be allowed as long as it is not required for proper use of the icons, but it would be best to leave external data completely out of the system.</li>
-    <li><b>Conserve Bandwidth</b>: The amount of markup used within the messages to define the icons should be kept to a minimum, as well as keeping the media files used for the icons from being transferred over the wire with the messages themselves. These easily consume too much bandwidth, a precious resource to most of the Internet.</li>
-    <li><b>Be Passive</b>: The convention should not force transports or recipients to take any action to properly display the icons. Not only does it put extra strain on the components, but it would also unnecessarily break old clients. Transports and recieving clients may have the option of taking some actions, but they should not be forced to.</li>
-    <li><b>Internationalization</b>: The convention must be inherently international in order to ease adoption of Jabber throughout the world and prevent later growing pains. The use of English must be kept to a minimum, restricted to "meta information" about the icons themselves, and must dynamically allow for non-English language sets.</li>
+    <li><strong>Here and Now</strong>: The convention should not rely on technologies such as feature negotiation or generic pub/sub which do not exist yet in Jabber in order to work properly. The convention should be a "here and now" solution, relying only on the current Jabber protocol.</li>
+    <li><strong>Meaningful</strong>: The convention for creating the icons must be meaningful to users of clients without icon support, or even users on the other side of transports. Whatever method is used, it should not be cryptic or difficult to understand in text-only mode, in case the user does not have or want the capability to view the icons.</li>
+    <li><strong>Component Friendly</strong>: In order for gateways, bots, and other "semi-intelligent" components to be able to convert or otherwise use the specification (such as to and from the MSN icon style, or use icons in conversations with Artificially Intelligent bots), a specific list of icons must be possible. Since these bots do not have an intelligent human behind them deciding their every action, they cannot deal with unlimited possibilities.</li>
+    <li><strong>Protect Privacy</strong>: Sender-defined external data must not be required to properly display the icons because it can be used by the sender to track the user, circumventing their privacy. When the sender can define their own graphics or sounds to be used for the icons, they can use unique URLs and monitor when these unique URLs are accessed. External data may be allowed as long as it is not required for proper use of the icons, but it would be best to leave external data completely out of the system.</li>
+    <li><strong>Conserve Bandwidth</strong>: The amount of markup used within the messages to define the icons should be kept to a minimum, as well as keeping the media files used for the icons from being transferred over the wire with the messages themselves. These easily consume too much bandwidth, a precious resource to most of the Internet.</li>
+    <li><strong>Be Passive</strong>: The convention should not force transports or recipients to take any action to properly display the icons. Not only does it put extra strain on the components, but it would also unnecessarily break old clients. Transports and recieving clients may have the option of taking some actions, but they should not be forced to.</li>
+    <li><strong>Internationalization</strong>: The convention must be inherently international in order to ease adoption of Jabber throughout the world and prevent later growing pains. The use of English must be kept to a minimum, restricted to "meta information" about the icons themselves, and must dynamically allow for non-English language sets.</li>
   </ul>
   <p>Because icons in Jabber should be easy to use, extensible, and customizable, they will be created using style definition files which can be exchanged between users and supporting clients. The specification will not allow external data, in order to protect the privacy of users, and will not rely on file transfers or directory services in order to not break old clients or components.</p>
 </section1>
@@ -92,12 +91,12 @@
   <section2 topic="Meta Elements">
     <p>The meta elements contain information about the Icon Style itself, rather that the individual icons. They are contained within the <tt>&lt;meta&gt;</tt> element, which is directly under the root element. There is one and only one the <tt>&lt;meta&gt;</tt> element.</p>
     <ul>
-      <li><b>Name</b>: This is an arbitrary text string (spaces allowed) which is the full name of the Icon Style. Only one name can be included.</li>
-      <li><b>Version</b>: This is an arbitrary text string (no spaces allowed) which is the version number of the Icon Style. Any version format is allowed, but the <tt>major.minor</tt> or <tt>major.minor.trivial</tt> formats are recommended. Only one version can be included.</li>
-      <li><b>Description</b>: This is the full description of the Icon Style. It summarizes the look and types of the icons, and can be used for keywords in searching. This is optional, but recommended.</li>
-      <li><b>Author</b>: This is the full name of the author. Multiple authors are allowed.</li>
-      <li><b>Creation</b>: This is the date of the creation of this version of the Icon Style. The date is in the <link url="http://www.w3.org/TR/NOTE-datetime">ISO 8601</link> standard format.</li>
-      <li><b>Home</b>: This is the full HTTP web address of the Icon Style's homepage. This is optional.</li>
+      <li><strong>Name</strong>: This is an arbitrary text string (spaces allowed) which is the full name of the Icon Style. Only one name can be included.</li>
+      <li><strong>Version</strong>: This is an arbitrary text string (no spaces allowed) which is the version number of the Icon Style. Any version format is allowed, but the <tt>major.minor</tt> or <tt>major.minor.trivial</tt> formats are recommended. Only one version can be included.</li>
+      <li><strong>Description</strong>: This is the full description of the Icon Style. It summarizes the look and types of the icons, and can be used for keywords in searching. This is optional, but recommended.</li>
+      <li><strong>Author</strong>: This is the full name of the author. Multiple authors are allowed.</li>
+      <li><strong>Creation</strong>: This is the date of the creation of this version of the Icon Style. The date is in the <link url="http://www.w3.org/TR/NOTE-datetime">ISO 8601</link> standard format.</li>
+      <li><strong>Home</strong>: This is the full HTTP web address of the Icon Style's homepage. This is optional.</li>
     </ul>
   </section2>
 
@@ -196,29 +195,29 @@
   <section2 topic='Core Icons'>
     <p>Although any text string can be turned into an icon by defining it in an <tt>icondef.xml</tt> file, it is highly reccomended they either follow traditional ASCII Art (smileys and frownys, for example) or full keywords in simple markup such as double-colons. If you want to design icons, always keep in mind that not every Jabber user uses graphics to "translate" this to something visual, as explained in the "Meaningful" requirement, above. Here is a short list of recommended "core" icons that should be in most definitions, as well as possibly be used by transports:</p>
     <ul>
-      <li><b>:-)</b> and <b>:)</b> - A smiling face.</li>
-      <li><b>:-(</b> and <b>:(</b> - A frowing face.</li>
-      <li><b>;-)</b> and <b>;)</b> - A winking smiling face.</li>
-      <li><b>:'-(</b> and <b>:'(</b> - A crying face.</li>
-      <li><b>>:-(</b> and <b>>:(</b> - An angry face.</li>
-      <li><b>:yes:</b> - A thumbs-up or checkmark.</li>
-      <li><b>:no:</b> - A thumbs-down or a crossmark.</li>
-      <li><b>:wait:</b> - An open hand, palm outstretched.</li>
-      <li><b>@->--</b> and <b>:rose:</b> - A rose flower.</li>
-      <li><b>:telephone:</b> - A telephone.</li>
-      <li><b>:email:</b> - An electronic-looking envelope.</li>
-      <li><b>:jabber:</b> - Jabber's lightbulb logo.</li>
-      <li><b>:cake:</b> - A birthday cake.</li>
-      <li><b>:kiss:</b> - A pair of puckered lips.</li>
-      <li><b>:heart:</b> and <b>:love:</b> - A heart.</li>
-      <li><b>:brokenheart:</b> - A broken heart.</li>
-      <li><b>:music:</b> - A musical note or instrument.</li>
-      <li><b>:beer:</b> - A beer mug.</li>
-      <li><b>:coffee:</b> - A cup of coffee.</li>
-      <li><b>:money:</b> - A gold coin.</li>
-      <li><b>:moon:</b> - A moon.</li>
-      <li><b>:sun:</b> - A sun.</li>
-      <li><b>:star:</b> - A star.</li>
+      <li><strong>:-)</strong> and <strong>:)</strong> - A smiling face.</li>
+      <li><strong>:-(</strong> and <strong>:(</strong> - A frowing face.</li>
+      <li><strong>;-)</strong> and <strong>;)</strong> - A winking smiling face.</li>
+      <li><strong>:'-(</strong> and <strong>:'(</strong> - A crying face.</li>
+      <li><strong>>:-(</strong> and <strong>>:(</strong> - An angry face.</li>
+      <li><strong>:yes:</strong> - A thumbs-up or checkmark.</li>
+      <li><strong>:no:</strong> - A thumbs-down or a crossmark.</li>
+      <li><strong>:wait:</strong> - An open hand, palm outstretched.</li>
+      <li><strong>@->--</strong> and <strong>:rose:</strong> - A rose flower.</li>
+      <li><strong>:telephone:</strong> - A telephone.</li>
+      <li><strong>:email:</strong> - An electronic-looking envelope.</li>
+      <li><strong>:jabber:</strong> - Jabber's lightbulb logo.</li>
+      <li><strong>:cake:</strong> - A birthday cake.</li>
+      <li><strong>:kiss:</strong> - A pair of puckered lips.</li>
+      <li><strong>:heart:</strong> and <strong>:love:</strong> - A heart.</li>
+      <li><strong>:brokenheart:</strong> - A broken heart.</li>
+      <li><strong>:music:</strong> - A musical note or instrument.</li>
+      <li><strong>:beer:</strong> - A beer mug.</li>
+      <li><strong>:coffee:</strong> - A cup of coffee.</li>
+      <li><strong>:money:</strong> - A gold coin.</li>
+      <li><strong>:moon:</strong> - A moon.</li>
+      <li><strong>:sun:</strong> - A sun.</li>
+      <li><strong>:star:</strong> - A star.</li>
     </ul>
   </section2>
 </section1>

xep-0039.xml

@@ -13,6 +13,10 @@
     <status>Deferred</status>
     <type>Standards Track</type>
     <sig>Standards</sig>
+    <dependencies><spec>XEP-0053</spec></dependencies>
+    <supersedes/>
+    <supersededby/>
+    <shortname>N/A</shortname>
     <author>
       <firstname>Paul</firstname>
       <surname>Curtis</surname>
@@ -21,7 +25,7 @@
     </author>
     <author>
       <firstname>Russell</firstname>
-      <surname>Davis</surname>  
+      <surname>Davis</surname>
       <email>ukscone@burninghorse.com</email>
       <jid>ukscone@burninghorse.com</jid>
     </author>
@@ -41,41 +45,44 @@
       <version>0.6.0</version>
       <date>2002-11-05</date>
       <initials>rkd</initials>
-      <remark>Corrected David Sutton's JID and email. It has been pointed out
-	to me by amoungst others Rob Norris that things such as lists of JIDs 
-	and lists in general are really the province of disco and browse and 
-	that at least one of the suggested 'core' statistics doesn't 
-	make sense for all components so removed these from the document. This namespace
-	was starting to become a generic data gathering namespace and we already 
-	have one of those, so i've reworked yet again hopefully for the 
-	final time it should now be simpler to implement and more consistent in
-	all cases.</remark>
-    </revision>    
+      <remark>
+        Corrected David Sutton's JID and email.
+        It has been pointed out to me by amoungst others Rob Norris that things
+        such as lists of JIDs and lists in general are really the province of
+        disco and browse and that at least one of the suggested 'core'
+        statistics doesn't make sense for all components so removed these from
+        the document.
+        This namespace was starting to become a generic data gathering namespace
+        and we already have one of those, so I've reworked yet again hopefully
+        for the final time it should now be simpler to implement and more
+        consistent in all cases.
+      </remark>
+    </revision>
     <revision>
       <version>0.5.0</version>
       <date>2002-11-03</date>
       <initials>rkd</initials>
       <remark>Heavily modified document according to suggestions from Matt Miller (linuxwolf). rkd had some additional thoughts on the name attribute, this version reflects those. Reorganized the description section.</remark>
-    </revision>    
+    </revision>
     <revision>
       <version>0.4.2</version>
       <date>2002-10-25</date>
       <initials>rkd</initials>
       <remark>Changed rkd's email address and jid. Modified namespace to use http uri.</remark>
-    </revision>    
+    </revision>
     <revision>
       <version>0.4.1</version>
       <date>2002-08-20</date>
       <initials>rkd</initials>
       <remark>Corrected error codes</remark>
-    </revision>    
+    </revision>
     <revision>
       <version>0.4</version>
       <date>2002-08-18</date>
       <initials>rkd</initials>
       <remark>Fixed two silly typos that crept back in. Rewrote SNMP
       to read better. Added the DTD</remark>
-    </revision>    
+    </revision>
     <revision>
       <version>0.3</version>
       <date>2002-08-16</date>
@@ -83,9 +90,9 @@
       <remark>Added &lt;display/&gt; so a server or component may
       optionally return data in a human readable format. It is nothing
       more than a bit of visual fluff but it has potential to be quite
-      useful. Renumbered the revisions to allow room for stpeter's new 
-      document numbering scheme, sorry if it is now confusing but I hadn't 
-      left much room to grow with the previous revision numbering. A 
+      useful. Renumbered the revisions to allow room for stpeter's new
+      document numbering scheme, sorry if it is now confusing but I hadn't
+      left much room to grow with the previous revision numbering. A
       little more prettying and judicious use of punctuation has occurred.</remark>
     </revision>
     <revision>
@@ -99,7 +106,7 @@
       <date>2002-08-14</date>
       <initials>rkd</initials>
       <remark>I seem to have misunderstood one of Ryan Eatmon's
-      suggestions and didn't make this generic enough. I have  
+      suggestions and didn't make this generic enough. I have
       fixed that now. Clarified error codes and reworked how errors
       are indicated to work with the new generic
       namespace. Rearranged the order of the sections a bit make this
@@ -157,15 +164,14 @@
       <initials>rkd</initials>
       <remark>Initial version.</remark>
     </revision>
-    <dependencies>XEP-0053</dependencies>
   </header>
   <section1 topic='Introduction'>
     <p>As things currently stand it is not possible to obtain statistics
-    from a jabber component or server without resorting to parsing the 
-    various log files. This makes it extremely difficult to obtain statistics 
-    that are of any use in real world situations. This document attempts to 
-    rectify this situation by defining a new namespace that would be used 
-    to obtain statistics from a component or server so that they may be 
+    from a jabber component or server without resorting to parsing the
+    various log files. This makes it extremely difficult to obtain statistics
+    that are of any use in real world situations. This document attempts to
+    rectify this situation by defining a new namespace that would be used
+    to obtain statistics from a component or server so that they may be
     manipulated and used in a useful manner. For the purposes of this namespace
     a statistic is anything that maybe expressed in a numeric form, such as the
     uptime of a server, the <strong>number</strong> of registered users and the
@@ -182,7 +188,7 @@
         &lt;stat name='' units='' value=''/&gt;
       &lt;/query&gt;
       </code>
-      <p> There is one variation in the	case of an error invalidating one or 
+      <p> There is one variation in the	case of an error invalidating one or
 	more errors in a single returned query that does not actually
 	invalidate the whole query.</p>
       <code>
@@ -194,8 +200,8 @@
     <section2 topic='Name Attribute'>
       <p>The name of the statistic. The format for this attribute is the
 	generic statistic type such as bandwidth, users, time etc. followed by
-	a '/' character and then then the name of the actual statistic. For 
-	example bandwidth/packets-in, time/uptime and users/online. This will 
+	a '/' character and then then the name of the actual statistic. For
+	example bandwidth/packets-in, time/uptime and users/online. This will
 	be assigned and administered by JANA<note>See Name Registration</note>.</p>
     </section2>
     <section2 topic='Units Attribute'>
@@ -218,7 +224,6 @@
       send:     &lt;iq type='get' to='component'&gt;
 	          &lt;query xmlns='http://jabber.org/protocol/stats'/&gt;
                 &lt;/iq&gt;
-      
 
       recv:     &lt;iq type='result' from='component'&gt;
                   &lt;query xmlns='http://jabber.org/protocol/stats'&gt;
@@ -252,8 +257,8 @@
                   &lt;query xmlns='http://jabber.org/protocol/stats'&gt;
                     &lt;stat name='time/uptime' units='seconds'	value='3054635'/&gt;
 	            &lt;stat name='users/online' units='users' value='365'/&gt;
-	            &lt;stat name='bandwidth/packets-in' units='packets' value='23434'/&gt; 
-	            &lt;stat name='bandwidth/packets-out' units='packets' value='23422'/&gt;      
+	            &lt;stat name='bandwidth/packets-in' units='packets' value='23434'/&gt;
+	            &lt;stat name='bandwidth/packets-out' units='packets' value='23422'/&gt;
                   &lt;/query&gt;
                 &lt;/iq&gt;
       </example>
@@ -261,7 +266,7 @@
     </section2>
     <section2 topic='Errors'>
       <p>If an error occurs with one or more of the requests for
-      statistics the component or server should return one of the 
+      statistics the component or server should return one of the
       following error codes.</p>
       <table caption='Error Codes'>
         <tr><th>Code</th><th>String</th><th>Reason</th></tr>
@@ -274,17 +279,15 @@
         <tr><td>503</td><td>Service Unavailable</td><td>Statistic is
         temporarily unavailable</td></tr>
       </table>
-
-   
       <p>Because we wish to be able to collect groups of statistics
       within a single returned packet errors must be handled in a two
-      tier way with authorization and core errors that would render 
-      <strong>all</strong> the statistics meaningless being indicated 
+      tier way with authorization and core errors that would render
+      <strong>all</strong> the statistics meaningless being indicated
       with a type='error' in the returned packet.</p>
 
       <example>
-        &lt;iq type='error' from='component'&gt; 
-          &lt;query xmlns='http://jabber.org/protocol/stats'&gt;  
+        &lt;iq type='error' from='component'&gt;
+          &lt;query xmlns='http://jabber.org/protocol/stats'&gt;
             &lt;error code='401'&gt;Not Authorized&lt;/error&gt;
           &lt;/query&gt;
         &lt;/iq&gt;
@@ -310,12 +313,12 @@
     <section2 topic='Name Registration'>
       <p>All statistic names, returned data units types and other
 	pertinent statistic information will be assigned and registered with
-	the Jabber Naming Authority in the category <em><strong>stat</strong></em>. 
-	Unfortunately at this time such a body does not exist so we will 
+	the Jabber Naming Authority in the category <em><strong>stat</strong></em>
+	Unfortunately at this time such a body does not exist so we will
 	have to rely on component and server authors diligently
-	researching to ensure that their desired name is not already 
+	researching to ensure that their desired name is not already
 	in use and that they adequately document the returned units
-	type and anything else that would normally be registered. 
+	type and anything else that would normally be registered.
 	Hopefully by the time this document is formally adopted
 	a central naming authority for the Jabber protocol will be in
 	place and functional and authors will be then able to register
@@ -386,16 +389,16 @@
     <section2 topic='SNMP'>
       <p>Supporting industry accepted standards and procedures
       <note>For more details on <link url='http://www.snmplink.org'>SNMP</link>
-      and <link url='http://www.dmtf.org'>CIM</link></note> within 
-      the Jabber protocol is highly desirable as long as it does not 
-      restrict the flexibility or functionality of Jabber. So while 
-      the <strong>http://jabber.org/protocol/stats</strong> namespace seems to fall within the domain of 
-      the SNMP and CIM standards amongst others and large jabber 
-      installations would find direct support an appealing prospect 
-      when tying jabber into their existing network information and 
-      management systems the jabber:iq:namespace will not do this. 
-      Because Jabber is an XML based protocol, conversion of 
-      the returned data to other formats including those required 
+      and <link url='http://www.dmtf.org'>CIM</link></note> within
+      the Jabber protocol is highly desirable as long as it does not
+      restrict the flexibility or functionality of Jabber. So while
+      the <strong>http://jabber.org/protocol/stats</strong> namespace seems to fall within the domain of
+      the SNMP and CIM standards amongst others and large jabber
+      installations would find direct support an appealing prospect
+      when tying jabber into their existing network information and
+      management systems the jabber:iq:namespace will not do this.
+      Because Jabber is an XML based protocol, conversion of
+      the returned data to other formats including those required
       for SNMP, CIM etc. should be relatively simple. Not supporting
       industry standards is not without advantages. By leaving the
       <strong>http://jabber.org/protocol/stats</strong> as a <em>pure</em> jabber namespace we allow
@@ -412,14 +415,14 @@
     </section2>
   </section1>
   <section1 topic='Realworld Examples'>
-      TBD
+    <p>TBD</p>
   </section1>
   <section1 topic='DTD'>
     <section2 topic='DTD in English'>
-      TBD
-    </section2>    
+      <p>TBD</p>
+    </section2>
     <section2 topic='DTD'>
-      TBD
+      <p>TBD</p>
     </section2>
   </section1>
 </xep>

xep-0040.xml

@@ -15,7 +15,7 @@
       <sig>Standards</sig>
       <dependencies/>
       <supersedes/>
-      <supersededby>XEP-0060</supersededby>
+      <supersededby><spec>XEP-0060</spec></supersededby>
       <shortname>None</shortname>
       <author>
          <firstname>Tim</firstname>

xep-0041.xml

@@ -13,9 +13,13 @@
   <status>Retracted</status>
   <type>Standards Track</type>
   <sig>Standards</sig>
-  <dependencies>XMPP Core, XEP-0020, XEP-0030</dependencies>
+  <dependencies>
+    <spec>XMPP Core</spec>
+    <spec>XEP-0020</spec>
+    <spec>XEP-0030</spec>
+  </dependencies>
   <supersedes/>
-  <supersededby>XEP-0065</supersededby>
+  <supersededby><spec>XEP-0065</spec></supersededby>
   <shortname>rel</shortname>
   <author>
     <firstname>Justin</firstname>
@@ -27,7 +31,7 @@
     <version>0.2</version>
     <date>2003-09-30</date>
     <initials>psa</initials>
-    <remark>At the request of the author, the status of this specification has been changed to Retracted since it has been superseded by &xep0065;.</remark>
+    <remark>At the request of the author, the status of this specification has been changed to Retracted since it has been superseded by XEP-0065.</remark>
   </revision>
   <revision>
     <version>0.8</version>
@@ -87,36 +91,36 @@
 <p>A REL-compatible stream transport must have the following properties:</p>
 <ul>
   <li>Provides a reliable bytestream between two Jabber entities, which means that the bytestream transport handles all data delivery issues, such that the application need not worry about them.</li>
-  <li>Has a the following link states:
-    <table caption='Link states'>
-      <tr>
-        <th>Code</th>
-        <th>Description</th>
-      </tr>
-      <tr>
-        <td><tt>INIT</tt></td>
-        <td>Initiation</td>
-      </tr>
-      <tr>
-        <td><tt>GOOD</tt></td>
-        <td>Successful initiation (connected)</td>
-      </tr>
-      <tr>
-        <td><tt>BAD</tt></td>
-        <td>Unsuccessful initiation (stream is closed, no further state)</td>
-      </tr>
-      <tr>
-        <td><tt>CLOS</tt></td>
-        <td>Successful closure after establishment (stream is closed, no further state)</td>
-      </tr>
-      <tr>
-        <td><tt>ERR</tt></td>
-        <td>Link failure after establishment (stream is closed, no further state)</td>
-      </tr>
-    </table>
+  <li>Has link states from the following table.
   </li>
   <li>Defines a stream identifier, which MUST have a unique ASCII representation. The stream protocol MUST be able to use any ASCII identifier chosen during REL negotiation, as long as the sending party doesn't use the same identifier more than once.</li>
 </ul>
+<table caption='Link states'>
+  <tr>
+    <th>Code</th>
+    <th>Description</th>
+  </tr>
+  <tr>
+    <td><tt>INIT</tt></td>
+    <td>Initiation</td>
+  </tr>
+  <tr>
+    <td><tt>GOOD</tt></td>
+    <td>Successful initiation (connected)</td>
+  </tr>
+  <tr>
+    <td><tt>BAD</tt></td>
+    <td>Unsuccessful initiation (stream is closed, no further state)</td>
+  </tr>
+  <tr>
+    <td><tt>CLOS</tt></td>
+    <td>Successful closure after establishment (stream is closed, no further state)</td>
+  </tr>
+  <tr>
+    <td><tt>ERR</tt></td>
+    <td>Link failure after establishment (stream is closed, no further state)</td>
+  </tr>
+</table>
 <p>The following stream transports that meet these guidelines are:</p>
 <table caption='Supported streams'>
   <tr>
@@ -146,7 +150,7 @@
 </iq>
 ]]></example>
 
-The remote entity will advertise the "http://jabber.org/protocol/rel" namespace as a feature to represent they implement this protocol.
+<p>The remote entity will advertise the "http://jabber.org/protocol/rel" namespace as a feature to represent they implement this protocol.</p>
 
 <example caption='Response'><![CDATA[
 <iq type="result" from="joe@blow.com/Home" id="sd_1">

xep-0042.xml

@@ -13,9 +13,13 @@
   <status>Retracted</status>
   <type>Standards Track</type>
   <sig>Standards</sig>
-  <dependencies>XEP-0004 (OPTIONAL), XEP-0011 (RECOMMENDED) XEP-0029 (REQUIRED)</dependencies>
+  <dependencies>
+    <spec>XEP-0004 (OPTIONAL)</spec>
+    <spec>XEP-0011 (RECOMMENDED)</spec>
+    <spec>XEP-0029 (REQUIRED)</spec>
+  </dependencies>
   <supersedes/>
-  <supersededby>XEP-0065</supersededby>
+  <supersededby><spec>XEP-0065</spec></supersededby>
   <shortname>JOBS</shortname>
   <author>
     <firstname>Matthew</firstname>

xep-0043.xml

@@ -13,6 +13,10 @@
     <status>Retracted</status>
     <type>Standards Track</type>
     <sig>Standards</sig>
+    <dependencies/>
+    <supersedes/>
+    <supersededby/>
+    <shortname>N/A</shortname>
     <author>
       <firstname>Justin</firstname>
       <surname>Kirby</surname>
@@ -38,14 +42,11 @@
     Database API or query language. Instead, it will providing a
     simple mechanism for a JID to read/write data that it has access to 
     and specifying a model for those schemas to use in xml.</p>
-  
     <p>This document has two aims.</p>
-
     <ol>
       <li>Be able to request the available schemas</li>
       <li>Perform near SQL-like data manipulation</li>
     </ol>
-  
     <p>Although designed for use with an RDBMS this document is not
     restricted to such uses. It may be used with any data storage 
     system that can be broken down to a simple table, column/row 

xep-0044.xml

@@ -15,6 +15,10 @@
   <status>Deferred</status>
   <type>Standards Track</type>
   <sig>Standards</sig>
+  <dependencies/>
+  <supersedes/>
+  <supersededby/>
+  <shortname>N/A</shortname>
   <author>
     <firstname>Robert</firstname>
     <surname>Norris</surname>
@@ -42,7 +46,6 @@
 <section1 topic='Requirements and Protocol'>
 
   <p>A typical XML stream is a pair of XML documents, one for each direction of communication between the two peers. An simple example of these might look like this:</p>
-  
   <example caption="A typical XML stream"><![CDATA[
 SEND: <stream:stream xmlns='jabber:client'
                      xmlns:stream='http://etherx.jabber.org/streams'
@@ -91,7 +94,6 @@ RECV: <iq type='result' from='jabber.org'>
   </example>
 
   <p>Currently, the prefix for each namespace is fixed; it cannot vary at all, since implementations use it for matching. The desire is to be able to use arbitrary prefixes:</p>
- 
   <example caption="XML stream with arbitrary namespace prefixes (1)"><![CDATA[
 SEND: <stream xmlns:app='jabber:client'
               xmlns='http://etherx.jabber.org/streams'

xep-0046.xml

@@ -15,7 +15,7 @@
   <sig>Standards</sig>
   <dependencies/>
   <supersedes/>
-  <supersededby>XEP-0065</supersededby>
+  <supersededby><spec>XEP-0065</spec></supersededby>
   <shortname>None</shortname>
   <author>
     <firstname>Justin</firstname>

xep-0047.xml

@@ -18,10 +18,10 @@
   </dependencies>
   <supersedes/>
   <supersededby/>
+  <shortname>ibb</shortname>
   <schemaloc>
     <url>http://www.xmpp.org/schemas/ibb.xsd</url>
   </schemaloc>
-  <shortname>ibb</shortname>
   &infiniti;
   &stpeter;
   <revision>
@@ -216,7 +216,7 @@
       <li>Because the sequence number has already been used, the recipient returns an &unexpected; error with a type of 'cancel'.</li>
       <li>Because the data is not formatted in accordance with Section 4 of <cite>RFC 4648</cite>, the recipient returns a &badrequest; error with a type of 'cancel'.</li>
     </ol>
-    <p>Upon receiving an error related to the data packet, the sender MUST close the bytestream as described under <link rel='#close'>Closing the Bytestream</link>.</p>
+    <p>Upon receiving an error related to the data packet, the sender MUST close the bytestream as described under <link url='#close'>Closing the Bytestream</link>.</p>
     <p>Data packets MUST be processed in the order they are received. If an out-of-sequence packet is received for a particular direction within a bytestream (determined by checking the 'seq' attribute), then this indicates that a packet has been lost. The recipient MUST NOT process the data of such an out-of-sequence packet, nor any that follow it within the same bytestream; instead, the recipient MUST close the bytestream as described in the next section.</p>
   </section2>
 

xep-0051.xml

@@ -13,6 +13,10 @@
   <status>Deferred</status>
   <type>Standards Track</type>
   <sig>Standards</sig>
+  <dependencies/>
+  <supersedes/>
+  <supersededby/>
+  <shortname>N/A</shortname>
   <author>
     <firstname>Klaus</firstname>
     <surname>Wolf</surname>

xep-0052.xml

@@ -13,9 +13,18 @@
   <status>Retracted</status>
   <type>Standards Track</type>
   <sig>Standards</sig>
-  <dependencies>XMPP Core, XMPP IM, XEP-0004, XEP-0020, XEP-0030</dependencies>
+  <dependencies>
+    <spec>XMPP Core</spec>
+    <spec>XMPP IM</spec>
+    <spec>XEP-0004</spec>
+    <spec>XEP-0020</spec>
+    <spec>XEP-0030</spec>
+  </dependencies>
   <supersedes/>
-  <supersededby>XEP-0095, XEP-0096</supersededby>
+  <supersededby>
+    <spec>XEP-0095</spec>
+    <spec>XEP-0096</spec>
+  </supersededby>
   <shortname>N/A</shortname>
   <author>
     <firstname>Thomas</firstname>

xep-0056.xml

@@ -14,6 +14,9 @@
 <type>Standards Track</type>
 <sig>Standards</sig>
 <dependencies/>
+<supersedes/>
+<supersededby/>
+<shortname>N/A</shortname>
 <author>
 <firstname>Ulrich</firstname>
 <surname>Staudinger</surname>
@@ -159,7 +162,7 @@ EDIFACT/UN is very similar to X.12 and differs only in the meaning of tags and i
 
 <section1 topic='Transmitting SAP iDoc via XMPP'>
 <section2 topic='Introduction'>
-SAP Systems can create IDocs as receipts of transactions. These receipts can be used within other EDI systems, or within the SAP system. Of course transmission of IDocs can take place through XMPP as well.
+  <p>SAP Systems can create IDocs as receipts of transactions. These receipts can be used within other EDI systems, or within the SAP system. Of course transmission of IDocs can take place through XMPP as well.</p>
 </section2>
 
 <section2 topic='Protocol'>

xep-0057.xml

@@ -13,6 +13,7 @@
     <status>Retracted</status>
     <type>Standards Track</type>
     <sig>Standards</sig>
+    <dependencies/>
     <supersedes/>
     <supersededby/>
     <shortname>None</shortname>
@@ -97,14 +98,14 @@
 	</ul>
       </section3>
       <section3 topic="Client JIDs">
-	  For all JIDs with category=client allowed following subtags:
-	<ul>
-	  <li>
-	    <strong>always-visible</strong>, <strong>always-invisible</strong>:
-	    The client should send custom presence to this JID to be always
-	    visible or invisible to it.
-	  </li>
-	</ul>
+        <p>For all JIDs with category=client allowed following subtags:</p>
+        <ul>
+          <li>
+            <strong>always-visible</strong>, <strong>always-invisible</strong>:
+            The client should send custom presence to this JID to be always
+            visible or invisible to it.
+          </li>
+        </ul>
       </section3>
       <section3 topic="Conference JIDs">
 	<p>

xep-0058.xml

@@ -13,6 +13,10 @@
     <status>Deferred</status>
     <type>Standards Track</type>
     <sig>Standards</sig>
+    <dependencies/>
+    <supersedes/>
+    <supersededby/>
+    <shortname>N/A</shortname>
     <author>
       <firstname>Alexey</firstname>
       <surname>Shchepin</surname>
@@ -28,11 +32,16 @@
   </header>
 
   <section1 topic="Introduction">
-    This document defines an XMPP protocol extension for editing one text document by several people.
-    This can be useful when several people write different parts of one single document, or
-    one person edits the text and other people can see the changes.  The advantage of
-    using this protocol in compared to using a  version control systems is that all
-    changes are distributed between editors in real-time.
+    <p>
+      This document defines an XMPP protocol extension for editing one text
+      document by several people.
+      This can be useful when several people write different parts of one single
+      document, or one person edits the text and other people can see the
+      changes.
+      The advantage of using this protocol in compared to using a  version
+      control systems is that all changes are distributed between editors in
+      real-time.
+    </p>
   </section1>
 
   <section1 topic="Protocol description">