Add latest changes from gitlab-org/gitlab@master

3 files changed, 46 insertions, 38 deletions

diff --git a/doc/user/ai_features.md b/doc/user/ai_features.md
index 72d1c5a6a4b..f5541297d58 100644
--- a/doc/user/ai_features.md
+++ b/doc/user/ai_features.md
@@ -17,16 +17,19 @@ Prerequisites:
 
 - You must have the Owner role for the group.
 
-To enable AI/ML features:
+To enable AI/ML features for a top-level group:
 
-- Enable the [Experiment features setting](group/manage.md#group-experiment-features-setting).
-- The [third-party AI features setting](group/manage.md#group-third-party-ai-features-setting) is enabled by default. To disable AI features powered by third-party APIs, disable this setting.
+- Enable [Experiment features](group/manage.md#enable-experiment-features).
+- Enable [third-party AI features](group/manage.md#enable-third-party-ai-features) (enabled by default).
+  To disable AI features powered by third-party APIs, clear this setting.
 
-These settings give you control over which features are enabled. These settings work together so you can have a mix of both experimental and third-party AI features.
+These settings work together so you can have a mix of both experimental and third-party AI features.
 
 ## Generally Available AI features
 
-When a feature is [Generally Available](../policy/alpha-beta-support.md#generally-available-ga), it does not require the [group-level Experiment features setting](group/manage.md#group-experiment-features-setting) to be enabled. Some of these features might require the [group-level third-party AI features setting](group/manage.md#group-third-party-ai-features-setting).
+When a feature is [Generally Available](../policy/alpha-beta-support.md#generally-available-ga),
+it does not require [Experiment features to be enabled](group/manage.md#enable-experiment-features).
+Some of these features might require [third-party AI features to be enabled](group/manage.md#enable-third-party-ai-features).
 
 The following feature is Generally Available:
 
@@ -34,7 +37,8 @@ The following feature is Generally Available:
 
 ## Beta AI features
 
-[Beta features](../policy/alpha-beta-support.md#beta) do not require the [group-level Experiment features setting](group/manage.md#group-experiment-features-setting) to be enabled.
+[Beta features](../policy/alpha-beta-support.md#beta) do not require
+[Experiment features to be enabled](group/manage.md#enable-experiment-features).
 
 The following feature is in Beta:
 
@@ -42,11 +46,14 @@ The following feature is in Beta:
 
 ## Experiment AI features
 
-[Experiment features](../policy/alpha-beta-support.md#experiment) will soon require the [group-level Experiment features setting](group/manage.md#group-experiment-features-setting) to be enabled.
+[Experiment features](../policy/alpha-beta-support.md#experiment) will soon require
+[Experiment features to be enabled](group/manage.md#enable-experiment-features).
 
 ## Third-party AI features
 
-Third-party AI features require the [group-level third-party AI features setting](group/manage.md#group-third-party-ai-features-setting) to be enabled. Experiment third-party AI features also require the [Experiment features setting](group/manage.md#group-experiment-features-setting) to be enabled.
+Third-party AI features require [third-party AI services to be enabled](group/manage.md#enable-third-party-ai-features).
+
+For Experiment third-party AI features, [Experiment features must be enabled](group/manage.md#enable-experiment-features) as well.
 
 ### Explain Selected Code in the Web UI **(ULTIMATE SAAS)**
 
@@ -117,7 +124,7 @@ We cannot guarantee that the large language model produces results that are corr
 
 > Introduced in GitLab 16.0 as an [Experiment](../policy/alpha-beta-support.md#experiment).
 
-This feature is an [Experiment](../policy/alpha-beta-support.md) on GitLab.com that is powered by OpenAI's GPT-3. It requires the [group-level third-party AI features setting](group/manage.md#group-third-party-ai-features-setting) to be enabled.
+This feature is an [Experiment](../policy/alpha-beta-support.md) on GitLab.com that is powered by OpenAI's GPT-3. It requires the [group-level third-party AI features setting](group/manage.md#enable-third-party-ai-features) to be enabled.
 
 Getting help has never been easier. If you have a question about how the GitLab product works, you can ask product how-to questions and get AI generated support from GitLab Chat.
 
@@ -131,7 +138,7 @@ To give feedback, select the **Give Feedback** link.
 
 > [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10400) in GitLab 16.0 as an [Experiment](../policy/alpha-beta-support.md#experiment).
 
-This feature is an [Experiment](../policy/alpha-beta-support.md) on GitLab.com that is powered by OpenAI's GPT-3. It requires the [group-level third-party AI features setting](group/manage.md#group-third-party-ai-features-setting) to be enabled.
+This feature is an [Experiment](../policy/alpha-beta-support.md) on GitLab.com that is powered by OpenAI's GPT-3. It requires the [group-level third-party AI features setting](group/manage.md#enable-third-party-ai-features) to be enabled.
 
 You can generate a merge request summary in a merge request comment.
 
@@ -148,7 +155,7 @@ and the target branch is sent to the large language model referenced above.
 
 > [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10466) in GitLab 16.0 as an [Experiment](../policy/alpha-beta-support.md#experiment).
 
-This feature is an [Experiment](../policy/alpha-beta-support.md) on GitLab.com that is powered by OpenAI's GPT-3. It requires the [group-level third-party AI features setting](group/manage.md#group-third-party-ai-features-setting) to be enabled.
+This feature is an [Experiment](../policy/alpha-beta-support.md) on GitLab.com that is powered by OpenAI's GPT-3. It requires the [group-level third-party AI features setting](group/manage.md#enable-third-party-ai-features) to be enabled.
 
 When you've completed your review of a merge request and are ready to [submit your review](project/merge_requests/reviews/index.md#submit-a-review), you can have a summary generated for you.
 
@@ -171,7 +178,7 @@ Provide feedback on this experimental feature in [issue 408991](https://gitlab.c
 
 > [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10366) in GitLab 16.0 as an [Experiment](../policy/alpha-beta-support.md#experiment).
 
-This feature is an [Experiment](../policy/alpha-beta-support.md) on GitLab.com that is powered by OpenAI's GPT-3. It requires the [group-level third-party AI features setting](group/manage.md#group-third-party-ai-features-setting) to be enabled.
+This feature is an [Experiment](../policy/alpha-beta-support.md) on GitLab.com that is powered by OpenAI's GPT-3. It requires the [group-level third-party AI features setting](group/manage.md#enable-third-party-ai-features) to be enabled.
 
 In a merge request, you can get a list of suggested tests for the file you are reviewing. This functionality can help determine if appropriate test coverage has been provided, or if you need more coverage for your project.
 
@@ -208,7 +215,7 @@ These features are in a variety of [feature support levels](../policy/alpha-beta
 
 Some AI features require the use of third-party AI services models and APIs from: Google AI and OpenAI. The processing of any personal data is in accordance with our [Privacy Statement](https://about.gitlab.com/privacy/). You may also visit the [Sub-Processors page](https://about.gitlab.com/privacy/subprocessors/#third-party-sub-processors) to see the list of our Sub-Processors that we use in order to provide these features.
 
-Group owners can control which top-level groups have access to third-party AI features by using the [group level third-party AI features setting](group/manage.md#group-third-party-ai-features-setting).
+Group owners can control which top-level groups have access to third-party AI features by using the [group level third-party AI features setting](group/manage.md#enable-third-party-ai-features).
 
 ### Model accuracy and quality
 
diff --git a/doc/user/group/manage.md b/doc/user/group/manage.md
index 508b5b27600..83ec7115660 100644
--- a/doc/user/group/manage.md
+++ b/doc/user/group/manage.md
@@ -408,7 +408,7 @@ To view the merge request approval settings for a group:
 
 Support for group-level settings for merge request approval rules is tracked in this [epic](https://gitlab.com/groups/gitlab-org/-/epics/4367).
 
-## Group Code Suggestions **(FREE SAAS)**
+## Enable Code Suggestions **(FREE SAAS)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/405126) in GitLab 15.11.
 > - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/408158) from GitLab Ultimate to GitLab Premium in 16.0.
@@ -416,38 +416,37 @@ Support for group-level settings for merge request approval rules is tracked in
 
 WARNING:
 This feature is in [Beta](../../policy/alpha-beta-support.md#beta).
-Code Suggestions use generative AI to suggest code while you're developing.
-Due to high demand, this feature may have unscheduled downtime and code suggestions in VS Code may be delayed.
+Due to high demand, this feature may have unscheduled downtime and Code Suggestions in IDEs may be delayed.
 Code Suggestions may produce
 [low-quality or incomplete suggestions](../project/repository/code_suggestions.md#model-accuracy-and-quality).
 Beta users should read about the [known limitations](../project/repository/code_suggestions.md#known-limitations).
 We look forward to hearing your feedback.
 
-This setting enables users in the group to access [Code Suggestions](../project/repository/code_suggestions.md).
-This setting [cascades to all projects](../project/merge_requests/approvals/settings.md#settings-cascading)
-that belong to the group.
+You can give all users in a group and its subgroups access to [Code Suggestions](../project/repository/code_suggestions.md).
 
-However, each user can enable or disable Code Suggestions for themselves.
+- This setting
+  [cascades to all projects](../project/merge_requests/approvals/settings.md#settings-cascading) in the group.
+- Each user can
+  [enable or disable Code Suggestions for themselves](../project/repository/code_suggestions.md#enable-code-suggestions-for-an-individual-user).
 
 To enable Code Suggestions for a group:
 
 1. On the top bar, select **Main menu > Groups** and find your group.
 1. On the left sidebar, select **Settings > General**.
-1. Expand the **Permissions and group features** section.
-1. Find the **Code Suggestions** settings.
+1. Expand **Permissions and group features**.
+1. Under **Code Suggestions**, select the **Projects in this group can use Code Suggestions** checkbox.
 1. Select **Save changes**.
 
-## Group Experiment features setting **(ULTIMATE SAAS)**
+## Enable Experiment features **(ULTIMATE SAAS)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/404856) in GitLab 16.0.
 
-You can give all users in a top-level group access to Experiment features.
-
 WARNING:
 [Experiment features](../../policy/alpha-beta-support.md#experiment) may produce unexpected results
 (for example, the results might be low-quality, incomplete, incoherent, offensive, or insensitive,
 and might include insecure code or failed pipelines).
 
+You can give all users in a top-level group access to Experiment features.
 This setting [cascades to all projects](../project/merge_requests/approvals/settings.md#settings-cascading)
 that belong to the group.
 
@@ -455,16 +454,16 @@ To enable Experiment features for a top-level group:
 
 1. On the top bar, select **Main menu > Groups** and find your group.
 1. On the left sidebar, select **Settings > General**.
-1. Expand the **Permissions and group features** section.
-1. Find the **Experiment features** settings.
+1. Expand **Permissions and group features**.
+1. Under **Experiment features**, select the **Use Experiment features** checkbox.
 1. Select **Save changes**.
 
-## Group third-party AI features setting **(ULTIMATE SAAS)**
+## Enable third-party AI features **(ULTIMATE SAAS)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/404856) in GitLab 16.0.
 
 WARNING:
-These Artifical Intelligence (AI) features use [third-party services](../ai_features.md#data-usage)
+These AI features use [third-party services](../ai_features.md#data-usage)
 and require transmission of data, including personal data.
 
 You can give all users in the group access to third-party AI features.
@@ -475,8 +474,8 @@ To enable third-party AI features for a group:
 
 1. On the top bar, select **Main menu > Groups** and find your group.
 1. On the left sidebar, select **Settings > General**.
-1. Expand the **Permissions and group features** section.
-1. Find the **Third-party Artificial Intelligence (AI) features** settings.
+1. Expand **Permissions and group features**.
+1. Under **Third-party AI services**, select the **Use third-party AI services** checkbox.
 1. Select **Save changes**.
 
 ## Group activity analytics **(PREMIUM)**
diff --git a/doc/user/project/repository/code_suggestions.md b/doc/user/project/repository/code_suggestions.md
index e567f157fa3..dcd74bbaebf 100644
--- a/doc/user/project/repository/code_suggestions.md
+++ b/doc/user/project/repository/code_suggestions.md
@@ -15,12 +15,12 @@ type: index, reference
 
 WARNING:
 This feature is in [Beta](/ee/policy/alpha-beta-support.md#beta).
-Due to high demand, this feature may have unscheduled downtime and code suggestions in IDEs may be delayed.
+Due to high demand, this feature may have unscheduled downtime and Code Suggestions in IDEs may be delayed.
 Code Suggestions may produce [low-quality or incomplete suggestions](#model-accuracy-and-quality).
 Beta users should read about the [known limitations](#known-limitations). We look forward to hearing your feedback.
 
 Code Suggestions use generative AI to suggest code while you're developing.
-Use Code Suggestions to write code more efficiently by viewing code suggestions
+Use Code Suggestions to write code more efficiently by viewing Code Suggestions
 as you type. Depending on the cursor position, the extension either:
 
 - Provides entire code snippets, like generating functions.
@@ -65,17 +65,19 @@ Each user can enable Code Suggestions for themselves:
 1. On the top bar, in the upper-right corner, select your avatar.
 1. On the left sidebar, select **Preferences**.
 1. In the **Code Suggestions** section, select **Enable Code Suggestions**.
+1. Select **Save changes**.
 
 NOTE:
-If Code Suggestions is [enabled for the group](../../group/manage.md#group-code-suggestions), the group setting overrides the user setting.
+If Code Suggestions is [enabled for the group](../../group/manage.md#enable-code-suggestions), the group setting overrides the user setting.
 
 ## Enable Code Suggestions in VS Code
 
 Prerequisites:
 
-- Your group owner must enable the [group level code suggestions setting](../../group/manage.md#group-code-suggestions).
+- Code Suggestions must be [enabled for the top-level group](../../group/manage.md#enable-code-suggestions).
 - Code Suggestions must be [enabled for your user account](#enable-code-suggestions-for-an-individual-user).
-- If using a [personal access token](../../profile/personal_access_tokens.md#create-a-personal-access-token), the token must have the `read_api` and `read_user` scopes.
+- If you use a [personal access token](../../profile/personal_access_tokens.md#create-a-personal-access-token),
+  the token must have the `read_api` and `read_user` scopes.
 
 To enable Code Suggestions in VS Code:
 
@@ -111,14 +113,14 @@ Start typing and receive suggestions for your GitLab projects.
   <iframe src="https://www.youtube-nocookie.com/embed/WnxBYxN2-p4" frameborder="0" allowfullscreen> </iframe>
 </figure>
 
-## Why can't I see any code suggestions?
+## Why aren't Code Suggestions displayed?
 
 If Code Suggestions are not displayed, try the following troubleshooting steps.
 
 In GitLab, ensure Code Suggestions is enabled:
 
 - [For your user account](#enable-code-suggestions-for-an-individual-user).
-- [For *all* top-level groups your account belongs to](../../group/manage.md#group-code-suggestions). If you don't have a role that lets you view the top-level group's settings, contact a group owner.
+- [For *all* top-level groups your account belongs to](../../group/manage.md#enable-code-suggestions). If you don't have a role that lets you view the top-level group's settings, contact a group owner.
 
 In VS Code: