diff --git a/inbox/calendaring.xml b/inbox/calendaring.xml index 67003f18..185b7d58 100644 --- a/inbox/calendaring.xml +++ b/inbox/calendaring.xml @@ -183,7 +183,7 @@ END:VCALENDAR

A calendar node contains calendar items that represent calendar components within a calendar. A calendar node is manifested to entities as a publish-subscribe node identified by a NodeID. A calendar node MUST report the '&NS;' feature &VNOTE; in the result of a 'disco#info' query. A calendar service MUST persist items for a calendar node.

-

A calendar node can be created through provisioning (i.e., automatically created when a user's account is provisioned), or it can be created with the publish-subscribe <create/> request (see section Creating Calendars). It can be useful for a user to create additional calendars (e.g., soccer schedule) or for users to share a calendar (e.g., team events or conference rooms). However, note that this specification doesn't define the purpose of calendar nodes. Users may use the 'pubsub#title' and 'pubsub#description' fields in node metadata to find out what a calendar node is for.

+

A calendar node can be created through provisioning (i.e., automatically created when a user's account is provisioned), or it can be created with the publish-subscribe <create/> request (see section Creating Calendars). It can be useful for a user to create additional calendars (e.g., soccer schedule) or for users to share a calendar (e.g., team events or conference rooms). However, note that this specification doesn't define the purpose of calendar nodes. Users may use the 'pubsub#title' and 'pubsub#description' fields in node meta-data to find out what a calendar node is for.

Calendar nodes MUST only contain calendar items. This ensures that entities do not have to deal with non-calendar data in a calendar node.

@@ -331,7 +331,7 @@ END:VCALENDAR -

A calendar service MUST also allow entities to query individual nodes for the information associated with that node. A calendar service supporting the features described in this specification MUST include "&NS;" &VNOTE; as a feature in the "disco#info" result for a calendar node. It MUST NOT include the feature in the result for a non-calendar node. The "disco#info" result MAY include detailed metadata about the node as described in section 5.4 of XEP-0060.

+

A calendar service MUST also allow entities to query individual nodes for the information associated with that node. A calendar service supporting the features described in this specification MUST include "&NS;" &VNOTE; as a feature in the "disco#info" result for a calendar node. It MUST NOT include the feature in the result for a non-calendar node. The "disco#info" result MAY include detailed meta-data about the node as described in section 5.4 of XEP-0060.

]]> - - http://jabber.org/protocol/pubsub#metadata + http://jabber.org/protocol/pubsub#meta-data urn:ietf:params:xml:ns:xcal diff --git a/inbox/pubsub-uri.xml b/inbox/pubsub-uri.xml index 8e32b06e..8ea0b57b 100644 --- a/inbox/pubsub-uri.xml +++ b/inbox/pubsub-uri.xml @@ -158,7 +158,7 @@ pubsub-itemid = 1*( unreserved / pct-encoded / sub-delims )

The query component provides a way to refer more specifically to data associated with the target. Possible values for URIs referring to - nodes are: "metadata" and "last-item".

+ nodes are: "meta-data" and "last-item".

If an authority ("authxmpp") is given in the URI string, this indicates the user the application should connect as. Otherwise, the application @@ -174,8 +174,8 @@ pubsub-itemid = 1*( unreserved / pct-encoded / sub-delims ) - - + +