Merge branch 'master' of https://github.com/friendica/red

2 files changed, 60 insertions, 0 deletions

diff --git a/doc/main.bb b/doc/main.bb
index ed98d3bd0..c9984b1f6 100644
--- a/doc/main.bb
+++ b/doc/main.bb
@@ -18,6 +18,7 @@ Zot is the great new communicaton protocol invented especially for the RedMatrix
 [zrl=[baseurl]/help/accounts_profiles_channels_basics]You at the RedMatrix: accounts, profiles and channels in short[/zrl]

 [zrl=[baseurl]/help/profiles]Profiles[/zrl]

 [zrl=[baseurl]/help/channels]Channels[/zrl]

+[zrl=[baseurl]/help/roles]Permission roles and Channel types[/zrl]

 [zrl=[baseurl]/help/first-post]Your first posting[/zrl]

 [zrl=[baseurl]/help/connecting_to_channels]Connecting To Other Channels[/zrl]

 [zrl=[baseurl]/help/permissions]Permissions And Encryption: You Are In Control[/zrl]

diff --git a/doc/roles.md b/doc/roles.md
new file mode 100644
index 000000000..1b8741d76
--- /dev/null
+++ b/doc/roles.md
@@ -0,0 +1,59 @@
+Account Permission Roles
+========================
+
+
+##Social
+
+**Mostly Public**
+
+The channel is a typical social networking profile. By default posts and published items are public, but one can over-ride this when creating the item and restrict it. You are listed in the directory. Your online presence and connections are visible to others. 
+
+
+**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.
+
+**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. 
+
+
+##Forum
+
+**Mostly Public**
+
+The channel is a typical forum. By default posts and published items are public. Members may post by @mention+ or wall-to-wall post. Posting photos and other published items is blocked. The channel is visible in the directory. Members are added automatically.
+
+
+**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. 
+
+**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.  
+
+
+##Feed
+
+
+**Public**
+
+Similiar to Social - Mostly Public, but tailored for RSS feed sources. Items may be freely republished and sourced. Online presence is meaningless, therefore hidden. New connections are automatically approved.  
+
+
+**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. 
+
+
+##Soapbox
+
+Listed in directory. Communications are by default public. Online presence is hidden. No commenting or feedback of any form is allowed, though connections have the ability to "like" your profile. 
+
+##Custom/Advanced
+
+You decide the privacy behaviour.   
+
+ 
+