diff --git a/GITALY_SERVER_VERSION b/GITALY_SERVER_VERSION
index 8a584c4bb37..c7c00179d6f 100644
--- a/GITALY_SERVER_VERSION
+++ b/GITALY_SERVER_VERSION
@@ -1 +1 @@
-4bb38a198255d9b898763eedfd64508b72af7b3b
+b05554db74bc6ee18ac6a916363a56fd677005a8
diff --git a/doc/administration/geo/replication/configuration.md b/doc/administration/geo/replication/configuration.md
index 8b8c8071292..dcd48cf2e76 100644
--- a/doc/administration/geo/replication/configuration.md
+++ b/doc/administration/geo/replication/configuration.md
@@ -238,7 +238,7 @@ You can login to the **secondary** node with the same credentials as used for th
 Using Hashed Storage significantly improves Geo replication. Project and group
 renames no longer require synchronization between nodes.
 
-1. Visit the **primary** node's **Admin Area >** **{settings}** **Settings > Repository**
+1. Visit the **primary** node's **Admin Area > Settings > Repository**
    (`/admin/application_settings/repository`) in your browser.
 1. In the **Repository storage** section, check **Use hashed storage paths for newly created and renamed projects**.
 
@@ -255,7 +255,7 @@ on the **secondary** node.
 ### Step 6. Enable Git access over HTTP/HTTPS
 
 Geo synchronizes repositories over HTTP/HTTPS, and therefore requires this clone
-method to be enabled. Navigate to **Admin Area >** **{settings}** **Settings**
+method to be enabled. Navigate to **Admin Area > Settings**
 (`/admin/application_settings/general`) on the **primary** node, and set
 `Enabled Git access protocols` to `Both SSH and HTTP(S)` or `Only HTTP(S)`.
 
diff --git a/doc/administration/monitoring/performance/performance_bar.md b/doc/administration/monitoring/performance/performance_bar.md
index bbaede0bd39..a2bb9242c0d 100644
--- a/doc/administration/monitoring/performance/performance_bar.md
+++ b/doc/administration/monitoring/performance/performance_bar.md
@@ -73,7 +73,7 @@ The GitLab Performance Bar is disabled by default. To enable it for a given grou
 
 1. Sign in as a user with Administrator [permissions](../../../user/permissions.md).
 1. In the menu bar, click **Admin Area**.
-1. Navigate to **{settings}** **Settings > Metrics and profiling**
+1. Navigate to **Settings > Metrics and profiling**
    (`admin/application_settings/metrics_and_profiling`), and expand the section
    **Profiling - Performance bar**.
 1. Click **Enable access to the Performance Bar**.
diff --git a/doc/administration/raketasks/project_import_export.md b/doc/administration/raketasks/project_import_export.md
index 29bbe5261c6..51e0e2e46b6 100644
--- a/doc/administration/raketasks/project_import_export.md
+++ b/doc/administration/raketasks/project_import_export.md
@@ -46,6 +46,6 @@ Note the following:
   compatible as described in the [Version history](../../user/project/settings/import_export.md#version-history).
 - The project import option must be enabled in
   application settings (`/admin/application_settings/general`) under **Import sources**, which is available
-  under **Admin Area >** **{settings}** **Settings > Visibility and access controls**.
+  under **Admin Area > Settings > Visibility and access controls**.
 - The exports are stored in a temporary [shared directory](../../development/shared_files.md)
   and are deleted every 24 hours by a specific worker.
diff --git a/doc/ci/pipelines/settings.md b/doc/ci/pipelines/settings.md
index 80614afdc62..40093167213 100644
--- a/doc/ci/pipelines/settings.md
+++ b/doc/ci/pipelines/settings.md
@@ -208,7 +208,7 @@ If you want all pending non-HEAD pipelines on branches to auto-cancel each time
 a new pipeline is created, such as after a Git push or manually from the UI,
 you can enable this in the project settings:
 
-1. Go to **{settings}** **Settings > CI / CD**.
+1. Go to **Settings > CI / CD**.
 1. Expand **General Pipelines**.
 1. Check the **Auto-cancel redundant, pending pipelines** checkbox.
 1. Click **Save changes**.
@@ -227,7 +227,7 @@ newer one, which may not be what you want.
 
 To avoid this scenario:
 
-1. Go to **{settings}** **Settings > CI / CD**.
+1. Go to **Settings > CI / CD**.
 1. Expand **General pipelines**.
 1. Check the **Skip outdated deployment jobs** checkbox.
 1. Click **Save changes**.
diff --git a/doc/ci/runners/README.md b/doc/ci/runners/README.md
index 1e3cde6af3f..967011f8ef0 100644
--- a/doc/ci/runners/README.md
+++ b/doc/ci/runners/README.md
@@ -118,7 +118,7 @@ You can also enable shared Runners for individual projects.
 
 To enable shared Runners:
 
-1. Go to the project's **{settings}** **Settings > CI/CD** and expand the **Runners** section.
+1. Go to the project's **Settings > CI/CD** and expand the **Runners** section.
 1. Click **Allow shared Runners**.
 
 #### Disable shared Runners
@@ -128,12 +128,12 @@ You must have Owner permissions for the project<!-- or group-->.
 
 To disable shared Runners for a project:
 
-1. Go to the project's **{settings}** **Settings > CI/CD** and expand the **Runners** section.
+1. Go to the project's **Settings > CI/CD** and expand the **Runners** section.
 1. In the **Shared Runners** area, click **Disable shared Runners**.
 
 <!--To disable shared Runners for a group:
 
-1. Go to the group's **{settings}** **Settings > CI/CD** and expand the **Runners** section.
+1. Go to the group's **Settings > CI/CD** and expand the **Runners** section.
 1. In the **Shared Runners** area, click **Disable shared Runners globally**.
 1. Optionally, to allow shared Runners to be enabled for individual projects or subgroups,
    click **Allow projects/subgroups to override the global setting**.
@@ -155,7 +155,7 @@ To create a group Runner:
 
 1. [Install Runner](https://docs.gitlab.com/runner/install/).
 1. Go to the group you want to make the Runner work for.
-1. Go to **{settings}** **Settings > CI/CD** and expand the **Runners** section.
+1. Go to **Settings > CI/CD** and expand the **Runners** section.
 1. Note the URL and token.
 1. [Register the Runner](https://docs.gitlab.com/runner/register/).
 
@@ -168,7 +168,7 @@ You can do this for your self-managed GitLab instance or for GitLab.com.
 You must have [Owner permissions](../../user/permissions.md#group-members-permissions) for the group.
 
 1. Go to the group where you want to view the Runners.
-1. Go to **{settings}** **Settings > CI/CD** and expand the **Runners** section.
+1. Go to **Settings > CI/CD** and expand the **Runners** section.
 1. The following fields are displayed.
 
    | Attribute    | Description |
@@ -191,7 +191,7 @@ You can pause or remove a group Runner for your self-managed GitLab instance or
 You must have [Owner permissions](../../user/permissions.md#group-members-permissions) for the group.
 
 1. Go to the group you want to remove or pause the Runner for.
-1. Go to **{settings}** **Settings > CI/CD** and expand the **Runners** section.
+1. Go to **Settings > CI/CD** and expand the **Runners** section.
 1. Click **Pause** or **Remove Runner**.
    - If you pause a group Runner that is used by multiple projects, the Runner pauses for all projects.
    - From the group view, you cannot remove a Runner that is assigned to more than one project.
@@ -223,7 +223,7 @@ You must have [Owner permissions](../../user/permissions.md#project-members-perm
 To create a specific Runner:
 
 1. [Install Runner](https://docs.gitlab.com/runner/install/).
-1. Go to the project's **{settings}** **Settings > CI/CD** and expand the **Runners** section.
+1. Go to the project's **Settings > CI/CD** and expand the **Runners** section.
 1. Note the URL and token.
 1. [Register the Runner](https://docs.gitlab.com/runner/register/).
 
@@ -237,7 +237,7 @@ enable a specific Runner to apply to additional projects.
 
 To enable or disable a specific Runner for a project:
 
-1. Go to the project's **{settings}** **Settings > CI/CD** and expand the **Runners** section.
+1. Go to the project's **Settings > CI/CD** and expand the **Runners** section.
 1. Click **Enable for this project** or **Disable for this project**.
 
 #### Prevent a specific Runner from being enabled for other projects
@@ -248,7 +248,7 @@ but can also be changed later.
 
 To lock or unlock a Runner:
 
-1. Go to the project's **{settings}** **Settings > CI/CD** and expand the **Runners** section.
+1. Go to the project's **Settings > CI/CD** and expand the **Runners** section.
 1. Find the Runner you want to lock or unlock. Make sure it's enabled.
 1. Click the pencil button.
 1. Check the **Lock to current projects** option.
@@ -317,7 +317,7 @@ and ignores other jobs.
 
 To protect or unprotect a Runner:
 
-1. Go to the project's **{settings}** **Settings > CI/CD** and expand the **Runners** section.
+1. Go to the project's **Settings > CI/CD** and expand the **Runners** section.
 1. Find the Runner you want to protect or unprotect. Make sure it's enabled.
 1. Click the pencil button.
 1. Check the **Protected** option.
@@ -346,7 +346,7 @@ may then be used to obtain the values of secret variables or to clone project co
 
 To reset the token:
 
-1. Go to the project's **{settings}** **Settings > CI/CD**.
+1. Go to the project's **Settings > CI/CD**.
 1. Expand the **General pipelines settings** section.
 1. Find the **Runner token** form field and click the **Reveal value** button.
 1. Delete the value and save the form.
@@ -386,7 +386,7 @@ the GitLab instance. To determine this:
 To can find the IP address of a Runner for a specific project,
 you must have Owner [permissions](../../user/permissions.md#project-members-permissions) for the project.
 
-1. Go to the project's **{settings}** **Settings > CI/CD** and expand the **Runners** section.
+1. Go to the project's **Settings > CI/CD** and expand the **Runners** section.
 1. On the details page you should see a row for **IP Address**.
 
 ![specific Runner IP address](img/specific_runner_ip_address.png)
@@ -409,7 +409,7 @@ To change this, you must have Owner [permissions](../../user/permissions.md#proj
 
 To make a Runner pick untagged jobs:
 
-1. Go to the project's **{settings}** **Settings > CI/CD** and expand the **Runners** section.
+1. Go to the project's **Settings > CI/CD** and expand the **Runners** section.
 1. Find the Runner you want to pick untagged jobs and make sure it's enabled.
 1. Click the pencil button.
 1. Check the **Run untagged jobs** option.
diff --git a/doc/development/telemetry/index.md b/doc/development/telemetry/index.md
index 0000e7e9e4f..409d741017a 100644
--- a/doc/development/telemetry/index.md
+++ b/doc/development/telemetry/index.md
@@ -81,27 +81,19 @@ Our different tracking tools allows us to track different types of events. The e
 
 | Event Type          | Snowplow JS (Frontend) | Snowplow Ruby (Backend) | Usage Ping          | Database import     | Log system          |
 |---------------------|------------------------|-------------------------|---------------------|---------------------|---------------------|
-| Database counts     | **{dotted-circle}**    | **{dotted-circle}**     | **{check-circle}**  | **{check-circle}**  | **{dotted-circle}** |
 | Pageview events     | **{check-circle}**     | **{check-circle}**      | **{dotted-circle}** | **{dotted-circle}** | **{dotted-circle}** |
 | UI events           | **{check-circle}**     | **{dotted-circle}**     | **{dotted-circle}** | **{dotted-circle}** | **{dotted-circle}** |
 | CRUD and API events | **{dotted-circle}**    | **{check-circle}**      | **{dotted-circle}** | **{dotted-circle}** | **{dotted-circle}** |
-| Event funnels       | **{check-circle}**     | **{check-circle}**      | **{dotted-circle}** | **{dotted-circle}** | **{dotted-circle}** |
-| PostgreSQL Data     | **{dotted-circle}**    | **{dotted-circle}**     | **{dotted-circle}** | **{check-circle}**  | **{dotted-circle}** |
-| Logs                | **{dotted-circle}**    | **{dotted-circle}**     | **{dotted-circle}** | **{dotted-circle}** | **{check-circle}**  |
-| External services   | **{dotted-circle}**    | **{dotted-circle}**     | **{dotted-circle}** | **{dotted-circle}** | **{dotted-circle}** |
-
-### Database counts
-
-- Number of Projects created by unique users
-- Number of users logged in the past 28 day
-
-Database counts are row counts for different tables in an instance’s database. These are SQL count queries which have been filtered, grouped, or aggregated which provide high level usage data. The full list of available tables can be found in [structure.sql](https://gitlab.com/gitlab-org/gitlab/-/blob/master/db/structure.sql).
+| Database records    | **{dotted-circle}**    | **{dotted-circle}**     | **{check-circle}**  | **{check-circle}**  | **{dotted-circle}** |
+| Instance logs         | **{dotted-circle}**    | **{dotted-circle}**     | **{dotted-circle}** | **{dotted-circle}** | **{check-circle}**  |
+| Instance settings   | **{dotted-circle}**    | **{dotted-circle}**     | **{check-circle}**  | **{dotted-circle}** | **{dotted-circle}** |
+| Instance integrations | **{dotted-circle}**  | **{dotted-circle}**     | **{check-circle}**  | **{dotted-circle}** | **{dotted-circle}** |
 
 ### Pageview events
 
 - Number of sessions that visited the /dashboard/groups page
 
-### UI Events
+### UI events
 
 - Number of sessions that clicked on a button or link
 - Number of sessions that closed a modal
@@ -116,22 +108,21 @@ UI events are any interface-driven actions from the browser including click data
 
 These are backend events that include the creation, read, update, deletion of records, and other events that might be triggered from layers other than those available in the interface.
 
-### Event funnels
-
-- Number of sessions that performed action A, B, then C
-- Conversion rate from step A to B
-
-### PostgreSQL data
+### Database records
 
 These are raw database records which can be explored using business intelligence tools like Sisense. The full list of available tables can be found in [structure.sql](https://gitlab.com/gitlab-org/gitlab/-/blob/master/db/structure.sql).
 
-### Logs
+### Instance logs
 
 These are raw logs such as the [Production logs](../../administration/logs.md#production_jsonlog), [API logs](../../administration/logs.md#api_jsonlog), or [Sidekiq logs](../../administration/logs.md#sidekiqlog). See the [overview of Logging Infrastructure](https://gitlab.com/gitlab-com/runbooks/tree/master/logging/doc#logging-infrastructure-overview) for more details.
 
-### External services
+### Instance settings
 
-These are external services a GitLab instance interacts with such as an [external storage provider](../../administration/static_objects_external_storage.md) or an [external container registry](../../administration/packages/container_registry.md#use-an-external-container-registry-with-gitlab-as-an-auth-endpoint). These services must be able to send data back into a GitLab instance for data to be tracked.
+These are settings of your instance such as the instance's Git version and if certain features are enabled such as `container_registry_enabled`.
+
+### Instance integrations
+
+These are integrations your GitLab instance interacts with such as an [external storage provider](../../administration/static_objects_external_storage.md) or an [external container registry](../../administration/packages/container_registry.md#use-an-external-container-registry-with-gitlab-as-an-auth-endpoint). These services must be able to send data back into a GitLab instance for data to be tracked.
 
 ## Telemetry systems overview
 
diff --git a/doc/operations/incident_management/index.md b/doc/operations/incident_management/index.md
index 5a0f9cf1b88..6a395e3cfbb 100644
--- a/doc/operations/incident_management/index.md
+++ b/doc/operations/incident_management/index.md
@@ -16,7 +16,7 @@ such as setting up Prometheus alerts, displaying metrics, and sending notificati
 You can enable or disable Incident Management features in the GitLab user interface
 to create issues when alerts are triggered:
 
-1. Navigate to **{settings}** **Settings > Operations > Incidents** and expand
+1. Navigate to **Settings > Operations > Incidents** and expand
    **Incidents**:
 
    ![Incident Management Settings](img/incident_management_settings.png)
@@ -58,7 +58,7 @@ for each PagerDuty incident. This configuration requires you to make changes
 in both PagerDuty and GitLab:
 
 1. Sign in as a user with Maintainer [permissions](../../user/permissions.md).
-1. Navigate to **{settings}** **Settings > Operations > Incidents** and expand **Incidents**.
+1. Navigate to **Settings > Operations > Incidents** and expand **Incidents**.
 1. Select the **PagerDuty integration** tab:
 
    ![PagerDuty incidents integration](img/pagerduty_incidents_integration_13_3.png)
diff --git a/doc/operations/incident_management/status_page.md b/doc/operations/incident_management/status_page.md
index b26af7b5af3..b253cf4f5a1 100644
--- a/doc/operations/incident_management/status_page.md
+++ b/doc/operations/incident_management/status_page.md
@@ -57,7 +57,7 @@ To deploy the Status Page to AWS S3 you need to add the Status Page project & co
 
 Once the CI/CD variables are set, you'll need to set up the Project you want to use for Incident issues:
 
-1. To view the [Operations Settings](../../user/project/settings/#operations-settings) page, navigate to **{settings}** **Settings > Operations > Status Page**.
+1. To view the [Operations Settings](../../user/project/settings/#operations-settings) page, navigate to **Settings > Operations > Status Page**.
 1. Fill in your cloud provider's credentials and make sure the **Active** checkbox is checked.
 1. Click **Save changes**.
 
diff --git a/doc/operations/metrics/alerts.md b/doc/operations/metrics/alerts.md
index ce7e310a9f4..8923e99daec 100644
--- a/doc/operations/metrics/alerts.md
+++ b/doc/operations/metrics/alerts.md
@@ -37,7 +37,7 @@ To remove the alert, click back on the alert icon for the desired metric, and cl
 
 For manually configured Prometheus servers, GitLab provides a notify endpoint for
 use with Prometheus webhooks. If you have manual configuration enabled, an
-**Alerts** section is added to **{settings}** **Settings > Integrations > Prometheus**.
+**Alerts** section is added to **Settings > Integrations > Prometheus**.
 This section contains the **URL** and **Authorization Key** you will need. The
 **Reset Key** button will invalidate the key and generate a new one.
 
@@ -75,7 +75,7 @@ Prometheus server to use the
 Alerts can be used to trigger actions, like opening an issue automatically
 (disabled by default since `13.1`). To configure the actions:
 
-1. Navigate to your project's **{settings}** **Settings > Operations > Incidents**.
+1. Navigate to your project's **Settings > Operations > Incidents**.
 1. Enable the option to create issues.
 1. Choose the [issue template](../../user/project/description_templates.md) to create the issue from.
 1. Optionally, select whether to send an email notification to the developers of the project.
diff --git a/doc/operations/metrics/dashboards/index.md b/doc/operations/metrics/dashboards/index.md
index 1a0d861db63..0e258e27718 100644
--- a/doc/operations/metrics/dashboards/index.md
+++ b/doc/operations/metrics/dashboards/index.md
@@ -104,7 +104,7 @@ To manage the settings for your metrics dashboard:
 1. Sign in as a user with project Maintainer or Admin
    [permissions](../../../user/permissions.md#project-members-permissions).
 1. Navigate to your dashboard at **{cloud-gear}** **Operations > Metrics**.
-1. In the top-right corner of your dashboard, click **{settings}** **Metrics Settings**:
+1. In the top-right corner of your dashboard, click **Metrics Settings**:
 
    ![Monitoring Dashboard actions menu with create new item](img/metrics_settings_button_v13_2.png)
 
diff --git a/doc/operations/metrics/dashboards/settings.md b/doc/operations/metrics/dashboards/settings.md
index 451daabbb79..a4aef6b1674 100644
--- a/doc/operations/metrics/dashboards/settings.md
+++ b/doc/operations/metrics/dashboards/settings.md
@@ -21,7 +21,7 @@ time zone, but you can display dates and times in UTC format. To change the
 time zone:
 
 1. Sign in as a user with Manage Project Operations [permissions](../../../user/permissions.md).
-1. Navigate to **{settings}** **Settings > Operations**, and scroll to
+1. Navigate to **Settings > Operations**, and scroll to
    **Metrics Dashboard**.
 1. In the **Dashboard timezone** select box, select *User's local timezone*
    or *UTC*:
@@ -37,7 +37,7 @@ You can add a button on your monitoring dashboard that links directly to your
 existing external dashboards:
 
 1. Sign in as a user with Manage Project Operations [permissions](../../../user/permissions.md).
-1. Navigate to **{settings}** **Settings > Operations**, and scroll to
+1. Navigate to **Settings > Operations**, and scroll to
    **Metrics Dashboard**.
 1. In **External dashboard URL**, provide the URL to your external dashboard:
 
diff --git a/doc/operations/metrics/embed_grafana.md b/doc/operations/metrics/embed_grafana.md
index 7365a92360a..2843a4319a8 100644
--- a/doc/operations/metrics/embed_grafana.md
+++ b/doc/operations/metrics/embed_grafana.md
@@ -51,7 +51,7 @@ from a Grafana instance, the data source must:
 ## Setting up the Grafana integration
 
 1. In Grafana, [generate an Admin-level API Token](https://grafana.com/docs/grafana/latest/http_api/auth/#create-api-token).
-1. In your GitLab project, navigate to **{settings}** **Settings > Operations > Grafana Authentication**.
+1. In your GitLab project, navigate to **Settings > Operations > Grafana Authentication**.
 1. To enable the integration, check the **Active** checkbox.
 1. For **Grafana URL**, enter the base URL of the Grafana instance.
 1. For **API Token**, enter the Admin API Token you just generated.
diff --git a/doc/operations/metrics/index.md b/doc/operations/metrics/index.md
index 8e2a2f44848..f344b2c60f2 100644
--- a/doc/operations/metrics/index.md
+++ b/doc/operations/metrics/index.md
@@ -46,7 +46,7 @@ navigation bar contains:
   ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/34779) in GitLab 12.5.)
 - **Create dashboard** **{file-addition-solid}** - Create a
   [new custom dashboard for your project](dashboards/index.md#add-a-new-dashboard-to-your-project).
-- **Metrics settings** **{settings}** - Configure the
+- **Metrics settings** - Configure the
   [settings for this dashboard](dashboards/index.md#manage-the-metrics-dashboard-settings).
 
 ## Populate your metrics dashboard
@@ -60,7 +60,7 @@ helps quickly create a deployment:
 1. Ensure that, in addition to Prometheus, you also have Runner and Ingress
    installed.
 1. After installing Ingress, copy its endpoint.
-1. Navigate to your project's **{settings}** **Settings > CI/CD** page. In the
+1. Navigate to your project's **Settings > CI/CD** page. In the
    **Auto DevOps** section, select a deployment strategy and save your changes.
 1. On the same page, in the **Variables** section, add a variable named
    `KUBE_INGRESS_BASE_DOMAIN` with the value of the Ingress endpoint you
diff --git a/doc/subscriptions/index.md b/doc/subscriptions/index.md
index af669117bbd..b26a834e80b 100644
--- a/doc/subscriptions/index.md
+++ b/doc/subscriptions/index.md
@@ -518,8 +518,8 @@ CI pipeline minutes are the execution time for your [pipelines](../ci/pipelines/
 
 Quotas apply to:
 
-- Groups, where the minutes are shared across all members of the group, its subgroups, and nested projects. To view the group's usage, navigate to the group, then **{settings}** **Settings** > **Usage Quotas**.
-- Your personal account, where the minutes are available for your personal projects. To view and buy personal minutes, click your avatar, then **{settings}** **Settings** > **[Usage Quotas](https://gitlab.com/profile/usage_quotas#pipelines-quota-tab)**.
+- Groups, where the minutes are shared across all members of the group, its subgroups, and nested projects. To view the group's usage, navigate to the group, then **Settings > Usage Quotas**.
+- Your personal account, where the minutes are available for your personal projects. To view and buy personal minutes, click your avatar, then **Settings > [Usage Quotas](https://gitlab.com/profile/usage_quotas#pipelines-quota-tab)**.
 
 Only pipeline minutes for GitLab shared runners are restricted. If you have a specific runner set up for your projects, there is no limit to your build time on GitLab.com.
 
@@ -539,11 +539,11 @@ main quota. You can find pricing for additional CI/CD minutes in the [GitLab Cus
 
 To purchase additional minutes for your group on GitLab.com:
 
-1. From your group, go to **{settings}** **Settings > Usage Quotas**.
+1. From your group, go to **Settings > Usage Quotas**.
 1. Select **Buy additional minutes** and you will be directed to the Customers Portal.
 1. Locate the subscription card that's linked to your group on GitLab.com, click **Buy more CI minutes**, and complete the details about the transaction.
 1. Once we have processed your payment, the extra CI minutes will be synced to your group namespace.
-1. To confirm the available CI minutes, go to your group, then **{settings}** **Settings > Usage Quotas**.
+1. To confirm the available CI minutes, go to your group, then **Settings > Usage Quotas**.
 
    The **Additional minutes** displayed now includes the purchased additional CI minutes, plus any minutes rolled over from last month.
 
diff --git a/doc/topics/autodevops/customize.md b/doc/topics/autodevops/customize.md
index 2d6da4d322b..f8dba7e4cd9 100644
--- a/doc/topics/autodevops/customize.md
+++ b/doc/topics/autodevops/customize.md
@@ -381,7 +381,7 @@ these prefixed variables available to the deployed application as environment va
 
 To configure your application variables:
 
-1. Go to your project's **{settings}** **Settings > CI/CD**, then expand the
+1. Go to your project's **Settings > CI/CD**, then expand the
    **Variables** section.
 
 1. Create a CI/CD variable, ensuring the key is prefixed with
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md
index 3088c57b51a..aaeedc8f8ac 100644
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -185,7 +185,7 @@ instance level.
 
 If enabling, check that your project does not have a `.gitlab-ci.yml`, or if one exists, remove it.
 
-1. Go to your project's **{settings}** **Settings > CI/CD > Auto DevOps**.
+1. Go to your project's **Settings > CI/CD > Auto DevOps**.
 1. Select the **Default to Auto DevOps pipeline** checkbox to enable it.
 1. (Optional, but recommended) When enabling, you can add in the
    [base domain](#auto-devops-base-domain) Auto DevOps uses to
@@ -207,7 +207,7 @@ is specifically enabled or disabled on the subgroup or project.
 
 To enable or disable Auto DevOps at the group level:
 
-1. Go to your group's **{settings}** **Settings > CI/CD > Auto DevOps** page.
+1. Go to your group's **Settings > CI/CD > Auto DevOps** page.
 1. Select the **Default to Auto DevOps pipeline** checkbox to enable it.
 1. Click **Save changes** for the changes to take effect.
 
@@ -227,7 +227,7 @@ Auto DevOps at the group and project level, respectively.
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/38542) in GitLab 11.0.
 
 You can change the deployment strategy used by Auto DevOps by going to your
-project's **{settings}** **Settings > CI/CD > Auto DevOps**. The following options
+project's **Settings > CI/CD > Auto DevOps**. The following options
 are available:
 
 - **Continuous deployment to production**: Enables [Auto Deploy](stages.md#auto-deploy)
diff --git a/doc/topics/autodevops/quick_start_guide.md b/doc/topics/autodevops/quick_start_guide.md
index 4f8074f047e..8705227fd32 100644
--- a/doc/topics/autodevops/quick_start_guide.md
+++ b/doc/topics/autodevops/quick_start_guide.md
@@ -127,7 +127,7 @@ While Auto DevOps is enabled by default, Auto DevOps can be disabled at both
 the instance level (for self-managed instances) and the group level. Complete
 these steps to enable Auto DevOps if it's disabled:
 
-1. Navigate to **{settings}** **Settings > CI/CD > Auto DevOps**, and click **Expand**.
+1. Navigate to **Settings > CI/CD > Auto DevOps**, and click **Expand**.
 1. Select **Default to Auto DevOps pipeline** to display more options.
 1. In **Deployment strategy**, select your desired [continuous deployment strategy](index.md#deployment-strategy)
    to deploy the application to production after the pipeline successfully runs on the `master` branch.
@@ -221,7 +221,7 @@ takes you to the pod's logs page.
 TIP: **Tip:**
 The example shows only one pod hosting the application at the moment, but you can add
 more pods by defining the [`REPLICAS` variable](customize.md#environment-variables)
-in **{settings}** **Settings > CI/CD > Environment variables**.
+in **Settings > CI/CD > Environment variables**.
 
 ### Work with branches
 
diff --git a/doc/user/admin_area/settings/index.md b/doc/user/admin_area/settings/index.md
index 8728ec9a112..8f8e916b6cc 100644
--- a/doc/user/admin_area/settings/index.md
+++ b/doc/user/admin_area/settings/index.md
@@ -95,7 +95,7 @@ Access the default page for admin area settings by navigating to **Admin Area >
 
 | Option | Description |
 | ------ | ----------- |
-| Geo    | Geo allows you to replicate your GitLab instance to other geographical locations. Redirects to **Admin Area >** **{location-dot}** **Geo >** **{settings}** **Settings**, and will no longer be available at **Admin Area >** **{settings}** **Settings >** **{location-dot}** **Geo** in [GitLab 13.0](https://gitlab.com/gitlab-org/gitlab/-/issues/36896). |
+| Geo    | Geo allows you to replicate your GitLab instance to other geographical locations. Redirects to **Admin Area >** **{location-dot}** **Geo > Settings**, and will no longer be available at **Admin Area > Settings >** **{location-dot}** **Geo** in [GitLab 13.0](https://gitlab.com/gitlab-org/gitlab/-/issues/36896). |
 
 ## Preferences
 
diff --git a/doc/user/application_security/index.md b/doc/user/application_security/index.md
index f4f5b0239db..bf75e4671b3 100644
--- a/doc/user/application_security/index.md
+++ b/doc/user/application_security/index.md
@@ -303,7 +303,7 @@ To enable Security Approvals, a [project approval rule](../project/merge_request
 must be created with the case-sensitive name `Vulnerability-Check`. This approval group must be set
 with the number of approvals required greater than zero. You must have Maintainer or Owner [permissions](../permissions.md#project-members-permissions) to manage approval rules.
 
-1. Navigate to your project's **{settings}** **Settings > General** and expand **Merge request approvals**.
+1. Navigate to your project's **Settings > General** and expand **Merge request approvals**.
 1. Click **Add approval rule**, or **Edit**.
    - Add or change the **Rule name** to `Vulnerability-Check` (case sensitive).
 
diff --git a/doc/user/group/index.md b/doc/user/group/index.md
index f4651ebb151..a99f3942d89 100644
--- a/doc/user/group/index.md
+++ b/doc/user/group/index.md
@@ -219,7 +219,7 @@ By default, every group inherits the branch protection set at the global level.
 
 To change this setting for a specific group:
 
-1. Go to the group's **{settings}** **Settings > General** page.
+1. Go to the group's **Settings > General** page.
 1. Expand the **Permissions, LFS, 2FA** section.
 1. Select the desired option in the **Default branch protection** dropdown list.
 1. Click **Save changes**.
@@ -472,7 +472,7 @@ username, you can create a new group and transfer projects to it.
 
 To remove a group and its contents:
 
-1. Navigate to your group's **{settings}** **Settings > General** page.
+1. Navigate to your group's **Settings > General** page.
 1. Expand the **Path, transfer, remove** section.
 1. In the Remove group section, click the **Remove group** button.
 1. Confirm the action when asked to.
@@ -488,7 +488,7 @@ This action either:
 
 To restore a group that is marked for deletion:
 
-1. Navigate to your group's **{settings}** **Settings > General** page.
+1. Navigate to your group's **Settings > General** page.
 1. Expand the **Path, transfer, remove** section.
 1. In the Restore group section, click the **Restore group** button.
 
diff --git a/doc/user/group/saml_sso/group_managed_accounts.md b/doc/user/group/saml_sso/group_managed_accounts.md
index e317573d89d..a424940c524 100644
--- a/doc/user/group/saml_sso/group_managed_accounts.md
+++ b/doc/user/group/saml_sso/group_managed_accounts.md
@@ -105,7 +105,7 @@ Only a GitLab administrator or an owner of a Group-managed account can set a lim
 
 To set a limit on how long personal access tokens are valid for users in a group managed account:
 
-1. Navigate to the **{settings}** **Settings > General** page in your group's sidebar.
+1. Navigate to the **Settings > General** page in your group's sidebar.
 1. Expand the **Permissions, LFS, 2FA** section.
 1. Fill in the **Maximum allowable lifetime for personal access tokens (days)** field.
 1. Click **Save changes**.
diff --git a/doc/user/group/settings/import_export.md b/doc/user/group/settings/import_export.md
index b89fcf2704d..03e500aff99 100644
--- a/doc/user/group/settings/import_export.md
+++ b/doc/user/group/settings/import_export.md
@@ -21,7 +21,7 @@ See also:
 
 To enable GitLab import/export:
 
-1. Navigate to **Admin Area >** **{settings}** **Settings > Visibility and access controls**.
+1. Navigate to **Admin Area > Settings > Visibility and access controls**.
 1. Scroll to **Import sources**
 1. Enable desired **Import sources**
 
@@ -63,7 +63,7 @@ For more details on the specific data persisted in a group export, see the
 
 1. Navigate to your group's homepage.
 
-1. Click **{settings}** **Settings** in the sidebar.
+1. Click **Settings** in the sidebar.
 
 1. In the **Advanced** section, click the **Export Group** button.
 
diff --git a/doc/user/infrastructure/index.md b/doc/user/infrastructure/index.md
index 097e1826afc..21e8e3298ec 100644
--- a/doc/user/infrastructure/index.md
+++ b/doc/user/infrastructure/index.md
@@ -50,7 +50,7 @@ If you plan to only run `terraform plan` and `terraform apply` commands from you
 local machine, this is a simple way to get started:
 
 1. Create your project on your GitLab instance.
-1. Navigate to **{settings}** **Settings > General** and note your **Project name**
+1. Navigate to **Settings > General** and note your **Project name**
    and **Project ID**.
 1. Define the Terraform backend in your Terraform project to be:
 
diff --git a/doc/user/packages/index.md b/doc/user/packages/index.md
index 439bc88919f..af2f3c572a6 100644
--- a/doc/user/packages/index.md
+++ b/doc/user/packages/index.md
@@ -93,7 +93,7 @@ see the [administration documentation](../../administration/packages/index.md).
 
 You can also remove the Package Registry for your project specifically:
 
-1. In your project, go to **{settings}** **Settings > General**.
+1. In your project, go to **Settings > General**.
 1. Expand the **Visibility, project features, permissions** section and disable the
    **Packages** feature.
 1. Click **Save changes**.
diff --git a/doc/user/packages/workflows/monorepo.md b/doc/user/packages/workflows/monorepo.md
index a9c1b4114cc..c87f181bf82 100644
--- a/doc/user/packages/workflows/monorepo.md
+++ b/doc/user/packages/workflows/monorepo.md
@@ -82,44 +82,39 @@ Using the example project above, this `gitlab-ci.yml` file will publish
 and publish `MyPackage` anytime changes are made to anywhere _except_ the `Foo`
 directory on the `master` branch.
 
-```shell
+```yaml
+image: node:latest
+
 stages:
   - build
 
-.default-rule: &default-rule
-  if: '$CI_MERGE_REQUEST_IID || $CI_COMMIT_REF_SLUG == "master"'
-
-.foo-package:
+build-foo-package:
+  stage: build
   variables:
     PACKAGE: "Foo"
-  before_script:
+  script:
     - cd src/components/Foo
+    - echo "Building $PACKAGE"
+    - npm publish
   only:
+    refs:
+      - master
+      - merge_requests
     changes:
       - "src/components/Foo/**/*"
 
-.parent-package:
+build-my-project-package:
+  stage: build
   variables:
     PACKAGE: "MyPackage"
-  except:
-    changes:
-      - "src/components/Foo/**/*"
-
-.build-package:
-  stage: build
   script:
     - echo "Building $PACKAGE"
     - npm publish
-  rules:
-    - <<: *default-rule
-
-build-foo-package:
-  extends:
-    - .build-package
-    - .foo-package
-
-build-my-project-package:
-  extends:
-    - .build-package
-    - .parent-package
+  only:
+    refs:
+      - master
+      - merge_requests
+  except:
+    changes:
+      - "src/components/Foo/**/*"
 ```
diff --git a/doc/user/project/clusters/runbooks/index.md b/doc/user/project/clusters/runbooks/index.md
index a592d59f964..360b02efb69 100644
--- a/doc/user/project/clusters/runbooks/index.md
+++ b/doc/user/project/clusters/runbooks/index.md
@@ -129,7 +129,7 @@ the components outlined above and the pre-loaded demo runbook.
    %env DB_NAME={project.variables.get('DB_NAME').value}
    ```
 
-   1. Navigate to **{settings}** **Settings >> CI/CD >> Variables** to create
+   1. Navigate to **Settings > CI/CD > Variables** to create
       the variables in your project.
 
       ![GitLab variables](img/gitlab-variables.png)
diff --git a/doc/user/project/clusters/serverless/aws.md b/doc/user/project/clusters/serverless/aws.md
index 595d8fb3895..543ffdbce8f 100644
--- a/doc/user/project/clusters/serverless/aws.md
+++ b/doc/user/project/clusters/serverless/aws.md
@@ -373,7 +373,7 @@ variables.
 
 To set these:
 
-1. Navigate to the project's **{settings}** **Settings > CI / CD**.
+1. Navigate to the project's **Settings > CI / CD**.
 1. Expand the **Variables** section and create entries for `AWS_ACCESS_KEY_ID` and
    `AWS_SECRET_ACCESS_KEY`.
 1. Mask the credentials so they do not show in logs using the **Masked** toggle.
diff --git a/doc/user/project/deploy_tokens/index.md b/doc/user/project/deploy_tokens/index.md
index b7daca567f4..5ca421dda5b 100644
--- a/doc/user/project/deploy_tokens/index.md
+++ b/doc/user/project/deploy_tokens/index.md
@@ -25,7 +25,7 @@ You can create as many deploy tokens as you like from the settings of your proje
 
 1. Log in to your GitLab account.
 1. Go to the project (or group) you want to create Deploy Tokens for.
-1. Go to **{settings}** **Settings** > **Repository**.
+1. Go to **Settings > Repository**.
 1. Click on "Expand" on **Deploy Tokens** section.
 1. Choose a name, expiry date (optional), and username (optional) for the token.
 1. Choose the [desired scopes](#limiting-scopes-of-a-deploy-token).
diff --git a/doc/user/project/integrations/custom_issue_tracker.md b/doc/user/project/integrations/custom_issue_tracker.md
index 5ec044731d1..1329f584fdc 100644
--- a/doc/user/project/integrations/custom_issue_tracker.md
+++ b/doc/user/project/integrations/custom_issue_tracker.md
@@ -8,7 +8,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 To enable the Custom Issue Tracker integration in a project:
 
-1. Go to **{settings}** **Settings > Integrations**.
+1. Go to **Settings > Integrations**.
 1. Click **Custom Issue Tracker**
 1. Fill in the tracker's details, such as title, description, and URLs.
    You will be able to edit these fields later as well.
diff --git a/doc/user/project/integrations/generic_alerts.md b/doc/user/project/integrations/generic_alerts.md
index 3490a3f2b9e..9036846282f 100644
--- a/doc/user/project/integrations/generic_alerts.md
+++ b/doc/user/project/integrations/generic_alerts.md
@@ -29,8 +29,8 @@ To obtain credentials for setting up a generic alerts integration:
 
 - Sign in to GitLab as a user with maintainer [permissions](../../permissions.md) for a project.
 - Navigate to the **Operations** page for your project, depending on your installed version of GitLab:
-  - *In GitLab versions 13.1 and greater,* navigate to **{settings}** **Settings > Operations** in your project.
-  - *In GitLab versions prior to 13.1,* navigate to **{settings}** **Settings > Integrations** in your project. GitLab will display a banner encouraging you to enable the Alerts endpoint in **{settings}** **Settings > Operations** instead.
+  - *In GitLab versions 13.1 and greater,* navigate to **Settings > Operations** in your project.
+  - *In GitLab versions prior to 13.1,* navigate to **Settings > Integrations** in your project. GitLab will display a banner encouraging you to enable the Alerts endpoint in **Settings > Operations** instead.
 - Click **Alerts endpoint**.
 - Toggle the **Active** alert setting to display the **URL** and **Authorization Key** for the webhook configuration.
 
@@ -101,7 +101,7 @@ After a [project maintainer or owner](#setting-up-generic-alerts)
 test alert to confirm your integration works properly.
 
 1. Sign in as a user with Developer or greater [permissions](../../../user/permissions.md).
-1. Navigate to **{settings}** **Settings > Operations** in your project.
+1. Navigate to **Settings > Operations** in your project.
 1. Click **Alerts endpoint** to expand the section.
 1. Enter a sample payload in **Alert test payload** (valid JSON is required).
 1. Click **Test alert payload**.
diff --git a/doc/user/project/integrations/gitlab_slack_application.md b/doc/user/project/integrations/gitlab_slack_application.md
index ef4cf372f56..62fccb22d36 100644
--- a/doc/user/project/integrations/gitlab_slack_application.md
+++ b/doc/user/project/integrations/gitlab_slack_application.md
@@ -42,7 +42,7 @@ docs on [Adding an app to your workspace](https://slack.com/help/articles/202035
 
 To enable GitLab's service for your Slack team:
 
-1. Go to your project's **{settings}** **Settings > Integration > Slack application** (only
+1. Go to your project's **Settings > Integration > Slack application** (only
    visible on GitLab.com).
 1. Click **Add to Slack**.
 
@@ -53,7 +53,7 @@ That's all! You can now start using the Slack slash commands.
 To create a project alias on GitLab.com for Slack integration:
 
 1. Go to your project's home page.
-1. Navigate to **{settings}** **Settings > Integrations** (only visible on GitLab.com)
+1. Navigate to **Settings > Integrations** (only visible on GitLab.com)
 1. On the **Integrations** page, click **Slack application**.
 1. The current **Project Alias**, if any, is displayed. To edit this value,
    click **Edit**.
diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md
index 145e32e0816..a19b819c823 100644
--- a/doc/user/project/integrations/prometheus.md
+++ b/doc/user/project/integrations/prometheus.md
@@ -88,7 +88,7 @@ service account can be found at Google's documentation for
 [Authenticating from a service account](https://cloud.google.com/iap/docs/authentication-howto#authenticating_from_a_service_account).
 
 1. Navigate to the [Integrations page](overview.md#accessing-integrations) at
-   **{settings}** **Settings > Integrations**.
+   **Settings > Integrations**.
 1. Click the **Prometheus** service.
 1. For **API URL**, provide the domain name or IP address of your server, such as
    `http://prometheus.example.com/` or `http://192.0.2.1/`.
diff --git a/doc/user/project/integrations/slack.md b/doc/user/project/integrations/slack.md
index 1365f11ebe0..03ff5f845b6 100644
--- a/doc/user/project/integrations/slack.md
+++ b/doc/user/project/integrations/slack.md
@@ -25,7 +25,7 @@ separately configured [Slack slash commands](slack_slash_commands.md).
 
 1. Open your project's page, and navigate to your project's
    [Integrations page](overview.md#accessing-integrations) at
-   **{settings}** **Settings > Integrations**.
+   **Settings > Integrations**.
 1. Select the **Slack notifications** integration to configure it.
 1. Click **Enable integration**.
 1. In **Trigger**, select the checkboxes for each type of GitLab event to send to Slack as a
diff --git a/doc/user/project/issue_board.md b/doc/user/project/issue_board.md
index 15967c050eb..7be58ce4ecb 100644
--- a/doc/user/project/issue_board.md
+++ b/doc/user/project/issue_board.md
@@ -338,7 +338,7 @@ Examples:
 To set a WIP limit for a list:
 
 1. Navigate to a Project or Group board of which you're a member.
-1. Click the Settings icon (**{settings}**) in a list's header.
+1. Click the settings icon in a list's header.
 1. Next to **Work In Progress Limit**, click **Edit**.
 1. Enter the maximum number of issues.
 1. Press <kbd>Enter</kbd> to save.
diff --git a/doc/user/project/merge_requests/merge_request_approvals.md b/doc/user/project/merge_requests/merge_request_approvals.md
index b17e2c708e1..c8b0df36dce 100644
--- a/doc/user/project/merge_requests/merge_request_approvals.md
+++ b/doc/user/project/merge_requests/merge_request_approvals.md
@@ -119,7 +119,7 @@ Alternatively, you can **require**
 
 To add or edit the default merge request approval rule:
 
-1. Navigate to your project's **{settings}** **Settings > General** and expand **Merge request approvals**.
+1. Navigate to your project's **Settings > General** and expand **Merge request approvals**.
 
 1. Click **Add approval rule**, or **Edit**.
    - Add or change the **Rule name**.
@@ -233,7 +233,7 @@ or a [failed CI/CD pipeline](merge_when_pipeline_succeeds.md).
 ### Merge request approvals project settings
 
 The project settings for Merge request approvals are found by going to
-**{settings}** **Settings > General** and expanding **Merge request approvals**.
+**Settings > General** and expanding **Merge request approvals**.
 
 #### Prevent overriding default approvals
 
diff --git a/doc/user/project/releases/index.md b/doc/user/project/releases/index.md
index c9e9fd2d9ea..e077db321ac 100644
--- a/doc/user/project/releases/index.md
+++ b/doc/user/project/releases/index.md
@@ -197,7 +197,7 @@ To set a deploy freeze window in the UI, complete these steps:
 
 1. Sign in to GitLab as a user with project Maintainer [permissions](../../permissions.md).
 1. Navigate to **Project overview**.
-1. In the left navigation menu, navigate to **{settings}** **Settings > CI / CD**.
+1. In the left navigation menu, navigate to **Settings > CI / CD**.
 1. Scroll to **Deploy freezes**.
 1. Click **Expand** to see the deploy freeze table.
 1. Click **Add deploy freeze** to open the deploy freeze modal.
diff --git a/doc/user/project/repository/reducing_the_repo_size_using_git.md b/doc/user/project/repository/reducing_the_repo_size_using_git.md
index f62d5017aa4..8247f69c61a 100644
--- a/doc/user/project/repository/reducing_the_repo_size_using_git.md
+++ b/doc/user/project/repository/reducing_the_repo_size_using_git.md
@@ -214,7 +214,7 @@ references to these objects. You can use
 To clean up a repository:
 
 1. Go to the project for the repository.
-1. Navigate to **{settings}** **Settings > Repository**.
+1. Navigate to **Settings > Repository**.
 1. Upload a list of objects. For example, a `commit-map` file created by `git filter-repo` which is located in the
    `filter-repo` directory.
 
diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md
index 3088acc4ad4..5697fc91d15 100644
--- a/doc/user/project/settings/import_export.md
+++ b/doc/user/project/settings/import_export.md
@@ -24,7 +24,7 @@ See also:
 
 To set up a project import/export:
 
-  1. Navigate to **Admin Area >** **{settings}** **Settings > Visibility and access controls**.
+  1. Navigate to **Admin Area > Settings > Visibility and access controls**.
   1. Scroll to **Import sources**
   1. Enable desired **Import sources**
 
@@ -131,7 +131,7 @@ For more details on the specific data persisted in a project export, see the
 
 1. Go to your project's homepage.
 
-1. Click **{settings}** **Settings** in the sidebar.
+1. Click **Settings** in the sidebar.
 
 1. Scroll down to find the **Export project** button:
 
diff --git a/doc/user/project/settings/index.md b/doc/user/project/settings/index.md
index 45d60ecc4db..d104e0614ea 100644
--- a/doc/user/project/settings/index.md
+++ b/doc/user/project/settings/index.md
@@ -141,7 +141,7 @@ in project listings.
 
 To archive a project:
 
-1. Navigate to your project's **{settings}** **Settings > General**.
+1. Navigate to your project's **Settings > General**.
 1. Under **Advanced**, click **Expand**.
 1. In the **Archive project** section, click the **Archive project** button.
 1. Confirm the action when asked to.
@@ -165,7 +165,7 @@ To find an archived project:
 
 Next, to unarchive the project:
 
-1. Navigate to your project's **{settings}** **Settings > General**.
+1. Navigate to your project's **Settings > General**.
 1. Under **Advanced**, click **Expand**.
 1. In the **Unarchive project** section, click the **Unarchive project** button.
 1. Confirm the action when asked to.
@@ -182,7 +182,7 @@ project via a browser) and its place on the file disk where GitLab is installed.
 
 To rename a repository:
 
-1. Navigate to your project's **{settings}** **Settings > General**.
+1. Navigate to your project's **Settings > General**.
 1. Under **Advanced**, click **Expand**.
 1. Under "Rename repository", change the "Path" to your liking.
 1. Hit **Rename project**.
@@ -205,7 +205,7 @@ You can transfer an existing project into a [group](../../group/index.md) if:
 
 To transfer a project:
 
-1. Navigate to your project's **{settings}** **Settings > General**.
+1. Navigate to your project's **Settings > General**.
 1. Under **Advanced**, click **Expand**.
 1. Under "Transfer project", choose the namespace you want to transfer the
    project to.
@@ -226,7 +226,7 @@ Only project owners and admins have [permissions](../../permissions.md#project-m
 
 To remove a project:
 
-1. Navigate to your project, and select **{settings}** **Settings > General > Advanced**.
+1. Navigate to your project, and select **Settings > General > Advanced**.
 1. In the Remove project section, click the **Remove project** button.
 1. Confirm the action when asked to.
 
@@ -249,7 +249,7 @@ The default behavior of [Delayed Project deletion](https://gitlab.com/gitlab-org
 
 To restore a project marked for deletion:
 
-1. Navigate to your project, and select **{settings}** **Settings > General > Advanced**.
+1. Navigate to your project, and select **Settings > General > Advanced**.
 1. In the Restore project section, click the **Restore project** button.
 
 #### Removing a fork relationship
diff --git a/doc/user/project/settings/project_access_tokens.md b/doc/user/project/settings/project_access_tokens.md
index 8dede311fcc..6d36d6f0e82 100644
--- a/doc/user/project/settings/project_access_tokens.md
+++ b/doc/user/project/settings/project_access_tokens.md
@@ -28,7 +28,7 @@ For examples of how you can use a project access token to authenticate with the
 
 1. Log in to GitLab.
 1. Navigate to the project you would like to create an access token for.
-1. In the **{settings}** **Settings** menu choose **Access Tokens**.
+1. In the **Settings** menu choose **Access Tokens**.
 1. Choose a name and optional expiry date for the token.
 1. Choose the [desired scopes](#limiting-scopes-of-a-project-access-token).
 1. Click the **Create project access token** button.
@@ -51,7 +51,7 @@ see [Associated Records](../../profile/account/delete_account.md#associated-reco
 ## Revoking a project access token
 
 At any time, you can revoke any project access token by clicking the
-respective **Revoke** button in **{settings}** **Settings > Access Tokens**.
+respective **Revoke** button in **Settings > Access Tokens**.
 
 ## Limiting scopes of a project access token