Merge branch '221100-replace-project-remove-with-project-delete' into 'master'

Replace delayed project "removal" with "deletion" in docs and specs

See merge request gitlab-org/gitlab!74640

doc/administration/logs.md

@@ -296,7 +296,7 @@ Depending on your installation method, this file is located at:
 - Installations from source: `/home/git/gitlab/log/application.log`
 
 It helps you discover events happening in your instance such as user creation
-and project removal. For example:
+and project deletion. For example:
 
 ```plaintext
 October 06, 2014 11:56: User "Administrator" (admin@example.com) was created

doc/api/projects.md

@@ -2093,7 +2093,7 @@ This endpoint:
   merge requests).
 - From [GitLab 13.2](https://gitlab.com/gitlab-org/gitlab/-/issues/220382) on
   [Premium or higher](https://about.gitlab.com/pricing/) tiers, group
-  administrators can [configure](../user/group/index.md#enable-delayed-project-removal)
+  administrators can [configure](../user/group/index.md#enable-delayed-project-deletion)
   projects within a group to be deleted after a delayed period. When enabled,
   actual deletion happens after the number of days specified in the
   [default deletion delay](../user/admin_area/settings/visibility_and_access_controls.md#default-deletion-delay).
@@ -2101,7 +2101,7 @@ This endpoint:
 WARNING:
 The default behavior of [Delayed Project deletion](https://gitlab.com/gitlab-org/gitlab/-/issues/32935)
 in GitLab 12.6 was changed to [Immediate deletion](https://gitlab.com/gitlab-org/gitlab/-/issues/220382)
-in GitLab 13.2, as discussed in [Enable delayed project removal](../user/group/index.md#enable-delayed-project-removal).
+in GitLab 13.2, as discussed in [Enable delayed project deletion](../user/group/index.md#enable-delayed-project-deletion).
 
 ```plaintext
 DELETE /projects/:id

doc/development/cascading_settings.md

@@ -194,7 +194,7 @@ This function should be imported and called in the [page-specific JavaScript](fe
           setting_locked: delayed_project_removal_locked,
           settings_path_helper: -> (locked_ancestor) { edit_group_path(locked_ancestor, anchor: 'js-permissions-settings') },
           help_text: s_('Settings|Projects will be permanently deleted after a 7-day delay. Inherited by subgroups.') do
-        = s_('Settings|Enable delayed project removal')
+        = s_('Settings|Enable delayed project deletion')
       = render 'shared/namespaces/cascading_settings/enforcement_checkbox',
           attribute: :delayed_project_removal,
           group: @group,

doc/user/admin_area/index.md

@@ -111,7 +111,7 @@ You can combine the filter options. For example, to list only public projects wi
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37014) in GitLab 13.3.
 
-When delayed project deletion is [enabled for a group](../group/index.md#enable-delayed-project-removal),
+When delayed project deletion is [enabled for a group](../group/index.md#enable-delayed-project-deletion),
 projects within that group are not deleted immediately, but only after a delay. To access a list of all projects that are pending deletion:
 
 1. On the top bar, select **Menu > Projects > Explore projects**.

doc/user/admin_area/settings/visibility_and_access_controls.md

@@ -98,7 +98,7 @@ delete a project. To allow only users with the Administrator role to delete proj
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/255449) in GitLab 14.2 for groups created after August 12, 2021.
 
 Projects in a group (but not a personal namespace) can be deleted after a delayed period.
-You can [configure it in group settings](../../group/index.md#enable-delayed-project-removal).
+You can [configure it in group settings](../../group/index.md#enable-delayed-project-deletion).
 
 To enable delayed project deletion by default in new groups:
 
@@ -117,7 +117,7 @@ The default behavior of [Delayed Project deletion](https://gitlab.com/gitlab-org
 [Immediate deletion](https://gitlab.com/gitlab-org/gitlab/-/issues/220382) in GitLab 13.2.
 
 Projects in a group (but not a personal namespace) can be deleted after a delayed period, by
-[configuring in Group Settings](../../group/index.md#enable-delayed-project-removal).
+[configuring in Group Settings](../../group/index.md#enable-delayed-project-deletion).
 The default period is seven days, and can be changed. Setting this period to `0` enables immediate removal
 of projects or groups.
 

doc/user/gitlab_com/index.md

@@ -85,7 +85,7 @@ are included when cloning.
 Top-level groups created after August 12, 2021 have delayed project deletion enabled by default.
 Projects are permanently deleted after a seven-day delay.
 
-You can disable this by changing the [group setting](../group/index.md#enable-delayed-project-removal).
+You can disable this by changing the [group setting](../group/index.md#enable-delayed-project-deletion).
 
 ## Alternative SSH port
 

doc/user/group/index.md

@@ -666,7 +666,7 @@ To disable group mentions:
 1. Select **Disable group mentions**.
 1. Select **Save changes**.
 
-## Enable delayed project removal **(PREMIUM)**
+## Enable delayed project deletion **(PREMIUM)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/220382) in GitLab 13.2.
 > - [Inheritance and enforcement added](https://gitlab.com/gitlab-org/gitlab/-/issues/321724) in GitLab 13.11.
@@ -691,12 +691,12 @@ To enable delayed deletion of projects in a group:
 
 1. Go to the group's **Settings > General** page.
 1. Expand the **Permissions, LFS, 2FA** section.
-1. Check **Enable delayed project removal**.
+1. Check **Enable delayed project deletion**.
 1. Optional. To prevent subgroups from changing this setting, select **Enforce for all subgroups**.
 1. Select **Save changes**.
 
 NOTE:
-In GitLab 13.11 and above the group setting for delayed project removal is inherited by subgroups. As discussed in [Cascading settings](../../development/cascading_settings.md) inheritance can be overridden, unless enforced by an ancestor.
+In GitLab 13.11 and above 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.
 
 ## Prevent project forking outside group **(PREMIUM)**
 

doc/user/project/settings/index.md

@@ -450,7 +450,7 @@ To delete a project:
 This action deletes a project including all associated resources (issues, merge requests, and so on).
 
 In [GitLab 13.2](https://gitlab.com/gitlab-org/gitlab/-/issues/220382) and later, on Premium or higher tiers,
-group Owners can [configure](../../group/index.md#enable-delayed-project-removal) projects in a group
+group Owners can [configure](../../group/index.md#enable-delayed-project-deletion) projects in a group
 to be deleted after a delayed period.
 When enabled, actual deletion happens after number of days
 specified in [instance settings](../../admin_area/settings/visibility_and_access_controls.md#default-deletion-delay).

doc/user/project/working_with_projects.md

@@ -248,7 +248,7 @@ To delete a project, first navigate to the home page for that project.
 1. Click **Delete project**
 1. Confirm this action by typing in the expected text.
 
-Projects in personal namespaces are deleted immediately on request. For information on delayed deletion of projects in a group, please see [Enable delayed project removal](../group/index.md#enable-delayed-project-removal).
+Projects in personal namespaces are deleted immediately on request. For information on delayed deletion of projects in a group, please see [Enable delayed project deletion](../group/index.md#enable-delayed-project-deletion).
 
 ## Project settings
 

ee/spec/features/groups/group_settings_spec.rb

@@ -153,7 +153,7 @@ RSpec.describe 'Edit group settings' do
     end
   end
 
-  context 'enable delayed project removal' do
+  context 'enable delayed project deletion' do
     before do
       stub_licensed_features(adjourned_deletion_for_projects_and_groups: true)
     end

ee/spec/requests/api/projects_spec.rb

@@ -1304,7 +1304,7 @@ RSpec.describe API::Projects do
         stub_licensed_features(adjourned_deletion_for_projects_and_groups: true)
       end
 
-      context 'delayed project removal is enabled for group' do
+      context 'delayed project deletion is enabled for group' do
         let(:group) { create(:group) }
 
         before do
@@ -1334,7 +1334,7 @@ RSpec.describe API::Projects do
         end
       end
 
-      context 'delayed project removal is disabled for group' do
+      context 'delayed project deletion is disabled for group' do
         it_behaves_like 'deletes project immediately'
       end