Merge branch 'master' of athena.jabber.org:xmpp

This commit is contained in:
Peter Saint-Andre 2012-06-29 12:03:58 -06:00
commit 3395490a2b
1 changed files with 1 additions and 1 deletions

View File

@ -106,7 +106,7 @@
<p>Some informal examples:</p>
<ul>
<li>There have been 9 messages since the client was last in the room, and the client joins requesting a maximum of 20 stanzas. The client receives the 9 messages.</li>
<li>There have been 9 messages since the client was last in the room, and the client joins requesting a maximum of 5 stanzas. The client first receives a message that the history has been trucated and then the 5 most recent messages.</li>
<li>There have been 9 messages since the client was last in the room, and the client joins requesting a maximum of 5 stanzas. The client first receives a message that the history has been truncated and then the 5 most recent messages.</li>
<li>There have been 9 messages since the client was last in the room, and the client requests that no history be sent. The client receives the truncation message and no history</li>
</ul>
<example caption="Romeo receives annotated message while in room" ><![CDATA[