diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2014-10-19 18:00:32 +0200 |
---|---|---|
committer | Daniel Gultsch <daniel@gultsch.de> | 2014-10-19 18:00:32 +0200 |
commit | 3f280134bb7ec89d84638e5d8e944ce51a55f87d (patch) | |
tree | 76c62af8493a5aa657c9db8bb6fe0d5e2d40d8ea | |
parent | 0605390144b85dfe3531ad47cfa276f9f5c8ba5b (diff) | |
parent | ac3c96b0db5598139d83e169e3047b1c2d00487d (diff) |
Merge pull request #565 from the-solipsist/patch-2
Update README.md
-rw-r--r-- | README.md | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -1,5 +1,5 @@ #Conversations -Conversations - the very last word in instant messaging +Conversations: the very last word in instant messaging [![Google Play](http://developer.android.com/images/brand/en_generic_rgb_wo_45.png)](https://play.google.com/store/apps/details?id=eu.siacs.conversations) @@ -10,10 +10,10 @@ Conversations - the very last word in instant messaging privacy * Rely on existing, well established protocols (XMPP) * Do not require a Google Account or specifically Google Cloud Messaging (GCM) -* Require as little permissons as possible +* Require as few permissions as possible ##Features -* End-to-end encryption with either OTR or openPGP +* End-to-end encryption with either [OTR](https://otr.cypherpunks.ca/) or [OpenPGP](http://www.openpgp.org/about_openpgp/) * Sending and receiving images * Indication when your contact has read your message * Intuitive UI that follows Android Design guidelines @@ -21,7 +21,7 @@ Conversations - the very last word in instant messaging * Syncs with desktop client * Conferences (with support for bookmarks) * Address book integration -* Multiple Accounts / unified inbox +* Multiple accounts / unified inbox * Very low impact on battery life @@ -31,10 +31,10 @@ protocol. These extensions are standardized as well in so called XEP’s. Conversations supports a couple of those to make the overall user experience better. There is a chance that your current XMPP server does not support these extensions. Therefore to get the most out of Conversations you should consider either switching to an -XMPP server that does or - even better - run your own XMPP server for you and +XMPP server that does or — even better — run your own XMPP server for you and your friends. These XEPs are - as of now: -* XEP-0065: SOCKS5 Bytestreams - or rather mod_proxy65. Will be used to transfer files if both parties are behind a firewall (NAT). +* XEP-0065: SOCKS5 Bytestreams (or rather mod_proxy65). Will be used to transfer files if both parties are behind a firewall (NAT). * XEP-0138: Stream Compression saves bandwidth * XEP-0163: Personal Eventing Protocol for avatars * XEP-0198: Stream Management allows XMPP to survive small network outages and changes of the underlying TCP connection. @@ -44,7 +44,7 @@ These XEPs are - as of now: * XEP-0237: Roster Versioning mainly to save bandwidth on poor mobile connections * XEP-0352: Client State Indication let the server know whether or not Conversations is in the background. Allows the server to save bandwidth by - withholding unimportent packages. + withholding unimportant packages. ##Team ####Head of Development |