help: Improve groups documentation.

Update for recently added functionality.

help/create-user-groups.md

@@ -6,22 +6,6 @@
 
 {!how-to-create-a-user-group.md!}
 
-## User group options
-
-There are several parameters you can set while creating a user group, which can
-all be changed later.
-
-* **User group name**: The user group name can be in any language, and can
-  include spaces and other punctuation.
-
-* **User group description** (optional)
-
-* **Who can mention this group**: Configures who is allowed to
-  [mention this group](/help/mention-a-user-or-group).
-
-* **Choose members**: You can copy the membership from an existing channel or
-  user group, add all users, or enter users one by one.
-
 ## Related articles
 
 * [Moving to Zulip](/help/moving-to-zulip)

help/include/how-to-create-a-user-group.md

@@ -10,7 +10,10 @@
 1. Fill out the requested information, and click **Continue to add
    members**.
 
-1. Add users who will be members of the group, and click **Create**.
+1. Under **Add members**, enter groups and users you want to add. You can enter
+   a `#channel` to add all subscribers to the group. Click **Add**.
+
+1. Click **Create** to create the group.
 
 !!! warn ""
 

help/include/user-groups-intro.md

@@ -1,5 +1,14 @@
-User groups allow you to [mention](/help/mention-a-user-or-group) multiple users
+User groups make it easier to manage any organization with multiple teams or job
-at once. When you mention a user group, everyone in the group is
+functions. You can:
-[notified](/help/dm-mention-alert-notifications) as if they were personally
+
-mentioned. For example, you may choose to create user groups for teams in your
+- Assign permissions to user groups.
-organization.
+- Add a user group to another user group.
+- Subscribe a user group to a channel. This individually subscribes all the users
+  in the group.
+- [Mention](/help/mention-a-user-or-group) a group of users,
+  [notifying](/help/dm-mention-alert-notifications) everyone in the group as if
+  they were personally mentioned.
+- Compose a [direct message](/help/direct-messages) to a user group. This
+  automatically puts all the users in the group into the addressee field.
+
+You may want to create a user group for each team in your organization.

help/manage-user-groups.md

@@ -30,7 +30,13 @@
 
 {end_tabs}
 
-## Configure who can mention a user group
+## Configure group permissions
+
+!!! warn ""
+
+    Guests can never manage user groups, add anyone else to a group, or remove
+    anyone else from a group, even if they belong to a group that has permissions
+    to do so.
 
 {start_tabs}
 
@@ -42,13 +48,15 @@
 
 1. Select the **General** tab on the right.
 
-1. Under **Group permissions**, configure **Who can mention this group**.
+1. Under **Group permissions**, configure **Who can manage this group**, **Who
+   can mention this group**, **Who can add members to this group**, **Who can join
+   this group**, and **Who can leave this group**.
 
 {!save-changes.md!}
 
 {end_tabs}
 
-## Add users to a user group
+## Add groups and users to a group
 
 {start_tabs}
 
@@ -60,16 +68,11 @@
 
 1. Select the **Members** tab on the right.
 
-1. Under **Add members**, enter a name or email address. The typeahead
+1. Under **Add members**, enter groups and users you want to add. You can enter
-   will only include users who aren't already members of the group.
+   a `#channel` to add all subscribers to the group.
 
 1. Click **Add**. Zulip will notify everyone who is added to the group.
 
-!!! tip ""
-
-    To add users in bulk, you can copy members from an
-    existing channel or user group.
-
 {end_tabs}
 
 ## Remove users from a user group
@@ -89,11 +92,6 @@
 1. Click the **Remove** button in that row. Zulip will notify everyone who is
    removed from the group.
 
-!!! warn ""
-
-    **Note**: If you remove yourself from a user group, you
-    may no longer have permission to modify the user group.
-
 {end_tabs}
 
 ## Deactivate a user group
@@ -117,10 +115,9 @@
 
 {!admin-only.md!}
 
-By default, [all members](/help/roles-and-permissions) in a Zulip
+You can configure who can create groups in your organization. Guests can never
-organization can create user groups. However, you can restrict that
+create user groups, even if they belong to a group that has permissions to do
-ability to specific [roles](/help/roles-and-permissions). Note that
+so.
-guests cannot create user groups.
 
 {start_tabs}
 
@@ -138,11 +135,12 @@ guests cannot create user groups.
 
 {!admin-only.md!}
 
-By default, [owners](/help/roles-and-permissions) in a Zulip
+You can configure who can manage groups in your organization. Guests can never
-organization can manage user groups. However, you can expand that
+manage user groups, even if they belong to a group that has permissions to do
-ability to specific [roles](/help/roles-and-permissions).
+so.
 
-Guests cannot modify user groups.
+In addition, you can [give users permission](#configure-group-permissions) to
+manage a specific group.
 
 {start_tabs}
 

help/user-groups.md

@@ -2,15 +2,6 @@
 
 {!user-groups-intro.md!}
 
-You can also:
-
-- Add a user group to another user group. This individually adds all the users
-  in the group.
-- Subscribe a user group to a channel. This individually subscribes all the users
-  in the group.
-- Compose a [direct message](/help/direct-messages) to a user group. This
-  automatically puts all the users in the group into the addressee field.
-
 ## Browse and join user groups
 
 {start_tabs}