Merge pull request #2032 from fabrixxm/cron_update_suggestions

[friendica.git] / doc / FAQ.md

diff --git a/doc/FAQ.md b/doc/FAQ.md
index f9e5cacd367fa34536a0b87004d2027d66907ca0..0343833a2503c6b0666cf52da40d08cde801df8c 100644 (file)
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -87,8 +87,8 @@ However their conversations with your friends will still be visible in your stre
 If you remove a contact completely, they can send you another friend request.
 Blocked contacts cannot do this. They cannot communicate with you directly, only through friends.
 
-**Ignored contacts** are included in delivery - they will receive your posts.
-However we do not import their posts to you.
+**Ignored contacts** are included in delivery - they will receive your posts and private messages.
+However we do not import their posts or private messages to you.
 Like blocking, you will still see this person's comments to posts made by your friends.
 
 A plugin called "blockem" can be installed to collapse/hide all posts from a particular person in your stream if you desire complete blocking of an individual, including his/her conversations with your other friends.
@@ -121,7 +121,7 @@ No. The act of 'following' a hashtags is an interesting technology, but presents
 
 1. Posts would have to be copied to all sites on the network that are "listening" to that hashtag. This would increase the storage demands to the detriment of small sites. It would make the use of shared hosting practically impossible.
 
-2. Making spam easy (tag spam is quite a serious issue on identi.ca for instance)
+2. Making spam easy (tag spam is a serious issue on Twitter for instance)
 
 3. It creates a natural bias towards large sites which hold more tagged content - if your network uses tagging instead of other conversation federation mechanisms such as groups/forums.
 
@@ -153,7 +153,7 @@ RSS feed of the conversations at your site
 
 ###Are there any clients for friendica I can use?
 
-Friendica is using a [Twitter/StatusNet compatible API](help/api), which means you can use any Twitter/StatusNet/GNU Social client for your plattform as long as you can change the API path in its settings.
+Friendica is using a [Twitter/GNU Social compatible API](help/api), which means you can use any Twitter/GNU Social client for your plattform as long as you can change the API path in its settings.
 Here is a list of known working clients:
 
 * Android