1
0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-28 12:12:22 -05:00

Merge commit 'refs/pull/580/head' of github.com:xsf/xeps into 580-582

This commit is contained in:
JC Brand 2018-02-08 19:19:34 +01:00
commit 85c835c785

View File

@ -387,7 +387,7 @@ R: <?xml version='1.0'?>
<example caption="Recipient Sends Stream Features"><![CDATA[ <example caption="Recipient Sends Stream Features"><![CDATA[
R: <stream:features> R: <stream:features>
<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'> <starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'>
<optional/> <required/>
</starttls> </starttls>
</stream:features> </stream:features>
]]></example> ]]></example>
@ -450,7 +450,7 @@ R: <?xml version='1.0'?>
<example caption="Recipient Sends Stream Features"><![CDATA[ <example caption="Recipient Sends Stream Features"><![CDATA[
R: <stream:features> R: <stream:features>
<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'> <starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'>
<optional/> <required/>
</starttls> </starttls>
<query xmlns='http://jabber.org/protocol/disco#info' <query xmlns='http://jabber.org/protocol/disco#info'
node='http://code.google.com/p/exodus#QgayPKawpkPSDYmwT/WM94uAlu0='> node='http://code.google.com/p/exodus#QgayPKawpkPSDYmwT/WM94uAlu0='>