check for existing diaspora comment before accepting, add 'Diaspora' app to item...

[friendica.git] / README

diff --git a/README b/README
index fb2033862cc60c83cbb4f92dd5a370c56c1bdfe6..598b6d292145d21e2dda6c16f2eabf073dc6e3f9 100644 (file)
--- a/README
+++ b/README
@@ -27,29 +27,32 @@ private social circles, and which cannot be seen outside the circle.
 
        Friendika is decentralised. Any account on any Friendika server can connect
 with any account on any other Friendika server. You can also connect to and
-interact directly with friends on Status.Net and other federated social web
-services (e.g. identi.ca, GNU-Social, etc.).
+interact directly with friends on Facebook, Status.Net, and other federated
+social web services (e.g. identi.ca, GNU-Social, etc.).
 
-       Outgoing communications can be directed at these networks and also
-existing accounts on Facebook and Twitter - or even delivered to email 
-contacts.
+       Outgoing communications can be directed to Friendika, existing accounts on 
+Facebook and Twitter, federated social web providers - or even delivered to
+email contacts.
 
        Incoming data streams aren't limited to traditional social networks.
-They may include most any service that provide a syndication feed (both RSS
+They may include most any service which provides a syndication feed (both RSS
 and Atom). This allows you to view communications from friends in other 
 diverse social networks - such as Diaspora, Google Buzz, and millions of 
-Wordpress blogs, news services, and other websites. Over time we will try to
-build two-way bridges to many of these services so that you can freely
-interact in both directions with anybody who allows it. 
-
-        Communications between Friendika servers are private and encrypted, 
+blogs, news services, and other websites. You can also import
+contacts from (and write to) anybody that is accessible from your email
+INBOX and view them in your social stream. Over time we will try to
+build two-way bridges to other services so that you can freely
+interact in both directions with anybody on an accessible network that 
+allows it. 
+
+       Communications between Friendika servers are private and encrypted, 
 using military grade encryption - and require mutual identity provenance
 before any data is exchanged. These same crypto mechanisms provide remote 
 password-less authentication; allowing you to post to profiles and view private
 photo collections on other servers - without encountering any login and/or
 authorisation dialogues when visiting these sites.
 
-    Friendika has no boundaries and no central ownership of the data generated
+       Friendika has no boundaries and no central ownership of the data generated
 within the network. Anybody with a commodity PHP/MySQL web server or hosting
 account can provide a server, and each individual server can then support
 up to several thousand participating members - each with their own unique
@@ -63,7 +66,7 @@ simply be used as an alternative to traditional "monolithic" social networks.
 
        Friendika is also free - in every sense of the word. 
 
-    Choose freedom. Join us.
+       Choose freedom - join us.
 
        Find out more about the project at http://project.friendika.com