diff --git a/help/add-or-remove-users-from-a-stream.md b/help/add-or-remove-users-from-a-stream.md index a164f8585a..d3a874cb21 100644 --- a/help/add-or-remove-users-from-a-stream.md +++ b/help/add-or-remove-users-from-a-stream.md @@ -7,8 +7,11 @@ stream. Anyone can always [unsubscribe themselves from a stream](/help/unsubscri Organization administrators can also unsubscribe *other* users from any stream, including streams the admin is not subscribed to. They can also configure which -[roles](/help/roles-and-permissions) have access to [add other users -to a stream][configure-invites]. +[roles](/help/roles-and-permissions) have access to [add other users to a +stream][add-users] or [remove other users from a stream][remove-users]. + +[add-users]: /help/configure-who-can-invite-to-streams#configure-who-can-add-users +[remove-users]: /help/configure-who-can-invite-to-streams#configure-who-can-remove-users ## Add users to a stream @@ -65,8 +68,6 @@ subscribe the user. {end_tabs} -[configure-invites]: /help/configure-who-can-invite-to-streams - ### From a user's profile (alternate method) This method is useful if you need to remove one user from multiple streams. @@ -84,29 +85,6 @@ This method is useful if you need to remove one user from multiple streams. {end_tabs} -## Configure who can remove users - -{!admin-only.md!} - -Organization administrators can configure who can remove other users from a -public stream. For private streams, administrators must be subscribed to the -stream to configure this setting. - -{start_tabs} - -{relative|stream|all} - -1. Select a stream. - -{!select-stream-view-general.md!} - -1. Under **Stream permissions**, configure - **Who can unsubscribe others from this stream?** - -{!save-changes.md!} - -{end_tabs} - ## Related articles * [Browse and subscribe to streams](/help/browse-and-subscribe-to-streams) diff --git a/help/configure-who-can-invite-to-streams.md b/help/configure-who-can-invite-to-streams.md index 4a09002fa4..1922bc37cc 100644 --- a/help/configure-who-can-invite-to-streams.md +++ b/help/configure-who-can-invite-to-streams.md @@ -1,18 +1,37 @@ -# Restrict stream invitation +# Restrict stream membership management {!admin-only.md!} By default, anyone other than guests can add other users to streams. However, you can restrict the ability to do so to specific -[roles](/help/roles-and-permissions). +[roles](/help/roles-and-permissions). You can also can configure who can remove +other users from a public stream. For private streams, administrators must be +subscribed to the stream to configure these settings. -### Manage who can add users to streams +## Configure who can add users {start_tabs} {settings_tab|organization-permissions} -2. Under **Stream permissions**, configure **Who can add users to streams**. +1. Under **Stream permissions**, configure **Who can add users to streams**. + +{!save-changes.md!} + +{end_tabs} + +## Configure who can remove users + +{start_tabs} + +{relative|stream|all} + +1. Select a stream. + +{!select-stream-view-general.md!} + +1. Under **Stream permissions**, configure + **Who can unsubscribe others from this stream?** {!save-changes.md!} diff --git a/help/create-a-stream.md b/help/create-a-stream.md index e5c194da0d..2974ab2034 100644 --- a/help/create-a-stream.md +++ b/help/create-a-stream.md @@ -44,7 +44,7 @@ There are several parameters you can set while creating a stream. All but * **Who can post to the stream?**: See [Stream permissions](/help/stream-permissions). * **Who can unsubscribe others from this stream?**: See - [Add or remove users from a stream](/help/add-or-remove-users-from-a-stream#configure-who-can-remove-users). + [Restrict stream membership management](/help/configure-who-can-invite-to-streams#configure-who-can-remove-users). * **Message retention period**: See [Message retention policy](/help/message-retention-policy#configure-message-retention-policy-for-individual-streams). diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index 2e095f09ec..344014e0f0 100644 --- a/help/include/sidebar_index.md +++ b/help/include/sidebar_index.md @@ -186,7 +186,7 @@ * [Public access option](/help/public-access-option) * [Stream posting policy](/help/stream-sending-policy) * [Restrict stream creation](/help/configure-who-can-create-streams) -* [Restrict stream invitation](/help/configure-who-can-invite-to-streams) +* [Restrict stream membership management](/help/configure-who-can-invite-to-streams) * [Add or remove users from a stream](/help/add-or-remove-users-from-a-stream) * [Set default streams for new users](/help/set-default-streams-for-new-users) * [Rename a stream](/help/rename-a-stream) diff --git a/help/stream-permissions.md b/help/stream-permissions.md index 4a13c2fcfc..502ad51eb5 100644 --- a/help/stream-permissions.md +++ b/help/stream-permissions.md @@ -64,7 +64,7 @@ administrator can access private stream messages: | View stream name | ✔ | ✔ | ✔ | ◾ | Join | ✔ | ✔ | ✔ | | Unsubscribe | ◾ | ◾ | ◾ | ◾ -| Add others | ✔ | ✔ | ✔ | +| Add others | ✔ | ✶ | ✶ | | Remove others | ✔ | ✶ | ✶ | ✶ | See subscriber list | ✔ | ✔ | ✔ | ◾ | See full history | ✔ | ✔ | ✔ | ◾ @@ -80,8 +80,9 @@ administrator can access private stream messages: ◾If subscribed to the stream ✶ -Configurable. See [Stream posting policy](/help/stream-sending-policy) and -[Configure who can remove users](/help/add-or-remove-users-from-a-stream#configure-who-can-remove-users) +Configurable. See [Stream posting policy](/help/stream-sending-policy), +[Configure who can add users][add-users], and +[Configure who can remove users][remove-users] for details. @@ -93,7 +94,7 @@ for details. | View stream name | ✔ | ◾ | ◾ | ◾ | Join | | | | | Unsubscribe | ◾ | ◾ | ◾ | ◾ -| Add others | ◾ | ◾ | ◾ | +| Add others | ◾ | ✶ | ✶ | | Remove others | ✔ | ✶ | ✶ | ✶ | See subscriber list | ✔ | ◾ | ◾ | ◾ | See full history | ✶ | ✶ | ✶ | ✶ @@ -110,8 +111,9 @@ for details. ✶ Configurable, but at minimum must be subscribed to the stream. -See [Stream posting policy](/help/stream-sending-policy) and -[Configure who can remove users](/help/add-or-remove-users-from-a-stream#configure-who-can-remove-users) +See [Stream posting policy](/help/stream-sending-policy), +[Configure who can add users][add-users], and +[Configure who can remove users][remove-users] for details. @@ -120,3 +122,6 @@ for details. * [Roles and permissions](/help/roles-and-permissions) * [Stream sending policy](/help/stream-sending-policy) * [Web-public streams](/help/public-access-option) + +[add-users]: /help/configure-who-can-invite-to-streams#configure-who-can-add-users +[remove-users]: /help/configure-who-can-invite-to-streams#configure-who-can-remove-users