aboutsummaryrefslogtreecommitdiffstats
path: root/README.md
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-03-12 01:48:41 +0100
committerDaniel Gultsch <daniel@gultsch.de>2014-03-12 01:48:41 +0100
commit36728d5c0f58488479c2f9eaa4511621774b0dd6 (patch)
tree4750bc187bf89833cb8c2d55a36f7942057d63f9 /README.md
parent01e2a3a4cda80ae0bc1bacc8d5413152c1390816 (diff)
updated readme
Diffstat (limited to '')
-rw-r--r--README.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/README.md b/README.md
index 2c4561f2..23c9e051 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,13 @@ Therefore to get the most out of Conversations you should consider either switch
XMPP server that does or - even better - run your own XMPP server for you and
your friends.
These XEPs are - as of now:
+* XEP-0198: Stream Management allows XMPP to surive small network outages and changes of the underlying TCP connection.
* XEP-0280: Message Carbons which automatically syncs the messages you send to
your desktop client and thus allows you to switch seamlessly from your mobile
client to your desktop client and back within one conversation.
* XEP-0237: Roster Versioning mainly to save bandwith on poor mobile connections
+
+##FAQ
+###Security
+####Why are there to end-to-end encryption methods and which one should I choose?
+In most cases OTR should be the encryption method of choice. It works out of the box with most contacts as long as they are online.