diff --git a/xep-0369.xml b/xep-0369.xml index fe071af8..0856a4a4 100644 --- a/xep-0369.xml +++ b/xep-0369.xml @@ -52,8 +52,8 @@ Creating Channel Clarification, Address security concerns on Converting a 1:1 Conversation to a Channel, Remove requirement for all user clients to support MIX, - Change Retract to use MAM-ID, - + Change Retract to use MAM-ID; + Ensure use of .example throughout (follow RFC conventions);

0.9.3 @@ -621,7 +621,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa the three witches meet - greymalkin@shakespeare.lit + greymalkin@shakespeare.example jid-visible @@ -638,8 +638,8 @@ This approach enables flexible support of multiple clients for a MIX channel pa

- - + + ]]> @@ -649,8 +649,8 @@ This approach enables flexible support of multiple clients for a MIX channel pa

- - + + ]]> @@ -694,10 +694,10 @@ This approach enables flexible support of multiple clients for a MIX channel pa urn:xmpp:mix:1 - hecate@shakespeare.lit + hecate@shakespeare.example - greymalkin@shakespeare.lit + greymalkin@shakespeare.example allowed @@ -794,13 +794,13 @@ This approach enables flexible support of multiple clients for a MIX channel pa ]]> @@ -817,14 +817,14 @@ This approach enables flexible support of multiple clients for a MIX channel pa ]]>

If the querying user is allowed to subscribe, the channel MUST return its identity and the features it supports. Note that a MIX channel MUST support MAM and so the response will always include both MIX and MAM support. All disco queries on a MIX channel and results returned MUST include the attribute node='mix'. The reason for this is to facilitate MIX channels and &xep0045; MUC rooms sharing the same JID. This extra parameter will enable a server to return appropriate information.

@@ -844,13 +844,13 @@ This approach enables flexible support of multiple clients for a MIX channel pa ]]> @@ -872,7 +872,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa @@ -880,7 +880,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa ]]> @@ -900,7 +900,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa the three witches meet - greymalkin@shakespeare.lit + greymalkin@shakespeare.example @@ -915,7 +915,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa @@ -923,7 +923,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa ]]> @@ -953,17 +953,17 @@ This approach enables flexible support of multiple clients for a MIX channel pa Where a client supports MIX, it MUST advertise this capability in response to a Disco request. This will enable other entities to determine if a client supports MIX, and in particular it facilitates the client's server to determine client support. This can be optimized by use of CAPS. The following example shows a Disco request to and response from a client that supports both MIX and MUC.

- @@ -1566,7 +1566,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa @@ -1575,7 +1575,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa - @@ -1600,7 +1600,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa - @@ -1781,12 +1781,12 @@ This approach enables flexible support of multiple clients for a MIX channel pa With this approach, the original message <body> is removed and replaced with a tombstone using the <retracted> element qualified by the 'urn:xmpp:mix:1' namespace that shows the JID of user performing the retraction and the time of the retraction.

+ + to="macbeth@shakespeare.example"> @@ -1818,25 +1818,25 @@ This approach enables flexible support of multiple clients for a MIX channel pa The first step is for the inviter to request an invitation from the channel. The invitation contains inviter, invitee and a token. The channel will evaluate if the inviter has rights to issue the invitation. This will be because the inviter is a channel administrator or if the inviter is a channel participant and the channel allows invitation by participants. If the inviter has rights to make the invitation, the channel will return a token. The token is a string that the channel can subsequently use to validate an invitation. The format of the token is not specified in this standard. The encoded token MAY reflect a validity time. The invitation request is encoded as an <invite/> child element of an <iq/> element. The <invite/> element is qualified by the 'urn:xmpp:mix:1' namespace. <invite/> contains an <invitation/> child element, which contain <inviter/>, <invitee/>, <channel/> and <token/> child elements.

- cat@shakespeare.lit + cat@shakespeare.example - - hag66@shakespeare.lit - cat@shakespeare.lit - coven@mix.shakespeare.lit + hag66@shakespeare.example + cat@shakespeare.example + coven@mix.shakespeare.example ABCDEF @@ -1846,14 +1846,14 @@ This approach enables flexible support of multiple clients for a MIX channel pa The inviter can now send the invitee a message containing the invitation within the <message/> element, as shown in the following example.

+ to='cat@shakespeare.example'> Would you like to join the coven? - hag66@shakespeare.lit - cat@shakespeare.lit - coven@mix.shakespeare.lit + hag66@shakespeare.example + cat@shakespeare.example + coven@mix.shakespeare.example ABCDEF @@ -1867,9 +1867,9 @@ This approach enables flexible support of multiple clients for a MIX channel pa - hag66@shakespeare.lit - cat@shakespeare.lit - coven@mix.shakespeare.lit + hag66@shakespeare.example + cat@shakespeare.example + coven@mix.shakespeare.example ABCDEF @@ -1884,16 +1884,16 @@ This approach enables flexible support of multiple clients for a MIX channel pa
  • 'Acknowledged': The invitation is acknowledged, without information on action taken or planned.
    • + to='hag66@shakespeare.example/UUID-h5z/0253'> No Thanks - too busy chasing mice.... Declined - hag66@shakespeare.lit - cat@shakespeare.lit - coven@mix.shakespeare.lit + hag66@shakespeare.example + cat@shakespeare.example + coven@mix.shakespeare.example ABCDEF @@ -1936,7 +1936,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa     @@ -1945,7 +1945,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa The user's server, on behalf of the user, MAY send a response or reject with an error. The user's server will send the vCard back to the channel.

    @@ -2104,8 +2104,8 @@ This approach enables flexible support of multiple clients for a MIX channel pa urn:xmpp:mix:1 - hecate@shakespeare.lit - greymalkin@shakespeare.lit + hecate@shakespeare.example + greymalkin@shakespeare.example allowed @@ -2269,7 +2269,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa the three witches meet - greymalkin@shakespeare.lit + greymalkin@shakespeare.example @@ -2333,8 +2333,8 @@ This approach enables flexible support of multiple clients for a MIX channel pa urn:xmpp:mix:1 - hecate@shakespeare.lit - greymalkin@shakespeare.lit + hecate@shakespeare.example + greymalkin@shakespeare.example allowed @@ -2383,8 +2383,8 @@ This approach enables flexible support of multiple clients for a MIX channel pa type='result'> - - + + @@ -2399,7 +2399,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa type='set'> - + @@ -2421,7 +2421,7 @@ This approach enables flexible support of multiple clients for a MIX channel pa type='set'> - +