X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=doc-src%2Ffaq;h=ee7cd506a82ababee882ace89b10ece5d8034ad6;hb=7a9777df053a9007b5eaa71f5437584065b615a5;hp=589b18b8d8844193e21188e4d941f90deb643d49;hpb=8884a5255fb90fda67b63fa0d4252d77176337e5;p=quix0rs-gnu-social.git

diff --git a/doc-src/faq b/doc-src/faq
index 589b18b8d8..ee7cd506a8 100644
--- a/doc-src/faq
+++ b/doc-src/faq
@@ -8,39 +8,43 @@ some answers.
 What is %%site.name%%?
 ----------------------
 
-%%site.name%% is a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service.
+%%site.name%% is a stream oriented social network service.
+
 You can use it to write short notices about yourself, where you are,
 and what you're doing, and those notices will be sent to all your friends
 and fans.
 
-How is %%site.name%% different from Twitter, Jaiku, Pownce, Plurk, others?
---------------------------------------------------------------------------
-
-%%site.name%% is an [Open Network Service](http://opendefinition.org/ossd). Our main
-goal is to provide a fair and transparent service that preserves users' autonomy. In
-particular, all the software used for %%site.name%% is [Free Software](http://en.wikipedia.org/wiki/Free_Software), and all the data is available
-under the [%%license.title%%](%%license.url%%) license, making it Open Data.
+You can also post event invitations, bookmarks, polls, and questions or
+other kinds of social broadcasts.
 
-The software also implements the [OpenMicroBlogging](http://openmicroblogging.org/) protocol, meaning that you can have friends on other microblogging services
-that can receive your notices.
+How is %%site.name%% different from Twitter?
+--------------------------------------------
 
-The goal here is *autonomy* -- you deserve the right to manage your own on-line
-presence. If you don't like how %%site.name%% works, you can take your data and the source code and set up your own server (or move your account to another one).
+Like [Twitter](http://twitter.com/), %%site.name%% is a light service
+with a stream-oriented interface. It uses @-replies, hashtags,
+provides search, and has private messages. It provides an API, and can
+be integrated with SMS systems. You can create lists.
 
-Where is feature X?
--------------------
+Unlike Twitter, %%site.name%% allows more data than just plain text
+and links to travel across the network. You can install the StatusNet
+software that runs %%site.name%% on your own servers, since it's Free
+and Open Source software. You can make groups, and share privately
+with those groups.
 
-The software we run, [StatusNet](http://status.net/), is still in its early stages,
-and many features people expect from microblogging sites are not yet implemented. Some important ones that are expected "soon":
+You can make your site available only to people you choose. You can
+customize it with your own themes and plugins, or download plugins
+from the StatusNet site.
 
-* More [AJAX](http://en.wikipedia.org/wiki/AJAX)-y interface
-* Maps
-* Cross-post to Pownce, Jaiku, etc.
-* Pull messages from Twitter, Pownce, Jaiku, etc.
-* [Facebook](http://www.facebook.com/) integration
-* Image, video, audio notices
+How is %%site.name%% different from Yammer, SocialCast, or Salesforce Chatter?
+------------------------------------------------------------------------------
 
-There is [a list of bugs and features](http://status.net/bugs/) that you may find
-interesting. New ideas or complaints are very welcome.
+Like some enterprise social software services, StatusNet lets you
+share privately with other people in your company. You can use
+microapps to post richer kinds of data, use public and private groups
+to share with team members, use extended profiles to show more about
+yourself and your company, and review groups and users in a directory.
 
+Unlike those other services, StatusNet is free and open source
+software. You can install it on your own servers. You can customize
+the theme and add plugins.