Add latest changes from gitlab-org/gitlab@master

16 files changed, 33 insertions, 33 deletions

diff --git a/doc/administration/monitoring/prometheus/gitlab_metrics.md b/doc/administration/monitoring/prometheus/gitlab_metrics.md
index f89521bdbbd..bc3edee908f 100644
--- a/doc/administration/monitoring/prometheus/gitlab_metrics.md
+++ b/doc/administration/monitoring/prometheus/gitlab_metrics.md
@@ -173,7 +173,7 @@ The following metrics are available:
 
 The following metrics can be controlled by feature flags:
 
-| Metric                                                         | Feature Flag                                                       |
+| Metric                                                         | Feature flag                                                       |
 |:---------------------------------------------------------------|:-------------------------------------------------------------------|
 | `gitlab_view_rendering_duration_seconds`                       | `prometheus_metrics_view_instrumentation`                          |
 
diff --git a/doc/api/api_resources.md b/doc/api/api_resources.md
index 6c04a73a760..7304c0a86be 100644
--- a/doc/api/api_resources.md
+++ b/doc/api/api_resources.md
@@ -44,8 +44,8 @@ The following API resources are available in the project context:
 | [Environments](environments.md)                                         | `/projects/:id/environments`                                                                                                                                                                          |
 | [Error Tracking](error_tracking.md)                                     | `/projects/:id/error_tracking/settings`                                                                                                                                                               |
 | [Events](events.md)                                                     | `/projects/:id/events` (also available for users and standalone)                                                                                                                                      |
-| [Feature Flag User Lists](feature_flag_user_lists.md)                   | `/projects/:id/feature_flags_user_lists`                                                                                                                                                              |
-| [Feature Flags](feature_flags.md)                                       | `/projects/:id/feature_flags`                                                                                                                                                                         |
+| [Feature flag User Lists](feature_flag_user_lists.md)                   | `/projects/:id/feature_flags_user_lists`                                                                                                                                                              |
+| [Feature flags](feature_flags.md)                                       | `/projects/:id/feature_flags`                                                                                                                                                                         |
 | [Freeze Periods](freeze_periods.md)                                     | `/projects/:id/freeze_periods`                                                                                                                                                                        |
 | [Go Proxy](packages/go_proxy.md)                                        | `/projects/:id/packages/go`                                                                                                                                                                           |
 | [Helm repository](packages/helm.md)                                     | `/projects/:id/packages/helm_repository`                                                                                                                                                              |
diff --git a/doc/api/feature_flag_user_lists.md b/doc/api/feature_flag_user_lists.md
index c7a8fc0ec32..ee8ec3f9595 100644
--- a/doc/api/feature_flag_user_lists.md
+++ b/doc/api/feature_flag_user_lists.md
@@ -9,9 +9,9 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/205409) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.10.
 > - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/212318) to GitLab Free in 13.5.
 
-API for accessing GitLab Feature Flag User Lists.
+API for accessing GitLab feature flag user lists.
 
-Users with Developer or higher [permissions](../user/permissions.md) can access the Feature Flag User Lists API.
+Users with Developer or higher [permissions](../user/permissions.md) can access the feature flag user lists API.
 
 NOTE:
 `GET` requests return twenty results at a time because the API results
diff --git a/doc/ci/caching/index.md b/doc/ci/caching/index.md
index d7c5b089116..4be6c261c65 100644
--- a/doc/ci/caching/index.md
+++ b/doc/ci/caching/index.md
@@ -65,7 +65,7 @@ For runners to work with caches efficiently, you must do one of the following:
 ## Use multiple caches
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/32814) in GitLab 13.10.
-> - [Feature Flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/321877), in GitLab 13.12.
+> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/321877), in GitLab 13.12.
 
 You can have a maximum of four caches:
 
diff --git a/doc/ci/index.md b/doc/ci/index.md
index b3a441dc87d..bcc00fcd435 100644
--- a/doc/ci/index.md
+++ b/doc/ci/index.md
@@ -95,7 +95,7 @@ GitLab CI/CD features, grouped by DevOps stage, include:
 | [Building Docker images](docker/using_docker_build.md)                                       | Maintain Docker-based projects using GitLab CI/CD. |
 | [Canary Deployments](../user/project/canary_deployments.md)                                  | Ship features to only a portion of your pods and let a percentage of your user base to visit the temporarily deployed feature. |
 | [Deploy boards](../user/project/deploy_boards.md)                                            | Check the current health and status of each CI/CD environment running on Kubernetes. |
-| [Feature Flags](../operations/feature_flags.md)                                              | Deploy your features behind Feature Flags. |
+| [Feature flags](../operations/feature_flags.md)                                              | Deploy your features behind Feature flags. |
 | [GitLab Pages](../user/project/pages/index.md)                                               | Deploy static websites. |
 | [GitLab Releases](../user/project/releases/index.md)                                         | Add release notes to Git tags. |
 | [Cloud deployment](cloud_deployment/index.md)                                                | Deploy your application to a main cloud provider. |
diff --git a/doc/ci/testing/accessibility_testing.md b/doc/ci/testing/accessibility_testing.md
index ee833ea4a74..5999b8d85ba 100644
--- a/doc/ci/testing/accessibility_testing.md
+++ b/doc/ci/testing/accessibility_testing.md
@@ -30,7 +30,7 @@ As of [GitLab 14.5](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/73309)
 ## Accessibility merge request widget
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/39425) in GitLab 13.0 behind the disabled [feature flag](../../administration/feature_flags.md) `:accessibility_report_view`.
-> - [Feature Flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/217372) in GitLab 13.1.
+> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/217372) in GitLab 13.1.
 
 GitLab displays an **Accessibility Report** in the merge request widget area:
 
diff --git a/doc/development/feature_flags/controls.md b/doc/development/feature_flags/controls.md
index f8a592f98f5..0e88c68cc99 100644
--- a/doc/development/feature_flags/controls.md
+++ b/doc/development/feature_flags/controls.md
@@ -40,7 +40,7 @@ easier to measure the impact of both separately.
 
 The GitLab feature library (using
 [Flipper](https://github.com/jnunemaker/flipper), and covered in the
-[Feature Flags process](https://about.gitlab.com/handbook/product-development-flow/feature-flag-lifecycle/) guide) supports rolling out changes to a percentage of
+[Feature flags process](https://about.gitlab.com/handbook/product-development-flow/feature-flag-lifecycle/) guide) supports rolling out changes to a percentage of
 time to users. This in turn can be controlled using [GitLab ChatOps](../../ci/chatops/index.md).
 
 For an up to date list of feature flag commands please see
@@ -115,13 +115,13 @@ incidents or in-progress change issues, for example:
   2021-06-29 Canary deployment failing QA tests
 ```
 
-Before enabling a feature flag, verify that you are not violating any [Production Change Lock periods](https://about.gitlab.com/handbook/engineering/infrastructure/change-management/#production-change-lock-pcl) and are in compliance with the [Feature Flags and the Change Management Process](https://about.gitlab.com/handbook/engineering/infrastructure/change-management/#feature-flags-and-the-change-management-process).
+Before enabling a feature flag, verify that you are not violating any [Production Change Lock periods](https://about.gitlab.com/handbook/engineering/infrastructure/change-management/#production-change-lock-pcl) and are in compliance with the [Feature flags and the Change Management Process](https://about.gitlab.com/handbook/engineering/infrastructure/change-management/#feature-flags-and-the-change-management-process).
 
 The following `/chatops` commands should be performed in the Slack
 `#production` channel.
 
 When you begin to enable the feature, please link to the relevant
-Feature Flag Rollout Issue within a Slack thread of the first `/chatops`
+feature flag rollout issue within a Slack thread of the first `/chatops`
 command you make so people can understand the change if they need to.
 
 To enable a feature for 25% of the time, run the following in Slack:
@@ -358,7 +358,7 @@ After turning on the feature flag, you need to [monitor the relevant graphs](htt
 
 In this illustration, you can see that the Apdex score started to decline after the feature flag was enabled at `09:46`. The feature flag was then deactivated at `10:31`, and the service returned to the original value:
 
-![Feature Flag Metrics](../img/feature-flag-metrics.png)
+![Feature flag metrics](../img/feature-flag-metrics.png)
 
 ### Feature flag change logging
 
diff --git a/doc/development/feature_flags/index.md b/doc/development/feature_flags/index.md
index 9b6876ac0bc..40a5d2a2abc 100644
--- a/doc/development/feature_flags/index.md
+++ b/doc/development/feature_flags/index.md
@@ -83,7 +83,7 @@ used for deploying unfinished code to production. Most feature flags used at
 GitLab are the `development` type.
 
 A `development` feature flag must have a rollout issue
-created from the [Feature Flag Roll Out template](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/issue_templates/Feature%20Flag%20Roll%20Out.md).
+created from the [Feature flag Roll Out template](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/issue_templates/Feature%20Flag%20Roll%20Out.md).
 
 The format for `development` feature flags is `Feature.<state>(:<dev_flag_name>)`.
 To enable and disable them, run on the GitLab Rails console:
@@ -252,7 +252,7 @@ deleting feature flags.
 
 ## Develop with a feature flag
 
-There are two main ways of using Feature Flags in the GitLab codebase:
+There are two main ways of using feature flags in the GitLab codebase:
 
 - [Backend code (Rails)](#backend)
 - [Frontend code (VueJS)](#frontend)
diff --git a/doc/development/gitaly.md b/doc/development/gitaly.md
index 4aec08add4e..408f3d5fa3c 100644
--- a/doc/development/gitaly.md
+++ b/doc/development/gitaly.md
@@ -239,7 +239,7 @@ Re-run steps 2-5 each time you want to try out new changes.
 
 [Return to Development documentation](index.md)
 
-## Wrapping RPCs in Feature Flags
+## Wrapping RPCs in feature flags
 
 Here are the steps to gate a new feature in Gitaly behind a feature flag.
 
diff --git a/doc/development/pages/index.md b/doc/development/pages/index.md
index d5b18ee80fb..4769dbf427d 100644
--- a/doc/development/pages/index.md
+++ b/doc/development/pages/index.md
@@ -255,7 +255,7 @@ incidents and downtime. To add a new feature flag to GitLab Pages:
 1. Create the feature flag in
    [`internal/feature/feature.go`](https://gitlab.com/gitlab-org/gitlab-pages/-/blob/master/internal/feature/feature.go),
    which must be **off** by default.
-1. Create an issue to track the feature flag using the `Feature Flag` template.
+1. Create an issue to track the feature flag using the `Feature flag` template.
 1. Add the `~"feature flag"` label to any merge requests that handle feature flags.
 
 For GitLab Pages, the feature flags are controlled by environment variables at a global level.
diff --git a/doc/development/redis/new_redis_instance.md b/doc/development/redis/new_redis_instance.md
index c1f69f4d103..00cc102b427 100644
--- a/doc/development/redis/new_redis_instance.md
+++ b/doc/development/redis/new_redis_instance.md
@@ -119,7 +119,7 @@ Migration Requirements:
 
 - No downtime.
 - No loss of stored data until the TTL for storing data expires.
-- Partial rollout using Feature Flags or ENV vars or combinations of both.
+- Partial rollout using feature flags or ENV vars or combinations of both.
 - Monitoring of the switch.
 - Prometheus metrics in place.
 - Easy rollback without downtime in case the new instance or logic does not behave as expected.
diff --git a/doc/development/testing_guide/testing_levels.md b/doc/development/testing_guide/testing_levels.md
index 2a5c303217f..c349e53b5c8 100644
--- a/doc/development/testing_guide/testing_levels.md
+++ b/doc/development/testing_guide/testing_levels.md
@@ -65,7 +65,7 @@ that is not directly perceivable by a user.
 graph RL
     plain[Plain JavaScript];
     Vue[Vue Components];
-    feature-flags[Feature Flags];
+    feature-flags[Feature flags];
     license-checks[License Checks];
 
     plain---Vuex;
@@ -149,7 +149,7 @@ Component tests cover the state of a single component that is perceivable by a u
 graph RL
     plain[Plain JavaScript];
     Vue[Vue Components];
-    feature-flags[Feature Flags];
+    feature-flags[Feature flags];
     license-checks[License Checks];
 
     plain---Vuex;
@@ -243,7 +243,7 @@ Their abstraction level is comparable to how a user would interact with the UI.
 graph RL
     plain[Plain JavaScript];
     Vue[Vue Components];
-    feature-flags[Feature Flags];
+    feature-flags[Feature flags];
     license-checks[License Checks];
 
     plain---Vuex;
@@ -371,7 +371,7 @@ See also:
 graph RL
     plain[Plain JavaScript];
     Vue[Vue Components];
-    feature-flags[Feature Flags];
+    feature-flags[Feature flags];
     license-checks[License Checks];
 
     plain---Vuex;
diff --git a/doc/operations/feature_flags.md b/doc/operations/feature_flags.md
index 213685676a7..a3874b54ccd 100644
--- a/doc/operations/feature_flags.md
+++ b/doc/operations/feature_flags.md
@@ -38,7 +38,7 @@ with GitLab, so it's up to developers to use a compatible client library and
 To create and enable a feature flag:
 
 1. On the top bar, select **Main menu > Projects** and find your project.
-1. On the left sidebar, select **Deployments > Feature Flags**.
+1. On the left sidebar, select **Deployments > Feature flags**.
 1. Select **New feature flag**.
 1. Enter a name that starts with a letter and contains only lowercase letters, digits, underscores (`_`),
    or dashes (`-`), and does not end with a dash (`-`) or underscore (`_`).
@@ -85,7 +85,7 @@ and the supported strategies are:
 - [User List](#user-list)
 
 Strategies can be added to feature flags when [creating a feature flag](#create-a-feature-flag),
-or by editing an existing feature flag after creation by navigating to **Deployments > Feature Flags**
+or by editing an existing feature flag after creation by navigating to **Deployments > Feature flags**
 and selecting **Edit** (**{pencil}**).
 
 ### All users
@@ -181,7 +181,7 @@ For example:
 To create a user list:
 
 1. On the top bar, select **Main menu > Projects** and find your project.
-1. On the left sidebar, select **Deployments > Feature Flags**.
+1. On the left sidebar, select **Deployments > Feature flags**.
 1. Select **View user lists**
 1. Select **New user list**.
 1. Enter a name for the list.
@@ -197,7 +197,7 @@ When viewing a list, you can rename it by selecting **Edit** (**{pencil}**).
 To add users to a user list:
 
 1. On the top bar, select **Main menu > Projects** and find your project.
-1. On the left sidebar, select **Deployments > Feature Flags**.
+1. On the left sidebar, select **Deployments > Feature flags**.
 1. Select **Edit** (**{pencil}**) next to the list you want to add users to.
 1. Select **Add Users**.
 1. Enter the user IDs as a comma-separated list of values. For example,
@@ -211,7 +211,7 @@ To add users to a user list:
 To remove users from a user list:
 
 1. On the top bar, select **Main menu > Projects** and find your project.
-1. On the left sidebar, select **Deployments > Feature Flags**.
+1. On the left sidebar, select **Deployments > Feature flags**.
 1. Select **Edit** (**{pencil}**) next to the list you want to change.
 1. Select **Remove** (**{remove}**) next to the ID you want to remove.
 
@@ -225,7 +225,7 @@ code so that you can clean it up when it's time to remove the feature flag.
 To search for code references of a feature flag:
 
 1. On the top bar, select **Main menu > Projects** and find your project.
-1. On the left sidebar, select **Deployments > Feature Flags**.
+1. On the left sidebar, select **Deployments > Feature flags**.
 1. Edit the feature flag you want to remove.
 1. Select **More actions** (**{ellipsis_v}**).
 1. Select **Search code references**.
@@ -236,7 +236,7 @@ In [GitLab 13.0 and earlier](https://gitlab.com/gitlab-org/gitlab/-/issues/8621)
 to disable a feature flag for a specific environment:
 
 1. On the top bar, select **Main menu > Projects** and find your project.
-1. On the left sidebar, select **Deployments > Feature Flags**.
+1. On the left sidebar, select **Deployments > Feature flags**.
 1. For the feature flag you want to disable, select **Edit** (**{pencil}**).
 1. To disable the flag:
 
@@ -251,7 +251,7 @@ to disable a feature flag for a specific environment:
 To disable a feature flag for all environments:
 
 1. On the top bar, select **Main menu > Projects** and find your project.
-1. On the left sidebar, select **Deployments > Feature Flags**.
+1. On the left sidebar, select **Deployments > Feature flags**.
 1. For the feature flag you want to disable, slide the Status toggle to **Disabled**.
 
 The feature flag is displayed on the **Disabled** tab.
@@ -266,7 +266,7 @@ Then prepare your application with a client library.
 To get the access credentials that your application needs to communicate with GitLab:
 
 1. On the top bar, select **Main menu > Projects** and find your project.
-1. On the left sidebar, select **Deployments > Feature Flags**.
+1. On the left sidebar, select **Deployments > Feature flags**.
 1. Select **Configure** to view the following:
    - **API URL**: URL where the client (application) connects to get a list of feature flags.
    - **Instance ID**: Unique token that authorizes the retrieval of the feature flags.
diff --git a/doc/operations/index.md b/doc/operations/index.md
index d4a5f895947..56b27af316b 100644
--- a/doc/operations/index.md
+++ b/doc/operations/index.md
@@ -76,4 +76,4 @@ an environment.
 
 - Deploy to different [environments](../ci/environments/index.md).
 - Connect your project to a [Kubernetes cluster](../user/infrastructure/clusters/index.md).
-- Create, toggle, and remove [Feature Flags](feature_flags.md).
+- Create, toggle, and remove [feature flags](feature_flags.md).
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index ab08f5b4767..002797b386a 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -137,7 +137,7 @@ The following table lists project permissions available for each role:
 | [Package registry](packages/index.md):<br>Delete a package                                                                                                                           |          |          |           | ✓          | ✓        |
 | [Package registry](packages/index.md):<br>Delete a file associated with a package                                                                                                    |          |          |           | ✓          | ✓        |
 | [Project operations](../operations/index.md):<br>View [Error Tracking](../operations/error_tracking.md) list                                                                         |          | ✓        | ✓         | ✓          | ✓        |
-| [Project operations](../operations/index.md):<br>Manage [Feature Flags](../operations/feature_flags.md)                                                                              |          |          | ✓         | ✓          | ✓        |
+| [Project operations](../operations/index.md):<br>Manage [Feature flags](../operations/feature_flags.md)                                                                              |          |          | ✓         | ✓          | ✓        |
 | [Project operations](../operations/index.md):<br>Manage [Error Tracking](../operations/error_tracking.md)                                                                            |          |          |           | ✓          | ✓        |
 | [Projects](project/index.md):<br>Download project                                                                                                                                    | ✓ (1)  | ✓        | ✓         | ✓          | ✓        |
 | [Projects](project/index.md):<br>Leave comments                                                                                                                                      | ✓        | ✓        | ✓         | ✓          | ✓        |
diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md
index 42387535100..3ead11d3a9e 100644
--- a/doc/user/project/settings/index.md
+++ b/doc/user/project/settings/index.md
@@ -94,7 +94,7 @@ Use the toggles to enable or disable features in the project.
 | **Metrics Dashboard**            | ✓                         | Control access to [metrics dashboard](../integrations/prometheus.md).                                                                                  |
 | **Releases**                     | ✓                         | Control access to [Releases](../releases/index.md).                                                                                                    |
 | **Environments**                 | ✓                         | Control access to [Environments and Deployments](../../../ci/environments/index.md).                                                                   |
-| **Feature flags**                | ✓                         | Control access to [Feature Flags](../../../operations/feature_flags.md).                                                                               |
+| **Feature flags**                | ✓                         | Control access to [Feature flags](../../../operations/feature_flags.md).                                                                               |
 | **Monitor**                      | ✓                         | Control access to [Monitor](../../../operations/index.md) features.                                                                                    |
 | **Infrastructure**               | ✓                         | Control access to [Infrastructure](../../infrastructure/index.md) features.                                                                            |