X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=doc%2FTags-and-Mentions.md;h=eac2c97f84937ed559bff64b0f8d8f4ebe39ce58;hb=de15984fd1d25353fe44c5b253332246dbd3a895;hp=ce4e45f42fbfdea6e7ec34b937f152505d841690;hpb=43d5876e8b35d53a0bef5248c5d63e5bc209dbbf;p=friendica.git

diff --git a/doc/Tags-and-Mentions.md b/doc/Tags-and-Mentions.md
index ce4e45f42f..eac2c97f84 100644
--- a/doc/Tags-and-Mentions.md
+++ b/doc/Tags-and-Mentions.md
@@ -11,18 +11,32 @@ Like many other modern social networks, Friendica uses a special notation inside
 
 People are tagged by preceding their name with the @ character.
 
-The following are various ways of indicating a person:
+You can tag **persons who are in your social circle** by adding the "@"-sign in front of the name.
 
 * @mike - indicates a known contact in your social circle whose nickname is "mike"
 * @mike_macgirvin - indicates a known contact in your social circle whose  full name is "Mike Macgirvin". Note that spaces cannot be used inside tags.
 * @mike+151 - this form is used by the drop-down tag completion tool. It indicates the contact whose nickname is mike and whose contact identifier number is 151. The drop-down tool may be used to resolve people with duplicate nicknames. 
-* @mike@macgirvin.com - indicates the Identity Address of a person on a different network, or one that is *not* in your social circle. This is called a "remote mention" and can only be an email-style locator, not a web URL.
 
-Unless their system blocks unsolicited "mentions", the person tagged will likely receive a "Mention" post/activity or become a direct participant in the conversation in the case of public posts. Please note that Friendica blocks incoming "mentions" from people with no relationship to you. This is a spam prevention measure.
+You can tag a person on a different network or one that is **not in your social circle** by using the following notation:
+	
+* @mike@macgirvin.com - This is called a "remote mention" and can only be an email-style locator, not a web URL.
 
-Remote mentions are delivered using the OStatus protocol. This protocol is used by Friendica and StatusNet and several other systems, but is not currently implemented in Diaspora. 
+Unless their system blocks unsolicited "mentions", the person tagged will likely receive a "Mention" post/activity or become a direct participant in the conversation in the case of public posts.
+Friendica blocks incoming “mentions” from people with no relationship to you.
+The exception is an ongiong conversation started from a contact of both you and the 3rd person or a conversation in a forum where you are a member of.
+This is a spam prevention measure.
 
-Friendica makes no distinction between people and groups for the purpose of tagging. (Some other networks use !group to indicate a group.)
+Remote mentions are delivered using the OStatus protocol.
+This protocol is used by Friendica and GNU Social and several other systems, but is not currently implemented in Diaspora. 
+As the OStatus protocol allows this Friendica user can be @-mentioned by users from platforms using this protocol in conversations if the "Enable OStatus support" is activated on the Friendica node.
+These @-mentions wont be blocked, even if there is no relationship between the sender and the receiver of the message.
+
+Friendica makes no distinction between people and forums for the purpose of tagging.
+(Some other networks use !forum to indicate a forum.)
+
+If you sort your contacts into groups, you cannot @-mention these groups.
+But you can select the group in the access control when creating a new posting, to allow (or disallow) a certain group of people to see the posting.
+See [Groups and Privacy](help/Groups-and-Privacy) for more details about grouping your contacts.
 
 **Topical Tags**