Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

1 files changed, 11 insertions, 19 deletions

diff --git a/doc/operations/incident_management/incidents.md b/doc/operations/incident_management/incidents.md
index 66d04fce14c..e48127b3415 100644
--- a/doc/operations/incident_management/incidents.md
+++ b/doc/operations/incident_management/incidents.md
@@ -58,7 +58,7 @@ GitLab to create incident automatically whenever an alert is triggered:
    with the Developer role, select
    **Send a separate email notification to Developers**. Email notifications are
    also sent to users with the **Maintainer** and **Owner** roles.
-1. Click **Save changes**.
+1. Select **Save changes**.
 
 ### Create incidents via the PagerDuty webhook
 
@@ -149,7 +149,7 @@ displays it in the Incident Details view:
 
 For live examples of GitLab incidents, visit the `tanuki-inc` project's
 [incident list page](https://gitlab.com/gitlab-examples/ops/incident-setup/everyone/tanuki-inc/-/incidents).
-Click any incident in the list to display its incident details page.
+Select any incident in the list to display its incident details page.
 
 ### Summary
 
@@ -180,7 +180,7 @@ charts in the **Metrics** tab:
 
 ![Incident Metrics tab](img/incident_metrics_tab_v13_8.png)
 
-When you upload an image, you can associate the image with text or a link to the original graph.  
+When you upload an image, you can associate the image with text or a link to the original graph.
 
 ![Text link modal](img/incident_metrics_tab_text_link_modal_v14_9.png)
 
@@ -199,7 +199,7 @@ field populated.
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/227836) in GitLab 13.5.
 
-To quickly see the latest updates on an incident, click
+To quickly see the latest updates on an incident, select
 **{history}** **Turn recent updates view on** in the comment bar to display comments
 un-threaded and ordered chronologically, newest to oldest:
 
@@ -217,11 +217,11 @@ every 15 minutes so you do not have to refresh the page to see the time remainin
 To configure the timer:
 
 1. Navigate to **Settings > Monitor**.
-1. Scroll to **Incidents** and click **Expand**, then select the
+1. Scroll to **Incidents** and select **Expand**, then select the
    **Incident settings** tab.
 1. Select **Activate "time to SLA" countdown timer**.
 1. Set a time limit in increments of 15 minutes.
-1. Click **Save changes**.
+1. Select **Save changes**.
 
 After you enable the SLA countdown timer, the **Time to SLA** attribute is displayed
 as a column in the Incidents List, and as a field on newly created Incidents. If
@@ -250,18 +250,14 @@ You can also change the severity using the [`/severity` quick action](../../user
 
 ### Add a to-do item
 
-Add a to-do for incidents that you want to track in your to-do list. Click the
-**Add a to do** button at the top of the right-hand side bar to add a to-do item.
+Add a to-do for incidents that you want to track in your to-do list. Select
+**Add a to do** at the top of the right-hand side bar to add a to-do item.
 
 ### Change incident status
 
 > - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/5716) in GitLab 14.9 [with a flag](../../administration/feature_flags.md) named `incident_escalations`. Disabled by default.
 > - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/345769) in GitLab 14.10.
-
-FLAG:
-This feature is available by default. To disable it per project or for your entire
-instance, ask an administrator to [disable the feature flag](../../administration/feature_flags.md)
-named `incident_escalations`.
+> - [Feature flag `incident_escalations`](https://gitlab.com/gitlab-org/gitlab/-/issues/345769) removed in GitLab 15.1.
 
 For users with the Developer role or higher, select **Edit** in the **Status** section of the
 right-hand side bar of an incident, then select a status. **Triggered** is the default status for
@@ -281,11 +277,7 @@ updating the incident status also updates the alert status.
 
 > - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/5716) in GitLab 14.9 [with a flag](../../administration/feature_flags.md) named `incident_escalations`. Disabled by default.
 > - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/345769) in GitLab 14.10.
-
-FLAG:
-This feature is available by default. To disable it per project or for your entire
-instance, ask an administrator to [disable the feature flag](../../administration/feature_flags.md)
-named `incident_escalations`.
+> - [Feature flag `incident_escalations`](https://gitlab.com/gitlab-org/gitlab/-/issues/345769) removed in GitLab 15.1.
 
 For users with the Developer role or higher, select **Edit** in the **Escalation policy** section of
 the right-hand side bar of an incident, then select a policy. By default, new incidents do not have
@@ -336,7 +328,7 @@ With at least the Maintainer role, you can enable
 
 1. Navigate to **Settings > Monitor > Incidents** and expand **Incidents**.
 1. Check the **Automatically close associated Incident** checkbox.
-1. Click **Save changes**.
+1. Select **Save changes**.
 
 When GitLab receives a **Recovery Alert**, it closes the associated incident.
 This action is recorded as a system message on the incident indicating that it