Add latest changes from gitlab-org/gitlab@master

9 files changed, 37 insertions, 39 deletions

diff --git a/doc/user/group/index.md b/doc/user/group/index.md
index 943d4137185..22fe60a8000 100644
--- a/doc/user/group/index.md
+++ b/doc/user/group/index.md
@@ -365,7 +365,7 @@ To change the role that can create projects under a group:
 1. On the left sidebar, select **Search or go to** and find your group.
 1. Select **Settings > General**.
 1. Expand the **Permissions and group features** section.
-1. From the **Roles allowed to create projects** dropdown list, select an option.
+1. From **Roles allowed to create projects**, select an option.
 1. Select **Save changes**.
 
 To change this setting globally, see [Default project creation protection](../../administration/settings/visibility_and_access_controls.md#define-which-roles-can-create-projects).
diff --git a/doc/user/group/saml_sso/group_sync.md b/doc/user/group/saml_sso/group_sync.md
index 1b5e8414ee7..144d927f7e5 100644
--- a/doc/user/group/saml_sso/group_sync.md
+++ b/doc/user/group/saml_sso/group_sync.md
@@ -214,7 +214,7 @@ To enable global group memberships lock:
 
 1. [Configure SAML](../../../integration/saml.md) for your self-managed GitLab instance.
 1. On the left sidebar, at the bottom, select **Admin Area**.
-1. On the left sidebar, select **Settings > General**.
+1. Select **Settings > General**.
 1. Expand the **Visibility and access controls** section.
 1. Ensure that **Lock memberships to SAML Group Links synchronization** is selected.
 
diff --git a/doc/user/group/subgroups/index.md b/doc/user/group/subgroups/index.md
index 672eefc079e..a63d4a98fa2 100644
--- a/doc/user/group/subgroups/index.md
+++ b/doc/user/group/subgroups/index.md
@@ -58,23 +58,25 @@ To view the subgroups of a group:
 
 1. On the left sidebar, select **Search or go to** and find your group.
 1. Select the **Subgroups and projects** tab.
-1. To view a nested subgroup, expand a subgroup in the hierarchy list.
+1. Select the subgroup you want to view.
+   To view nested subgroups, expand (**{chevron-down}**) a subgroup.
 
 ### Private subgroups in public parent groups
 
-In the hierarchy list, public groups with a private subgroup have an expand option (**{chevron-down}**)
-for all users that indicate there is a subgroup. When users who are not direct or inherited members of
-the private subgroup select expand (**{chevron-down}**), the nested subgroup does not display.
+In the hierarchy list, public groups with private subgroups have an expand option (**{chevron-down}**),
+which indicates the group has nested subgroups. The expand option (**{chevron-down}**) is visible
+to all users, but the private group is displayed only to users who are direct or inherited members
+of the private subgroup.
 
-If you prefer to keep information about the presence of nested subgroups private, we advise that you
-add private subgroups only to private parent groups.
+If you prefer to keep information about the presence of nested subgroups private,
+you should add private subgroups only to private parent groups.
 
 ## Create a subgroup
 
 Prerequisites:
 
 - You must have either:
-  - At least the Maintainer role for a group to create subgroups for it.
+  - At least the Maintainer role for a group.
   - The [role determined by a setting](#change-who-can-create-subgroups). These users can create
     subgroups even if group creation is
     [disabled by an Administrator](../../../administration/admin_area.md#prevent-a-user-from-creating-top-level-groups) in the user's settings.
@@ -84,11 +86,10 @@ You cannot host a GitLab Pages subgroup website with a top-level domain name. Fo
 
 To create a subgroup:
 
-1. On the left sidebar, select **Search or go to** and find a parent group for the subgroup.
+1. On the left sidebar, select **Search or go to** and find the group you want to create the subgroup in.
 1. On the parent group's overview page, in the upper-right corner, select **New subgroup**.
-1. Select **Create group**.
 1. Fill in the fields. View a list of [reserved names](../../reserved_names.md) that cannot be used as group names.
-1. Select **Create group**.
+1. Select **Create subgroup**.
 
 ### Change who can create subgroups
 
@@ -102,24 +103,21 @@ To change who can create subgroups on a group:
   1. On the left sidebar, select **Search or go to** and find your group.
   1. Select **Settings > General**.
   1. Expand **Permissions and group features**.
-  1. Select a role from **Roles allowed to create subgroups**.
+  1. From **Roles allowed to create subgroups**, select an option.
   1. Select **Save changes**.
 - As an administrator:
   1. On the left sidebar, at the bottom, select **Admin Area**.
-  1. On the left sidebar, select **Overview > Groups**.
-  1. In the group's row select **Edit**.
-  1. Select a role from **Allowed to create subgroups**.
+  1. On the left sidebar, select **Overview > Groups** and find your group.
+  1. In the group's row, select **Edit**.
+  1. From the **Allowed to create subgroups** dropdown list, select an option.
   1. Select **Save changes**.
 
 For more information, view the [permissions table](../../permissions.md#group-members-permissions).
 
 ## Subgroup membership
 
-NOTE:
-There is a bug that causes some pages in the parent group to be accessible by subgroup members. For more details, see [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/340421).
-
-When you add a member to a group, that member is also added to all subgroups. The user's permissions are inherited from
-the group's parent.
+When you add a member to a group, that member is also added to all subgroups of that group.
+The member's permissions are inherited from the group's parent.
 
 Subgroup members can be:
 
@@ -162,6 +160,7 @@ To see if a member has inherited the permissions from a parent group:
 
 1. On the left sidebar, select **Search or go to** and find your group.
 1. Select **Manage > Members**.
+   The member's inheritance is displayed in the **Source** column.
 
 Members list for an example subgroup _Four_:
 
@@ -188,22 +187,23 @@ Members can be [filtered by inherited or direct membership](../index.md#filter-a
 
 ### Override ancestor group membership
 
-Users with the Owner role on a subgroup can add members to it.
+Users with the Owner role in a subgroup can add members to it.
 
-You can't give a user a role on a subgroup that's lower than the roles they have on ancestor groups. To override a user's
-role on an ancestor group, add the user to the subgroup again with a higher role. For example:
+You can't give a user a role in a subgroup that is lower than the roles the user has in ancestor groups.
+To override a user's role in an ancestor group, add the user to the subgroup again with a higher role.
+For example:
 
-- If User 1 is added to group _Two_ with the Developer role, they inherit that role in every subgroup of group _Two_.
-- To give User 1 the Maintainer role on group _Four_ (under _One / Two / Three_), add them again to group _Four_ with
+- If User 1 is added to group _Two_ with the Developer role, User 1 inherits that role in every subgroup of group _Two_.
+- To give User 1 the Maintainer role in group _Four_ (under _One / Two / Three_), add User 1 again to group _Four_ with
   the Maintainer role.
-- If User 1 is removed from group _Four_, their role falls back to their role on group _Two_. They have the Developer
-  role on group _Four_ again.
+- If User 1 is removed from group _Four_, the user's role falls back to their role in group _Two_. User 1 has the Developer
+  role in group _Four_ again.
 
 ## Mention subgroups
 
 Mentioning subgroups ([`@<subgroup_name>`](../../discussions/index.md#mentions)) in issues, commits, and merge requests
-notifies all direct members of that group. Inherited members of a subgroup are not notified by mentions. Mentioning works the same as for projects and groups, and you can choose the group
-of people to be notified.
+notifies all direct members of that group. Inherited members of a subgroup are not notified by mentions.
+Mentioning works the same as for projects and groups, and you can choose the group of members to be notified.
 
 <!-- ## Troubleshooting
 
diff --git a/doc/user/img/enable_AI_ML_features.png b/doc/user/img/enable_AI_ML_features.png
deleted file mode 100644
index 97d06c877e4..00000000000
--- a/doc/user/img/enable_AI_ML_features.png
+++ /dev/null
diff --git a/doc/user/infrastructure/clusters/connect/index.md b/doc/user/infrastructure/clusters/connect/index.md
index e56ec2b2af2..4a8ec3d85f7 100644
--- a/doc/user/infrastructure/clusters/connect/index.md
+++ b/doc/user/infrastructure/clusters/connect/index.md
@@ -45,7 +45,7 @@ your cluster's level.
 **Instance-level clusters:**
 
 1. On the left sidebar, at the bottom, select **Admin Area**.
-1. On the left sidebar, select **Kubernetes**.
+1. Select **Kubernetes**.
 
 ## Security implications for clusters connected with certificates
 
diff --git a/doc/user/packages/container_registry/reduce_container_registry_storage.md b/doc/user/packages/container_registry/reduce_container_registry_storage.md
index b7b382afc21..614639c705f 100644
--- a/doc/user/packages/container_registry/reduce_container_registry_storage.md
+++ b/doc/user/packages/container_registry/reduce_container_registry_storage.md
@@ -282,7 +282,7 @@ For self-managed instances, those settings can be updated in the [Rails console]
 They are also available in the [administrator area](../../../administration/admin_area.md):
 
 1. On the left sidebar, at the bottom, select **Admin Area**.
-1. On the left sidebar, select **Settings > CI/CD**
+1. Select **Settings > CI/CD**
 1. Expand **Container Registry**.
 
 ### Use the cleanup policy API
diff --git a/doc/user/project/integrations/slack.md b/doc/user/project/integrations/slack.md
index 91e21da6807..9b92fa35e24 100644
--- a/doc/user/project/integrations/slack.md
+++ b/doc/user/project/integrations/slack.md
@@ -11,8 +11,6 @@ WARNING:
 This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/372411) in GitLab 15.9
 and is planned for removal in 17.0. Use the [GitLab for Slack app](gitlab_slack_application.md) instead.
 This change is a breaking change.
-For the planned support of the GitLab for Slack app for self-managed instances,
-see [epic 1211](https://gitlab.com/groups/gitlab-org/-/epics/1211).
 
 The Slack notifications integration enables your GitLab project to send events
 (such as issue creation) to your existing Slack team as notifications. Setting up
diff --git a/doc/user/project/repository/code_suggestions/self_managed.md b/doc/user/project/repository/code_suggestions/self_managed.md
index a1022c52e81..2bd798ea842 100644
--- a/doc/user/project/repository/code_suggestions/self_managed.md
+++ b/doc/user/project/repository/code_suggestions/self_managed.md
@@ -47,7 +47,7 @@ Prerequisites:
 To enable Code Suggestions for your self-managed GitLab instance:
 
 1. On the left sidebar, at the bottom, select **Admin Area**.
-1. On the left sidebar, select **Settings > General**.
+1. Select **Settings > General**.
 1. Expand **Code Suggestions** and select **Turn on Code Suggestions for this instance**.
    In GitLab 16.3, you do not need to enter anything into the **Personal access token** field.
    In GitLab 16.4 and later, there is no **Personal access token** field.
@@ -95,7 +95,7 @@ To enable Code Suggestions for your GitLab SaaS account:
 To enable Code Suggestions for your self-managed GitLab instance:
 
 1. On the left sidebar, at the bottom, select **Admin Area**.
-1. On the left sidebar, select **Settings > General**.
+1. Select **Settings > General**.
 1. Expand **Code Suggestions** and:
    - Select **Turn on Code Suggestions for this instance**.
    - In **Personal access token**, enter your GitLab SaaS personal access token.
diff --git a/doc/user/workspace/gitlab_agent_configuration.md b/doc/user/workspace/gitlab_agent_configuration.md
index 856b39814fa..0e35c72c5ef 100644
--- a/doc/user/workspace/gitlab_agent_configuration.md
+++ b/doc/user/workspace/gitlab_agent_configuration.md
@@ -11,12 +11,12 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136744) in GitLab 16.7. Feature flag `remote_development_feature_flag` removed.
 
 When you [set up a workspace](configuration.md#set-up-a-workspace),
-you must configure remote development for the GitLab agent.
+you must configure the GitLab agent for remote development.
 The remote development settings are available in the agent
 configuration file under `remote_development`.
 
 You can use any agent defined under the root group of your project,
-provided that remote development is properly configured for that agent.
+provided that the agent is properly configured for remote development.
 
 ## Remote development settings
 
@@ -116,7 +116,7 @@ Use this setting to define a list of IP CIDR ranges to allow as egress destinati
 Define egress rules when:
 
 - The GitLab instance is on a private IP range.
-- Workspace users must access a cloud resource on a private IP range.
+- The workspace must access a cloud resource on a private IP range.
 
 Each element of the list defines an `allow` attribute with an optional `except` attribute.
 `allow` defines an IP range to allow traffic from.