aboutsummaryrefslogtreecommitdiffstats
path: root/doc/roles.md
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-27 17:24:05 +0100
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2016-01-27 17:24:05 +0100
commitc766cf9565129b762998e709f5ee7c3eb14cffca (patch)
treec462e39540d6f63e30d10aca1c64ffefcfa4d4ef /doc/roles.md
parente4674142c6a205651d4bb207aa038e6d089da73f (diff)
parent722d7ff38d5bbf49a7c990d9219998c2c8a5b58f (diff)
downloadvolse-hubzilla-c766cf9565129b762998e709f5ee7c3eb14cffca.tar.gz
volse-hubzilla-c766cf9565129b762998e709f5ee7c3eb14cffca.tar.bz2
volse-hubzilla-c766cf9565129b762998e709f5ee7c3eb14cffca.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'doc/roles.md')
-rw-r--r--doc/roles.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/roles.md b/doc/roles.md
index 5d8d07113..a7608ff90 100644
--- a/doc/roles.md
+++ b/doc/roles.md
@@ -11,11 +11,11 @@ The channel is a typical social networking profile. By default posts and publish
**Restricted**
-By default all posts and published items are sent to your 'Friends' collection and not made public. New friends are added to this collection. You can over-ride this and create a public post or published item if you desire. You are listed in the directory. Your online presence (for chat) and your connections (friends) are visible to your profile viewers.
+By default all posts and published items are sent to your 'Friends' privacy group and not made public. New friends are added to this privacy group. You can over-ride this and create a public post or published item if you desire. You are listed in the directory. Your online presence (for chat) and your connections (friends) are visible to your profile viewers.
**Private**
-By default all posts and published items are sent to your 'Friends' collection. New friends are added to this collection. You can over-ride this and create a public post or public item if you desire. You are NOT listed in the directory. Only your connections can see your other connections. Your online presence is hidden.
+By default all posts and published items are sent to your 'Friends' privacy group. New friends are added to this privacy group. You can over-ride this and create a public post or public item if you desire. You are NOT listed in the directory. Only your connections can see your other connections. Your online presence is hidden.
##Forum
@@ -27,11 +27,11 @@ The channel is a typical forum. By default posts and published items are public.
**Restricted**
-By default all posts and published items are sent to the channel's 'Friends' collection. New friends are added to this collection. Members may post by @mention+ or wall-to-wall post, but posts and replies may also be seen by other receipients of the top-level post who are not members. The channel is visible in the directory. Members must be manually added by the forum owner.
+By default all posts and published items are sent to the channel's 'Friends' privacy group. New friends are added to this privacy group. Members may post by @mention+ or wall-to-wall post, but posts and replies may also be seen by other receipients of the top-level post who are not members. The channel is visible in the directory. Members must be manually added by the forum owner.
**Private**
-By default all posts and published items are sent to your 'Friends' collection. New friends are added to this collection. The owner can over-ride this and create a public post or public item if desired. Members cannot. You are NOT listed in the directory. Only your connections can see your other connections. Your online presence is hidden. Members must be manually added by the forum owner. Posting by @mention+ is disabled. Posts can only be made via wall-to-wall posts, and sent to members of the 'Friends' collection. They are not publicly visible.
+By default all posts and published items are sent to your 'Friends' privacy group. New friends are added to this privacy group. The owner can over-ride this and create a public post or public item if desired. Members cannot. You are NOT listed in the directory. Only your connections can see your other connections. Your online presence is hidden. Members must be manually added by the forum owner. Posting by @mention+ is disabled. Posts can only be made via wall-to-wall posts, and sent to members of the 'Friends' privacy group. They are not publicly visible.
##Feed
@@ -44,7 +44,7 @@ Similiar to Social - Mostly Public, but tailored for RSS feed sources. Items may
**Restricted**
-Not listed in directory. Online presence is meaningless, therefore hidden. Feed is published only to members of the 'Friends' collection. New connections are automatically added to this collections. Members must be manually approved by the channel owner.
+Not listed in directory. Online presence is meaningless, therefore hidden. Feed is published only to members of the 'Friends' privacy group. New connections are automatically added to this privacy group. Members must be manually approved by the channel owner.
##Special