Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

4 files changed, 11 insertions, 15 deletions

diff --git a/doc/operations/error_tracking.md b/doc/operations/error_tracking.md
index 70e3115a98e..68a0d492c5d 100644
--- a/doc/operations/error_tracking.md
+++ b/doc/operations/error_tracking.md
@@ -34,7 +34,7 @@ For error tracking to work, you need two pieces:
 
 ### Deploying Sentry
 
-You can sign up to the cloud hosted [Sentry](https://sentry.io), deploy your own [on-premise instance](https://github.com/getsentry/onpremise/), or use GitLab to [install Sentry to a Kubernetes cluster](../user/clusters/applications.md#install-sentry-using-gitlab-cicd). To make this easier, we are [considering shipping Sentry with GitLab](https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/5343).
+You can sign up to the cloud hosted [Sentry](https://sentry.io), deploy your own [on-premise instance](https://github.com/getsentry/onpremise/), or use GitLab to [install Sentry to a Kubernetes cluster](../user/clusters/applications.md#install-sentry-using-gitlab-cicd).
 
 ### Enabling Sentry
 
diff --git a/doc/operations/feature_flags.md b/doc/operations/feature_flags.md
index 2ef193b0f5d..49898d2e904 100644
--- a/doc/operations/feature_flags.md
+++ b/doc/operations/feature_flags.md
@@ -81,7 +81,7 @@ You can apply a feature flag strategy across multiple environments, without defi
 the strategy multiple times.
 
 GitLab Feature Flags use [Unleash](https://docs.getunleash.io/) as the feature flag
-engine. In Unleash, there are [strategies](https://docs.getunleash.io/activation_strategy/)
+engine. In Unleash, there are [strategies](https://docs.getunleash.io/user_guide/activation_strategy)
 for granular feature flag controls. GitLab Feature Flags can have multiple strategies,
 and the supported strategies are:
 
@@ -96,8 +96,7 @@ and selecting **Edit** (**{pencil}**).
 
 ### All users
 
-Enables the feature for all users. It uses the [`default`](https://docs.getunleash.io/activation_strategy/#default)
-Unleash activation strategy.
+Enables the feature for all users. It uses the Standard (`default`) Unleash activation [strategy](https://docs.getunleash.io/user_guide/activation_strategy#standard).
 
 ### Percent Rollout
 
@@ -105,8 +104,7 @@ Unleash activation strategy.
 
 Enables the feature for a percentage of page views, with configurable consistency
 of behavior. This consistency is also known as stickiness. It uses the
-[`flexibleRollout`](https://docs.getunleash.io/activation_strategy/#flexiblerollout)
-Unleash activation strategy.
+Gradual Rollout (`flexibleRollout`) Unleash activation [strategy](https://docs.getunleash.io/user_guide/activation_strategy#gradual-rollout).
 
 You can configure the consistency to be based on:
 
@@ -134,7 +132,7 @@ Selecting **Random** provides inconsistent application behavior for individual u
 ### Percent of Users
 
 Enables the feature for a percentage of authenticated users. It uses the Unleash activation strategy
-[`gradualRolloutUserId`](https://docs.getunleash.io/activation_strategy/#gradualrolloutuserid).
+[`gradualRolloutUserId`](https://docs.getunleash.io/user_guide/activation_strategy#gradual-rollout).
 
 For example, set a value of 15% to enable the feature for 15% of authenticated users.
 
@@ -156,8 +154,7 @@ ID for the feature to be enabled. See the [Ruby example](#ruby-application-examp
 > - [Updated](https://gitlab.com/gitlab-org/gitlab/-/issues/34363) to be defined per environment in GitLab 12.6.
 
 Enables the feature for a list of target users. It is implemented
-using the Unleash [`userWithId`](https://docs.getunleash.io/activation_strategy/#userwithid)
-activation strategy.
+using the Unleash UserIDs (`userWithId`) activation [strategy](https://docs.getunleash.io/user_guide/activation_strategy#userids).
 
 Enter user IDs as a comma-separated list of values (for example,
 `user@example.com, user2@example.com`, or `username1,username2,username3`, and so on). Note that
@@ -187,8 +184,7 @@ To search for code references of a feature flag:
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/35930) in GitLab 13.1.
 
 Enables the feature for lists of users created [in the Feature Flags UI](#create-a-user-list), or with the [Feature Flag User List API](../api/feature_flag_user_lists.md).
-Similar to [User IDs](#user-ids), it uses the Unleash [`userWithId`](https://docs.getunleash.io/activation_strategy/#userwithid)
-activation strategy.
+Similar to [User IDs](#user-ids), it uses the Unleash UsersIDs (`userWithId`) activation [strategy](https://docs.getunleash.io/user_guide/activation_strategy#userids).
 
 It's not possible to *disable* a feature for members of a user list, but you can achieve the same
 effect by enabling a feature for a user list that doesn't contain the excluded users.
diff --git a/doc/operations/incident_management/integrations.md b/doc/operations/incident_management/integrations.md
index 92f5a50b1c3..a8b455e05a0 100644
--- a/doc/operations/incident_management/integrations.md
+++ b/doc/operations/incident_management/integrations.md
@@ -65,11 +65,11 @@ and you can [customize the payload](#customize-the-alert-payload-outside-of-gitl
    1. Toggle the **Active** alert setting. The **URL** and **Authorization Key** for the webhook
       configuration are available in the **View credentials** tab after you save the integration.
       You must also input the URL and Authorization Key in your external service.
-   1. _(Optional)_ To map fields from your monitoring tool's alert to GitLab fields, enter a sample
+   1. Optional. To map fields from your monitoring tool's alert to GitLab fields, enter a sample
       payload and click **Parse payload for custom mapping**. Valid JSON is required. If you update
       a sample payload, you must also remap the fields.
 
-   1. _(Optional)_ If you provided a valid sample payload, select each value in
+   1. Optional. If you provided a valid sample payload, select each value in
       **Payload alert key** to [map to a **GitLab alert key**](#map-fields-in-custom-alerts).
    1. To save your integration, click **Save Integration**. If desired, you can send a test alert
       from your integration's **Send test alert** tab after the integration is created.
@@ -173,7 +173,7 @@ curl --request POST \
 The authorization key can be used as the `password`. The `username` is left blank:
 
 - username: `<blank>`
-- pasword: authorization_key
+- password: authorization_key
 
 ```shell
 curl --request POST \
diff --git a/doc/operations/metrics/dashboards/yaml_number_format.md b/doc/operations/metrics/dashboards/yaml_number_format.md
index 3b6e10e647e..ce9e359a587 100644
--- a/doc/operations/metrics/dashboards/yaml_number_format.md
+++ b/doc/operations/metrics/dashboards/yaml_number_format.md
@@ -15,7 +15,7 @@ You can select units to format your charts by adding `format` to your
 
 ## Internationalization and localization
 
-Currently, your [internationalization and localization options](https://en.wikipedia.org/wiki/Internationalization_and_localization) for number formatting are dependent on the system you are using i.e. your OS or browser.
+Currently, your [internationalization and localization options](https://en.wikipedia.org/wiki/Internationalization_and_localization) for number formatting are dependent on the system you are using (that is, your OS or browser).
 
 ## Engineering Notation