moparisthebest/xeps
1
0
Fork 0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-28 12:12:22 -05:00
Code Issues Releases Wiki Activity

PEP adjustments

Browse Source 
git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@488 4b5297f7-1745-476d-ba37-a9c6900126ab
This commit is contained in:
Peter Saint-Andre 2007-02-02 03:18:30 +00:00
parent 0de3d697ce
commit 04aa1a1aef
4 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xep-0080.xml
View File

@ -244,13 +244,13 @@
<p>NOTE: The datatypes specified above are defined in &w3xmlschema2;.</p> <p>NOTE: The datatypes specified above are defined in &w3xmlschema2;.</p>
</section1> </section1>
<section1 topic='Use Cases' anchor='usecases'> <section1 topic='Use Cases' anchor='usecases'>
<p>The location information SHOULD be communicated by means of &xep0060; or the subset of pubsub defined in &xep0163;. Because location 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;, although an application MAY do so if necessary.</p> <p>The location information SHOULD be communicated by means of &xep0060; or the subset of publish-subscribe specified in &xep0163;. Because location 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;, although an application MAY do so if necessary.</p>
<section2 topic='Entity publishes location via pubsub' anchor='usecases-pubsub'> <section2 topic='Entity publishes location via pubsub' anchor='usecases-pubsub'>
<p>In order to provide information about one's location, the publishing entity should use the pubsub protocol (the following examples show use of the publish-subscribe subset specified in <cite>XEP-0163</cite>).</p> <p>In order to provide information about one's location, the publishing entity should use the pubsub protocol (the following examples show use of the publish-subscribe subset specified in <cite>XEP-0163</cite>).</p>
<example caption='Entity publishes location'><![CDATA[ <example caption='Entity publishes location'><![CDATA[
<iq type='set' from='portia@merchantofvenice.lit/pda'> id='publish1'> <iq type='set' from='portia@merchantofvenice.lit/pda'> id='publish1'>
<pubsub xmlns='http://jabber.org/protocol/pubsub'> <pubsub xmlns='http://jabber.org/protocol/pubsub'>
<publish node='n48ad4fj78zn38st734'> <publish node='http://jabber.org/protocol/geoloc'>
<item id='a1s2d3f4g5h6bjeh936'> <item id='a1s2d3f4g5h6bjeh936'>
<geoloc xmlns='http://jabber.org/protocol/geoloc' xml:lang='en'> <geoloc xmlns='http://jabber.org/protocol/geoloc' xml:lang='en'>
<country>Italy</country> <country>Italy</country>
@ -267,7 +267,7 @@
<message from='portia@merchantofvenice.lit' <message from='portia@merchantofvenice.lit'
to='bassanio@merchantofvenice.lit/home'> to='bassanio@merchantofvenice.lit/home'>
<event xmlns='http://jabber.org/protocol/pubsub#event'> <event xmlns='http://jabber.org/protocol/pubsub#event'>
<items node='n48ad4fj78zn38st734'> <items node='http://jabber.org/protocol/geoloc'>
<item id='a1s2d3f4g5h6bjeh936'> <item id='a1s2d3f4g5h6bjeh936'>
<geoloc xmlns='http://jabber.org/protocol/geoloc' xml:lang='en'> <geoloc xmlns='http://jabber.org/protocol/geoloc' xml:lang='en'>
<country>Italy</country> <country>Italy</country>

16
xep-0107.xml
View File

@ -91,16 +91,16 @@
]]></code> ]]></code>
</section2> </section2>
<section2 topic='Pubsub Transport' anchor='proto-pubsub'> <section2 topic='Pubsub Transport' anchor='proto-pubsub'>
<p>The &lt;mood/&gt; element SHOULD be communicated by means of &xep0060; 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;.</p> <p>The &lt;mood/&gt; 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;.</p>
<p>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.</p> <p>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 <cite>XEP-0163</cite>).</p>
<example caption='User Publishes Mood'><![CDATA[ <example caption='User Publishes Mood'><![CDATA[
<iq type='set' <iq type='set'
from='juliet@capulet.com/balcony' from='juliet@capulet.com/balcony'
to='pubsub.shakespeare.lit' to='pubsub.shakespeare.lit'
id='publish1'> id='publish1'>
<pubsub xmlns='http://jabber.org/protocol/pubsub'> <pubsub xmlns='http://jabber.org/protocol/pubsub'>
<publish node='generic/juliet-mood'> <publish node='http://jabber.org/protocol/mood'>
<item id='current'> <item id='a92lvfmlzsd923k'>
<mood xmlns='http://jabber.org/protocol/mood'> <mood xmlns='http://jabber.org/protocol/mood'>
<annoyed/> <annoyed/>
<text>curse my nurse!</text> <text>curse my nurse!</text>
@ -116,8 +116,8 @@
from='pubsub.shakespeare.lit' from='pubsub.shakespeare.lit'
to='romeo@montague.net/orchard'> to='romeo@montague.net/orchard'>
<event xmlns='http://jabber.org/protocol/pubsub#event'> <event xmlns='http://jabber.org/protocol/pubsub#event'>
<items node='generic/juliet-mood'> <items node='http://jabber.org/protocol/mood'>
<item id='current'> <item id='a92lvfmlzsd923k'>
<mood xmlns='http://jabber.org/protocol/mood'> <mood xmlns='http://jabber.org/protocol/mood'>
<annoyed/> <annoyed/>
<text>curse my nurse!</text> <text>curse my nurse!</text>
@ -136,8 +136,8 @@
from='pubsub.shakespeare.lit' from='pubsub.shakespeare.lit'
to='romeo@montague.net/orchard'> to='romeo@montague.net/orchard'>
<event xmlns='http://jabber.org/protocol/pubsub#event'> <event xmlns='http://jabber.org/protocol/pubsub#event'>
<items node='generic/juliet-mood'> <items node='http://jabber.org/protocol/mood'>
<item id='current'> <item id='a92lvfmlzsd923k'>
<mood xmlns='http://jabber.org/protocol/mood'> <mood xmlns='http://jabber.org/protocol/mood'>
<annoyed/> <annoyed/>
<text>curse my nurse!</text> <text>curse my nurse!</text>

11
xep-0108.xml
View File

@ -91,15 +91,16 @@
<p>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.</p> <p>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.</p>
</section2> </section2>
<section2 topic='Pubsub Transport' anchor='proto-pubsub'> <section2 topic='Pubsub Transport' anchor='proto-pubsub'>
<p>The &lt;activity/&gt; element SHOULD be communicated by means of &xep0060;. 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;.</p> <p>The &lt;activity/&gt; 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;.</p>
<p>Note: The following examples show use of the publish-subscribe subset specified in <cite>XEP-0163</cite>.</p>
<example caption='User Publishes Activity'><![CDATA[ <example caption='User Publishes Activity'><![CDATA[
<iq type='set' <iq type='set'
from='juliet@capulet.com/balcony' from='juliet@capulet.com/balcony'
to='pubsub.shakespeare.lit' to='pubsub.shakespeare.lit'
id='publish1'> id='publish1'>
<pubsub xmlns='http://jabber.org/protocol/pubsub'> <pubsub xmlns='http://jabber.org/protocol/pubsub'>
<publish node='generic/juliet-activity'> <publish node='http://jabber.org/protocol/activity'>
<item id='current'> <item id='zjsdf929la982873j'>
<activity xmlns='http://jabber.org/protocol/activity'> <activity xmlns='http://jabber.org/protocol/activity'>
<relaxing> <relaxing>
<partying/> <partying/>
@ -117,8 +118,8 @@
from='pubsub.shakespeare.lit' from='pubsub.shakespeare.lit'
to='romeo@montague.net/orchard'> to='romeo@montague.net/orchard'>
<event xmlns='http://jabber.org/protocol/pubsub#event'> <event xmlns='http://jabber.org/protocol/pubsub#event'>
<items node='generic/juliet-activity'> <items node='http://jabber.org/protocol/activity'>
<item id='current'> <item id='zjsdf929la982873j'>
<activity xmlns='http://jabber.org/protocol/activity'> <activity xmlns='http://jabber.org/protocol/activity'>
<relaxing> <relaxing>
<partying/> <partying/>

27
xep-0118.xml
View File

@ -139,15 +139,16 @@
<p>NOTE: The datatypes specified above are defined in &w3xmlschema2;.</p> <p>NOTE: The datatypes specified above are defined in &w3xmlschema2;.</p>
</section2> </section2>
<section2 topic='Transport Mechanism' anchor='protocol-transport'> <section2 topic='Transport Mechanism' anchor='protocol-transport'>
<p>Tune information SHOULD be communicated and transported by means of the &xep0060; protocol. 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;.</p> <p>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;.</p>
<p>Note: The following examples show use of the publish-subscribe subset specified in <cite>XEP-0163</cite>.</p>
<example caption='User Publishes Tune Information'><![CDATA[ <example caption='User Publishes Tune Information'><![CDATA[
<iq type='set' <iq type='set'
from='stpeter@jabber.org/work' from='stpeter@jabber.org/work'
to='pubsub.jabber.org' to='pubsub.jabber.org'
id='tunes123'> id='tunes123'>
<pubsub xmlns='http://jabber.org/protocol/pubsub'> <pubsub xmlns='http://jabber.org/protocol/pubsub'>
<publish node='generic/tunes/stpeter@jabber.org'> <publish node='http://jabber.org/protocol/tune'>
<item id='current'> <item id='jg939lalsd92l11jdlsd'>
<tune xmlns='http://jabber.org/protocol/tune'> <tune xmlns='http://jabber.org/protocol/tune'>
<artist>Yes</artist> <artist>Yes</artist>
<title>Heart of the Sunrise</title> <title>Heart of the Sunrise</title>
@ -166,8 +167,8 @@
from='pubsub.jabber.org' from='pubsub.jabber.org'
to='maineboy@jabber.org'> to='maineboy@jabber.org'>
<event xmlns='http://jabber.org/protocol/pubsub#event'> <event xmlns='http://jabber.org/protocol/pubsub#event'>
<items node='generic/tunes/stpeter@jabber.org'> <items node='http://jabber.org/protocol/tune'>
<item id='current'> <item id='jg939lalsd92l11jdlsd'>
<tune xmlns='http://jabber.org/protocol/tune'> <tune xmlns='http://jabber.org/protocol/tune'>
<artist>Yes</artist> <artist>Yes</artist>
<title>Heart of the Sunrise</title> <title>Heart of the Sunrise</title>
@ -189,8 +190,8 @@
from='pubsub.jabber.org' from='pubsub.jabber.org'
to='maineboy@jabber.org'> to='maineboy@jabber.org'>
<event xmlns='http://jabber.org/protocol/pubsub#event'> <event xmlns='http://jabber.org/protocol/pubsub#event'>
<items node='generic/tunes/stpeter@jabber.org'> <items node='http://jabber.org/protocol/tune'>
<item id='current'> <item id='jg939lalsd92l11jdlsd'>
<tune xmlns='http://jabber.org/protocol/tune'> <tune xmlns='http://jabber.org/protocol/tune'>
<artist>Yes</artist> <artist>Yes</artist>
<title>Heart of the Sunrise</title> <title>Heart of the Sunrise</title>
@ -212,8 +213,8 @@
from='pubsub.jabber.org' from='pubsub.jabber.org'
to='maineboy@jabber.org'> to='maineboy@jabber.org'>
<event xmlns='http://jabber.org/protocol/pubsub#event'> <event xmlns='http://jabber.org/protocol/pubsub#event'>
<items node='generic/tunes/stpeter@jabber.org'> <items node='http://jabber.org/protocol/tune'>
<item id='current'> <item id='jg939lalsd92l11jdlsd'>
<tune xmlns='http://jabber.org/protocol/tune'> <tune xmlns='http://jabber.org/protocol/tune'>
<artist>Yes</artist> <artist>Yes</artist>
<title>Heart of the Sunrise</title> <title>Heart of the Sunrise</title>
@ -238,8 +239,8 @@
to='pubsub.jabber.org' to='pubsub.jabber.org'
id='tunes345'> id='tunes345'>
<pubsub xmlns='http://jabber.org/protocol/pubsub'> <pubsub xmlns='http://jabber.org/protocol/pubsub'>
<publish node='generic/tunes/stpeter@jabber.org'> <publish node='http://jabber.org/protocol/tune'>
<item id='current'> <item id='jg939lalsd92l11jdlsd'>
<tune xmlns='http://jabber.org/protocol/tune'/> <tune xmlns='http://jabber.org/protocol/tune'/>
</item> </item>
</publish> </publish>
@ -251,8 +252,8 @@
from='pubsub.jabber.org' from='pubsub.jabber.org'
to='maineboy@jabber.org'> to='maineboy@jabber.org'>
<event xmlns='http://jabber.org/protocol/pubsub#event'> <event xmlns='http://jabber.org/protocol/pubsub#event'>
<items node='generic/tunes/stpeter@jabber.org'> <items node='http://jabber.org/protocol/tune'>
<item id='current'> <item id='jg939lalsd92l11jdlsd'>
<tune xmlns='http://jabber.org/protocol/tune'/> <tune xmlns='http://jabber.org/protocol/tune'/>
</item> </item>
</items> </items>