From 0be5f868baf669801e782964ae2a21230b42e4c4 Mon Sep 17 00:00:00 2001 From: Peter Saint-Andre Date: Thu, 10 May 2007 17:16:44 +0000 Subject: [PATCH] 0091 to 0203 git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@821 4b5297f7-1745-476d-ba37-a9c6900126ab --- xep-0060.xml | 26 ++++++++++++++++++++++++-- xep-0160.xml | 8 ++++---- xep-0187.xml | 2 +- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/xep-0060.xml b/xep-0060.xml index 83b22c57..14fa34f4 100644 --- a/xep-0060.xml +++ b/xep-0060.xml @@ -1,3 +1,17 @@ +PEP FEATURES + +presence-subscribe (4.1) +caps-filtering (4.2) +auto-create (3) +last-published (4.3.4 -- or config?) + +one feature for each default access model? + +OTHER FEATURES + +subscribe-and-get (needed if last-published?) +plus-private + @@ -1016,7 +1030,7 @@ And by opposing end them? ]]> -

The service MAY also send the last published item to the new subscriber. The message containing this item SHOULD be stamped with extended information qualified by the 'jabber:x:delay' namespace (see &xep0091;) to indicate it is are sent with delayed delivery. (Note that in this example the message notification is sent to the bare JID since that is the subscribed JID.)

+

The service MAY also send the last published item to the new subscriber. The message containing this item SHOULD be stamped with extended information qualified by the 'urn:xmpp:delay' namespace (see &xep0203;) to indicate it is are sent with delayed delivery. (Note that in this example the message notification is sent to the bare JID since that is the subscribed JID.)

@@ -1040,7 +1054,7 @@ And by opposing end them? - + ]]>

There are several reasons why the subscription request might fail:

@@ -4550,6 +4564,14 @@ And by opposing end them? + +

Publish-subscribe functionality can be integrated into existing instant messaging and presence services (see RFC 3921), such that each registered account functions as a virtual pubsub service (sometimes called "pubsub-on-a-JID"). In such deployments, the root pubsub node for each virtual pubsub service has the same address as the account JID, which is typically associated with an IM user (e.g., <hamlet@denmark.lit>). Since an IM user typically has a roster of buddies and shares presence information with those buddies, the virtual pubsub service can use the roster and presence information to provide some helpful shortcuts for subscribers, in particular the auto-subscribe and filtered-notifications features described in this section.

+ + + + + +

This section summarizes the features described herein, specifies the appropriate requirements level for each feature (REQUIRED, RECOMMENDED, or OPTIONAL), and provides cross-references to the section of this document in which each feature is described.

Note: The feature names are all of the form "http://jabber.org/protocol/pubsub#name", where "name" is the text specified in the first column below.

diff --git a/xep-0160.xml b/xep-0160.xml index db8f7cc3..e9a5ad36 100644 --- a/xep-0160.xml +++ b/xep-0160.xml @@ -77,7 +77,7 @@ 1 ]]> -

The recipient's server now delivers the offline message to that resource (it is RECOMMENDED for the server to add a &xep0091; extension to indicate that the message was stored offline).

+

The recipient's server now delivers the offline message to that resource (it is RECOMMENDED for the server to add a &xep0203; extension to indicate that the message was stored offline).

@@ -85,9 +85,9 @@ Being in night, all this is but a dream, Too flattering-sweet to be substantial. - - Offline Storage - + Offline Storage ]]> diff --git a/xep-0187.xml b/xep-0187.xml index df965699..de2bf8a4 100644 --- a/xep-0187.xml +++ b/xep-0187.xml @@ -380,7 +380,7 @@

Alice MUST NOT send encrypted content within an offline ESession started by Bob. If Bob is conducting an offline ESession with Alice when she is online (e.g., if he is not subscribing to her presence), then if Alice wants to send a stanza to Bob, she MUST terminate the offline ESession and start a new online ESession first.

-

For Offline ESessions, Bob SHOULD include a 'Created' SHIM header in the encrypted content. Assuming she trusts Bob, Alice SHOULD trust this header and ignore the unencrypted &xep0091; element inserted by her server.

+

For Offline ESessions, Bob SHOULD include a 'Created' SHIM header in the encrypted content. Assuming she trusts Bob, Alice SHOULD trust this header and ignore the unencrypted &xep0203; element inserted by her server.