From 6842676930122aaa2988cf3595175849fd7fa4f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20=E2=80=9Cpep=E2=80=9D=20Buquet?= Date: Sat, 3 Nov 2018 14:03:00 +0000 Subject: [PATCH] Revert "Revert normative changes for 'meta-data'" This reverts commit 37c7b852f302fca26a885e9d2c2aea5de019fc3e. --- inbox/calendaring.xml | 2 +- inbox/pubsub-uri.xml | 2 +- xep-0060.xml | 20 ++++++++++---------- xep-0214.xml | 10 +++++----- xep-0248.xml | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/inbox/calendaring.xml b/inbox/calendaring.xml index baa4413a..67003f18 100644 --- a/inbox/calendaring.xml +++ b/inbox/calendaring.xml @@ -353,7 +353,7 @@ END:VCALENDAR - http://jabber.org/protocol/pubsub#meta-data + http://jabber.org/protocol/pubsub#metadata urn:ietf:params:xml:ns:xcal diff --git a/inbox/pubsub-uri.xml b/inbox/pubsub-uri.xml index 29fbac7d..8e32b06e 100644 --- a/inbox/pubsub-uri.xml +++ b/inbox/pubsub-uri.xml @@ -175,7 +175,7 @@ pubsub-itemid = 1*( unreserved / pct-encoded / sub-delims ) - + diff --git a/xep-0060.xml b/xep-0060.xml index b981b1eb..e724c154 100644 --- a/xep-0060.xml +++ b/xep-0060.xml @@ -301,7 +301,7 @@ 1.6 2004-07-13 pgm/psa -

Added service discovery features for pubsub#meta-data, and pubsub#retrieve-items. Added pubsub#subscription_depth configuration option. Specified pubsub-specific error condition elements qualified by pubsub#errors namespace.

 +

Added service discovery features for pubsub#metadata, and pubsub#retrieve-items. Added pubsub#subscription_depth configuration option. Specified pubsub-specific error condition elements qualified by pubsub#errors namespace.

 1.5 @@ -367,7 +367,7 @@ 0.12 2003-08-13 pgm/psa -

Defined public vs. private nodes; described how changes to existing nodes might trigger meta-node events (e.g., configuration changes); changed <x/> to <event/> for #events namespace; added meta-data about meta-nodes; fully defined XMPP Registrar considerations.

 +

Defined public vs. private nodes; described how changes to existing nodes might trigger meta-node events (e.g., configuration changes); changed <x/> to <event/> for #events namespace; added metadata about meta-nodes; fully defined XMPP Registrar considerations.

 0.11 @@ -981,7 +981,7 @@ And by opposing end them? ]]> -

The "disco#info" result MAY include detailed metadata about the node, encapsulated in the &xep0004; format as described in &xep0128;, where the data form context is specified by including a FORM_TYPE of "http://jabber.org/protocol/pubsub#meta-data" in accordance with &xep0068;. If metadata is provided, it SHOULD include values for all configured options as well as "automatic" information such as the node creation date, a list of publishers, and the like.

+

The "disco#info" result MAY include detailed metadata about the node, encapsulated in the &xep0004; format as described in &xep0128;, where the data form context is specified by including a FORM_TYPE of "http://jabber.org/protocol/pubsub#metadata" in accordance with &xep0068;. If metadata is provided, it SHOULD include values for all configured options as well as "automatic" information such as the node creation date, a list of publishers, and the like.

- http://jabber.org/protocol/pubsub#meta-data + http://jabber.org/protocol/pubsub#metadata http://www.w3.org/2005/Atom @@ -5118,7 +5118,7 @@ And by opposing end them? Affiliations - meta-data + metadata Node metadata is supported. RECOMMENDED   @@ -6013,7 +6013,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings;item=ae XEP-0060 - http://jabber.org/protocol/pubsub#meta-data + http://jabber.org/protocol/pubsub#metadata Node metadata is supported. XEP-0060 @@ -6136,7 +6136,7 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings;item=ae
  • Authorization of subscriptions using the 'http://jabber.org/protocol/pubsub#subscribe_authorization' namespace.
  • Configuration of subscription options using the 'http://jabber.org/protocol/pubsub#subscribe_options' namespace.
  • Configuration of a node using the 'http://jabber.org/protocol/pubsub#node_config' namespace.
    • -
  • Setting of metadata information using the 'http://jabber.org/protocol/pubsub#meta-data' namespace.
    • +
  • Setting of metadata information using the 'http://jabber.org/protocol/pubsub#metadata' namespace.

    • The registry submissions associated with these namespaces are defined below.

    Note: There is no requirement that configuration fields need to be registered with the XMPP Registrar. However, as specified in Section 3.4 of XEP-0068, names of custom (unregistered) fields MUST begin with the characters "x-" if the form itself is scoped by a registered FORM_TYPE.

    @@ -6240,10 +6240,10 @@ xmpp:pubsub.shakespeare.lit?pubsub;action=retrieve;node=princely_musings;item=ae ]]> - + - http://jabber.org/protocol/pubsub#meta-data + http://jabber.org/protocol/pubsub#metadata XEP-0060 Forms enabling setting of metadata information about pubsub nodes - + diff --git a/xep-0214.xml b/xep-0214.xml index 4c33bb6d..280aab60 100644 --- a/xep-0214.xml +++ b/xep-0214.xml @@ -127,7 +127,7 @@ - http://jabber.org/protocol/pubsub#meta-data + http://jabber.org/protocol/pubsub#metadata Juliet's Sonnets Optional Description @@ -163,7 +163,7 @@ - http://jabber.org/protocol/pubsub#meta-data + http://jabber.org/protocol/pubsub#metadata Sonnets About Romeo Optional Description @@ -218,7 +218,7 @@ - http://jabber.org/protocol/pubsub#meta-data + http://jabber.org/protocol/pubsub#metadata sonnet.txt Sonnet 42 @@ -234,7 +234,7 @@ - + 5623 2006-12-13T18:30:02Z 59282c5db190bdc3b152c5b38363442bfda8ebdd @@ -332,7 +332,7 @@ - http://jabber.org/protocol/pubsub#meta-data + http://jabber.org/protocol/pubsub#metadata Sonnet 42 sonnet.txt diff --git a/xep-0248.xml b/xep-0248.xml index 147ef0f2..f31a91e9 100644 --- a/xep-0248.xml +++ b/xep-0248.xml @@ -259,7 +259,7 @@ - http://jabber.org/protocol/pubsub#meta-data + http://jabber.org/protocol/pubsub#metadata 2003-07-29T22:56Z