1
0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-25 02:32:18 -05:00

Merge commit 'refs/pull/605/head' of https://github.com/xsf/xeps into feature/xep-369

This commit is contained in:
Jonas Wielicki 2018-03-18 12:13:21 +01:00
commit 6fc5ae00d4

View File

@ -36,6 +36,14 @@
&ksmithisode; &ksmithisode;
&skille; &skille;
&stpeter; &stpeter;
<revision>
<version>0.9.6</version>
<date>2018-03-15</date>
<initials>marj</initials>
<remark><p>
Fix typo errors with single quotes.
</p></remark>
</revision>
<revision> <revision>
<version>0.9.5</version> <version>0.9.5</version>
<date>2018-01-08</date> <date>2018-01-08</date>
@ -1314,7 +1322,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
to='hag66@shakespeare.example' to='hag66@shakespeare.example'
id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'> id='E6E10350-76CF-40C6-B91B-1EA08C332FC7'>
<leave xmlns='urn:xmpp:mix:1' <leave xmlns='urn:xmpp:mix:1'
channel=`coven@mix.shakespeare.example`/> channel='coven@mix.shakespeare.example'/>
</iq> </iq>
]]></example> ]]></example>
@ -1514,7 +1522,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
<p> <p>
A user setting status is now used as an example. Unlike in &xep0045; where coming online is a special action, coming online in MIX is implicit when presence status is set. Going offline is a achieved by setting presence status to unavailable, which removes the client full JID entry from the presence node. When a user sets a presence status, the user's server sends updated presence to the MIX channel, and the MIX service then publishes the user's availability to the "urn:xmpp:mix:nodes:presence" node. If there is not an item named by the full JID of the client with updated presence status, this item is created. The sequence is shown in the following examples, starting with a client setting presences status on the connected server.</p> A user setting status is now used as an example. Unlike in &xep0045; where coming online is a special action, coming online in MIX is implicit when presence status is set. Going offline is a achieved by setting presence status to unavailable, which removes the client full JID entry from the presence node. When a user sets a presence status, the user's server sends updated presence to the MIX channel, and the MIX service then publishes the user's availability to the "urn:xmpp:mix:nodes:presence" node. If there is not an item named by the full JID of the client with updated presence status, this item is created. The sequence is shown in the following examples, starting with a client setting presences status on the connected server.</p>
<example caption="Client Sets Presence Status on Server"> <example caption="Client Sets Presence Status on Server">
<![CDATA[<presence xmlns='jabber:client' from=hag66@shakespeare.example/UUID-a1j/7533> <![CDATA[<presence xmlns='jabber:client' from='hag66@shakespeare.example/UUID-a1j/7533'>
<show>dnd</show> <show>dnd</show>
<status>Making a Brew</status> <status>Making a Brew</status>
</presence>]]></example> </presence>]]></example>
@ -1523,7 +1531,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
The server then sends the presence information to roster entries. The following example then shows the presence message from the client's server to the MIX channel. The server then sends the presence information to roster entries. The following example then shows the presence message from the client's server to the MIX channel.
</p> </p>
<example caption="Server sends Presence Status to MIX Channel"> <example caption="Server sends Presence Status to MIX Channel">
<![CDATA[<presence from=hag66@shakespeare.example/UUID-a1j/7533 <![CDATA[<presence from='hag66@shakespeare.example/UUID-a1j/7533'
to='coven@mix.shakespeare.example'> to='coven@mix.shakespeare.example'>
<show>dnd</show> <show>dnd</show>
<status>Making a Brew</status> <status>Making a Brew</status>
@ -2252,7 +2260,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
<field type='text-multi' <field type='text-multi'
label='Channel Description' label='Channel Description'
var='Description'/> var='Description'/>
<field type=jid-single' <field type='jid-single'
label='Channel Administrative Contact' label='Channel Administrative Contact'
var='Contact'/> var='Contact'/>
</x> </x>
@ -2323,7 +2331,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
<value>urn:xmpp:mix:1</value> <value>urn:xmpp:mix:1</value>
</field> </field>
<title>Configuration Node Modification</title> <title>Configuration Node Modification</title>
<field type=jid-multi' <field type='jid-multi'
label='Channel Administrator' label='Channel Administrator'
var='Administrator'/> var='Administrator'/>
</x> </x>
@ -2617,7 +2625,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
id='bv1bs71f' id='bv1bs71f'
type='get'> type='get'>
<query xmlns='jabber:iq:roster'> <query xmlns='jabber:iq:roster'>
<annotate xmlns=urn:xmpp:mix:roster:0'/> <annotate xmlns='urn:xmpp:mix:roster:0'/>
<query/> <query/>
</iq> </iq>
]]></example> ]]></example>
@ -2633,7 +2641,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa
<example caption="Roster Item Encoding of a MIX Channel"><![CDATA[ <example caption="Roster Item Encoding of a MIX Channel"><![CDATA[
<item jid='balcony@example.net'> <item jid='balcony@example.net'>
<channel xmlns=urn:xmpp:mix:roster:0'/> <channel xmlns='urn:xmpp:mix:roster:0'/>
</item> </item>
]]></example> ]]></example>