diff --git a/help/archive-a-channel.md b/help/archive-a-channel.md index 3d22e3fdb8..d05b9bfdd1 100644 --- a/help/archive-a-channel.md +++ b/help/archive-a-channel.md @@ -71,7 +71,9 @@ content](#hide-content-in-an-archived-channel). 1. Under **Channel permissions**, [make the channel private](/help/change-the-privacy-of-a-channel). -1. Under **Advanced configurations**, remove everyone from **Who can subscribe +1. Click **Advanced configuration** to view advanced configuration options. + +1. Under **Subscription permissions**, remove everyone from **Who can subscribe to this channel**, and **Who can subscribe anyone to this channel**. These permissions give users content access to the channel. diff --git a/help/channel-posting-policy.md b/help/channel-posting-policy.md index f22fd6845f..8035785850 100644 --- a/help/channel-posting-policy.md +++ b/help/channel-posting-policy.md @@ -10,9 +10,9 @@ you can set up an announcement channel where only a specific 1. Select a channel. -{!select-channel-view-general.md!} +{!select-channel-view-general-advanced.md!} -1. Under **Channel permissions**, configure **Who can post to the channel**. +1. Under **Messaging permissions**, configure **Who can post to this channel**. {!save-changes.md!} diff --git a/help/configure-who-can-administer-a-channel.md b/help/configure-who-can-administer-a-channel.md index 8b5339a79d..3556d214ac 100644 --- a/help/configure-who-can-administer-a-channel.md +++ b/help/configure-who-can-administer-a-channel.md @@ -14,9 +14,9 @@ 1. Select a channel. -{!select-channel-view-general.md!} +{!select-channel-view-general-advanced.md!} -1. Under **Channel permissions**, configure **Who can administer +1. Under **Administrative permissions**, configure **Who can administer this channel**. {!save-changes.md!} diff --git a/help/configure-who-can-invite-to-channels.md b/help/configure-who-can-invite-to-channels.md index 7e53f1bf21..c3c7a3201f 100644 --- a/help/configure-who-can-invite-to-channels.md +++ b/help/configure-who-can-invite-to-channels.md @@ -44,9 +44,9 @@ have content access in order to change this configuration. 1. Select a channel. -{!select-channel-view-general.md!} +{!select-channel-view-general-advanced.md!} -1. Under **Advanced configurations**, configure **Who can subscribe anyone to +1. Under **Subscription permissions**, configure **Who can subscribe anyone to this channel**. {!save-changes.md!} diff --git a/help/configure-who-can-subscribe.md b/help/configure-who-can-subscribe.md index e50021a41e..7a26a6123e 100644 --- a/help/configure-who-can-subscribe.md +++ b/help/configure-who-can-subscribe.md @@ -34,9 +34,9 @@ have content access in order to change this configuration. 1. Select a channel. -{!select-channel-view-general.md!} +{!select-channel-view-general-advanced.md!} -1. Under **Channel permissions**, configure **Who can subscribe to this +1. Under **Subscription permissions**, configure **Who can subscribe to this channel**. {!save-changes.md!} diff --git a/help/configure-who-can-unsubscribe-others.md b/help/configure-who-can-unsubscribe-others.md index d34d8ce31a..eca56eb77c 100644 --- a/help/configure-who-can-unsubscribe-others.md +++ b/help/configure-who-can-unsubscribe-others.md @@ -10,9 +10,9 @@ unsubscribe anyone from a channel. 1. Select a channel. -{!select-channel-view-general.md!} +{!select-channel-view-general-advanced.md!} -1. Under **Advanced configurations**, configure **Who can unsubscribe anyone +1. Under **Subscription permissions**, configure **Who can unsubscribe anyone from this channel**. {!save-changes.md!} diff --git a/help/include/create-a-channel-instructions.md b/help/include/create-a-channel-instructions.md index fde8d8438e..dc7b7484cf 100644 --- a/help/include/create-a-channel-instructions.md +++ b/help/include/create-a-channel-instructions.md @@ -9,7 +9,7 @@ 1. Fill out the requested information. -1. _(optional)_ Click on **Advanced configurations** to review and update +1. _(optional)_ Click on **Advanced configuration** to review and update additional channel settings. 1. Click **Continue to add subscribers**. diff --git a/help/message-retention-policy.md b/help/message-retention-policy.md index 4046669860..a934db23e9 100644 --- a/help/message-retention-policy.md +++ b/help/message-retention-policy.md @@ -45,9 +45,9 @@ Standard hosting. 1. Select a channel. -{!select-channel-view-general.md!} +{!select-channel-view-general-advanced.md!} -1. Under **Channel permissions**, configure the +1. Under **Administrative permissions**, configure the **Message retention period**. {!save-changes.md!} diff --git a/help/restrict-moving-messages.md b/help/restrict-moving-messages.md index 8137b079b0..86bca99dff 100644 --- a/help/restrict-moving-messages.md +++ b/help/restrict-moving-messages.md @@ -46,9 +46,9 @@ Permissions for moving messages between channels can be configured separately. 1. Select a channel. -{!select-channel-view-general.md!} +{!select-channel-view-general-advanced.md!} -1. Under **Channel permissions**, configure **Who can move messages inside this +1. Under **Moderation permissions**, configure **Who can move messages inside this channel**. {!save-changes.md!} @@ -72,6 +72,8 @@ Permissions for moving messages between channels can be configured separately. ## Configure who can move messages out of any channel +{!admin-only.md!} + {start_tabs} {settings_tab|organization-permissions} @@ -92,9 +94,9 @@ Permissions for moving messages between channels can be configured separately. 1. Select a channel. -{!select-channel-view-general.md!} +{!select-channel-view-general-advanced.md!} -1. Under **Channel permissions**, configure **Who can move messages out of this +1. Under **Moderation permissions**, configure **Who can move messages out of this channel**. {!save-changes.md!} diff --git a/help/restrict-resolving-topics.md b/help/restrict-resolving-topics.md index 9a894886c2..047541b555 100644 --- a/help/restrict-resolving-topics.md +++ b/help/restrict-resolving-topics.md @@ -1,12 +1,14 @@ # Restrict resolving topics -{!admin-only.md!} - Zulip lets you configure who can [mark topics as resolved](/help/resolve-a-topic). This permission can be granted to any combination of [roles](/help/user-roles), [groups](/help/user-groups), and individual [users](/help/introduction-to-users). +## Configure who can resolve topics in any channel + +{!admin-only.md!} + {start_tabs} {tab|desktop-web} @@ -19,6 +21,25 @@ permission can be granted to any combination of [roles](/help/user-roles), {end_tabs} +## Configure who can resolve topics in a specific channel + +{start_tabs} + +{tab|desktop-web} + +{relative|channel|all} + +1. Select a channel. + +{!select-channel-view-general-advanced.md!} + +1. Under **Moderation permissions**, configure **Who can resolve topics in this + channel**. + +{!save-changes.md!} + +{end_tabs} + ## Related articles * [Restrict moving messages](/help/restrict-moving-messages)