From b3c87cb6cf85434a1a0839afc5fe4874acc6b2e0 Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Tue, 30 Jan 2007 18:07:07 +0000
Subject: [PATCH] 1.1pre1

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@448 4b5297f7-1745-476d-ba37-a9c6900126ab
---
 xep-0073.xml | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/xep-0073.xml b/xep-0073.xml
index 9dc11f3f..e38a6971 100644
--- a/xep-0073.xml
+++ b/xep-0073.xml
@@ -25,6 +25,12 @@
   <supersededby/>
   <shortname>N/A</shortname>
   &stpeter;
+  <revision>
+    <version>1.1pre1</version>
+    <date>in progress, last updated 2007-01-30</date>
+    <initials>psa</initials>
+    <remark>Changed support for XEP-0078 and XEP-0086 from REQUIRED to RECOMMENDED.</remark>
+  </revision>
   <revision>
     <version>1.0</version>
     <date>2004-12-09</date>
@@ -106,7 +112,7 @@
   <p>The Basic IM Protocol Suite does not include more advanced IM functionality, such as groupchat or HTML message formatting; see &xep0117; for such features.</p>
 </section1>
 <section1 topic='Definition' anchor='def'>
-  <p>The software developed in the Jabber community is built on the foundation of XML streams, a consistent addressing scheme (JIDs), channel encryption, authentication of an entity (client or server) with a server, three core data elements (&MESSAGE;, &PRESENCE;, and &IQ;), and proper handling of XML namespaces. These foundational building blocks have been formalized within RFC 3920, support for which is REQUIRED by this protocol suite. However, XMPP Core is not fully congruent with the core of what has traditionally been known as "Jabber", and this divergence needs to be captured in the Basic IM Protocol Suite. In particular, the following are REQUIRED herein in order to ensure compatibility with the large deployed base of older Jabber software: 
+  <p>The software developed in the Jabber community is built on the foundation of XML streams, a consistent addressing scheme (JIDs), channel encryption, authentication of an entity (client or server) with a server, three core data elements (&MESSAGE;, &PRESENCE;, and &IQ;), and proper handling of XML namespaces. These foundational building blocks have been formalized within RFC 3920, support for which is REQUIRED by this protocol suite. However, XMPP Core is not fully congruent with the core of what has traditionally been known as "Jabber", and this divergence needs to be captured in the Basic IM Protocol Suite. In particular, the following are RECOMMENDED herein in order to ensure compatibility with the large deployed base of older Jabber software: 
     <note>Older software also used port 5223 for SSL-enabled communications between a client and a server, rather than upgrading port 5222 as is done during TLS negotiation (the equivalent for server-to-server communications was never implemented); while support for this behavior is OPTIONAL, it may be quite desirable in order to interoperate with older software and deployments.</note>
   </p>
   <ul>
@@ -130,14 +136,6 @@
       <td><strong>RFC 3921: XMPP IM</strong></td>
       <td>REQUIRED</td>
     </tr>
-    <tr>
-      <td><strong>XEP-0078: Non-SASL Authentication</strong></td>
-      <td>REQUIRED</td>
-    </tr>
-    <tr>
-      <td><strong>XEP-0086: Error Condition Mappings</strong></td>
-      <td>REQUIRED for servers; RECOMMENDED for clients</td>
-    </tr>
     <tr>
       <td><strong>XEP-0030: Service Discovery</strong></td>
       <td>REQUIRED</td>
@@ -146,6 +144,14 @@
       <td><strong>XEP-0077: In-Band Registration</strong></td>
       <td>REQUIRED for servers; RECOMMENDED for clients</td>
     </tr>
+    <tr>
+      <td><strong>XEP-0078: Non-SASL Authentication</strong></td>
+      <td>RECOMMENDED</td>
+    </tr>
+    <tr>
+      <td><strong>XEP-0086: Error Condition Mappings</strong></td>
+      <td>RECOMMENDED</td>
+    </tr>
   </table>
 </section1>
 <section1 topic='Security Considerations' anchor='security'>
@@ -155,6 +161,6 @@
   <p>This document requires no interaction with &IANA;.</p> 
 </section1>
 <section1 topic='XMPP Registrar Considerations' anchor='registrar'>
-  <p>No namespaces or parameters need to be registered with the &REGISTRAR; as a result of this document.</p>
+  <p>This document requires no interaction with the &REGISTRAR;.</p> 
 </section1>
 </xep>