diff --git a/doc/development/code_suggestions/index.md b/doc/development/code_suggestions/index.md
index 12c0e77ab5abab9e26b6efe22a0e80311ca96d47..4098e4f6512c0e4d37bbfd480823e0727af6c32d 100644
--- a/doc/development/code_suggestions/index.md
+++ b/doc/development/code_suggestions/index.md
@@ -42,7 +42,7 @@ This should enable everyone to see locally any change in an IDE being sent to th
When testing interactions with the AI Gateway, you might want to integrate your local GDK
with the deployed staging AI Gateway. To do this:
-1. You need a [cloud staging license](../../user/project/repository/code_suggestions/self_managed.md#upgrade-gitlab) that has the Code Suggestions add-on, because add-ons are enabled on staging. Drop a note in the `#s_fulfillment` internal Slack channel to request an add-on to your license. See this [handbook page](https://handbook.gitlab.com/handbook/developer-onboarding/#working-on-gitlab-ee-developer-licenses) for how to request a license for local development.
+1. You need a [cloud staging license](../../user/project/repository/code_suggestions/self_managed_prior_versions.md#upgrade-to-gitlab-163) that has the Code Suggestions add-on, because add-ons are enabled on staging. Drop a note in the `#s_fulfillment` internal Slack channel to request an add-on to your license. See this [handbook page](https://about.gitlab.com/handbook/developer-onboarding/#working-on-gitlab-ee-developer-licenses) for how to request a license for local development.
1. Set environment variables to point customers-dot to staging, and the AI Gateway to staging:
```shell
diff --git a/doc/user/ai_features.md b/doc/user/ai_features.md
index d21f24ff8e1dd62970d60841efba97b751078bc2..ddaea49f70d0a4b20d738da57beb7e311ca6c10a 100644
--- a/doc/user/ai_features.md
+++ b/doc/user/ai_features.md
@@ -50,7 +50,7 @@ Some features are still in development. View details about [support for each sta
who has the Owner role in the group.
- View [how to enable this setting](group/manage.md#enable-experiment-and-beta-features).
- Code Suggestions
- - View [how to enable for self-managed](project/repository/code_suggestions/self_managed.md#enable-code-suggestions-on-self-managed-gitlab).
+ - View [how to enable for self-managed](project/repository/code_suggestions/self_managed.md#enable-code-suggestions).
- View [how to enable for SaaS](project/repository/code_suggestions/saas.md#enable-code-suggestions).
## Experimental AI features and how to use them
diff --git a/doc/user/group/manage.md b/doc/user/group/manage.md
index 95cce896d04535d9b7a8015a5c5f1a1d0fc1bfb1..7dc2d5e931097c6860f9ebbe18641d5f6d345b42 100644
--- a/doc/user/group/manage.md
+++ b/doc/user/group/manage.md
@@ -455,33 +455,6 @@ Approval settings should not be confused with [approval rules](../project/merge_
for the ability to set merge request approval rules for groups is tracked in
[epic 4367](https://gitlab.com/groups/gitlab-org/-/epics/4367).
-## Enable Code Suggestions for a group
-
-DETAILS:
-**Tier:** Free, Premium, Ultimate
-**Offering:** 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.
-> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/410801) from GitLab Premium to GitLab Free in 16.0.
-
-You can give all users in a group and its subgroups access to
-[Code Suggestions](../project/repository/code_suggestions/index.md). This setting
-[cascades to all projects](../project/merge_requests/approvals/settings.md#settings-cascading) in the group.
-
-Code Suggestions are enabled by default at the group level.
-
-To update this setting:
-
-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. Under **Code Suggestions**, select the **Projects in this group can use Code Suggestions** checkbox.
-1. Select **Save changes**.
-
-Individual users can disable Code Suggestions by disabling the feature in their
-[installed IDE editor extension](../project/repository/code_suggestions/index.md#supported-editor-extensions).
-
## Enable Experiment and Beta features
DETAILS:
diff --git a/doc/user/profile/preferences.md b/doc/user/profile/preferences.md
index 920cce436103aceeec47c01c07288a027be2a1e2..d4b36f940a8bf58366483d61439152bef625da18 100644
--- a/doc/user/profile/preferences.md
+++ b/doc/user/profile/preferences.md
@@ -322,22 +322,6 @@ To access your **Followers** and **Following** tabs:
- On the left sidebar, select your avatar > select your name or username.
- Select **Followers** or **Following**.
-## Enable Code Suggestions
-
-DETAILS:
-**Tier:** Free, Premium, Ultimate
-**Offering:** SaaS
-
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121079) in GitLab 16.1 as [Beta](../../policy/experiment-beta-support.md#beta).
-> - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139916) in GitLab 16.8. UI user setting removed.
-
-If Code Suggestions is
-[enabled for your top-level group](../group/manage.md#enable-code-suggestions-for-a-group),
-you can use Code Suggestions after you
-[configure a supported IDE extension](../project/repository/code_suggestions/index.md#supported-editor-extensions).
-
-If Code Suggestions are disabled [for all the groups that you belong to](../../user/group/manage.md#enable-code-suggestions-for-a-group), then you cannot enable them for yourself.
-
## Integrate your GitLab instance with third-party services
Give third-party services access to your GitLab account.
diff --git a/doc/user/project/repository/code_suggestions/index.md b/doc/user/project/repository/code_suggestions/index.md
index 816fd2ad689b18b8a8faa6bf0b190c980cdc791c..03eb9131c6d1ff3a662e185861df048abbac7b8b 100644
--- a/doc/user/project/repository/code_suggestions/index.md
+++ b/doc/user/project/repository/code_suggestions/index.md
@@ -13,68 +13,61 @@ info: To determine the technical writer assigned to the Stage/Group associated w
Write code more efficiently by using generative AI to suggest code while you're developing.
-With [GitLab Duo Code Suggestions](https://about.gitlab.com/solutions/code-suggestions/), you get:
+With GitLab Duo Code Suggestions, you get:
-- Code Completion, which suggests completions to the current line you are typing. These suggestions are usually low latency.
-- Code Generation, which generates code based on a natural language code
- comment block. Write a comment like `# Type more here`, then press <kbd>Enter</kbd> to generate the
- appropriate code, based on the context of your comment and the rest of your code.
- - Algorithms or large code blocks may take more than 10 seconds to generate.
- - Streaming of code generation responses is supported in VS Code, leading to faster average response times. Other supported IDEs offer slower response times and will return the generated code in a single block.
+- Code completion, which suggests completions to the current line you are typing.
+- Code generation, which generates code based on a natural language code
+ comment block. Write a comment like `# Type more here`, then press <kbd>Enter</kbd> to generate
+ code based on the context of your comment and the rest of your code.
+
+Get started with Code Suggestions on your [self-managed](self_managed.md) instance
+or on [SaaS](saas.md).
-## Code Suggestions access
+<i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
+[Watch a video overview](https://youtu.be/xQUlrbIWo8o).
+<!-- Video published on 2023-12-09 -->
+
+## Required subscription
Code Suggestions availability is changing.
-Free Open Access subject to the [Testing Agreement](https://handbook.gitlab.com/handbook/legal/testing-agreement/)
+Access subject to the [Testing Agreement](https://handbook.gitlab.com/handbook/legal/testing-agreement/)
is available through February 14, 2024:
- For SaaS, on all subscription tiers (Free, Premium, and Ultimate).
- For self-managed, on Premium and Ultimate tiers.
-Code Suggestions will be part of [GitLab Duo Pro](https://about.gitlab.com/gitlab-duo/) starting February 15, 2024:
+Starting February 15, 2024, Code Suggestions will be part of [GitLab Duo Pro](https://about.gitlab.com/gitlab-duo/):
- GitLab Duo Pro is available for both SaaS and self-managed, on Premium and Ultimate tiers.
-## Start using Code Suggestions
+NOTE:
+On February 15th, if you have not purchased GitLab Duo Pro,
+you will no longer have access to Code Suggestions.
-GitLab Duo Code Suggestions are available:
+Code Suggestions are not available for the GitLab Community Edition.
-- In the Premium and Ultimate tier for [self-managed](self_managed.md), and across all tiers for [SaaS](saas.md). View these pages to get started.
-- In VS Code, Microsoft Visual Studio, JetBrains IDEs, and Neovim. You must have the corresponding GitLab extension installed.
-- In the GitLab Web IDE.
+## Supported editor extensions
-<div class="video-fallback">
- <a href="https://youtu.be/xQUlrbIWo8o">View how to setup and use GitLab Duo Code Suggestions</a>.
-</div>
-<figure class="video-container">
- <iframe src="https://www.youtube-nocookie.com/embed/xQUlrbIWo8o" frameborder="0" allowfullscreen> </iframe>
-</figure>
+To use Code Suggestions, use one of these editor extensions:
-Code Suggestions is available and free to use until February 15, 2024:
+| IDE | Extension |
+|------------------|------------------------|
+| VSCode | [VS Code GitLab Workflow extension](https://marketplace.visualstudio.com/items?itemName=GitLab.gitlab-workflow)|
+| [GitLab WebIDE (VS Code in the Cloud)](../../../project/web_ide/index.md) | No configuration required. |
+| Microsoft Visual Studio | [Visual Studio GitLab extension](https://marketplace.visualstudio.com/items?itemName=GitLab.GitLabExtensionForVisualStudio) |
+ JetBrains IDEs | [GitLab plugin](https://plugins.jetbrains.com/plugin/22325-gitlab) |
+ Neovim | [`gitlab.vim` plugin](https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim) |
-- Before February 15, 2024, usage of Code Suggestions is governed by the
- [GitLab Testing Agreement](https://handbook.gitlab.com/handbook/legal/testing-agreement/).
-- On February 15, 2024, Code Suggestions becomes a paid add-on and will be governed by our
- [AI Functionality Terms](https://handbook.gitlab.com/handbook/legal/ai-functionality-terms/).
+A [GitLab Language Server](https://gitlab.com/gitlab-org/editor-extensions/gitlab-lsp) is used in VS Code, Visual Studio, and Neovim. The Language Server supports faster iteration across more platforms. You can also configure it to support Code Suggestions in IDEs where GitLab doesn't provide official support.
## Supported languages
-Code Suggestions support is a function of the:
-
-- Underlying large language model.
-- IDE used.
-- Extension or plug-in support in the IDE.
-
-For languages not listed in the following table, Code Suggestions might not function as expected.
-
-### Supported languages in IDEs
-
-Code Suggestions is aware of common popular programming concepts and
+Code Suggestions is aware of common popular programming languages, concepts, and
infrastructure-as-code interfaces, like Kubernetes Resource Model (KRM),
Google Cloud CLI, and Terraform.
-The editor supports these languages:
+The following languages are supported:
| Language | VS Code | JetBrains IDEs | Visual Studio | Neovim |
|------------------|------------------------|------------------------|------------------------|--------|
@@ -86,34 +79,31 @@ The editor supports these languages:
| HTML | **{check-circle}** No | **{check-circle}** Yes | **{check-circle}** No | **{check-circle}** No |
| Java | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
| JavaScript | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
-| Kotlin | **{check-circle}** Yes (Requires third-party extension providing Kotlin support) | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
+| Kotlin | **{check-circle}** Yes <br><br>(Requires third-party extension providing Kotlin support) | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
| PHP | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
| Python | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
| Ruby | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
| Rust | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
-| Scala | **{check-circle}** Yes (Requires third-party extension providing Scala support) | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
+| Scala | **{check-circle}** Yes <br><br>(Requires third-party extension providing Scala support) | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
| Shell scripts (`bash` only) | **{check-circle}** No | **{check-circle}** Yes | **{check-circle}** No | **{check-circle}** No |
| Swift | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
| TypeScript | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
-| Terraform | **{check-circle}** Yes (Requires third-party extension providing Terraform support) | **{check-circle}** Yes | **{dotted-circle}** No | **{check-circle}** Yes (Requires third-party extension providing the `terraform` file type) |
+| Terraform | **{check-circle}** Yes <br><br>(Requires third-party extension providing Terraform support) | **{check-circle}** Yes | **{dotted-circle}** No | **{check-circle}** Yes <br><br>(Requires third-party extension providing the `terraform` file type) |
NOTE:
-Some languages are not supported in all JetBrains IDEs, or may require additional
+Some languages are not supported in all JetBrains IDEs, or might require additional
plugin support. Refer to the JetBrains documentation for specifics on your IDE.
-## Supported editor extensions
-
-Code Suggestions supports a variety of popular editors including:
+For languages not listed in the table, Code Suggestions might not function as expected.
-- VS Code, using [the VS Code GitLab Workflow extension](https://marketplace.visualstudio.com/items?itemName=GitLab.gitlab-workflow). Supports streaming responses for code generation.
-- [GitLab WebIDE (VS Code in the Cloud)](../../../project/web_ide/index.md), with no additional configuration.
-- Microsoft Visual Studio, using the [Visual Studio GitLab extension](https://marketplace.visualstudio.com/items?itemName=GitLab.GitLabExtensionForVisualStudio).
-- JetBrains IDEs, using the [GitLab plugin](https://plugins.jetbrains.com/plugin/22325-gitlab).
-- Neovim, using the [`gitlab.vim` plugin](https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim).
+## Response time
-A [GitLab Language Server](https://gitlab.com/gitlab-org/editor-extensions/gitlab-lsp) is used in VS Code, Visual Studio, and Neovim. The Language Server supports faster iteration across more platforms. Users can also configure it to support Code Suggestions in IDEs where GitLab doesn't provide official support.
+- Code completion suggestions are usually low latency.
+- For code generation:
+ - Algorithms or large code blocks might take more than 10 seconds to generate.
+ - Streaming of code generation responses is supported in VS Code, leading to faster average response times. Other supported IDEs offer slower response times and will return the generated code in a single block.
-## Code Suggestions data usage
+## Data usage
Code Suggestions is powered by a generative AI model.
@@ -126,7 +116,7 @@ GitLab selects the best-in-class large-language models for specific tasks. We us
### Telemetry
-For self-managed instances that have enabled Code Suggestions and SaaS accounts, we collect aggregated or de-identified first-party usage data through our [Snowplow collector](https://about.gitlab.com/handbook/business-technology/data-team/platform/snowplow/). This usage data includes the following metrics:
+For self-managed instances that have enabled Code Suggestions and for SaaS accounts, we collect aggregated or de-identified first-party usage data through our [Snowplow collector](https://about.gitlab.com/handbook/business-technology/data-team/platform/snowplow/). This usage data includes the following metrics:
- Language the code suggestion was in (for example, Python)
- Editor being used (for example, VS Code)
@@ -150,10 +140,10 @@ For more information on GitLab Code Suggestions data [sub-processors](https://ab
- Google Vertex AI Codey APIs [data governance](https://cloud.google.com/vertex-ai/docs/generative-ai/data-governance) and [responsible AI](https://cloud.google.com/vertex-ai/docs/generative-ai/learn/responsible-ai).
- Anthropic Claude's [constitution](https://www.anthropic.com/index/claudes-constitution).
-## Known limitations
+## Accuracy of results
We are continuing to work on the accuracy of overall generated content.
-However, Code Suggestions may generate suggestions that are:
+However, Code Suggestions might generate suggestions that are:
- Irrelevant.
- Incomplete.
@@ -163,22 +153,17 @@ However, Code Suggestions may generate suggestions that are:
When using Code Suggestions, [code review best practice](../../../../development/code_review.md) still applies.
-Let us know if you have [feedback](#feedback).
-
## Progressive enhancement
-This feature is designed as a progressive enhancement to developer's IDEs.
+This feature is designed as a progressive enhancement to developer IDEs.
Code Suggestions offer a completion if a suitable recommendation is provided to the user in a timely matter.
In the event of a connection issue or model inference failure, the feature gracefully degrades.
Code Suggestions do not prevent you from writing code in your IDE.
-## Feedback
-
-Let us know about your Code Suggestions experience in [issue 435783](https://gitlab.com/gitlab-org/gitlab/-/issues/435783).
+## Disable Code Suggestions
-## Troubleshooting
+To disable Code Suggestions, disable the feature in your IDE editor extension.
-### Disable Code Suggestions
+## Feedback
-Individual users can disable Code Suggestions by disabling the feature in their
-[installed IDE editor extension](index.md#supported-editor-extensions).
+Provide feedback about your Code Suggestions experience in [issue 435783](https://gitlab.com/gitlab-org/gitlab/-/issues/435783).
diff --git a/doc/user/project/repository/code_suggestions/saas.md b/doc/user/project/repository/code_suggestions/saas.md
index a9f1da8b5df84d149eea5b43c0ca501cddad1a0d..3c3c3541bcf883fa531d6f9e440bd3f41b9a030c 100644
--- a/doc/user/project/repository/code_suggestions/saas.md
+++ b/doc/user/project/repository/code_suggestions/saas.md
@@ -17,61 +17,69 @@ DETAILS:
> - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121079) in GitLab 16.1.
> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/435271) in GitLab 16.7.
-NOTE:
-Starting in February 2024, Code Suggestions will be part of
-[GitLab Duo Pro](https://about.gitlab.com/gitlab-duo/),
-available to Premium and Ultimate users for purchase now.
+Get started using Code Suggestions in your IDE. These instructions apply to users
+of GitLab SaaS.
-Write code more efficiently by using generative AI to suggest code while you're developing.
+Prerequisites:
-Usage of GitLab Duo Code Suggestions is governed by the [GitLab Testing Agreement](https://handbook.gitlab.com/handbook/legal/testing-agreement/).
-Learn about [data usage when using Code Suggestions](index.md#code-suggestions-data-usage).
+- You must be using [one of the supported IDE extensions](index.md#supported-editor-extensions).
+- Code Suggestions must be enabled [for the top-level group](#enable-code-suggestions).
-## Enable Code Suggestions
+To use Code Suggestions:
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121079) in GitLab 16.1 as [Beta](../../../../policy/experiment-beta-support.md#beta).
-> - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139916) in GitLab 16.8. UI user setting removed.
+1. Author your code.
+ As you type, suggestions are displayed. Code Suggestions provide code snippets
+ or completes the current line, depending on the cursor position.
-A group owner must
-[enable Code Suggestions for your top-level group](../../../group/manage.md#enable-code-suggestions-for-a-group).
+1. Describe the requirements in natural language.
+ Code Suggestions generates functions and code snippets based on the context provided.
-NOTE:
-If you are having issues enabling Code Suggestions, view the
-[troubleshooting guide](troubleshooting.md#code-suggestions-are-not-displayed).
+1. To accept a suggestion, press <kbd>Tab</kbd>. To reject a suggestion, press <kbd>Esc</kbd>.
+1. To ignore a suggestion, keep typing as you usually would.
-## Use Code Suggestions
+## Best practices
-Prerequisites:
+To get the best results from code generation:
-- You must have configured Code Suggestions in a
- [supported IDE editor extension](index.md#supported-editor-extensions).
-- Code Suggestions must be enabled for [the top-level group](../../../group/manage.md#enable-code-suggestions-for-a-group).
+- Be as specific as possible while remaining concise.
+- State the outcome you want to generate (for example, a function)
+ and provide details on what you want to achieve.
+- Add additional information, like the framework or library you want to use.
+- Add a space or new line after each comment.
+ This space tells the code generator that you have completed your instructions.
-To use Code Suggestions:
+For example, to create a Python web service with some specific requirements,
+you might write something like:
-1. Author your code. As you type, suggestions are displayed.
- Code Suggestions provide code snippets or complete the current line, depending on the cursor position.
-1. Describe the requirements in natural language. Code Suggestions generates functions and code snippets based on the context provided. To get the best results from code generation:
- - Be as specific as possible while remaining concise. State the outcome you want to generate (for example, a function) and provide details on what you want to achieve. Add additional information, such as the framework or library you want to use when applicable.
- For example, to create a Python web service with some specific requirements, you might write something similar to the following:
+```plaintext
+# Create a web service using Tornado that allows a user to log in, run a security scan, and review the scan results.
+# Each action (log in, run a scan, and review results) should be its own resource in the web service
+...
+```
- ```plaintext
- # Create a web service using Tornado that allows a user to log in, run a security scan, and review the scan results.
- # Each action (log in, run a scan, and review results) should be its own resource in the web service
- ...
- ```
+AI is non-deterministic, so you may not get the same suggestion every time with the same input.
+To generate quality code, write clear, descriptive, specific tasks.
- - Add a space or go to a new line after each comment. This tells the code generator that you have completed your instructions.
-1. To accept a suggestion, press <kbd>Tab</kbd>.
-1. To ignore a suggestion, keep typing as you usually would.
-1. To explicitly reject a suggestion, press <kbd>Esc</kbd>.
+## Enable Code Suggestions
+
+> - [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.
+> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/410801) from GitLab Premium to GitLab Free in 16.0.
-Things to remember:
+Code Suggestions are enabled by default at the group level.
+This setting cascades to all subgroups and projects in the group.
-- AI is non-deterministic, so you may not get the same suggestion every time with the same input.
-- Just like product requirements, writing clear, descriptive, and specific tasks results in quality generated code.
+To update this setting:
+
+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. Under **Code Suggestions**, select the **Projects in this group can use Code Suggestions** checkbox.
+1. Select **Save changes**.
+
+If you have issues enabling Code Suggestions, view the
+[troubleshooting guide](troubleshooting.md#code-suggestions-are-not-displayed).
-## Disable Code Suggestions
+## Disable Code Suggestions for an individual user
-Individual users can disable Code Suggestions by disabling the feature in their
-[installed IDE editor extension](index.md#supported-editor-extensions).
+To disable Code Suggestions, you can disable the feature in your IDE editor extension.
diff --git a/doc/user/project/repository/code_suggestions/self_managed.md b/doc/user/project/repository/code_suggestions/self_managed.md
index a56d5ae7e9ef9278d24be38740f7233f42540091..4cb170283edf351eff95fabf11e653a7afe1a688 100644
--- a/doc/user/project/repository/code_suggestions/self_managed.md
+++ b/doc/user/project/repository/code_suggestions/self_managed.md
@@ -13,189 +13,100 @@ DETAILS:
> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10653) in GitLab 16.1 as [Beta](../../../../policy/experiment-beta-support.md#beta) on self-managed GitLab.
> - [Introduced support for Google Vertex AI Codey APIs](https://gitlab.com/groups/gitlab-org/-/epics/10562) in GitLab 16.1.
> - [Removed support for GitLab native model](https://gitlab.com/groups/gitlab-org/-/epics/10752) in GitLab 16.2.
-> - Code Suggestions in the GitLab WebIDE enabled for all GitLab-hosted customers.
+> - Code Suggestions in the GitLab Web IDE enabled for all GitLab-hosted customers.
> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/435271) in GitLab 16.7.
-
-NOTE:
-Starting in February 2024, Code Suggestions will be part of
-[GitLab Duo Pro](https://about.gitlab.com/gitlab-duo/),
-available to Premium and Ultimate users for purchase now.
-
-Write code more efficiently by using generative AI to suggest code while you're developing.
-
-GitLab Duo Code Suggestions are available on GitLab Enterprise Edition.
-
-Code Suggestions are not available for GitLab Community Edition.
-
-In GitLab 16.3 and later, to participate in the free trial of Code Suggestions on self-managed GitLab, you must:
-
-- Be a Premium or Ultimate customer.
-- Have activated cloud licensing.
-
-Usage of Code Suggestions is governed by the [GitLab Testing Agreement](https://handbook.gitlab.com/handbook/legal/testing-agreement/).
-Learn about [data usage when using Code Suggestions](index.md#code-suggestions-data-usage).
-
-## Enable Code Suggestions on self-managed GitLab
-
-> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/10653) in GitLab 16.1 as [Beta](../../../../policy/experiment-beta-support.md#beta).
> - [Enabled self-managed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/139916) in GitLab 16.8.
-When you enable Code Suggestions for your self-managed instance, you:
-
-- Agree to the [GitLab testing agreement](https://handbook.gitlab.com/handbook/legal/testing-agreement/).
-- Acknowledge that GitLab sends data from the instance, including personal data, to GitLab.com infrastructure.
+Get started using Code Suggestions in your IDE. These instructions apply to users
+of GitLab self-managed instances.
-How you enable Code Suggestions for your instance differs depending on your
-version of GitLab. This setting is visible only in self-managed GitLab instances.
+Prerequisites:
-::Tabs
+- You must be using [one of the supported IDE extensions](index.md#supported-editor-extensions).
+- Code Suggestions must be [enabled for the instance](#enable-code-suggestions).
-:::TabTitle GitLab 16.3 and later
+To use Code Suggestions:
-Prerequisites:
+1. Author your code.
+ As you type, suggestions are displayed. Code Suggestions provide code snippets
+ or completes the current line, depending on the cursor position.
-- You are a new Code Suggestions customer as of GitLab 16.3.
-- All of the users in your instance have the latest version of their IDE extension.
-- You are an administrator.
+1. Describe the requirements in natural language.
+ Code Suggestions generates functions and code snippets based on the context provided.
-To enable Code Suggestions for your self-managed GitLab instance:
+1. To accept a suggestion, press <kbd>Tab</kbd>. To reject a suggestion, press <kbd>Esc</kbd>.
+1. To ignore a suggestion, keep typing as you usually would.
-1. On the left sidebar, at the bottom, select **Admin Area**.
-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.
-1. Select **Save changes**.
-1. To make sure Code Suggestions works immediately, you must
- [manually synchronize your subscription](#manually-synchronize-your-subscription).
+AI is non-deterministic, so you may not get the same suggestion every time with the same input.
+To generate quality code, write clear, descriptive, specific tasks.
-The users in your instance can now use Code Suggestions.
+## Enable Code Suggestions
-:::TabTitle GitLab 16.2 and earlier
+How you enable Code Suggestions for your instance depends on your GitLab version.
-FLAG:
-On self-managed GitLab 16.0 and earlier, GitLab Duo Code Suggestions is not available. To use this feature, you must have GitLab 16.1 or later. For optimal performance and full feature access, you should upgrade to GitLab 16.3 or later, which supports cloud licensing.
+The following instructions apply to GitLab 16.3 and later.
+To use Code Suggestions on a self-managed instance in 16.1 or 16.2,
+follow [these instructions](self_managed_prior_versions.md).
Prerequisites:
-- You are an administrator.
-- You have a [customer success manager](https://about.gitlab.com/handbook/customer-success/csm/]).
-- You have a [GitLab SaaS account](https://gitlab.com/users/sign_up). You do not need to have a GitLab SaaS subscription.
-
-NOTE:
-If you do not have a customer success manager, you cannot participate in the free trial of Code Suggestions on self-managed GitLab. Upgrade to GitLab 16.3 or later to perform self-service onboarding.
-
-Then, you will:
+- You must be a new Code Suggestions customer. If you've used Code Suggestions in the past,
+ see the [upgrade steps](self_managed_prior_versions.md#upgrade-to-gitlab-163).
+- You must have a Premium or Ultimate subscription. These tiers support cloud licensing, which is required.
+- All of the users in your instance must have the latest version of their
+ [IDE extension](index.md#supported-editor-extensions).
+- You must be an administrator.
+- You must agree to the [GitLab Testing Agreement](https://handbook.gitlab.com/handbook/legal/testing-agreement/).
+- You must acknowledge that GitLab sends data from the instance, including personal data, to GitLab.com infrastructure.
-1. Enable Code Suggestions for your SaaS account.
-1. Enable Code Suggestions for the instance.
-1. [Request early access](#request-access-to-code-suggestions) to the Code Suggestions Beta.
+[What's my GitLab version](../../../version.md)?
-### Enable Code Suggestions for your SaaS account
+### Configure network and proxy settings
-To enable Code Suggestions for your GitLab SaaS account:
+The first step is to configure any firewalls to allow outbound connections to `https://cloud.gitlab.com/`.
-1. Create a [personal access token](../../../profile/personal_access_tokens.md#create-a-personal-access-token)
- with the `api` scope.
-1. On the left sidebar, select your avatar.
-1. Select **Preferences**.
-1. In the **Code Suggestions** section, select **Enable Code Suggestions**.
-1. Select **Save changes**.
+If your GitLab instance uses an HTTP proxy server to access the internet, ensure
+the server is configured to allow outbound connections, including the
+[`gitlab_workhorse` environment variable](https://docs.gitlab.com/omnibus/settings/environment-variables.html).
### Enable Code Suggestions for the instance
-To enable Code Suggestions for your self-managed GitLab instance:
+The second step is to enable Code Suggestions for your self-managed instance:
1. On the left sidebar, at the bottom, select **Admin Area**.
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.
-1. Select **Save changes**.
-
-This setting is visible only in self-managed GitLab instances.
+1. Expand **AI-powered features** and select **Enable Code Suggestions for this instance**.
-WARNING:
-If you clear the **Turn on Code Suggestions for this instance** checkbox, the users in your instance can still use Code Suggestions for up to one hour, until the issued JSON web token (JWT) expires.
+ In GitLab 16.3, leave the **Personal access token** text box blank.
+ In GitLab 16.4 and later, the **Personal access token** text box does not exist.
-::EndTabs
-
-### Request access to Code Suggestions
-
-GitLab provisions access on a customer-by-customer basis for Code Suggestions
-on self-managed instances. To request access, contact your customer success manager.
-
-Your customer success manager then provisions access by commenting on [issue 415393](https://gitlab.com/gitlab-org/gitlab/-/issues/415393) (internal access only).
-
-After GitLab has provisioned access to Code Suggestions for your instance,
-the users in your instance can now enable Code Suggestions.
-
-## Configure network and proxy settings
-
-Configure any firewalls to allow outbound connections to `https://codesuggestions.gitlab.com/`.
-
-If your GitLab instance uses an HTTP proxy server to access the internet, ensure
-the server is configured to allow outbound connections, including the
-[`gitlab_workhorse` environment variable](https://docs.gitlab.com/omnibus/settings/environment-variables.html).
-
-## Upgrade GitLab
-
-In GitLab 16.3 and later, GitLab is enforcing the cloud licensing requirement for Code Suggestions:
-
-- The Premium and Ultimate subscription tiers support cloud licensing.
-- GitLab Free does not have cloud licensing support.
-
-If you have a GitLab Free subscription and upgrade to GitLab 16.3 or later,
-to continue having early access to Code Suggestions, you must:
+1. Select **Save changes**.
+1. [Manually synchronize your subscription](../../../../subscriptions/self_managed/index.md#manually-synchronize-your-subscription-details).
-1. Have a [subscription that supports cloud licensing](https://about.gitlab.com/pricing/licensing-faq/cloud-licensing/).
-1. Make sure you have the latest version of your [IDE extension](index.md#supported-editor-extensions).
-1. [Manually synchronize your subscription](#manually-synchronize-your-subscription).
+The users in your instance can now use Code Suggestions.
-### Manually synchronize your subscription
+## Manually synchronize your subscription
You must [manually synchronize your subscription](../../../../subscriptions/self_managed/index.md#manually-synchronize-your-subscription-details) if either:
-- You have already upgraded to GitLab 16.3 and have just bought a Premium or Ultimate tier subscription.
-- You already have a Premium or Ultimate tier subscription and have just upgraded to GitLab 16.3.
+- You have already upgraded to GitLab 16.3 and have just bought a Premium or Ultimate subscription.
+- You already have a Premium or Ultimate subscription and have just upgraded to GitLab 16.3.
Without the manual synchronization, it might take up to 24 hours to active Code Suggestions on your instance.
-## Use Code Suggestions
-
-Prerequisites:
-
-- You must have a [supported IDE editor extension](index.md#supported-editor-extensions).
-- Code Suggestions must be enabled [for your instance](self_managed.md#enable-code-suggestions-on-self-managed-gitlab).
-
-To use Code Suggestions:
-
-1. Author your code. As you type, suggestions are displayed.
- Code Suggestions provide code snippets or complete the current line, depending on the cursor position.
-1. Describe the requirements in natural language. Be concise and specific. Code Suggestions generates functions and code snippets as appropriate.
-1. To accept a suggestion, press <kbd>Tab</kbd>.
-1. To ignore a suggestion, keep typing as you usually would.
-1. To explicitly reject a suggestion, press <kbd>Esc</kbd>.
-
-Things to remember:
-
-- AI is non-deterministic, so you may not get the same suggestion every time with the same input.
-- Just like product requirements, writing clear, descriptive, and specific tasks results in quality generated code.
-
-### Data privacy
+## Data privacy
-A self-managed GitLab instance does not generate the code suggestion. After successful
+A self-managed GitLab instance does not generate Code Suggestions. After successful
authentication to the self-managed instance, a token is generated.
-The IDE/editor then uses this token to securely transmit data directly to
-GitLab.com's Code Suggestions service via the [Cloud Connector gateway service](../../../../architecture/blueprints/cloud_connector/index.md) for processing.
+The IDE/editor then uses this token to securely transmit data directly to the
+GitLab.com Code Suggestions service through the [Cloud Connector gateway service](../../../../architecture/blueprints/cloud_connector/index.md) for processing.
-The Code Suggestions service then securely returns an AI-generated code suggestion.
+The Code Suggestions service then securely returns the AI-generated suggestion.
-Neither GitLab nor Google Vertex AI Codey APIs have any visibility into a self-managed customer's code other than
-what is sent to generate the code suggestion.
+Neither GitLab nor Google Vertex AI Codey APIs have any visibility into self-managed customers' code,
+other than what is sent to generate the suggestion.
## Disable Code Suggestions
-Individual users can disable Code Suggestions by disabling the feature in their
-[installed IDE editor extension](index.md#supported-editor-extensions).
+To disable Code Suggestions, disable the feature in your IDE editor extension.
diff --git a/doc/user/project/repository/code_suggestions/self_managed_prior_versions.md b/doc/user/project/repository/code_suggestions/self_managed_prior_versions.md
new file mode 100644
index 0000000000000000000000000000000000000000..821cc631656e8fb34d49b5856dda72ffe2fb87be
--- /dev/null
+++ b/doc/user/project/repository/code_suggestions/self_managed_prior_versions.md
@@ -0,0 +1,75 @@
+---
+stage: Create
+group: Code Creation
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://handbook.gitlab.com/handbook/product/ux/technical-writing/#assignments
+---
+
+# Enable Code Suggestions in GitLab 16.2 and earlier
+
+DETAILS:
+**Tier:** Free, Premium, Ultimate
+**Offering:** Self-managed
+
+WARNING:
+On self-managed GitLab 16.0 and earlier, Code Suggestions are not available. To use this feature, you must have GitLab 16.1 or later. For optimal performance and full feature access, upgrade to GitLab 16.3 or later and [enable Code Suggestions then](self_managed.md).
+
+To enable Code Suggestions on a self-managed instance for GitLab 16.1 or 16.2,
+follow these instructions.
+
+Prerequisites:
+
+- You must be an administrator.
+- You must have a [customer success manager](https://about.gitlab.com/handbook/customer-success/csm/]).
+- You must have a [GitLab SaaS account](https://gitlab.com/users/sign_up). You do not need a Premium or Ultimate subscription.
+- You must agree to the [GitLab Testing Agreement](https://handbook.gitlab.com/handbook/legal/testing-agreement/).
+- You must acknowledge that GitLab sends data from the instance, including personal data, to GitLab.com infrastructure.
+
+NOTE:
+If you do not have a customer success manager, you cannot participate in the free trial of Code Suggestions on self-managed GitLab. Upgrade to GitLab 16.3 or later to perform self-service onboarding.
+
+## Enable for your SaaS account
+
+Start by enabling Code Suggestions for your GitLab SaaS account:
+
+1. Create a [personal access token](../../../profile/personal_access_tokens.md#create-a-personal-access-token)
+ with the `api` scope.
+1. On the left sidebar, select your avatar.
+1. Select **Preferences**.
+1. In the **Code Suggestions** section, select **Enable Code Suggestions**.
+1. Select **Save changes**.
+
+## Enable for the instance
+
+Then enable Code Suggestions for your self-managed GitLab instance:
+
+1. On the left sidebar, at the bottom, select **Admin Area**.
+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.
+1. Select **Save changes**.
+
+This setting is visible only in self-managed GitLab instances.
+
+WARNING:
+If you clear the **Turn on Code Suggestions for this instance** checkbox, the users in your instance can still use Code Suggestions for up to one hour, until the issued JSON web token (JWT) expires.
+
+## Request access
+
+Finally, contact your customer success manager to request access.
+GitLab provisions access on a customer-by-customer basis for Code Suggestions
+on self-managed instances.
+
+Your customer success manager then provisions access by commenting on [issue 415393](https://gitlab.com/gitlab-org/gitlab/-/issues/415393) (internal access only).
+
+After GitLab has provisioned access to Code Suggestions for your instance,
+the users in your instance can now enable Code Suggestions.
+
+## Upgrade to GitLab 16.3
+
+If you have a GitLab Free subscription and upgrade to GitLab 16.3 or later,
+to continue having early access to Code Suggestions, you must:
+
+1. Have a Premium or Ultimate subscription. These subscriptions support cloud licensing.
+1. Make sure you have the latest version of your [IDE extension](index.md#supported-editor-extensions).
+1. [Manually synchronize your subscription](../../../../subscriptions/self_managed/index.md#manually-synchronize-your-subscription-details).
diff --git a/doc/user/project/repository/code_suggestions/troubleshooting.md b/doc/user/project/repository/code_suggestions/troubleshooting.md
index 5461bf5a8e7739f4308752f0f8bc93fea7e6ae37..29477af5ae0b59822463fbba2924d76d6c2acbab 100644
--- a/doc/user/project/repository/code_suggestions/troubleshooting.md
+++ b/doc/user/project/repository/code_suggestions/troubleshooting.md
@@ -17,14 +17,14 @@ When working with GitLab Duo Code Suggestions, you might encounter the following
If Code Suggestions are not displayed, and you have [installed a supported IDE extension](index.md#supported-editor-extensions), try the following troubleshooting steps.
In GitLab, ensure Code Suggestions is enabled for **at least one**
-[top-level group your account belongs to](../../../group/manage.md#enable-code-suggestions-for-a-group).
+[top-level group your account belongs to](saas.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.
-### Code Suggestions not displayed in VS Code or GitLab WebIDE
+### Code Suggestions not displayed in VS Code or GitLab Web IDE
Check all the steps in [Code Suggestions are not displayed](#code-suggestions-are-not-displayed) first.
-If you are a self-managed user, ensure that Code Suggestions for the [GitLab WebIDE](../../../project/web_ide/index.md) are enabled. The same settings apply to VS Code as local IDE.
+If you are a self-managed user, ensure that Code Suggestions for the [GitLab Web IDE](../../../project/web_ide/index.md) are enabled. The same settings apply to VS Code as local IDE.
1. On the left sidebar, select **Extensions > GitLab Workflow**.
1. Select **Settings** (**{settings}**), and then select **Extension Settings**.
diff --git a/ee/app/views/shared/_code_suggestions_ga_non_owner_alert.html.haml b/ee/app/views/shared/_code_suggestions_ga_non_owner_alert.html.haml
index 5a11e5c10ff1de0d6196fcdfcc66a3bcdbe655bc..0ae9734737fbd20de9a54dc29af822d4bcd0bb7b 100644
--- a/ee/app/views/shared/_code_suggestions_ga_non_owner_alert.html.haml
+++ b/ee/app/views/shared/_code_suggestions_ga_non_owner_alert.html.haml
@@ -18,6 +18,6 @@
- c.with_body do
= alert_body
- c.with_actions do
- = render Pajamas::ButtonComponent.new(href: help_page_path('user/project/repository/code_suggestions/saas', anchor: 'use-code-suggestions'), variant: :confirm,
+ = render Pajamas::ButtonComponent.new(href: help_page_path('user/project/repository/code_suggestions/saas'), variant: :confirm,
button_options: { class: 'js-close-and-follow-link' }) do
= s_('CodeSuggestionsGAAlert|Learn more')
diff --git a/ee/spec/features/code_suggestions_ga_non_owner_alert_spec.rb b/ee/spec/features/code_suggestions_ga_non_owner_alert_spec.rb
index df81f326bcd7586e37921a018213cef1f6f70f1f..0fce54c0d1841228d526830caa127b4282076792 100644
--- a/ee/spec/features/code_suggestions_ga_non_owner_alert_spec.rb
+++ b/ee/spec/features/code_suggestions_ga_non_owner_alert_spec.rb
@@ -43,7 +43,7 @@
visit group_path(group)
expect(page).to have_link('Learn more',
- href: help_page_path('user/project/repository/code_suggestions/saas', anchor: 'use-code-suggestions'))
+ href: help_page_path('user/project/repository/code_suggestions/saas'))
click_on 'Learn more'