1
0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-24 18:22:24 -05:00

Merge branch 'feature/xep-0162' into main

This commit is contained in:
Jonas Schäfer 2020-07-07 18:33:59 +02:00
commit 5077c3f0be

View File

@ -23,6 +23,12 @@
<email>lucas@lucas-nussbaum.net</email> <email>lucas@lucas-nussbaum.net</email>
<jid>lucas@nussbaum.fr</jid> <jid>lucas@nussbaum.fr</jid>
</author> </author>
<revision>
<version>0.2.1</version>
<date>2020-06-25</date>
<initials>ps</initials>
<remark>Fixed small typos</remark>
</revision>
<revision> <revision>
<version>0.2</version> <version>0.2</version>
<date>2005-12-06</date> <date>2005-12-06</date>
@ -90,7 +96,7 @@
</ul> </ul>
<p>Additionally, if <em>subscription='from'</em> or <p>Additionally, if <em>subscription='from'</em> or
<em>subscription='none'</em>, you can have <em>ask='suscribe'</em>, which <em>subscription='none'</em>, you can have <em>ask='subscribe'</em>, which
means you sent a subscription request to the item but haven't received an means you sent a subscription request to the item but haven't received an
answer yet.</p> answer yet.</p>
@ -160,7 +166,7 @@
(contacts with <em>subscription='both'</em> or <em>subscription='to'</em>) and contacts which (contacts with <em>subscription='both'</em> or <em>subscription='to'</em>) and contacts which
are only interested in receiving the user's presence information. Also, the are only interested in receiving the user's presence information. Also, the
user might be interested in having some contacts even with user might be interested in having some contacts even with
<em>subscription='none'</em>, because he often send messages to them but isn't <em>subscription='none'</em>, because he often sends messages to them but isn't
interested in their presence.</p> interested in their presence.</p>