help: Document channel folders, and update existing docs.

help-beta/astro.config.mjs

@@ -384,6 +384,7 @@ export default defineConfig({
                         },
                         "public-access-option",
                         "general-chat-channels",
+                        "channel-folders",
                         "channel-permissions",
                         "channel-posting-policy",
                         "configure-who-can-administer-a-channel",

help/channel-folders.md

@@ -0,0 +1,62 @@
+# Channel folders
+
+Organizations can sort channels into folders. For example, you can put all
+the channels associated with a team into a dedicated folder. Channels will be
+grouped into folders in the [left sidebar](/help/left-sidebar) and the
+[**Inbox**](/help/inbox) view.
+
+Everyone can [pin channels](/help/pin-a-channel) they personally want to pay
+close attention to. Pinned channels appear in a dedicated **pinned channels**
+section above channel folders.
+
+## Move a channel to a folder
+
+{start_tabs}
+
+{tab|desktop-web}
+
+{relative|channel|all}
+
+1. Select a channel.
+
+{!select-channel-view-general.md!}
+
+1. *(optional)* [Create a new channel folder](#create-a-new-channel-folder).
+
+1. Under **Folders**, select the desired folder from the **Channel folder**
+   dropdown.
+
+{!save-changes.md!}
+
+{!channel-settings-general-tab-tip.md!}
+
+{end_tabs}
+
+## Create a new channel folder
+
+{!admin-only.md!}
+
+{start_tabs}
+
+{tab|desktop-web}
+
+{relative|channel|all}
+
+1. Select any channel.
+
+{!select-channel-view-general.md!}
+
+1. Under **Folders**, click the **Create new folder** button to the right of the
+   folder selection dropdown.
+
+1. Fill out the requested information, and click **Create**.
+
+{end_tabs}
+
+## Related articles
+
+* [Introduction to channels](/help/introduction-to-channels)
+* [Pin a channel](/help/pin-a-channel)
+* [Mute or unmute a channel](/help/mute-a-channel)
+* [Manage inactive channels](/help/manage-inactive-channels)
+* [Manage user groups](/help/manage-user-groups)

help/include/channel-admin-permissions.md

@@ -10,6 +10,7 @@ administrators](/help/configure-who-can-administer-a-channel) can:
 - See and modify the channel's [name](/help/rename-a-channel) and [description](/help/change-the-channel-description).
 - See who is subscribed to the channel, and
   [unsubscribe](/help/unsubscribe-users-from-a-channel) them.
+- Move the channel to another [folder](/help/channel-folders).
 - See the channel's permissions settings, and modify settings that do not affect
   content access (e.g., [who can post](/help/channel-posting-policy) or [message
   retention policy](/help/message-retention-policy)).

help/include/sidebar_index.md

@@ -147,7 +147,7 @@
 * [Pin a channel](/help/pin-a-channel)
 * [Change the color of a channel](/help/change-the-color-of-a-channel)
 * [Unsubscribe from a channel](/help/unsubscribe-from-a-channel)
-* [Manage inactive channels](/help/manage-inactive-channels)
+* [Show or hide inactive channels](/help/manage-inactive-channels)
 * [Move content to another channel](/help/move-content-to-another-channel)
 * [View channel information](/help/view-channel-information)
 * [View channel subscribers](/help/view-channel-subscribers)
@@ -219,6 +219,7 @@
 * [Public channels](/help/channel-permissions#public-channels)
 * [Public access option](/help/public-access-option)
 * [“*General chat*” channels](/help/general-chat-channels)
+* [Channel folders](/help/channel-folders)
 * [Channel permissions](/help/channel-permissions)
 * [Channel posting policy](/help/channel-posting-policy)
 * [Configure who can administer a channel](/help/configure-who-can-administer-a-channel)

help/left-sidebar.md

@@ -2,22 +2,23 @@
 
 The left sidebar in the Zulip web and desktop apps helps you navigate your
 conversations, and [start new
-ones](#start-a-new-conversation-from-the-left-sidebar). It has three main
+ones](#start-a-new-conversation-from-the-left-sidebar). It's divided into
 sections:
 
 - **Views** provide various ways to get an overview of your messages.
 - The **direct messages** section shows your [direct
   message](/help/direct-messages) conversations.
-- The **channels** section shows the [channels](/help/introduction-to-channels)
-  you are subscribed to.
+- [Channels](/help/introduction-to-channels) you are subscribed to are shown
+  organized into sections by [folder](/help/channel-folders).
 
 You can customize how channels are organized within the **channels**
 section by:
 
-- [Pinning channels](/help/pin-a-channel) so that they appear in the top section.
+- [Pinning channels](/help/pin-a-channel) so that they appear in a dedicated
+  section at the top of the list of channels.
 - [Changing channel colors](/help/change-the-color-of-a-channel).
 - [Configuring](/help/manage-inactive-channels) whether inactive channels are
-  sorted at the bottom.
+  hidden.
 
 You can also [configure](#configure-where-channel-links-in-the-left-sidebar-go)
 where clicking on channel links in the left sidebar takes you.

help/pin-a-channel.md

@@ -1,8 +1,9 @@
 # Pin a channel
 
-Pinning a channel moves it to the **Pinned** section at the top of your channels
-list in the left sidebar. You can pin the channels you pay close attention to,
-which is especially handy if you are subscribed to a large number of channels.
+You can [pin channels](/help/pin-a-channel) that you want to pay close attention
+to. Pinned channels appear in a dedicated **pinned channels** section above
+[channel folders](/help/channel-folders) in the [left
+sidebar](/help/left-sidebar) and the [**Inbox**](/help/inbox) view.
 
 ## Pin a channel
 
@@ -68,3 +69,4 @@ description with 👍.
 
 * [Introduction to channels](/help/introduction-to-channels)
 * [Mute or unmute a channel](/help/mute-a-channel)
+* [Channel folders](/help/channel-folders)