From 21ca54ecb9e0c8e2c16cf5916104dca82293f4cc Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Fri, 13 Jun 2008 21:47:42 +0000
Subject: [PATCH] text tweaks

git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@1978 4b5297f7-1745-476d-ba37-a9c6900126ab
---
 xep-0234.xml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/xep-0234.xml b/xep-0234.xml
index f40d2463..1be5d7fe 100644
--- a/xep-0234.xml
+++ b/xep-0234.xml
@@ -101,7 +101,7 @@
   <p>The initiator then sends a Jingle session-initiation request to a potential responder. The content-type of the request specifies two things:</p>
   <ol>
     <li>An application type of "urn:xmpp:tmp:jingle:apps:file-transfer" &NSNOTE;. In particular, the &lt;description/&gt; element contains an &lt;offer/&gt; or &lt;request/&gt; element that in turn contains a &lt;file/&gt; element qualified by the existing 'http://jabber.org/protocol/si/profile/file-transfer' namespace from <cite>XEP-0096</cite>.</li>
-    <li>An appropriate transport method. Because the existing transport methods used in <cite>XEP-0096</cite> (i.e., &xep0065; and &xep0047;) are not yet defined as Jingle transport methods, this specification registers those definitions.</li>
+    <li>An appropriate transport method. Because the existing transport methods used in <cite>XEP-0096</cite> (i.e., &xep0065; and &xep0047;) are not yet defined as Jingle transport methods, this specification registers those definitions (if this specification is approved, those definitions will be moved to <cite>XEP-0047</cite> and <cite>XEP-0065</cite>).</li>
   </ol>
   <p>In this example, the initiator is &lt;kingclaudius@shakespeare.lit&gt;, the responder is &lt;laertes@shakespeare.lit&gt;, and the initiation request specifies a file offer and a transport method of bytestreams (i.e., XEP-0065).</p>
   <p>The flow is as follows.</p>
@@ -646,15 +646,7 @@ Claudius                      Laertes
 
 <section1 topic='XMPP Registrar Considerations' anchor='registrar'>
   <section2 topic='Protocol Namespaces' anchor='ns'>
-    <p>Until this specification advances to a status of Draft, its associated namespaces shall be:</p>
-    <ul>
-      <li>urn:xmpp:tmp:jingle:apps:file-transfer</li>
-    </ul>
-    <p>Upon advancement of this specification, the &REGISTRAR; shall issue permanent namespaces in accordance with the process defined in Section 4 of &xep0053;.</p>
-    <p>The following namespaces are requested, and are thought to be unique per the XMPP Registrar's requirements:</p>
-    <ul>
-      <li>urn:xmpp:jingle:apps:file-transfer</li>
-    </ul>
+    <p>Until this specification advances to a status of Draft, its associated namespaces shall be 'urn:xmpp:tmp:jingle:apps:file-transfer'. Upon advancement of this specification, the &REGISTRAR; shall issue a permanent namespace in accordance with the process defined in Section 4 of &xep0053;. The namespace 'urn:xmpp:jingle:apps:file-transfer' is requested, and is thought to be unique per the XMPP Registrar's requirements.</p>
   </section2>
   <section2 topic='Jingle Application Formats' anchor='registrar-content'>
     <p>The XMPP Registrar shall include "file-transfer" in its registry of Jingle application formats. The registry submission is as follows:</p>
@@ -663,7 +655,7 @@ Claudius                      Laertes
   <name>file-transfer</name>
   <desc>Jingle sessions for the transfer of a file</desc>
   <transport>reliable</transport>
-  <doc>XEP-xxxx</doc>
+  <doc>XEP-0234</doc>
 </application>
     ]]></code>
   </section2>
@@ -683,6 +675,7 @@ Claudius                      Laertes
   <doc>XEP-0047</doc>
 </transport>
     ]]></code>
+    <p>Note: If this specification is approved, the foregoing definitions will be moved to <cite>XEP-0047</cite> and <cite>XEP-0065</cite>.</p>
   </section2>
 </section1>