From 4cf39659aa66294cc0f2336bc04f7e3cf8294509 Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Tue, 20 Nov 2007 19:59:54 +0000
Subject: [PATCH] 1.5pre9

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

diff --git a/xep-0115.xml b/xep-0115.xml
index ecf611e6..182d7305 100644
--- a/xep-0115.xml
+++ b/xep-0115.xml
@@ -28,10 +28,10 @@
     &stpeter;
     &remko;
     <revision>
-      <version>1.5pre8</version>
-      <date>in progress, last updated 2007-11-19</date>
+      <version>1.5pre9</version>
+      <date>in progress, last updated 2007-11-20</date>
       <initials>jjh/psa</initials>
-      <remark><p>Removed hash attribute since only SHA-1 is used; clarified meaning of node attribute; further specified security considerations; clarified handling of the legacy format to assist developers.</p></remark>
+      <remark><p>Removed hash attribute since only SHA-1 is used; clarified meaning of node attribute; further specified security considerations; clarified handling of the legacy format to assist developers; defined optional v attribute for the software version.</p></remark>
     </revision>
     <revision>
       <version>1.4</version>
@@ -127,6 +127,7 @@
 <presence from='romeo@montague.lit/orchard'>
   <c xmlns='http://jabber.org/protocol/caps' 
      node='http://code.google.com/p/exodus/'
+     v='0.9.1'
      ver='8RovUdtOmiAjzj+xI7SK5BCw3A8='/>
 </presence>
       ]]></code>
@@ -159,6 +160,7 @@
 <presence from='benvolio@capulet.lit/230193'>
   <c xmlns='http://jabber.org/protocol/caps' 
      node='http://psi-im.org/'
+     v='0.11'
      ver='8RovUdtOmiAjzj+xI7SK5BCw3A8='/>
 </presence>
       ]]></code>
@@ -167,7 +169,8 @@
       <code><![CDATA[
 <presence from='nurse@capulet.lit/chamber'>
   <c xmlns='http://jabber.org/protocol/caps' 
-     node='http://psi-im.org/;0.10'
+     node='http://psi-im.org/'
+     v='0.10'
      ver='uCoVCteRe3ty2wU2gHxkMaA7xhs='/>
 </presence>
       ]]></code>
@@ -226,14 +229,20 @@
         <td>A unique identifier for the software underlying the entity, typically a URL at the website of the project or company that produces the software. *</td>
         <td>REQUIRED</td>
       </tr>
+      <tr>
+        <td>v</td>
+        <td>A specific version of the software. **</td>
+        <td>RECOMMENDED</td>
+      </tr>
       <tr>
         <td>ver</td>
-        <td>A string that specifies the identity and supported features of the entity. **</td>
+        <td>A string that specifies the identity and supported features of the entity. ***</td>
         <td>REQUIRED</td>
       </tr>
     </table>
-    <p>* Note: It is RECOMMENDED for the value of the 'node' attribute to identify both the software product and the released version in the form "ProductURL;SoftwareVersion", such as "http://psi-im.org/;0.11" <note>This enables a processing application to strip off everything after the ";" character and thereby determine a unique string for the generating application, which it could maintain in a list of known products or (if the string is a URL) which it could use to find more detailed information about the generating application.</note>.</p>
-    <p>**  Note: Before version 1.4 of this specification, the 'ver' attribute was used to specify the released version of the software; while the values of the 'ver' attribute that result from use of the algorithm specified herein are backward-compatible, applications SHOULD appropriately handle the <link url='#legacy'>Legacy Format</link>.</p>
+    <p>* Note: It is RECOMMENDED for the value of the 'node' attribute to be an HTTP URL at which a user could find further information about the software product, such as "http://psi-im.org/" for the Psi client; this enables a processing application to also determine a unique string for the generating application, which it could maintain in a list of known products (e.g., associating the name received via the disco#info reply with the URL found in the caps data).</p>
+    <p>**  Note: Before version 1.5 of this specification, the version information was contained in the 'ver' attribute as described below.</p>
+    <p>***  Note: Before version 1.4 of this specification, the 'ver' attribute was used to specify the released version of the software; while the values of the 'ver' attribute that result from use of the algorithm specified herein are backward-compatible, applications SHOULD appropriately handle the <link url='#legacy'>Legacy Format</link>.</p>
   </section1>
 
   <section1 topic='Generation of ver Attribute' anchor='ver'>
@@ -267,6 +276,7 @@
 <presence>
   <c xmlns='http://jabber.org/protocol/caps'
      node='http://code.google.com/p/exodus/'
+     v='0.9.1'
      ver='8RovUdtOmiAjzj+xI7SK5BCw3A8='/>
 </presence>
       ]]></example>
@@ -312,6 +322,7 @@
 <stream:features>
   <c xmlns='http://jabber.org/protocol/caps'
      node='http://jabberd.org/entity'
+     v='1.6.1'
      ver='ItBTI0XLDFvVxZ72NQElAzKS9sU='>
 </stream:features>
       ]]></example>
@@ -390,6 +401,7 @@
         <xs:extension base='empty'>
           <xs:attribute name='ext' type='xs:NMTOKENS' use='optional'/>
           <xs:attribute name='node' type='xs:string' use='required'/>
+          <xs:attribute name='v' type='xs:string' use='optional'/>
           <xs:attribute name='ver' type='xs:string' use='required'/>
         </xs:extension>
       </xs:simpleContent>