Merge branch 'selhorn-groups-3' into 'master'

More group editing

See merge request gitlab-org/gitlab!54993

doc/user/admin_area/settings/visibility_and_access_controls.md

@@ -29,7 +29,7 @@ To change the default branch protection:
 
 For more details, see [Protected branches](../../project/protected_branches.md).
 
-To change this setting for a specific group, see [Default branch protection for groups](../../group/index.md#changing-the-default-branch-protection-of-a-group)
+To change this setting for a specific group, see [Default branch protection for groups](../../group/index.md#change-the-default-branch-protection-of-a-group)
 
 ### Disable group owners from updating default branch protection **(PREMIUM SELF)**
 

doc/user/group/index.md

@@ -148,54 +148,35 @@ To remove a member from a group:
 > - [Improved](https://gitlab.com/gitlab-org/gitlab/-/issues/228675) in GitLab 13.7.
 > - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/289911) in GitLab 13.8.
 
-The following sections illustrate how you can filter and sort members in a group. To view these options,
-navigate to your desired group, go to **Members**, and include the noted search terms.
+To find members in a group, you can sort, filter, or search.
 
-### Membership filter
+### Filter a group
 
-By default, inherited and direct members are displayed. The [membership](subgroups/index.md#membership) filter can be used to display only inherited or only direct members.
+Filter a group to find members. By default, all members in the group and subgroups are displayed.
 
-#### Only display inherited members
+1. Go to the group and select **Members** (**{users}**).
+1. Above the list of members, in the **Filter members** box, enter filter criteria.
+   - To view members in the group only, select **Membership = Direct**.
+   - To view members of the group and its subgroups, select **Membership = Inherited**.
+   - To view members with two-factor authentication enabled or disabled, select **2FA = Enabled** or **Disabled**.
 
-Include `Membership` `=` `Inherited` in the search text box.
-
-![Group members filter inherited](img/group_members_filter_inherited_13_7.png)
-
-#### Only display direct members
-
-Include `Membership` `=` `Direct` in the search text box.
-
-![Group members filter direct](img/group_members_filter_direct_13_7.png)
-
-### 2FA filter
-
-[Owner](../permissions.md#group-members-permissions) permissions required.
-
-By default, members with 2FA enabled and disabled are displayed. The 2FA filter can be used to display only members with 2FA enabled or only members with 2FA disabled.
-
-#### Only display members with 2FA enabled
-
-Include `2FA` `=` `Enabled` in the search text box.
-
-![Group members filter 2FA enabled](img/group_members_filter_2fa_enabled_13_7.png)
-
-#### Only display members with 2FA disabled
-
-Include `2FA` `=` `Disabled` in the search text box.
-
-![Group members filter 2FA disabled](img/group_members_filter_2fa_disabled_13_7.png)
-
-### Search
+### Search a group
 
 You can search for members by name, username, or email.
 
-![Group members search](img/group_members_search_13_7.png)
+1. Go to the group and select **Members** (**{users}**).
+1. Above the list of members, in the **Filter members** box, enter search criteria.
+1. To the right of the **Filter members** box, select the magnifying glass (**{search}**).
 
-### Sort
+### Sort members in a group
 
-You can sort members by **Account**, **Access granted**, **Max role**, or **Last sign-in** in ascending or descending order.
+You can sort members by **Account**, **Access granted**, **Max role**, or **Last sign-in**.
 
-![Group members sort](img/group_members_sort_13_7.png)
+1. Go to the group and select **Members** (**{users}**).
+1. Above the list of members, on the top right, from the **Account** list, select
+   the criteria to filter by.
+1. To switch the sort between ascending and descending, to the right of the **Account** list, select the
+   arrow (**{sort-lowest}** or **{sort-highest}**).
 
 ## Mention a group in an issue or merge request
 
@@ -209,7 +190,7 @@ added to their To-do list.
 
 A to-do item is created for all the group and subgroup members.
 
-## Changing the default branch protection of a group
+## Change the default branch protection of a group
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/7583) in GitLab 12.9.
 

doc/user/group/subgroups/index.md

@@ -147,7 +147,7 @@ From the image above, we can deduce the following things:
 - Administrator is the Owner and member of **all** subgroups and for that reason,
   as with User 3, the **Source** column indicates **Direct member**.
 
-Members can be [filtered by inherited or direct membership](../index.md#membership-filter).
+Members can be [filtered by inherited or direct membership](../index.md#filter-a-group).
 
 ### Overriding the ancestor group membership
 

doc/user/permissions.md

@@ -303,7 +303,7 @@ group.
    - The [instance level](admin_area/settings/visibility_and_access_controls.md#default-project-creation-protection).
    - The [group level](group/index.md#default-project-creation-level).
 1. Does not apply to subgroups.
-1. Developers can push commits to the default branch of a new project only if the [default branch protection](group/index.md#changing-the-default-branch-protection-of-a-group) is set to "Partially protected" or "Not protected".
+1. Developers can push commits to the default branch of a new project only if the [default branch protection](group/index.md#change-the-default-branch-protection-of-a-group) is set to "Partially protected" or "Not protected".
 1. In addition, if your group is public or internal, all users who can see the group can also see group wiki pages.
 1. Users can only view events based on their individual actions.