Add latest changes from gitlab-org/gitlab@master

3 files changed, 9 insertions, 7 deletions

diff --git a/doc/operations/incident_management/alerts.md b/doc/operations/incident_management/alerts.md
index af42571f82f..a4b34807094 100644
--- a/doc/operations/incident_management/alerts.md
+++ b/doc/operations/incident_management/alerts.md
@@ -168,8 +168,9 @@ by changing the status. Setting the status to:
 - **Acknowledged** limits on-call pages based on the project's [escalation policy](escalation_policies.md).
 - **Triggered** from **Resolved** restarts the alert escalating from the beginning.
 
-For [alerts with an associated incident](alerts.md#create-an-incident-from-an-alert),
-updating the alert status also updates the incident status.
+In GitLab 15.1 and earlier, updating the status of an [alert with an associated incident](alerts.md#create-an-incident-from-an-alert)
+also updates the incident status. In [GitLab 15.2 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/356057),
+the incident status is independent and does not update when the alert status changes.
 
 ### Create an incident from an alert
 
diff --git a/doc/operations/incident_management/incidents.md b/doc/operations/incident_management/incidents.md
index bd7ef113a55..a6324595312 100644
--- a/doc/operations/incident_management/incidents.md
+++ b/doc/operations/incident_management/incidents.md
@@ -278,8 +278,9 @@ by changing the status. Setting the status to:
 - **Acknowledged** limits on-call pages based on the selected [escalation policy](#change-escalation-policy).
 - **Triggered** from **Resolved** restarts the incident escalating from the beginning.
 
-For [incidents created from alerts](alerts.md#create-an-incident-from-an-alert),
-updating the incident status also updates the alert status.
+In GitLab 15.1 and earlier, updating the status of an [incident created from an alert](alerts.md#create-an-incident-from-an-alert)
+also updates the alert status. In [GitLab 15.2 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/356057),
+the alert status is independent and does not update when the incident status changes.
 
 ### Change escalation policy **(PREMIUM)**
 
@@ -296,8 +297,9 @@ Selecting an escalation policy updates the incident status to **Triggered** and
 Deselecting an escalation policy halts escalation. Refer to the [incident status](#change-incident-status)
 to manage on-call paging once escalation has begun.
 
-For [incidents created from alerts](alerts.md#create-an-incident-from-an-alert),
-the incident's escalation policy reflects the alert's escalation policy and cannot be changed.
+In GitLab 15.1 and earlier, the escalation policy for [incidents created from alerts](alerts.md#create-an-incident-from-an-alert)
+reflects the alert's escalation policy and cannot be changed. In [GitLab 15.2 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/356057),
+the incident escalation policy is independent and can be changed.
 
 ### Manage incidents from Slack
 
diff --git a/doc/operations/incident_management/paging.md b/doc/operations/incident_management/paging.md
index 936c297e555..ef5f6c81383 100644
--- a/doc/operations/incident_management/paging.md
+++ b/doc/operations/incident_management/paging.md
@@ -62,4 +62,3 @@ the rule fires. You can respond to a page or stop incident escalations by
 [unsetting the incident's escalation policy](incidents.md#change-escalation-policy).
 
 To avoid duplicate pages, [incidents created from alerts](alerts.md#create-an-incident-from-an-alert) do not support independent escalation.
-Instead, the status and escalation policy fields are synced between the alert and the incident.