Merge commit 'refs/pull/641/head' of https://github.com/xsf/xeps into feature/mixify

This commit is contained in:
Jonas Wielicki 2018-05-22 15:03:36 +02:00
commit 3ef8c2c69b
1 changed files with 4 additions and 4 deletions

View File

@ -32,7 +32,7 @@
</dependencies>
<supersedes/>
<supersededby/>
<shortname>MIX-PRESENCE</shortname>
<shortname>MIX-MUC</shortname>
&ksmithisode;
&skille;
<revision>
@ -95,7 +95,7 @@
</p>
<p>For the partially integrated service, MIX servers will reference the associated MUC server and MUC servers will reference the associated MIX service. This will allow a client that only support MUC or only supports MIX to find the right server if it is given a reference to the other one. For a client that supports both MUC and MIX, it will enable the client to select its preferred service.
For a MIX client, it will also be useful to know the MUC service, so that this information can be shared with a MUC client invitation.
The following example shows how a MIX server identifies the associated MUC server:
The following example shows how a MIX server identifies the associated MUC server. Note that MUC MUST NOT be advertized as a feature:
</p>
<example caption="Client uses Disco to find MUC server assocated with MIX server" ><![CDATA[
@ -115,7 +115,7 @@
category='conference'
name='Shakespearean Chat Service'
type='text'/>
<feature var='urn:xmpp:mix:1'/>
<feature var='urn:xmpp:mix:core:0'/>
<x xmlns='jabber:x:data' type='result'>
<field var='FORM_TYPE' type='hidden'>
<value>urn:xmpp:mix:muc:0#muc-mirror</value>
@ -130,7 +130,7 @@
</iq>
]]></example>
<p>The result is returned in an extended disco results in a form whose type value is 'urn:xmpp:mix:muc:0#muc-mirror'. The field with var='muc-mirror' is the value of which is the mirrored MUC domain's JID. </p>
<p>Similarly, a MUC service can advertise an associated MIX doming. The following example shows discovery of a MUC domain.</p>
<p>Similarly, a MUC service can advertise an associated MIX doming. The following example shows discovery of a MUC domain. Note that MIX MUST NOT be advertized as a feature</p>
<example caption="Client uses Disco to find MIX server assocated with MUC server" ><![CDATA[
<iq from='hag66@shakespeare.example/UUID-c8y/1573'
id='lx09df27'