From e336a2054c18b94b0b6c151c2e73b447a109ea4b Mon Sep 17 00:00:00 2001
From: Peter Saint-Andre <stpeter@jabber.org>
Date: Tue, 18 Dec 2007 23:00:42 +0000
Subject: [PATCH] tweaks

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

diff --git a/xep-0115.xml b/xep-0115.xml
index 6a7922be..21bfc4ef 100644
--- a/xep-0115.xml
+++ b/xep-0115.xml
@@ -356,7 +356,7 @@
      ver='ItBTI0XLDFvVxZ72NQElAzKS9sU='>
 </stream:features>
       ]]></example>
-      <p>When a connected client or peer server sends a service discovery information request to determine the entity capabilities of a server that advertises capabilities via the stream feature, the requesting entity MUST send the disco#info request to the server's JID as provided in the 'from' attribute of the response stream header, if any (the 'from' attribute was recommended by &rfc3920; and is required by &rfc3920bis;).</p>
+      <p>When a connected client or peer server sends a service discovery information request to determine the entity capabilities of a server that advertises capabilities via the stream feature, the requesting entity MUST send the disco#info request to the server's JID as provided in the 'from' attribute of the response stream header (the 'from' attribute was recommended by &rfc3920; and is required by &rfc3920bis;). To enable this functionality, a server that advertises support for entity capabilities MUST provide a 'from' address in its response stream headers, in accordance with <cite>rfc3921bis</cite>.</p>
     </section2>
   </section1>
 
@@ -403,7 +403,7 @@
     type='result'>
   <query xmlns='http://jabber.org/protocol/disco#info'>
     ...
-    <feature var='http://jabber.org/protocol/caps'/>
+    <feature var='http://jabber.org/protocol/caps#optimize'/>
     ...
   </query>
 </iq>