about summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-02-11 17:09:36 +0100
committerEugen Rochko <eugen@zeonfederated.com>2017-02-11 17:13:11 +0100
commit50660d54e8cabd08fee649a6abc26f35a8d7a82c (patch)
tree0124bd26554896a409dc7b7b6bb357fc8be8e2c6 /docs
parent0b95eb36128077b3074f661dd451a90a18441ef0 (diff)
Fix semantics of follow requests another slaps
Diffstat (limited to 'docs')
-rw-r--r--docs/Extensions.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/Extensions.md b/docs/Extensions.md
index b56b5b85c..6a940eebc 100644
--- a/docs/Extensions.md
+++ b/docs/Extensions.md
@@ -23,7 +23,7 @@ Accounts and statuses have an access "scope":
 
 Accounts can be "private" or "public". The former requires a follow request to be approved before a follow relationship can be established, the latter can be followed directly.
 
-Statuses can be "private", "unlisted" or "public". Private must only be shown to the followers of the account, public can be displayed publicly. Unlisted statuses may be displayed publicly but preferably outside of any spotlights e.g. "whole known network" or "public" timelines.
+Statuses can be "private", "unlisted" or "public". Private must only be shown to the followers of the account or people mentioned in the status; public can be displayed publicly. Unlisted statuses may be displayed publicly but preferably outside of any spotlights e.g. "whole known network" or "public" timelines.
 
 Namespace of the scope element is `http://mastodon.social/schema/1.0`. Example:
 
@@ -47,7 +47,7 @@ Mastodon uses the following Salmon slaps to signal a follow request, a follow re
 - `http://activitystrea.ms/schema/1.0/authorize`
 - `http://activitystrea.ms/schema/1.0/reject`
 
-The activity object of the slaps is the account in question. Request-friend slap is sent to that account, when the end-user of that account decides, the authorize/reject decision slap is sent back to the requester.
+The activity object of the request-friend slap is the account in question. The activity object of the authorize and reject slaps is the original request-friend activity. Request-friend slap is sent to the locked account, when the end-user of that account decides, the authorize/reject decision slap is sent back to the requester.
 
 #### PuSH amendment