Add latest changes from gitlab-org/gitlab@master

12 files changed, 52 insertions, 52 deletions

diff --git a/doc/ci/chatops/index.md b/doc/ci/chatops/index.md
index 7be12d0c0fd..6dff87ed1c5 100644
--- a/doc/ci/chatops/index.md
+++ b/doc/ci/chatops/index.md
@@ -1,6 +1,6 @@
 ---
-stage: Deploy
-group: Environments
+stage: Manage
+group: Import and Integrate
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
 type: index, concepts, howto
 ---
diff --git a/doc/development/chatops_on_gitlabcom.md b/doc/development/chatops_on_gitlabcom.md
index 002470f7325..22f57e8ba43 100644
--- a/doc/development/chatops_on_gitlabcom.md
+++ b/doc/development/chatops_on_gitlabcom.md
@@ -1,6 +1,6 @@
 ---
-stage: Deploy
-group: Environments
+stage: Manage
+group: Import and Integrate
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
diff --git a/doc/integration/jira/connect-app.md b/doc/integration/jira/connect-app.md
index b40d9707274..e60eeb8fba1 100644
--- a/doc/integration/jira/connect-app.md
+++ b/doc/integration/jira/connect-app.md
@@ -96,7 +96,9 @@ With this method, GitLab.com serves as a proxy for Jira traffic from your instan
 If your instance doesn't meet the [prerequisites](#prerequisites) or you don't want to use the official marketplace listing, you can
 [install the app manually](#install-the-gitlab-for-jira-cloud-app-manually).
 
-It's not possible to create branches from Jira for self-managed instances. For more information, see [issue 391432](https://gitlab.com/gitlab-org/gitlab/-/issues/391432).
+With this method, it's not possible to create branches from Jira Cloud for self-managed instances.
+For more information, see [issue 391432](https://gitlab.com/gitlab-org/gitlab/-/issues/391432).
+To create branches from Jira Cloud, [install the app manually](#install-the-gitlab-for-jira-cloud-app-manually).
 
 ### Prerequisites
 
diff --git a/doc/integration/jira/img/jira_added_user_to_group.png b/doc/integration/jira/img/jira_added_user_to_group.png
deleted file mode 100644
index f5120a8d42e..00000000000
--- a/doc/integration/jira/img/jira_added_user_to_group.png
+++ /dev/null
diff --git a/doc/integration/jira/img/jira_create_new_group.png b/doc/integration/jira/img/jira_create_new_group.png
deleted file mode 100644
index 4ab7a5eae4e..00000000000
--- a/doc/integration/jira/img/jira_create_new_group.png
+++ /dev/null
diff --git a/doc/integration/jira/img/jira_group_access.png b/doc/integration/jira/img/jira_group_access.png
deleted file mode 100644
index 42a9b4ae564..00000000000
--- a/doc/integration/jira/img/jira_group_access.png
+++ /dev/null
diff --git a/doc/integration/jira/jira_server_configuration.md b/doc/integration/jira/jira_server_configuration.md
index 2f3b3520a7f..c840e1ebde5 100644
--- a/doc/integration/jira/jira_server_configuration.md
+++ b/doc/integration/jira/jira_server_configuration.md
@@ -6,24 +6,22 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Jira Server credentials **(FREE)**
 
-To [integrate Jira with GitLab](index.md), you can:
+To [integrate Jira with GitLab](configure.md), you should create a separate Jira user account for your Jira projects
+to access projects in GitLab. This Jira user account must have write access to your Jira projects.
+To create the credentials:
 
-- Recommended. Create a separate Jira user account for your Jira projects to access projects in GitLab.
-This Jira user account must have write access to your Jira projects. To create the
-credentials, you must:
+1. [Create a Jira Server user](#create-a-jira-server-user).
+1. [Create a Jira Server group for the user](#create-a-jira-server-group-for-the-user).
+1. [Create a permission scheme for the group](#create-a-permission-scheme-for-the-group).
 
-  1. [Create a Jira Server user](#create-a-jira-server-user).
-  1. [Create a Jira Server group](#create-a-jira-server-group) for the user to belong to.
-  1. [Create a permission scheme for your group](#create-a-permission-scheme-for-your-group).
+Alternatively, you can use an existing Jira user account, provided the user belongs to a Jira group that
+has been granted the **Administer Projects** [permission scheme](#create-a-permission-scheme-for-the-group).
 
-- Use an existing Jira user account provided the user belongs to a Jira group that
-has been granted the **Administer Projects** [permission scheme](#create-a-permission-scheme-for-your-group).
-
-After you select a Jira user account for the integration, [configure GitLab](configure.md) to use the account.
+After you select a Jira user account, [configure the integration](configure.md#configure-the-integration) in GitLab to use the account.
 
 ## Create a Jira Server user
 
-This process creates a user named `gitlab`:
+To create a Jira Server user:
 
 1. Sign in to your Jira instance as a Jira administrator.
 1. On the top bar, in the upper-right corner, select the gear icon, then
@@ -36,55 +34,42 @@ This process creates a user named `gitlab`:
      support SSO such as SAML.
 1. Select **Create user**.
 
-After you create the user, create a group for it.
-
-## Create a Jira Server group
+Now that you've created a user named `gitlab`, it's time to create a group for the user.
 
-After you [create a Jira Server user](#create-a-jira-server-user), create a
-group to assign permissions to the user.
+## Create a Jira Server group for the user
 
-This process adds the `gitlab` user you created to a new group named `gitlab-developers`:
+To create a Jira Server group for the user:
 
 1. Sign in to your Jira instance as a Jira administrator.
 1. On the top bar, in the upper-right corner, select the gear icon, then
    select **User Management**.
 1. On the left sidebar, select **Groups**.
-
-   ![Jira create new user](img/jira_create_new_group.png)
-
 1. In the **Add group** section, enter a **Name** for the group (for example,
-   `gitlab-developers`), and then select **Add group**.
+   `gitlab-developers`), then select **Add group**.
 1. To add the `gitlab` user to the `gitlab-developers` group, select **Edit members**.
-   The `gitlab-developers` group should be listed in the leftmost box as a
-   selected group.
+   The `gitlab-developers` group appears as a selected group.
 <!-- vale gitlab.BadPlurals = NO -->
 1. In the **Add members to selected group(s)** section, enter `gitlab`.
 1. Select **Add selected users**.
-   The `gitlab` user appears in the **Group member(s)**
-   section.
+   The `gitlab` user appears as a group member.
 <!-- vale gitlab.BadPlurals = YES -->
 
-   ![Jira added user to group](img/jira_added_user_to_group.png)
-
-Next, create a permission scheme for your group.
+Now that you've added the `gitlab` user to a new group named `gitlab-developers`,
+it's time to create a permission scheme for the group.
 
-## Create a permission scheme for your group
+## Create a permission scheme for the group
 
-After you [create the group in Jira](#create-a-jira-server-group), grant permissions to the group by creating a permission scheme:
+To create a permission scheme for the group:
 
 1. Sign in to your Jira instance as a Jira administrator.
 1. On the top bar, in the upper-right corner, select the gear icon, then
    select **Issues**.
 1. On the left sidebar, select **Permission Schemes**.
 1. Select **Add Permission Scheme**, enter a **Name** and (optionally) a
-   **Description**, and then select **Add**.
+   **Description**, then select **Add**.
 1. In the permissions scheme list, locate your new permissions scheme, and
    select **Permissions**.
 1. Next to **Administer Projects**, select **Edit**.
-1. From the **Group** dropdown list, select `gitlab-developers`, and then select **Grant**.
-
-   ![Jira group access](img/jira_group_access.png)
+1. From the **Group** dropdown list, select `gitlab-developers`, then select **Grant**.
 
-Write down the new Jira username and its
-password, as you need them when
-[configuring GitLab](configure.md).
+You need the new Jira username and password when you [configure the integration](configure.md#configure-the-integration) in GitLab.
diff --git a/doc/security/rate_limits.md b/doc/security/rate_limits.md
index fafce3a985e..da267388b7e 100644
--- a/doc/security/rate_limits.md
+++ b/doc/security/rate_limits.md
@@ -44,6 +44,7 @@ You can set these rate limits in the Admin Area of your instance:
 - [GitLab Pages rate limits](../administration/pages/index.md#rate-limits)
 - [Pipeline rate limits](../user/admin_area/settings/rate_limit_on_pipelines_creation.md)
 - [Incident management rate limits](../user/admin_area/settings/incident_management_rate_limits.md)
+- [Unauthenticated access to Projects List API rate limits](../user/admin_area/settings/rate_limit_on_projects_api.md)
 
 You can set these rate limits using the Rails console:
 
diff --git a/doc/user/admin_area/settings/rate_limit_on_projects_api.md b/doc/user/admin_area/settings/rate_limit_on_projects_api.md
index beed083c484..e82e682b0bb 100644
--- a/doc/user/admin_area/settings/rate_limit_on_projects_api.md
+++ b/doc/user/admin_area/settings/rate_limit_on_projects_api.md
@@ -7,7 +7,9 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Rate limit on Projects API **(FREE SELF)**
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112283) in GitLab 15.10 behind a feature flag, disabled by default.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/112283) in GitLab 15.10 with a [flag](../../../administration/feature_flags.md) named `rate_limit_for_unauthenticated_projects_api_access`. Disabled by default.
+> - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/391922) on May 08, 2023.
+> - [Enabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119603) in GitLab 16.0 by default.
 
 You can configure the rate limit per IP address for unauthenticated requests to the [list all projects API](../../../api/projects.md#list-all-projects).
 
diff --git a/doc/user/admin_area/settings/visibility_and_access_controls.md b/doc/user/admin_area/settings/visibility_and_access_controls.md
index dfb23a4017e..fcad1a31225 100644
--- a/doc/user/admin_area/settings/visibility_and_access_controls.md
+++ b/doc/user/admin_area/settings/visibility_and_access_controls.md
@@ -55,6 +55,8 @@ By default both administrators and anyone with the **Owner** role can delete a p
 > - [Enabled for projects in personal namespaces](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89466) in GitLab 15.1.
 > - [Disabled for projects in personal namespaces](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/95495) in GitLab 15.3.
 > - [Removed option to delete immediately](https://gitlab.com/gitlab-org/gitlab/-/issues/389557) in GitLab 15.11 [with a flag](../../../administration/feature_flags.md) named `always_perform_delayed_deletion`. Disabled by default.
+> - Enabled delayed deletion by default and removed the option to delete immediately [on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/393622) on May 08, 2023.
+> - Enabled delayed deletion by default and removed the option to delete immediately [on self-managed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119606) in GitLab 16.0.
 
 Instance-level protection against accidental deletion of groups and projects.
 
@@ -83,7 +85,7 @@ To configure delayed project deletion:
 1. On the left sidebar, select **Settings > General**.
 1. Expand the **Visibility and access controls** section.
 1. Scroll to:
-   - (GitLab 15.11 and later with `always_perform_delayed_deletion` feature flag enabled) **Deletion protection** and set the retention period to a value between `1` and `90`.
+   - (In GitLab 15.11 and later with `always_perform_delayed_deletion` feature flag enabled, or GitLab 16.0 and later) **Deletion protection** and set the retention period to a value between `1` and `90`.
    - (GitLab 15.1 and later) **Deletion protection** and select keep deleted groups and projects, and select a retention period.
    - (GitLab 15.0 and earlier) **Default delayed project protection** and select **Enable delayed project deletion by
      default for newly-created groups.** Then set a retention period in **Default deletion delay**.
@@ -100,7 +102,7 @@ In GitLab 15.1, and later this setting is enforced on groups when disabled and i
 Groups remain restorable if the retention period is `1` or more days.
 
 In GitLab 15.1 and later, delayed group deletion can be enabled by setting **Deletion projection** to **Keep deleted**.
-In GitLab 15.11 and later with the `always_perform_delayed_deletion` feature flag enabled:
+In GitLab 15.11 and later with the `always_perform_delayed_deletion` feature flag enabled, or in GitLab 16.0 and later:
 
 - The **Keep deleted** option is removed.
 - Delayed group deletion is the default.
diff --git a/doc/user/gitlab_com/index.md b/doc/user/gitlab_com/index.md
index 68d1b51ec08..22476d2410c 100644
--- a/doc/user/gitlab_com/index.md
+++ b/doc/user/gitlab_com/index.md
@@ -89,15 +89,21 @@ Similarly, you can clone a project's wiki to back it up. All files
 [uploaded after August 22, 2020](../project/wiki/index.md#create-a-new-wiki-page)
 are included when cloning.
 
+## Delayed group deletion **(PREMIUM SAAS)**
+
+After May 08, 2023, all groups have delayed deletion enabled by default.
+
+Groups are permanently deleted after a seven-day delay.
+
+If you are on the Free tier, your groups are immediately deleted, and you will not be able to restore them.
+
 ## Delayed project deletion **(PREMIUM SAAS)**
 
-Top-level groups created after August 12, 2021 have delayed project deletion enabled by default.
-Projects are permanently deleted after a seven-day delay.
+After May 08, 2023, all groups have delayed project deletion enabled by default.
 
-If you are on:
+Projects are permanently deleted after a seven-day delay.
 
-- Premium tier and above, you can disable this by changing the [group setting](../group/manage.md#enable-delayed-project-deletion).
-- Free tier, you cannot disable this setting or restore projects.
+If you are on the Free tier, your projects are immediately deleted, and you will not be able to restore them.
 
 ## Inactive project deletion
 
diff --git a/doc/user/group/manage.md b/doc/user/group/manage.md
index b867311c81f..bb7862419f2 100644
--- a/doc/user/group/manage.md
+++ b/doc/user/group/manage.md
@@ -402,6 +402,8 @@ To transfer a group:
 > - [Instance setting is inherited and enforced when disabled](https://gitlab.com/gitlab-org/gitlab/-/issues/352960) in GitLab 15.1.
 > - [User interface changed](https://gitlab.com/gitlab-org/gitlab/-/issues/352961) in GitLab 15.1.
 > - [Removed](https://gitlab.com/gitlab-org/gitlab/-/issues/389557) in GitLab 15.11 [with a flag](../../administration/feature_flags.md) named `always_perform_delayed_deletion`. Disabled by default.
+> - Enabled delayed deletion by default and removed the option to delete immediately [on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/393622) on May 08, 2023.
+> - Enabled delayed deletion by default and removed the option to delete immediately [on self-managed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119606) in GitLab 16.0.
 
 [Delayed project deletion](../project/settings/index.md#delayed-project-deletion) is locked and disabled unless the instance-level settings for
 [deletion protection](../admin_area/settings/visibility_and_access_controls.md#deletion-protection) are enabled for either groups only or groups and projects.
@@ -432,7 +434,7 @@ To enable delayed deletion of projects in a group:
 In GitLab 13.11 and later, the group setting for delayed project deletion is inherited by subgroups. As discussed in [Cascading settings](../../development/cascading_settings.md), inheritance can be overridden unless enforced by an ancestor.
 
 In GitLab 15.11 with the `always_perform_delayed_deletion` feature flag enabled, this setting is removed
-and all projects are deleted after the [retention period defined by the admin](../admin_area/settings/visibility_and_access_controls.md#retention-period).
+and all projects are deleted after the [retention period defined by the admin](../admin_area/settings/visibility_and_access_controls.md#retention-period). This will be the default behavior in GitLab 16.0 and later.
 
 ## Disable email notifications