git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@383 4b5297f7-1745-476d-ba37-a9c6900126ab
This commit is contained in:
Peter Saint-Andre 2007-01-19 04:16:18 +00:00
parent f6a2186ba9
commit eb68e66003
2 changed files with 2 additions and 2 deletions

View File

@ -151,7 +151,7 @@
]]></example>
</section1>
<section1 topic='Archiving Preferences' anchor='pref'>
<section2 topic='Introducton' anchor='pref-reqs'>
<section2 topic='Introduction' anchor='pref-reqs'>
<p>Not all users want to archive messages. A client SHOULD save its user's default archiving preference (or "Save Mode") to its own server (i.e., specify whether by default all conversations should be archived or not). In addition, a client MAY save different preferences for particular contacts.</p>
<p>Some users may also prefer that the messages they exchange with contacts are "<link url='#otr'>Off The Record</link>" (OTR). A client SHOULD save its user's default and contact-specific OTR preferences (or "OTR Modes") to its own server.</p>
<p>Whichever archiving method a client uses (e.g., local file archiving, or automatic or manual archiving to a server), it SHOULD adhere to its user's archiving preferences. However, a client MAY maintain a set of preferences in a local file which takes precedence over the preferences stored on the server for both local archiving and manual archiving.</p>

View File

@ -214,7 +214,7 @@ xmpp:romeo@montague.net?subscribe
<presence to='romeo@montague.net' type='subscribe'/>
]]></example>
</section3>
<section3 topic='Subscribe' anchor='actions-sub-subscribe'>
<section3 topic='Unsubscribe' anchor='actions-sub-unsubscribe'>
<p>XMPP includes a mechanism for unsubscribing from an entity. The registered querytype for doing so is "unsubscribe".</p>
<example caption='Unsubscribe Action: IRI/URI'><![CDATA[
xmpp:romeo@montague.net?unsubscribe