Merge pull request #160 from humhub/chg/pr-7329-new-manage-all-conten…

…t-permission

[v.17] Update doc for the new enableManageAllContentPermission - PR 7329

docs/admin/config-options.md

@@ -40,6 +40,10 @@ Data Type: `Array`<br/>
 Default: `60 * 60 * 24 * 90`<br/>
 Data Type: `Integer`<br/>
 
+**enableManageAllContentPermission** - Enable the "Manage All Content" Group Permission to manage all content (view, edit, move, archive, pin, etc.), even private content.<br/>
+Default: `false`<br/>
+Data Type: `Boolean`<br/>
+
 
 ### Comment
 
@@ -53,14 +57,6 @@ Data Type: `Integer`<br/>
 
 ### Content
 
-**adminCanViewAllContent** - Global admin can see all content.<br/>
-Default: `false`<br/>
-Data Type: `Boolean`<br/>
-
-**adminCanEditAllContent** - Global admin can edit/delete all content.<br/>
-Default: `true`<br/>
-Data Type: `Boolean`<br/>
-
 **emailSubjectHourlyUpdate** - Custom e-mail subject for hourly update mails.<br/>
 Default: `empty`<br/>
 Data Type: `String`<br/>

docs/develop/content.md

@@ -169,10 +169,10 @@ The visibility of a content for a user can be validated by the `Content::canView
 
 - Guests can only access public content of visible spaces/users or global content if "Guest Access" is enabled
 - Other users can access all public content within the network
-- System admins can access all content if the `adminCanViewAllContent` setting of the `content` modules is enabled (default)
 - All space members can read private space content
 - Non space members can only access public space content
 - Only friend users can access private profile content of a user.
+- If the "Manage All Content" Group Permission is enabled ([see configuration options](https://docs.humhub.org/docs/admin/config-options#admin)), it is possible to allow the members of certain Groups to manage all content (view, edit, move, archive, pin, etc.), even private content.
 
 ```php
 if(!$model->content->canView()) {