Add latest changes from gitlab-org/gitlab@master

7 files changed, 25 insertions, 15 deletions

diff --git a/doc/user/ai_features.md b/doc/user/ai_features.md
index 0659f39564c..780a8de63cd 100644
--- a/doc/user/ai_features.md
+++ b/doc/user/ai_features.md
@@ -29,6 +29,7 @@ GitLab is creating AI-assisted features across our DevSecOps platform. These fea
 | Processes and generates text and code in a conversational manner. Helps you quickly identify useful information in large volumes of text in issues, epics, code, and GitLab documentation. | [GitLab Duo Chat](gitlab_duo_chat.md) | **(ULTIMATE BETA)** |
 | Assists you in determining the root cause for a pipeline failure and failed CI/CD build. | [Root cause analysis](#root-cause-analysis) | **(ULTIMATE SAAS EXPERIMENT)** |
 | Assists you with predicting productivity metrics and identifying anomalies across your software development lifecycle. | [Value stream forecasting](#forecast-deployment-frequency-with-value-stream-forecasting) | **(ULTIMATE ALL EXPERIMENT)** |
+| Processes and responds to your questions about your application's usage data. | [Product Analytics](product_analytics/index.md) | **(ULTIMATE SAAS EXPERIMENT)** |
 
 ## Enable AI/ML features
 
diff --git a/doc/user/analytics/index.md b/doc/user/analytics/index.md
index eef34214c23..73543b1043e 100644
--- a/doc/user/analytics/index.md
+++ b/doc/user/analytics/index.md
@@ -24,7 +24,7 @@ Use group-level analytics to get insights into your groups':
 - [Security Dashboards](../application_security/security_dashboard/index.md)
 - [Contribution analytics](../group/contribution_analytics/index.md)
 - [DevOps adoption](../group/devops_adoption/index.md)
-- [Insights](../group/insights/index.md)
+- [Insights](../project/insights/index.md)
 - [Issue analytics](../group/issues_analytics/index.md)
 - [Productivity analytics](productivity_analytics.md)
 - [Repositories analytics](../group/repositories_analytics/index.md)
@@ -40,7 +40,7 @@ Use project-level analytics to get insights into your projects':
 - [Code review analytics](code_review_analytics.md)
 - [Contributor analytics](../../user/analytics/contributor_analytics.md)
 - [Insights](../project/insights/index.md)
-- [Issue analytics](../../user/analytics/issue_analytics.md)
+- [Issue analytics](../group/issues_analytics/index.md)
 - [Merge request analytics](merge_request_analytics.md), enabled with the `project_merge_request_analytics`
   [feature flag](../../development/feature_flags/index.md#enabling-a-feature-flag-locally-in-development)
 - [Repository analytics](repository_analytics.md)
diff --git a/doc/user/custom_roles.md b/doc/user/custom_roles.md
index 07e14494ada..31f647a0afe 100644
--- a/doc/user/custom_roles.md
+++ b/doc/user/custom_roles.md
@@ -22,7 +22,7 @@ You can discuss individual custom role and permission requests in [issue 391760]
 
 ## Available permissions
 
-For more information on available permissions, see [custom abilities](custom_roles/abilities.md).
+For more information on available permissions, see [custom permissions](custom_roles/abilities.md).
 
 ## Create a custom role
 
@@ -41,7 +41,7 @@ You create a custom role by selecting [permissions](#available-permissions) to a
 to a base role.
 
 You can select any number of permissions. For example, you can create a custom role
-with the ability to:
+with the permission to:
 
 - View vulnerability reports.
 - Change the status of vulnerabilities.
diff --git a/doc/user/custom_roles/abilities.md b/doc/user/custom_roles/abilities.md
index d117a495798..924275ae6ab 100644
--- a/doc/user/custom_roles/abilities.md
+++ b/doc/user/custom_roles/abilities.md
@@ -14,14 +14,14 @@ info: "To determine the technical writer assigned to the Stage/Group associated
   edit `tooling/custom_roles/docs/templates/custom_abilities.md.erb`.
 --->
 
-# Available custom abilities
+# Available custom permissions
 
-The following abilities are available. You can add these abilities in any combination
+The following permissions are available. You can add these permissions in any combination
 to a base role to create a custom role.
 
-Some abilities require having other abilities enabled first. For example, administration of vulnerabilities (`admin_vulnerability`) can only be enabled if reading vulnerabilities (`read_vulnerability`) is also enabled.
+Some permissions require having other permissions enabled first. For example, administration of vulnerabilities (`admin_vulnerability`) can only be enabled if reading vulnerabilities (`read_vulnerability`) is also enabled.
 
-These requirements are documented in the `Required ability` column in the following table.
+These requirements are documented in the `Required permission` column in the following table.
 
 ## Code review workflow
 
diff --git a/doc/user/group/import/index.md b/doc/user/group/import/index.md
index 28e77a942a6..2c26b3cf38d 100644
--- a/doc/user/group/import/index.md
+++ b/doc/user/group/import/index.md
@@ -152,6 +152,14 @@ After migration:
 If you used a private network on your source instance to hide content from the general public,
 make sure to have a similar setup on the destination instance, or to import into a private group.
 
+## Ensure projects can be imported
+
+You cannot import groups with projects when the source instance or group has **Default project creation protection** set to **No one**. If required, this setting can
+be changed:
+
+- For [a whole instance](../../../administration/settings/visibility_and_access_controls.md#define-which-roles-can-create-projects).
+- For [specific groups](../index.md#specify-who-can-add-projects-to-a-group).
+
 ## Prerequisites
 
 > Requirement for Maintainer role instead of Developer role introduced in GitLab 16.0 and backported to GitLab 15.11.1 and GitLab 15.10.5.
@@ -217,7 +225,7 @@ role.
 
 1. By default, the proposed group namespaces match the names as they exist in source instance, but based on your permissions, you can choose to edit these names before you proceed to import any of them.
 1. Next to the groups you want to import, select either:
-   - **Import with projects**.
+   - **Import with projects**. If this is not available, see [Ensure projects can be imported](#ensure-projects-can-be-imported).
    - **Import without projects**.
 1. The **Status** column shows the import status of each group. If you leave the page open, it updates in real-time.
 1. After a group has been imported, select its GitLab path to open its GitLab URL.
diff --git a/doc/user/project/insights/index.md b/doc/user/project/insights/index.md
index b7addb5131f..cc81e296e46 100644
--- a/doc/user/project/insights/index.md
+++ b/doc/user/project/insights/index.md
@@ -16,7 +16,7 @@ Configure insights for your projects and groups to explore data such as:
 
 You can also create custom Insights reports that are relevant for your group.
 
-## View project insights
+## View insights
 
 Prerequisites:
 
diff --git a/doc/user/ssh.md b/doc/user/ssh.md
index 1cce1cda20b..6a75411a48e 100644
--- a/doc/user/ssh.md
+++ b/doc/user/ssh.md
@@ -133,7 +133,7 @@ If you do not have an existing SSH key pair, generate a new one:
    Enter file in which to save the key (/home/user/.ssh/id_ed25519):
    ```
 
-1. Accept the suggested filename and directory, unless you are generating a [deploy key](project/deploy_keys/index.md)
+1. Accept the suggested file name and directory, unless you are generating a [deploy key](project/deploy_keys/index.md)
    or want to save in a specific directory where you store other keys.
 
    You can also dedicate the SSH key pair to a [specific host](#configure-ssh-to-point-to-a-different-directory).
@@ -254,7 +254,7 @@ To generate ED25519_SK or ECDSA_SK SSH keys, you must use OpenSSH 8.2 or later:
 
 1. Touch the button on the hardware security key.
 
-1. Accept the suggested filename and directory:
+1. Accept the suggested file name and directory:
 
    ```plaintext
    Enter file in which to save the key (/home/user/.ssh/id_ed25519_sk):
@@ -279,16 +279,17 @@ A public and private key are generated.
 You can use [1Password](https://1password.com/) and the [1Password browser extension](https://support.1password.com/getting-started-browser/) to either:
 
 - Automatically generate a new SSH key.
-- Use an existing SSH in your 1Password vault to authenticate with GitLab.
+- Use an existing SSH key in your 1Password vault to authenticate with GitLab.
 
 1. Sign in to GitLab.
 1. On the left sidebar, select your avatar.
 1. Select **Edit profile**.
 1. On the left sidebar, select **SSH Keys**.
+1. Select **Add new key**.
 1. Select **Key**, and you should see the 1Password helper appear.
 1. Select the 1Password icon and unlock 1Password.
 1. You can then select **Create SSH Key** or select an existing SSH key to fill in the public key.
-1. In the **Title** box, type a description, like `Work Laptop` or
+1. In the **Title** box, enter a description, like `Work Laptop` or
    `Home Workstation`.
 1. Optional. Select the **Usage type** of the key. It can be used either for `Authentication` or `Signing` or both. `Authentication & Signing` is the default value.
 1. Optional. Update **Expiration date** to modify the default expiration date.
@@ -324,7 +325,7 @@ To use SSH with GitLab, copy your public key to your GitLab account:
    cat ~/.ssh/id_ed25519.pub | clip
    ```
 
-   Replace `id_ed25519.pub` with your filename. For example, use `id_rsa.pub` for RSA.
+   Replace `id_ed25519.pub` with your file name. For example, use `id_rsa.pub` for RSA.
 
 1. Sign in to GitLab.
 1. On the left sidebar, select your avatar.