From 8d78ce1a998d7c33bed0a3939ca9776e93f01bbc Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Mon, 2 Mar 2020 12:59:10 +0100 Subject: [PATCH 1/5] XEP-0369: Fix wording --- xep-0369.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xep-0369.xml b/xep-0369.xml index db510fa0..7f6a40f3 100644 --- a/xep-0369.xml +++ b/xep-0369.xml @@ -485,7 +485,7 @@

MIX is specified as a family of XEPs that address the full set of requirements. Only two of these XEPs are mandatory for providing a MIX service. The others provide additional services and are used when these additional services are required. Each of these specifications has a short name, which is used to refer the specific XEP. The term MIX is used to refer to the family of XEPs. MIX is extensible, and it is anticipated that further XEPs will be added to this family. The XEPs are:

    -
  1. MIX-CORE. &xep0369;. This specification, which is the central mandatory MIX specification. This sets out requirements addressed by MIX and general MIX concepts and framework. It defines joining channels and associated participant management. It defines discovery and sharing of MIX channels and information about them. It defines use of MIX to share messages with channel participants.
    2. +
  2. MIX-CORE. &xep0369;. This specification is the central mandatory MIX specification. It sets out requirements addressed by MIX and general MIX concepts and framework. It defines joining channels and associated participant management. It defines discovery and sharing of MIX channels and information about them. It defines use of MIX to share messages with channel participants.
  3. MIX-PRESENCE. &xep0403;. This optional specification adds the ability for MIX online clients to share presence, so that this can be seen by other MIX clients. It also specifies relay of IQ stanzas through a channel.
  4. MIX-PAM. &xep0405;. This specification defines how a server supporting MIX clients behaves, to support servers implementing MIX-CORE and MIX-PRESENCE.
  5. MIX-ADMIN. &xep0406;. This specifies MIX configuration and administration of MIX.
    6. @@ -600,7 +600,7 @@ -

    MIX defines a number standard nodes, and this specification defines three of these nodes and the framework for adding further nodes. +

    MIX defines a number of standard nodes, and this specification defines three of these nodes and the framework for adding further nodes.

    @@ -655,7 +655,7 @@ It may be useful for clients to read the participants list. However it is not necessary for message and presence display, as both messages and presence contain sufficient information to enable display.

    - Users MAY subscribe to and read information this node, when permitted by the channel. Standard PubSub access will allow a full list of participants and associated nicks to be determined. By subscribing to the node, a user will be informed of changes to the Participants Node. + Users MAY subscribe to, and read information from this node, when permitted by the channel. Standard PubSub access will allow a full list of participants and associated nicks to be determined. By subscribing to the node, a user will be informed of changes to the Participants Node.

    The participants node is MANDATORY. The Participants node is a permanent node with one item per participant.

    • 'urn:xmpp:mix:core:1': This indicates support of MIX, and is returned by all MIX services.
      • -
    • 'urn:xmpp:mix:core:1#searchable': This is shown in the above example and indicates that a the MIX Service MAY be searched for channels. This presence of this feature can be used by a client to guide the user to search for channels in a MIX service.
      • -
    • 'urn:xmpp:mix:core:1#create-channel': This is described in Checking for Permission to Create a Channel in support of channel administration. When an end user client needs to create channels, perhaps for short term usage, this feature helps the client to identify an MIX service to use. It enables a configuration where permanent (searchable) channels are placed in one MIX service and clients will be able to create channels in another MIX service which is not searchable.
      • +
    • 'urn:xmpp:mix:core:1#searchable': This is shown in the above example and indicates that a the MIX Service MAY be searched for channels. The presence of this feature can be used by a client to guide the user to search for channels in a MIX service.
      • +
    • 'urn:xmpp:mix:core:1#create-channel': This is described in Checking for Permission to Create a Channel in support of channel administration. When an end user client needs to create channels, perhaps for short term usage, this feature helps the client to identify a MIX service to use. It enables a configuration where permanent (searchable) channels are placed in one MIX service and clients will be able to create channels in another MIX service which is not searchable.

    A MIX service MUST NOT advertise support for &xep0313;, as MAM is supported by the channels and not by the service. A MIX service MUST NOT advertise support for generic &xep0060;, as although MIX makes use of PubSub it is not a generic PubSub service.

    @@ -1069,7 +1069,7 @@

    - A user MAY subsequently modify subscription to nodes in a channel by sending a subscription modification request encoded as a <update-subscription/> child element of <iq/> element. The <update-subscription/> element is qualified by the 'urn:xmpp:mix:core:1' namespace. The requested notes are encoded as <subscribe/> child elements of the <update-subscription/> element with the node name encoded as a 'node' attribute. This modification goes directly from client to MIX channel, as this change does not impact the roster and so does not need any local action. The following example shows subscription modification. + A user MAY subsequently modify subscription to nodes in a channel by sending a subscription modification request encoded as a <update-subscription/> child element of <iq/> element. The <update-subscription/> element is qualified by the 'urn:xmpp:mix:core:1' namespace. The requested nodes are encoded as <subscribe/> child elements of the <update-subscription/> element with the node name encoded as a 'node' attribute. This modification goes directly from client to the MIX channel, as this change does not impact the roster and so does not need any local action. The following example shows subscription modification.

    Date: Mon, 2 Mar 2020 13:02:19 +0100 Subject: [PATCH 2/5] XEP-0369: Fix typo --- xep-0369.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xep-0369.xml b/xep-0369.xml index 7f6a40f3..fd0c17a9 100644 --- a/xep-0369.xml +++ b/xep-0369.xml @@ -546,7 +546,7 @@ - +

    MIX will enable a wide range of auxiliary services. The goal of the MIX family of specification is to set out the core capabilities needed for MIX. It is anticipated that additional XEPs will be written to extend the current MIX specification, and the MIX specification family notes some areas where this may happen. Profiles referencing sets of related MIX XEPs may be developed in the future.

    From 52224651352e31864c84fbbf0a60dcd5fd1eb9bc Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Mon, 2 Mar 2020 13:02:41 +0100 Subject: [PATCH 3/5] XEP-0369: Fix example XML indentation --- xep-0369.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xep-0369.xml b/xep-0369.xml index fd0c17a9..f8bdd972 100644 --- a/xep-0369.xml +++ b/xep-0369.xml @@ -662,8 +662,8 @@ - thirdwitch - hag66@shakespeare.example + thirdwitch + hag66@shakespeare.example @@ -1058,7 +1058,7 @@ hag66@shakespeare.example - third witch + third witch From 70c119be183d81d9090dbde9c7db811b089ee4bc Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Mon, 2 Mar 2020 13:03:00 +0100 Subject: [PATCH 4/5] XEP-0369: Add missing '.' --- xep-0369.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/xep-0369.xml b/xep-0369.xml index f8bdd972..92f0e3dc 100644 --- a/xep-0369.xml +++ b/xep-0369.xml @@ -605,8 +605,7 @@
    NameNodeDescriptionUpdateDistribution
    - - +
    NameNodeDescriptionUpdateDistribution
    Messages'urn:xmpp:mix:nodes:messages'For distributing messages to the channel. Each item of this node will contain a message sent to the channel.MessageMessage
    Participants'urn:xmpp:mix:nodes:participants'For storing the list of participants and the associated nick. Channel participants are added when they join the channel and removed when they leave Join/Leave/Set NickPubSub
    Participants'urn:xmpp:mix:nodes:participants'For storing the list of participants and the associated nick. Channel participants are added when they join the channel and removed when they leave.Join/Leave/Set NickPubSub
    Information'urn:xmpp:mix:nodes:info'For storing general channel information, such as description. PubSubPubSub
    From 7457d82c1c79aa6f0cee4d9199e1a358a76505b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Sch=C3=A4fer?= Date: Tue, 3 Mar 2020 18:38:27 +0100 Subject: [PATCH 5/5] =?UTF-8?q?XEP=E2=80=940369:=20add=20revision-block?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xep-0369.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xep-0369.xml b/xep-0369.xml index 92f0e3dc..8ab1655e 100644 --- a/xep-0369.xml +++ b/xep-0369.xml @@ -35,6 +35,12 @@ MIX-CORE &ksmithisode; &skille; + + 0.14.3 + 2020-03-03 + ps +

    Minor editorial fixes

     +     0.14.2 2019-03-18