aboutsummaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorroot <root@diekershoff.homeunix.net>2010-12-31 10:14:24 +0100
committerroot <root@diekershoff.homeunix.net>2010-12-31 10:14:24 +0100
commit31d447126aefbe1bdb14ed5a4a6b7d84845e9f29 (patch)
tree6178b09318e914e5743bc5687aad7b6dac0dc8b7 /README
parented6416b4ffcadf8b1a8a5f9d877b506b0e34d6bf (diff)
parentca83d24c0253a769f3e55c312dfd3bcd5fa7dfc7 (diff)
downloadvolse-hubzilla-31d447126aefbe1bdb14ed5a4a6b7d84845e9f29.tar.gz
volse-hubzilla-31d447126aefbe1bdb14ed5a4a6b7d84845e9f29.tar.bz2
volse-hubzilla-31d447126aefbe1bdb14ed5a4a6b7d84845e9f29.zip
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'README')
-rw-r--r--README13
1 files changed, 5 insertions, 8 deletions
diff --git a/README b/README
index d36c37ee4..7b9a51dea 100644
--- a/README
+++ b/README
@@ -79,15 +79,12 @@ rarely are (straight-forward and simple). Whether you're communicating with
drinking buddies or potential employers, you can rest assured that each is
only able to see the side of you that you wish to present. If you send a
private message to your aunt Mary, we will encrypt it with military grade
-encryption. We also won't share it with advertisers.
+encryption.
Other distributed social network projects talk about privacy and offering
a feature-rich social networking alternative, but all they can deliver is
-vapour and vague promises. You've probably heard about the four guys in New
-York and their "Facebook killer". What a disaster that was. Eventually they
-may get it right and release something that actually works (and lets you do
-something besides drag your friends into categories), but they may not.
-What are you going to use in the meantime?
+vapour and vague promises. Things like "Private mail will be in the next
+release".
Friendika delivers. We've got an incredibly rich social communications
interface you can make use of *right now*.
@@ -106,8 +103,8 @@ to connect with potentially hundreds or thousands of friends and associates
on any other supported network anywhere in the world and share photos, links,
status updates, etc.
- But maybe you don't want to be connected to the world... That's OK too.
-Friendika may also be closed off from the global community and used to support
+ But maybe you don't want to be connected to the world... and that's OK
+too. Friendika may be closed off from the global community and used to support
social networking amongst corporate, educational, religious, and other private
communities. This makes it an excellent choice for the social networking needs
of young teenagers and especially k-12 organisations.