xhtml fixes

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@539 4b5297f7-1745-476d-ba37-a9c6900126ab

all.shtml

@@ -24,5 +24,4 @@
 
 </table>
 
-</div>
 <!--#include virtual='/includes/foot.txt' -->

editor.shtml

@@ -17,6 +17,6 @@
 <li>gathers and tallies the votes of the <a href='/council/'>XMPP Council</a></li>
 <li>fulfills the responsibilities of the <a href='/registrar/'>XMPP Registrar</a></li>
 </ul>
-<p>Since the founding of the <a href='/xsf/'>XMPP Standards Foundation</a> in 2001, the XMPP Extensions Editor has been <a href='/xsf/people/stpeter.shtml'>Peter Saint-Andre</a>, who may be contacted via email or Jabber at &lt;&#101;&#100;&#105;&#116;&#111;&#114;&#64;&#106;&#97;&#98;&#98;&#101;&#114;&#46;&#111;&#114;&#103&gt;.</p>
+<p>Since the founding of the <a href='/xsf/'>XMPP Standards Foundation</a> in 2001, the XMPP Extensions Editor has been <a href='/xsf/people/stpeter.shtml'>Peter Saint-Andre</a>, who may be contacted via email or Jabber at &lt;&#101;&#100;&#105;&#116;&#111;&#114;&#64;&#106;&#97;&#98;&#98;&#101;&#114;&#46;&#111;&#114;&#103;&gt;.</p>
 </div>
 <!--#include virtual='/includes/foot.txt' -->

gps_datum.html

@@ -8,17 +8,8 @@
 <p>The following example of GPS datum differences was kindly provided to the <a href='http://www.xmpp.org/'>XMPP Standards Foundation</a> by Randy Steele of Apollo, Pennsylvania (URL: &lt;<a href='http://www.nb.net/~resteele/'>http://www.nb.net/~resteele/</a>&gt;) and is archived here so that a permanent link is available from <a href='http://www.xmpp.org/extensions/xep-0080.html'>XEP-0080: User Geolocation</a>.</p>
 <p>BEGIN EXAMPLE</p>
 <hr />
-<p>This is an example of the differences in the datums you can use with a GPS.
+<p>This is an example of the differences in the datums you can use with a GPS. Below is a site I was checking out. I marked it on my GPS in the field. When I got back home to find it on the topo map, I noticed something was not right. Using the UTM coordinates from the GPS, I located the site on the topo map. But the map site and the site I checked in the field did not match. The terrain was different, the site I actually checked was near the road (the top red circle). I then remembered about map datums. The topo map was made to NAD27, while my GPS was set to WGS84. After changing the GPS to the NAD27 datum, all was fine.  So the moral of this story is: MAKE SURE THE GPS DATUM AND THE MAP DATUM MATCH!!! Note the difference in the circle locations. I also changed my GPS datum to NAD27.</p>
-Below is a site I was checking out. I marked it on my GPS in the field. When I got back
+<p><img src='gps_datum.gif' alt='GPS Datum Example' longdesc='An example of different GPS readings when using a datum of NAD27 vs. WGS84, provided by Randy Steele'/></p>
-home to find it on the topo map, I noticed something was not right. Using
-the UTM coordinates from the GPS, I located the site on the topo map. But
-the map site and the site I checked in the field did not match. The terrain
-was different, the site I actually checked was near the road (the top red
-circle). I then remembered about map datums. The topo map was made to NAD27, while
-my GPS was set to WGS84. After changing the GPS to the NAD27 datum, all was fine.
-So the moral of this story is: MAKE SURE THE GPS DATUM AND THE MAP DATUM MATCH!!!
-Note the difference in the circle locations. I also changed my GPS datum to NAD27.</p>
-<p><img src='gps_datum.gif' alt='GPS Datum Example' longdesc='An example of different GPS readings when using a datum of NAD27 vs. WGS84, provided by Randy Steele'/>
 <hr />
 <p>END EXAMPLE</p>
 </body>

ipr-policy.shtml

@@ -34,19 +34,12 @@
 </blockquote>
 <h2>2.  <a name='terms'></a>Terms</h2>
 <blockquote>
-<h3>2.1 <a name='xmpp'></a>XMPP</a>
+  <h3>2.1 <a name='xmpp'></a>XMPP</h3>
-</h3>
   <p>The core XML streaming, instant messaging, and presence protocols developed by the Jabber community have been contributed by the XSF to the Internet Engineering Task Force (IETF) under the name Extensible Messaging and Presence Protocol (XMPP). XMPP is all and only these core protocols, as currently defined in <a href='http://www.ietf.org/rfc/rfc3920.txt'>RFC 3920</a> and <a href='http://www.ietf.org/rfc/rfc3921.txt'>RFC 3921</a>.</p>
-  </blockquote>
-  <blockquote>
   <h3>2.2 <a name='extension'></a>XMPP Extension</h3>
   <p>For the purposes of this IPR policy, an XMPP Extension is any specification approved by, or submitted for approval or consideration by, the XSF or its constituent committees (most particularly the <a href='/council/'>XMPP Council</a>). Such a specification must exist in the form of a standards-track XMPP Extension Protocol (XEP) specification in order to be considered an official submission. (Also referred to as an Extension.)</p>
-  </blockquote>
-  <blockquote>
   <h3>2.3 <a name='implementation'></a>Implementation</h3>
   <p>Any software that implements XMPP or XMPP Extensions for the purpose of providing the functionality defined by the relevant specification(s).</p>
-  </blockquote>
-  <blockquote>
 <h3>2.4 <a name='claim'></a>Intellectual Property Claim</h3>
     <p>Any patent, copyright, or other proprietary claim or claims made by an entity regarding a XMPP Extension. (Also referred to as a Claim.)</p>
   </blockquote>
@@ -55,13 +48,12 @@
 <blockquote>
   <h3>3.1 <a name='contrib-ownership'></a>Ownership</h3>
   <p>By submitting an XMPP Extension for consideration by the XSF, the author of the Extension shall assign any ownership rights or other Claims asserted over the Extension to the XSF. This does not apply to Claims regarding any Implementations of the Extension, but rather to the Extension itself. Any documentation of the Extension (in the form of a XEP specification) shall be copyrighted by the XSF. Once an author assigns ownership to the XSF, the XSF shall in turn make the Extension available to all entities so that they may create, use, sell, distribute, or dispose of implementations of XMPP and all XMPP Extensions in perpetuity and without payment or hindrance.</p>
-    </p>
   <h3>3.3 <a name='contrib-approval'></a>Approval of Extensions</h3>
   <p>No Extension shall be approved by the XSF or its constituent committees if there are Claims to the Extension itself, or any Claims that would prevent perpetual, unrestricted, royalty-free use of the Extension in a compliant Implementation by any interested party. If Claims preventing such use are discovered, the XSF shall immediately seek to replace the Extension with unencumbered protocols that may be implemented without condition by any entity.</p>
   <h3>3.3 <a name='contrib-private'></a>A Note about Private Extensions</h3>
   <p>By its nature as XML, XMPP enables implementers to create their own private extensions to XMPP within custom XML namespaces. Such extensions may be kept private, and there is no compulsion for implementers to contribute such extensions to the Jabber community. It is only when an implementer seeks to have an extension standardized through the XSF's public standards process that ownership over such an extension must be transferred to the XSF. If an implementer wishes to keep its extensions private, it may simply refrain from submitting them to the XSF. However, private extensions exist outside the boundaries of XMPP and approved XMPP Extensions and must not be considered or described as part of XMPP or XSF-approved XMPP Extensions.</p>
 </blockquote>
-<h2>5.  <a name='legal'></a>Legal Notice</h2>
+<h2>4.  <a name='legal'></a>Legal Notice</h2>
 <p>All XMPP Extension Protocol (XEP) specifications shall contain the following Legal Notice:</p>
 <blockquote><pre>
 This XMPP Extension Protocol is copyright 1999 - [year] 
@@ -83,5 +75,4 @@ License (&lt;http://creativecommons.org/licenses/by/2.5/&gt;).
 <p>Version 1.2 (2006-10-04): Modified terminology to reflect protocol branding change from Jabber to XMPP (e.g., Jabber Enhancement Proposal to XMPP Extension Protocol).</p>
 <p>Version 1.1 (2005-10-04): Replaced Open Publication License with Creative Commons Attribution License.</p>
 <p>Version 1.0 (2002-10-29): Initial version approved by XSF Board of Directors.</p>
-</div>
 <!--#include virtual='/includes/foot.txt' -->

submit.shtml

@@ -8,9 +8,8 @@
 <ol>
 <li><p>Contact the <a href='editor.shtml'>XMPP Extensions Editor</a> so that he knows to expect your submission.</p></li>
 <li><p>Write your proposal following the guidelines described in <a href='/extensions/xep-0143.html'>XEP-0143: Guidelines for Authors of XMPP Extension Protocols</a>.</p></li>
-<li>Make sure you read, understand, and agree to the XSF's <a href='/extensions/ipr-policy.shtml'>IPR Policy</a> before you submit your proposal!</li>
+<li>Make sure you read, understand, and agree to the XSF's <a href='/extensions/ipr-policy.shtml'>IPR Policy</a> before you submit your proposal!</p></li>
-<li><p>Email the XML file (or a URL for the file) to the <a href='editor.shtml'>XMPP Extensions Editor</a> with a subject line of 'ProtoXEP: [your title here]'.</li>
+<li><p>Email the XML file (or a URL for the file) to the <a href='editor.shtml'>XMPP Extensions Editor</a> with a subject line of 'ProtoXEP: [your title here]'.</p></li>
 </ol>
 <p><strong>Note:</strong> It is the author's responsibility to provide a properly-formatted source file (see the <a href='template.xml'>template</a> and <a href='http://www.jabberstudio.org/cgi-bin/viewcvs.cgi/xmpp/extensions/'>CVS repository</a>). Proposals submitted in HTML, TXT, MS Word, Open Document Format, etc. will be returned to the proposal author for proper formatting.</p>
-</div>
 <!--#include virtual='/includes/foot.txt' -->