Add latest changes from gitlab-org/gitlab@master

3 files changed, 11 insertions, 18 deletions

diff --git a/doc/ci/environments/deployment_approvals.md b/doc/ci/environments/deployment_approvals.md
index a95c47ca4b0..50c49079ce7 100644
--- a/doc/ci/environments/deployment_approvals.md
+++ b/doc/ci/environments/deployment_approvals.md
@@ -139,6 +139,9 @@ Using either the GitLab UI or the API, you can:
 - Approve a deployment to allow it to proceed.
 - Reject a deployment to prevent it.
 
+NOTE:
+GitLab administrators can approve or reject all deployments.
+
 ### Approve or reject a deployment using the UI
 
 Prerequisites:
diff --git a/doc/ci/environments/index.md b/doc/ci/environments/index.md
index 522b8d0af79..657e79267ff 100644
--- a/doc/ci/environments/index.md
+++ b/doc/ci/environments/index.md
@@ -699,14 +699,16 @@ You can manually override a deployment's expiration date.
 
 The `auto_stop_in` setting is overwritten and the environment remains active until it's stopped manually.
 
-#### Delete a stopped environment
+### Delete an environment
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/20620) in GitLab 12.10.
+Delete an environment when you want to remove it and all its deployments.
 
-You can delete [stopped environments](#stop-an-environment) in the GitLab UI or by using
-[the API](../../api/environments.md#delete-an-environment).
+Prerequisites:
+
+- You must have at least the Developer role.
+- You must [stop](#stop-an-environment) the environment before it can be deleted.
 
-To delete a stopped environment in the GitLab UI:
+To delete an environment:
 
 1. On the top bar, select **Main menu > Projects** and find your project.
 1. On the left sidebar, select **Deployments > Environments**.
@@ -714,18 +716,6 @@ To delete a stopped environment in the GitLab UI:
 1. Next to the environment you want to delete, select **Delete environment**.
 1. On the confirmation dialog box, select **Delete environment**.
 
-#### Delete an active environment without running a stop job
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/225794) in GitLab 15.1.
-
-You can delete an active environment without running a stop job.
-This is useful when you have an active environment, but the corresponding `action: stop` job can't run or succeed for some reason.
-
-To delete an active environment:
-
-1. Execute the [Stop an environment API](../../api/environments.md#stop-an-environment) while specifying `force=true`.
-1. Execute the [Delete an environment API](../../api/environments.md#delete-an-environment).
-
 ### Access an environment for preparation or verification purposes
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/208655) in GitLab 13.2.
diff --git a/doc/ci/environments/protected_environments.md b/doc/ci/environments/protected_environments.md
index 8e8cee302bc..fc49be798ec 100644
--- a/doc/ci/environments/protected_environments.md
+++ b/doc/ci/environments/protected_environments.md
@@ -125,7 +125,7 @@ If the user also has push or merge access to the branch deployed on production,
 they have the following privileges:
 
 - [Stop an environment](index.md#stop-an-environment).
-- [Delete a stopped environment](index.md#delete-a-stopped-environment).
+- [Delete an environment](index.md#delete-an-environment).
 - [Create an environment terminal](index.md#web-terminals-deprecated).
 
 ## Deployment-only access to protected environments