diff --git a/xep-0107.xml b/xep-0107.xml index 39713e27..c4ca0c50 100644 --- a/xep-0107.xml +++ b/xep-0107.xml @@ -15,7 +15,7 @@ Standards XMPP Core - XEP-0060 + XEP-0163 @@ -25,47 +25,53 @@ &stpeter; &ralphm; + + 1.1pre1 + in progress, last updated 2007-05-30 + psa +

Corrected PEP examples.

+
1.0 2004-10-20 psa/rm - Per a vote of the Jabber Council, advanced status to Draft; per Council discussion, also added two additional moods and adjusted structure to use elements rather than XML character data. +

Per a vote of the Jabber Council, advanced status to Draft; per Council discussion, also added two additional moods and adjusted structure to use elements rather than XML character data.

0.6 2004-09-15 psa - Added internationalization considerations. +

Added internationalization considerations.

0.5 2004-04-25 psa - Corrected several errors; added reference to XEP-0033. +

Corrected several errors; added reference to XEP-0033.

0.4 2004-02-19 psa - Minor fixes to text and schema. +

Minor fixes to text and schema.

0.3 2003-08-01 psa - Added more moods. +

Added more moods.

0.2 2003-07-23 psa - Expanded the information format; changed primary container to use pubsub. +

Expanded the information format; changed primary container to use pubsub.

0.1 2003-07-22 psa - Initial version. +

Initial version.

@@ -77,7 +83,7 @@ - Yay, the mood document has been approved! + Yay, the mood spec has been approved! ]]>

In addition, an application MAY provide a more specific mood value as a properly-namespaced child of the defined element, which extension MUST be ignored if the receiving application does not understand the extended namespace. Here is an example:

@@ -86,21 +92,19 @@ - Yay, the mood document has been approved! + Yay, the mood spec has been approved! ]]> -

The <mood/> element SHOULD be communicated by means of &xep0060; or the subset of publish-subscribe specified in &xep0163;, but MAY be provided in a message as well. Because mood information is not pure presence information and can change independently of the user's availability, it SHOULD NOT be provided as an extension to &PRESENCE;.

-

If the user wishes to publish his mood to all of those who are subscribed to his mood information, the user SHOULD use publish-subscribe (the following examples show use of the publish-subscribe subset specified in XEP-0163).

+

Mood information SHOULD be communicated and transported by means of the &xep0060; subset specified in &xep0163;. Because mood information is not pure presence information and can change independently of the user's availability, it SHOULD NOT be provided as an extension to &PRESENCE;.

- + curse my nurse! @@ -113,11 +117,11 @@

The mood is then delivered to all subscribers:

+ from='juliet@capulet.lit' + to='romeo@montague.net'> - + curse my nurse! @@ -130,52 +134,17 @@ . . ]]> -

As mentioned in XEP-0060, the stanza containing the event notification or payload MAY also include 'replyto' data (as specified by the &xep0033; protocol) to provide an explicit association between the published data and the user:

- - - - - - - curse my nurse! - - - - - -
- - - ]]> -

A user MAY also provide a mood extension in a specific message, in order to lend a defined emotional tone to the message.

+

A user MAY provide a mood extension in a specific message in order to lend a defined emotional tone to the text.

A thousand times good night! - - ]]> -

The <mood/> element could even contain a URL reference structured according to the &xep0066; protocol:

- - Cool! - - - Yay, the mood document has been published! - - http://www.xmpp.org/extensions/xep-0107.html - - ]]>
diff --git a/xep-0108.xml b/xep-0108.xml index 54252a75..fbb78005 100644 --- a/xep-0108.xml +++ b/xep-0108.xml @@ -15,7 +15,7 @@ Standards XMPP Core - XEP-0060 + XEP-0163 @@ -25,35 +25,41 @@ &ralphm; &stpeter; + + 1.1pre1 + in progress, last updated 2007-05-30 + psa +

Corrected PEP examples.

+
1.0 2004-10-20 psa/rm - Per a vote of the Jabber Council, advanced status to Draft; per Council discussion, also adjusted structure to use nested elements rather than XML character data. +

Per a vote of the Jabber Council, advanced status to Draft; per Council discussion, also adjusted structure to use nested elements rather than XML character data.

0.4 2004-09-15 psa - Added internationalization considerations. +

Added internationalization considerations.

0.3 2004-04-25 psa - Corrected several errors; added reference to XEP-0033. +

Corrected several errors; added reference to XEP-0033.

0.2 2004-02-19 psa - Minor text and schema changes; added RPID mapping. +

Minor text and schema changes; added RPID mapping.

0.1 2003-07-22 rm - Initial version. +

Initial version.

@@ -91,16 +97,14 @@

In accordance with &xmppcore;, the receiving application MUST ignore a specific activity element or detailed activity element if it does not understand the namespace that qualifies the element.

-

The <activity/> element SHOULD be communicated by means of &xep0060; or the subset of publish-subscribe specified in &xep0163;. Because activity information is not pure presence information and can change independently of the user's availability, it SHOULD NOT be provided as an extension to &PRESENCE;.

-

Note: The following examples show use of the publish-subscribe subset specified in XEP-0163.

+

Activity information SHOULD be communicated and transported by means of the &xep0060; subset specified in &xep0163;. Because activity information is not pure presence information and can change independently of the user's availability, it SHOULD NOT be provided as an extension to &PRESENCE;.

- + @@ -115,11 +119,11 @@

The activity is then delivered to all subscribers:

+ from='juliet@capulet.lit' + to='romeo@montague.lit'> - + @@ -134,28 +138,6 @@ . . ]]> -

As mentioned in XEP-0060, the stanza containing the event notification or payload MAY also include 'replyto' data (as specified by the &xep0033; protocol) to provide an explicit association between the published data and the user:

- - - - - - - - - My nurse's birthday! - - - - - -
- - - ]]> diff --git a/xep-0118.xml b/xep-0118.xml index 5056bfab..6f99def0 100644 --- a/xep-0118.xml +++ b/xep-0118.xml @@ -15,8 +15,7 @@ Standards XMPP Core - XMPP IM - XEP-0060 + XEP-0163 @@ -25,71 +24,77 @@ http://www.xmpp.org/schemas/tune.xsd &stpeter; + + 1.1pre1 + in progress, last updated 2007-05-30 + psa +

Removed non-PEP examples; added uri element.

+
1.0 2004-11-12 psa - Per a vote of the Jabber Council, advanced status to Draft. +

Per a vote of the Jabber Council, advanced status to Draft.

0.10 2004-10-29 psa - Added example with URL. +

Added example with URL.

0.9 2004-10-27 psa - Changed recommendation to not include the <length/> element if the track time is unknown. +

Changed recommendation to not include the <length/> element if the track time is unknown.

0.8 2004-10-26 psa - Added implementation notes; clarified nature of <source/> and <track/> elements; if length is unknown, set to zero. +

Added implementation notes; clarified nature of <source/> and <track/> elements; if length is unknown, set to zero.

0.7 2004-05-20 psa - Changed <length/> datatype from xs:duration to xs:unsignedShort. +

Changed <length/> datatype from xs:duration to xs:unsignedShort.

0.6 2004-04-25 psa - Corrected several errors; added reference to XEP-0033. +

Corrected several errors; added reference to XEP-0033.

0.5 2004-02-19 psa - Reverted from infobits to tune elements. +

Reverted from infobits to tune elements.

0.4 2003-12-14 psa - Slight modifications to track changes to infobits specifications. +

Slight modifications to track changes to infobits specifications.

0.3 2003-10-23 psa - Replaced tune elements with infobits. +

Replaced tune elements with infobits.

0.2 2003-09-10 psa - Added "stop" function via empty <tune/> element. +

Added "stop" function via empty <tune/> element.

0.1 2003-09-08 psa - Initial version. +

Initial version.

@@ -112,10 +117,10 @@ xs:string - title - The title of the song or piece - Heart of the Sunrise - xs:string + length + The duration of the song or piece in seconds + 686 + xs:unsignedShort source @@ -123,6 +128,12 @@ Yessongs xs:string + + title + The title of the song or piece + Heart of the Sunrise + xs:string + track A unique identifier for the tune; e.g., the track number within a collection or the specific URI for the object (e.g., a stream or audio file) @@ -130,31 +141,30 @@ xs:string - length - The duration of the song or piece in seconds - 686 - xs:unsignedShort + uri + A URI or URL pointing to information about the song, collection, or artist + http://www.yesworld.com/lyrics/Fragile.html#9 + xs:anyURI

NOTE: The datatypes specified above are defined in &w3xmlschema2;.

-

Tune information SHOULD be communicated and transported by means of the &xep0060; protocol or the subset of publish-subscribe specified in &xep0163;. Because tune information is not pure presence information and can change independently of the user's availability, it SHOULD NOT be provided as an extension to &PRESENCE;.

-

Note: The following examples show use of the publish-subscribe subset specified in XEP-0163.

+

Tune information SHOULD be communicated and transported by means of the &xep0060; subset specified in &xep0163;. Because tune information is not pure presence information and can change independently of the user's availability, it SHOULD NOT be provided as an extension to &PRESENCE;.

- + Yes - Heart of the Sunrise - Yessongs - 3 686 + Yessongs + Heart of the Sunrise + 3 + http://www.yesworld.com/lyrics/Fragile.html#9 @@ -164,17 +174,18 @@

The tune information is then delivered to all subscribers:

- + Yes - Heart of the Sunrise - Yessongs - 3 686 + Yessongs + Heart of the Sunrise + 3 + http://www.yesworld.com/lyrics/Fragile.html#9 @@ -184,63 +195,16 @@ . . ]]> -

As mentioned in XEP-0060, the stanza containing the event notification or payload MAY also include 'replyto' data (as specified by the &xep0033; protocol) to provide an explicit association between the published data and the user:

- - - - - - Yes - Heart of the Sunrise - Yessongs - 3 - 686 - - - - - -
- - - ]]> -

Naturally, further extensions could be included, e.g., using &xep0066; to specify a URL where one could buy the recording.

- - - - - - Yes - Heart of the Sunrise - Yessongs - 3 - 686 - - http://www.amazon.com/exec/obidos/ASIN/B000002J1Y - - - - - - - ]]>

In order to indicate that the user is no longer listening to any tunes, the user's client SHOULD send an empty <tune/> element, which can be considered a "stop command" for user tunes:

- + @@ -249,11 +213,11 @@ ]]> - + @@ -266,7 +230,7 @@
-

To prevent a large number of updates when a user is skipping through tracks, an implementation may wait several seconds before publishing new tune information.

+

To prevent a large number of updates when a user is skipping through tracks, an implementation SHOULD wait several seconds before publishing new tune information.

If the length is unknown (e.g., the user is listening to a stream), the <length/> element SHOULD NOT be included.

@@ -301,10 +265,11 @@ - - - + + + +