Add latest changes from gitlab-org/gitlab@master

80 files changed, 351 insertions, 155 deletions

diff --git a/doc/administration/auth/ldap/google_secure_ldap.md b/doc/administration/auth/ldap/google_secure_ldap.md
index 3b4ce1d3e81..fe54962538a 100644
--- a/doc/administration/auth/ldap/google_secure_ldap.md
+++ b/doc/administration/auth/ldap/google_secure_ldap.md
@@ -34,7 +34,7 @@ The steps below cover:
    'Entire domain (GitLab)' or 'Selected organizational units' for both 'Verify user
    credentials' and 'Read user information'. Select 'Add LDAP Client'
 
-   TIP: **Tip:**
+   NOTE:
    If you plan to use GitLab [LDAP Group Sync](index.md#group-sync)
    , turn on 'Read group information'.
 
diff --git a/doc/administration/geo/disaster_recovery/runbooks/planned_failover_multi_node.md b/doc/administration/geo/disaster_recovery/runbooks/planned_failover_multi_node.md
index 6fe4030ff54..f17990ce5f8 100644
--- a/doc/administration/geo/disaster_recovery/runbooks/planned_failover_multi_node.md
+++ b/doc/administration/geo/disaster_recovery/runbooks/planned_failover_multi_node.md
@@ -168,7 +168,7 @@ follow these steps to avoid unnecessary data loss:
    that has not been replicated to the **secondary** node. This data should be treated
    as lost if you proceed.
 
-   TIP: **Tip:**
+   NOTE:
    If you plan to [update the **primary** domain DNS record](../index.md#step-4-optional-updating-the-primary-domain-dns-record),
    you may wish to lower the TTL now to speed up propagation.
 
diff --git a/doc/administration/geo/disaster_recovery/runbooks/planned_failover_single_node.md b/doc/administration/geo/disaster_recovery/runbooks/planned_failover_single_node.md
index 634ff8b3b9d..a2a9350e411 100644
--- a/doc/administration/geo/disaster_recovery/runbooks/planned_failover_single_node.md
+++ b/doc/administration/geo/disaster_recovery/runbooks/planned_failover_single_node.md
@@ -156,7 +156,7 @@ follow these steps to avoid unnecessary data loss:
    that has not been replicated to the **secondary** node. This data should be treated
    as lost if you proceed.
 
-   TIP: **Tip:**
+   NOTE:
    If you plan to [update the **primary** domain DNS record](../index.md#step-4-optional-updating-the-primary-domain-dns-record),
    you may wish to lower the TTL now to speed up propagation.
 
diff --git a/doc/administration/geo/replication/troubleshooting.md b/doc/administration/geo/replication/troubleshooting.md
index d6519d2c8f5..580c6696a3a 100644
--- a/doc/administration/geo/replication/troubleshooting.md
+++ b/doc/administration/geo/replication/troubleshooting.md
@@ -466,7 +466,7 @@ to start again from scratch, there are a few steps that can help you:
    chown git:git /var/opt/gitlab/git-data/repositories
    ```
 
-   TIP: **Tip:**
+   NOTE:
    You may want to remove the `/var/opt/gitlab/git-data/repositories.old` in the future
    as soon as you confirmed that you don't need it anymore, to save disk space.
 
diff --git a/doc/administration/incoming_email.md b/doc/administration/incoming_email.md
index f6a2639e0e4..7a49542f8bb 100644
--- a/doc/administration/incoming_email.md
+++ b/doc/administration/incoming_email.md
@@ -44,7 +44,7 @@ Gmail, Google Apps, Yahoo! Mail, Outlook.com, and iCloud, as well as the
 Microsoft Exchange Server [does not support sub-addressing](#microsoft-exchange-server),
 and Microsoft Office 365 [does not support sub-addressing by default](#microsoft-office-365)
 
-TIP: **Tip:**
+NOTE:
 If your provider or server supports email sub-addressing, we recommend using it.
 A dedicated email address only supports Reply by Email functionality.
 A catch-all mailbox supports the same features as sub-addressing as of GitLab 11.7,
diff --git a/doc/administration/issue_closing_pattern.md b/doc/administration/issue_closing_pattern.md
index e23072c3bf4..6a5b90ae963 100644
--- a/doc/administration/issue_closing_pattern.md
+++ b/doc/administration/issue_closing_pattern.md
@@ -23,7 +23,7 @@ is installed on.
 The default pattern can be located in [`gitlab.yml.example`](https://gitlab.com/gitlab-org/gitlab/blob/master/config/gitlab.yml.example)
 under the "Automatic issue closing" section.
 
-TIP: **Tip:**
+NOTE:
 You are advised to use <https://rubular.com> to test the issue closing pattern.
 Because Rubular doesn't understand `%{issue_ref}`, you can replace this by
 `#\d+` when testing your patterns, which matches only local issue references like `#123`.
diff --git a/doc/administration/packages/container_registry.md b/doc/administration/packages/container_registry.md
index 8443a781ef1..ec3b19503fd 100644
--- a/doc/administration/packages/container_registry.md
+++ b/doc/administration/packages/container_registry.md
@@ -468,7 +468,7 @@ you can pull from the Container Registry, but you cannot push.
    sudo aws --endpoint-url https://your-object-storage-backend.com s3 sync registry s3://mybucket
    ```
 
-   TIP: **Tip:**
+   NOTE:
    If you have a lot of data, you may be able to improve performance by
    [running parallel sync operations](https://aws.amazon.com/premiumsupport/knowledge-center/s3-improve-transfer-sync-command/).
 
@@ -1139,7 +1139,7 @@ and a simple solution would be to enable relative URLs in the Registry.
 
 You can use the Container Registry debug server to diagnose problems. The debug endpoint can monitor metrics and health, as well as do profiling.
 
-CAUTION: **Warning:**
+WARNING:
 Sensitive information may be available from the debug endpoint.
 Access to the debug endpoint must be locked down in a production environment.
 
diff --git a/doc/administration/reference_architectures/10k_users.md b/doc/administration/reference_architectures/10k_users.md
index 4d02ae47897..caa0c059220 100644
--- a/doc/administration/reference_architectures/10k_users.md
+++ b/doc/administration/reference_architectures/10k_users.md
@@ -1750,7 +1750,7 @@ To configure the Sidekiq nodes, on each one:
 
 1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
 
-TIP: **Tip:**
+NOTE:
 You can also run [multiple Sidekiq processes](../operations/extra_sidekiq_processes.md).
 
 <div align="right">
diff --git a/doc/administration/reference_architectures/25k_users.md b/doc/administration/reference_architectures/25k_users.md
index 7349484f9a0..6245f884371 100644
--- a/doc/administration/reference_architectures/25k_users.md
+++ b/doc/administration/reference_architectures/25k_users.md
@@ -1750,7 +1750,7 @@ To configure the Sidekiq nodes, on each one:
 
 1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
 
-TIP: **Tip:**
+NOTE:
 You can also run [multiple Sidekiq processes](../operations/extra_sidekiq_processes.md).
 
 <div align="right">
diff --git a/doc/administration/reference_architectures/3k_users.md b/doc/administration/reference_architectures/3k_users.md
index 0770e7336ba..2d57f0b0317 100644
--- a/doc/administration/reference_architectures/3k_users.md
+++ b/doc/administration/reference_architectures/3k_users.md
@@ -1466,7 +1466,7 @@ To configure the Sidekiq nodes, one each one:
    run: sidekiq: (pid 30142) 77351s; run: log: (pid 29638) 77386s
    ```
 
-TIP: **Tip:**
+NOTE:
 You can also run [multiple Sidekiq processes](../operations/extra_sidekiq_processes.md).
 
 <div align="right">
diff --git a/doc/administration/reference_architectures/50k_users.md b/doc/administration/reference_architectures/50k_users.md
index d3b6f57fb3c..3c0fefe2430 100644
--- a/doc/administration/reference_architectures/50k_users.md
+++ b/doc/administration/reference_architectures/50k_users.md
@@ -1750,7 +1750,7 @@ To configure the Sidekiq nodes, on each one:
 
 1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
 
-TIP: **Tip:**
+NOTE:
 You can also run [multiple Sidekiq processes](../operations/extra_sidekiq_processes.md).
 
 <div align="right">
diff --git a/doc/administration/reference_architectures/5k_users.md b/doc/administration/reference_architectures/5k_users.md
index ce099f8f7e9..936f7b8f243 100644
--- a/doc/administration/reference_architectures/5k_users.md
+++ b/doc/administration/reference_architectures/5k_users.md
@@ -1466,7 +1466,7 @@ To configure the Sidekiq nodes, one each one:
    run: sidekiq: (pid 30142) 77351s; run: log: (pid 29638) 77386s
    ```
 
-TIP: **Tip:**
+NOTE:
 You can also run [multiple Sidekiq processes](../operations/extra_sidekiq_processes.md).
 
 <div align="right">
diff --git a/doc/administration/troubleshooting/postgresql.md b/doc/administration/troubleshooting/postgresql.md
index 52b50bbd460..7052b68370c 100644
--- a/doc/administration/troubleshooting/postgresql.md
+++ b/doc/administration/troubleshooting/postgresql.md
@@ -129,7 +129,7 @@ Quoting from issue [#1](https://gitlab.com/gitlab-org/gitlab/-/issues/30528):
 
 > "If a deadlock is hit, and we resolve it through aborting the transaction after a short period, then the retry mechanisms we already have will make the deadlocked piece of work try again, and it's unlikely we'll deadlock multiple times in a row."
 
-TIP: **Tip:**
+NOTE:
 In Support, our general approach to reconfiguring timeouts (applies also to the
 HTTP stack) is that it's acceptable to do it temporarily as a workaround. If it
 makes GitLab usable for the customer, then it buys time to understand the
diff --git a/doc/api/branches.md b/doc/api/branches.md
index 07da8c2e7f3..74383841272 100644
--- a/doc/api/branches.md
+++ b/doc/api/branches.md
@@ -9,7 +9,6 @@ type: reference, api
 
 This API operates on [repository branches](../user/project/repository/branches/index.md).
 
-TIP: **Tip:**
 See also [Protected branches API](protected_branches.md).
 
 ## List repository branches
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index 6697e3e327f..bbb2f483a3c 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -6616,6 +6616,46 @@ type DestroyContainerRepositoryPayload {
 }
 
 """
+Autogenerated input type of DestroyContainerRepositoryTags
+"""
+input DestroyContainerRepositoryTagsInput {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  ID of the container repository.
+  """
+  id: ContainerRepositoryID!
+
+  """
+  Container repository tag(s) to delete. Total number can't be greater than 20
+  """
+  tagNames: [String!]!
+}
+
+"""
+Autogenerated return type of DestroyContainerRepositoryTags
+"""
+type DestroyContainerRepositoryTagsPayload {
+  """
+  A unique identifier for the client performing the mutation.
+  """
+  clientMutationId: String
+
+  """
+  Deleted container repository tags
+  """
+  deletedTagNames: [String!]!
+
+  """
+  Errors encountered during execution of the mutation.
+  """
+  errors: [String!]!
+}
+
+"""
 Autogenerated input type of DestroyNote
 """
 input DestroyNoteInput {
@@ -14284,6 +14324,7 @@ type Mutation {
   destroyBoardList(input: DestroyBoardListInput!): DestroyBoardListPayload
   destroyComplianceFramework(input: DestroyComplianceFrameworkInput!): DestroyComplianceFrameworkPayload
   destroyContainerRepository(input: DestroyContainerRepositoryInput!): DestroyContainerRepositoryPayload
+  destroyContainerRepositoryTags(input: DestroyContainerRepositoryTagsInput!): DestroyContainerRepositoryTagsPayload
   destroyNote(input: DestroyNoteInput!): DestroyNotePayload
   destroySnippet(input: DestroySnippetInput!): DestroySnippetPayload
 
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index fafc1385709..97b19afa6d5 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -18336,6 +18336,142 @@
         },
         {
           "kind": "INPUT_OBJECT",
+          "name": "DestroyContainerRepositoryTagsInput",
+          "description": "Autogenerated input type of DestroyContainerRepositoryTags",
+          "fields": null,
+          "inputFields": [
+            {
+              "name": "id",
+              "description": "ID of the container repository.",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "ContainerRepositoryID",
+                  "ofType": null
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "tagNames",
+              "description": "Container repository tag(s) to delete. Total number can't be greater than 20",
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "defaultValue": null
+            },
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "defaultValue": null
+            }
+          ],
+          "interfaces": null,
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "OBJECT",
+          "name": "DestroyContainerRepositoryTagsPayload",
+          "description": "Autogenerated return type of DestroyContainerRepositoryTags",
+          "fields": [
+            {
+              "name": "clientMutationId",
+              "description": "A unique identifier for the client performing the mutation.",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "deletedTagNames",
+              "description": "Deleted container repository tags",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
+              "name": "errors",
+              "description": "Errors encountered during execution of the mutation.",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "LIST",
+                  "name": null,
+                  "ofType": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "String",
+                      "ofType": null
+                    }
+                  }
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            }
+          ],
+          "inputFields": null,
+          "interfaces": [
+
+          ],
+          "enumValues": null,
+          "possibleTypes": null
+        },
+        {
+          "kind": "INPUT_OBJECT",
           "name": "DestroyNoteInput",
           "description": "Autogenerated input type of DestroyNote",
           "fields": null,
@@ -40742,6 +40878,33 @@
               "deprecationReason": null
             },
             {
+              "name": "destroyContainerRepositoryTags",
+              "description": null,
+              "args": [
+                {
+                  "name": "input",
+                  "description": null,
+                  "type": {
+                    "kind": "NON_NULL",
+                    "name": null,
+                    "ofType": {
+                      "kind": "INPUT_OBJECT",
+                      "name": "DestroyContainerRepositoryTagsInput",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                }
+              ],
+              "type": {
+                "kind": "OBJECT",
+                "name": "DestroyContainerRepositoryTagsPayload",
+                "ofType": null
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
+            {
               "name": "destroyNote",
               "description": null,
               "args": [
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 1bb173bbed3..316476f290f 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -1118,6 +1118,16 @@ Autogenerated return type of DestroyContainerRepository.
 | `containerRepository` | ContainerRepository! | The container repository policy after scheduling the deletion. |
 | `errors` | String! => Array | Errors encountered during execution of the mutation. |
 
+### DestroyContainerRepositoryTagsPayload
+
+Autogenerated return type of DestroyContainerRepositoryTags.
+
+| Field | Type | Description |
+| ----- | ---- | ----------- |
+| `clientMutationId` | String | A unique identifier for the client performing the mutation. |
+| `deletedTagNames` | String! => Array | Deleted container repository tags |
+| `errors` | String! => Array | Errors encountered during execution of the mutation. |
+
 ### DestroyNotePayload
 
 Autogenerated return type of DestroyNote.
diff --git a/doc/ci/README.md b/doc/ci/README.md
index 8c1ea3b75ea..3675e8c1386 100644
--- a/doc/ci/README.md
+++ b/doc/ci/README.md
@@ -16,7 +16,7 @@ through the [continuous methodologies](introduction/index.md#introduction-to-cic
 - Continuous Delivery (CD)
 - Continuous Deployment (CD)
 
-TIP: **Tip:**
+NOTE:
 Out-of-the-box management systems can decrease hours spent on maintaining toolchains by 10% or more.
 Watch our ["Mastering continuous software development"](https://about.gitlab.com/webcast/mastering-ci-cd/)
 webcast to learn about continuous methods and how GitLab’s built-in CI can help you simplify and scale software development.
diff --git a/doc/ci/caching/index.md b/doc/ci/caching/index.md
index bcb0502ba99..04e8d3a97b6 100644
--- a/doc/ci/caching/index.md
+++ b/doc/ci/caching/index.md
@@ -92,7 +92,7 @@ cache, when declaring `cache` in your jobs, use one or a mix of the following:
   different caches on each branch). For that, you can take advantage of the
   [CI/CD predefined variables](../variables/README.md#predefined-environment-variables).
 
-TIP: **Tip:**
+NOTE:
 Using the same runner for your pipeline, is the most simple and efficient way to
 cache files in one stage or pipeline, and pass this cache to subsequent stages
 or pipelines in a guaranteed manner.
@@ -108,7 +108,7 @@ of the following must be true:
   share a common network-mounted directory (using NFS or something similar)
   where the cache is stored.
 
-TIP: **Tip:**
+NOTE:
 Read about the [availability of the cache](#availability-of-the-cache)
 to learn more about the internals and get a better idea how cache works.
 
diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md
index 88c92c9bead..78fde2767de 100644
--- a/doc/ci/docker/using_docker_build.md
+++ b/doc/ci/docker/using_docker_build.md
@@ -37,7 +37,7 @@ during jobs, each with their own tradeoffs.
 An alternative to using `docker build` is to [use kaniko](using_kaniko.md).
 This avoids having to execute a runner in privileged mode.
 
-TIP: **Tip:**
+NOTE:
 To see how Docker and GitLab Runner are configured for shared runners on
 GitLab.com, see [GitLab.com shared
 runners](../../user/gitlab_com/index.md#shared-runners).
diff --git a/doc/ci/introduction/index.md b/doc/ci/introduction/index.md
index 0c5bb8fe7df..ed34b0d6612 100644
--- a/doc/ci/introduction/index.md
+++ b/doc/ci/introduction/index.md
@@ -12,7 +12,7 @@ This document presents an overview of the concepts of Continuous Integration,
 Continuous Delivery, and Continuous Deployment, as well as an introduction to
 GitLab CI/CD.
 
-TIP: **Tip:**
+NOTE:
 Out-of-the-box management systems can decrease hours spent on maintaining toolchains by 10% or more.
 Watch our ["Mastering continuous software development"](https://about.gitlab.com/webcast/mastering-ci-cd/)
 webcast to learn about continuous methods and how GitLab’s built-in CI can help you simplify and scale software development.
diff --git a/doc/ci/pipelines/index.md b/doc/ci/pipelines/index.md
index bea7a20d4b5..22e331f2de0 100644
--- a/doc/ci/pipelines/index.md
+++ b/doc/ci/pipelines/index.md
@@ -10,7 +10,7 @@ type: reference
 
 > Introduced in GitLab 8.8.
 
-TIP: **Tip:**
+NOTE:
 Watch the
 ["Mastering continuous software development"](https://about.gitlab.com/webcast/mastering-ci-cd/)
 webcast to see a comprehensive demo of a GitLab CI/CD pipeline.
diff --git a/doc/ci/ssh_keys/README.md b/doc/ci/ssh_keys/README.md
index d55c2ac1009..a5410d53a95 100644
--- a/doc/ci/ssh_keys/README.md
+++ b/doc/ci/ssh_keys/README.md
@@ -165,7 +165,7 @@ Create a new [variable](../variables/README.md#gitlab-cicd-environment-variables
 If you need to connect to multiple servers, all the server host keys
 need to be collected in the **Value** of the variable, one key per line.
 
-TIP: **Tip:**
+NOTE:
 By using a variable instead of `ssh-keyscan` directly inside
 `.gitlab-ci.yml`, it has the benefit that you don't have to change `.gitlab-ci.yml`
 if the host domain name changes for some reason. Also, the values are predefined
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index da9404421fb..b5038a178ff 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -375,7 +375,7 @@ The files defined by `include` are:
 - Always evaluated first and merged with the content of `.gitlab-ci.yml`,
   regardless of the position of the `include` keyword.
 
-TIP: **Tip:**
+NOTE:
 Use merging to customize and override included CI/CD configurations with local
 definitions. Local definitions in `.gitlab-ci.yml` override included definitions.
 
@@ -1583,7 +1583,7 @@ that begin with `issue-`, but you can use `/issue-.*/`.
 
 Regular expression flags must be appended after the closing `/`.
 
-TIP: **Tip:**
+NOTE:
 Use anchors `^` and `$` to avoid the regular expression
 matching only a substring of the tag name or branch name.
 For example, `/^issue-.*$/` is equivalent to `/^issue-/`,
diff --git a/doc/development/adding_service_component.md b/doc/development/adding_service_component.md
index 0a07f67e7ba..7e2add2c91f 100644
--- a/doc/development/adding_service_component.md
+++ b/doc/development/adding_service_component.md
@@ -47,14 +47,14 @@ Adding a new service follows the same [merge request workflow](contributing/merg
 
 The first iteration should be to add the ability to connect and use the service as an externally installed component. Often this involves providing settings in GitLab to connect to the service, or allow connections from it. And then shipping documentation on how to install and configure the service with GitLab.
 
-TIP: **Tip:**
+NOTE:
 [Elasticsearch](../integration/elasticsearch.md#installing-elasticsearch) is an example of a service that has been integrated this way. And many of the other services, including internal projects like Gitaly, started off as separately installed alternatives.
 
 **For services that depend on the existing GitLab codebase:**
 
 The first iteration should be opt-in, either through the `gitlab.yml` configuration or through [feature flags](feature_flags/index.md). For these types of services it is often necessary to [bundle the service and its dependencies with GitLab](#bundling-a-service-with-gitlab) as part of the initial integration.
 
-TIP: **Tip:**
+NOTE:
 [ActionCable](https://docs.gitlab.com/omnibus/settings/actioncable.html) is an example of a service that has been added this way.
 
 ## Bundling a service with GitLab
diff --git a/doc/development/agent/local.md b/doc/development/agent/local.md
index 2af53d0b3bd..baa9cc5696b 100644
--- a/doc/development/agent/local.md
+++ b/doc/development/agent/local.md
@@ -9,45 +9,45 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 You can run `kas` and `agentk` locally to test the [Kubernetes Agent](index.md) yourself.
 
 1. Create a `cfg.yaml` file from the contents of
-   [`kas_config_example.yaml`](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/blob/master/doc/kas_config_example.yaml), or this example:
-
-   ```yaml
-   listen_agent:
-     network: tcp
-     address: 127.0.0.1:8150
-     websocket: false
-   gitlab:
-     address: http://localhost:3000
-     authentication_secret_file: /Users/tkuah/code/ee-gdk/gitlab/.gitlab_kas_secret
-   agent:
-     gitops:
-       poll_period: "10s"
-   ```
+    [`config_example.yaml`](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/blob/master/pkg/kascfg/config_example.yaml), or this example:
+
+    ```yaml
+    agent:
+      listen:
+        network: tcp
+        address: 127.0.0.1:8150
+        websocket: false
+      gitops:
+        poll_period: "10s"
+    gitlab:
+      address: http://localhost:3000
+      authentication_secret_file: /Users/tkuah/code/ee-gdk/gitlab/.gitlab_kas_secret
+    ```
 
 1. Create a `token.txt`. This is the token for
-   [the agent you created](../../user/clusters/agent/index.md#create-an-agent-record-in-gitlab). This file must not contain a newline character. You can create the file with this command:
+    [the agent you created](../../user/clusters/agent/index.md#create-an-agent-record-in-gitlab). This file must not contain a newline character. You can create the file with this command:
 
-   ```shell
-   echo -n "<TOKEN>" > token.txt
-   ```
+    ```shell
+    echo -n "<TOKEN>" > token.txt
+    ```
 
 1. Start the binaries with the following commands:
 
-   ```shell
-   # Need GitLab to start
-   gdk start
-   # Stop GDK's version of kas
-   gdk stop gitlab-k8s-agent
-
-   # Start kas
-   bazel run //cmd/kas -- --configuration-file="$(pwd)/cfg.yaml"
-   ```
+    ```shell
+    # Need GitLab to start
+    gdk start
+    # Stop GDK's version of kas
+    gdk stop gitlab-k8s-agent
+    
+    # Start kas
+    bazel run //cmd/kas -- --configuration-file="$(pwd)/cfg.yaml"
+    ```
 
 1. In a new terminal window, run this command to start agentk:
 
-   ```shell
-   bazel run //cmd/agentk -- --kas-address=grpc://127.0.0.1:8150 --token-file="$(pwd)/token.txt"
-   ```
+    ```shell
+    bazel run //cmd/agentk -- --kas-address=grpc://127.0.0.1:8150 --token-file="$(pwd)/token.txt"
+    ```
 
 You can also inspect the
 [Makefile](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/blob/master/Makefile)
diff --git a/doc/development/api_graphql_styleguide.md b/doc/development/api_graphql_styleguide.md
index 5ca5e17ad94..8a3fe93c4b1 100644
--- a/doc/development/api_graphql_styleguide.md
+++ b/doc/development/api_graphql_styleguide.md
@@ -179,7 +179,7 @@ end
 
 ### Connection types
 
-TIP: **Tip:**
+NOTE:
 For specifics on implementation, see [Pagination implementation](#pagination-implementation).
 
 GraphQL uses [cursor based
@@ -647,7 +647,7 @@ If the:
 
 Also see [authorizing resources in a mutation](#authorizing-resources).
 
-TIP: **Tip:**
+NOTE:
 Try to load only what the currently authenticated user is allowed to
 view with our existing finders first, without relying on authorization
 to filter the records. This minimizes database queries and unnecessary
diff --git a/doc/development/distributed_tracing.md b/doc/development/distributed_tracing.md
index 0137c06fd69..6eb4514730f 100644
--- a/doc/development/distributed_tracing.md
+++ b/doc/development/distributed_tracing.md
@@ -215,6 +215,6 @@ not set.
 
 By default, the Jaeger search UI is available at <http://localhost:16686/search>.
 
-TIP: **Tip:**
+NOTE:
 Don't forget that you must generate traces by using the application before
 they appear in the Jaeger UI.
diff --git a/doc/development/documentation/index.md b/doc/development/documentation/index.md
index 4fc7b16b8c3..401168179f0 100644
--- a/doc/development/documentation/index.md
+++ b/doc/development/documentation/index.md
@@ -418,7 +418,7 @@ working on. If you don't, the remote docs branch isn't removed either,
 and the server where the Review Apps are hosted can eventually run out of
 disk space.
 
-TIP: **Tip:**
+NOTE:
 Someone with no merge rights to the GitLab projects (think of forks from
 contributors) cannot run the manual job. In that case, you can
 ask someone from the GitLab team who has the permissions to do that for you.
diff --git a/doc/development/documentation/site_architecture/release_process.md b/doc/development/documentation/site_architecture/release_process.md
index e8ec0f39702..ba5363dbb71 100644
--- a/doc/development/documentation/site_architecture/release_process.md
+++ b/doc/development/documentation/site_architecture/release_process.md
@@ -26,7 +26,7 @@ To add a new charts version:
    version mapping. Note that only the `major.minor` version is needed.
 1. Create a new merge request and merge it.
 
-TIP: **Tip:**
+NOTE:
 It can be handy to create the future mappings since they are pretty much known.
 In that case, when a new GitLab version is released, you don't have to repeat
 this first step.
@@ -138,7 +138,7 @@ versions (stable branches `X.Y` of the `gitlab-docs` project):
    to check that their pipelines pass, and once all are merged, proceed to the
    following and final step.
 
-TIP: **Tip:**
+NOTE:
 In case a pipeline fails, see [troubleshooting](#troubleshooting).
 
 ## 5. Merge the release merge request
diff --git a/doc/development/documentation/workflow.md b/doc/development/documentation/workflow.md
index 698512e149d..87de8b9cdf6 100644
--- a/doc/development/documentation/workflow.md
+++ b/doc/development/documentation/workflow.md
@@ -62,7 +62,7 @@ To update GitLab documentation:
    - The [Markdown Guide](https://about.gitlab.com/handbook/markdown-guide/).
 1. Follow GitLab's [Merge Request Guidelines](../contributing/merge_request_workflow.md#merge-request-guidelines).
 
-TIP: **Tip:**
+NOTE:
 Work in a fork if you do not have Developer access to the GitLab project.
 
 Request help from the Technical Writing team if you:
diff --git a/doc/development/fe_guide/performance.md b/doc/development/fe_guide/performance.md
index 99e56058881..a2fa9819f43 100644
--- a/doc/development/fe_guide/performance.md
+++ b/doc/development/fe_guide/performance.md
@@ -82,7 +82,7 @@ Previously, GitLab encouraged the use of
 manually generated webpack bundles. However under this new system you should
 not ever need to manually add an entry point to the `webpack.config.js` file.
 
-TIP: **Tip:**
+NOTE:
 If you are unsure what controller and action corresponds to a given page, you
 can find this out by inspecting `document.body.dataset.page` within your
 browser's developer console while on any page within GitLab.
diff --git a/doc/development/fe_guide/style/javascript.md b/doc/development/fe_guide/style/javascript.md
index 857913435fd..d404d3e02e9 100644
--- a/doc/development/fe_guide/style/javascript.md
+++ b/doc/development/fe_guide/style/javascript.md
@@ -13,7 +13,7 @@ linter to manage most of our JavaScript style guidelines.
 In addition to the style guidelines set by Airbnb, we also have a few specific rules
 listed below.
 
-TIP: **Tip:**
+NOTE:
 You can run eslint locally by running `yarn eslint`
 
 ## Avoid forEach
diff --git a/doc/development/feature_flags/development.md b/doc/development/feature_flags/development.md
index 9ddc6eb29df..3690ec36ff1 100644
--- a/doc/development/feature_flags/development.md
+++ b/doc/development/feature_flags/development.md
@@ -96,7 +96,7 @@ Each feature flag is defined in a separate YAML file consisting of a number of f
 | `rollout_issue_url` | no       | The URL to the Issue covering the feature flag rollout.        |
 | `group`             | no       | The [group](https://about.gitlab.com/handbook/product/categories/#devops-stages) that owns the feature flag. |
 
-TIP: **Tip:**
+NOTE:
 All validations are skipped when running in `RAILS_ENV=production`.
 
 ## Create a new feature flag
@@ -131,7 +131,7 @@ type: development
 default_enabled: false
 ```
 
-TIP: **Tip:**
+NOTE:
 To create a feature flag that is only used in EE, add the `--ee` flag: `bin/feature-flag --ee`
 
 ## Delete a feature flag
diff --git a/doc/development/i18n/externalization.md b/doc/development/i18n/externalization.md
index c5ed07fe24c..90355e1cccb 100644
--- a/doc/development/i18n/externalization.md
+++ b/doc/development/i18n/externalization.md
@@ -13,7 +13,7 @@ For working with internationalization (i18n),
 used tool for this task and there are a lot of applications that help us
 work with it.
 
-TIP: **Tip:**
+NOTE:
 All `rake` commands described on this page must be run on a GitLab instance, usually GDK.
 
 ## Setting up GitLab Development Kit (GDK)
diff --git a/doc/development/redis.md b/doc/development/redis.md
index fd57143150c..bb725e3c321 100644
--- a/doc/development/redis.md
+++ b/doc/development/redis.md
@@ -106,7 +106,7 @@ requests that read the most data from the cache, we can just sort by
 
 ### The slow log
 
-TIP: **Tip:**
+NOTE:
 There is a [video showing how to see the slow log](https://youtu.be/BBI68QuYRH8) (GitLab internal)
 on GitLab.com
 
diff --git a/doc/development/shell_scripting_guide/index.md b/doc/development/shell_scripting_guide/index.md
index c9e2c98716b..6071ae3a09d 100644
--- a/doc/development/shell_scripting_guide/index.md
+++ b/doc/development/shell_scripting_guide/index.md
@@ -72,7 +72,7 @@ shell check:
     - shellcheck scripts/**/*.sh  # path to your shell scripts
 ```
 
-TIP: **Tip:**
+NOTE:
 By default, ShellCheck uses the [shell detection](https://github.com/koalaman/shellcheck/wiki/SC2148#rationale)
 to determine the shell dialect in use. If the shell file is out of your control and ShellCheck cannot
 detect the dialect, use `-s` flag to specify it: `-s sh` or `-s bash`.
@@ -100,7 +100,7 @@ shfmt:
     - shfmt -i 2 -ci -d scripts  # path to your shell scripts
 ```
 
-TIP: **Tip:**
+NOTE:
 By default, shfmt uses the [shell detection](https://github.com/mvdan/sh#shfmt) similar to one of ShellCheck
 and ignore files starting with a period. To override this, use `-ln` flag to specify the shell dialect:
 `-ln posix` or `-ln bash`.
diff --git a/doc/development/testing_guide/end_to_end/beginners_guide.md b/doc/development/testing_guide/end_to_end/beginners_guide.md
index 5f41267bc1c..d60b780eeea 100644
--- a/doc/development/testing_guide/end_to_end/beginners_guide.md
+++ b/doc/development/testing_guide/end_to_end/beginners_guide.md
@@ -29,7 +29,7 @@ must be configured to run the specs. The end-to-end tests:
 - Create [resources](resources.md) (such as project, issue, user) on an ad-hoc basis.
 - Test the UI and API interfaces, and use the API to efficiently set up the UI tests.
 
-TIP: **Tip:**
+NOTE:
 For more information, see [End-to-end testing Best Practices](best_practices.md).
 
 ## Determine if end-to-end tests are needed
diff --git a/doc/gitlab-basics/create-project.md b/doc/gitlab-basics/create-project.md
index 87cee993eb2..30f467c2b12 100644
--- a/doc/gitlab-basics/create-project.md
+++ b/doc/gitlab-basics/create-project.md
@@ -99,7 +99,7 @@ Available Enterprise templates include:
 
 - HIPAA Audit Protocol template ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/13756) in GitLab 12.10)
 
-TIP: **Tip:**
+NOTE:
 You can improve the existing built-in templates or contribute new ones in the
 [`project-templates`](https://gitlab.com/gitlab-org/project-templates) and
 [`pages`](https://gitlab.com/pages) groups by following [these steps](https://gitlab.com/gitlab-org/project-templates/contributing).
diff --git a/doc/gitlab-basics/start-using-git.md b/doc/gitlab-basics/start-using-git.md
index ddebc57355a..ea8a58154db 100644
--- a/doc/gitlab-basics/start-using-git.md
+++ b/doc/gitlab-basics/start-using-git.md
@@ -29,7 +29,7 @@ can download GitLab's [Git Cheat Sheet](https://about.gitlab.com/images/press/gi
 > - <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>&nbsp;Watch the [GitLab Source Code Management Walkthrough](https://www.youtube.com/watch?v=wTQ3aXJswtM) video.
 > - Learn how GitLab became the backbone of [Worldline](https://about.gitlab.com/customers/worldline/)’s development environment.
 
-TIP: **Tip:**
+NOTE:
 To help you visualize what you're doing locally, there are
 [Git GUI apps](https://git-scm.com/download/gui/) you can install.
 
@@ -234,7 +234,7 @@ To clone `https://gitlab.com/gitlab-tests/sample-project/` via HTTPS:
 git clone https://gitlab.com/gitlab-tests/sample-project.git
 ```
 
-TIP: **Troubleshooting:**
+NOTE:
 On Windows, if you entered incorrect passwords multiple times and GitLab is responding `Access denied`,
 you may have to add your namespace (user name or group name) to clone through HTTPS:
 `git clone https://namespace@gitlab.com/gitlab-org/gitlab.git`.
diff --git a/doc/install/aws/index.md b/doc/install/aws/index.md
index 5e90b102276..49916035616 100644
--- a/doc/install/aws/index.md
+++ b/doc/install/aws/index.md
@@ -399,7 +399,7 @@ a bug that [prevents Sidekiq from processing jobs](https://gitlab.com/gitlab-org
 
 Since our GitLab instances will be in private subnets, we need a way to connect to these instances via SSH to make configuration changes, perform upgrades, etc. One way of doing this is via a [bastion host](https://en.wikipedia.org/wiki/Bastion_host), sometimes also referred to as a jump box.
 
-TIP: **Tip:**
+NOTE:
 If you do not want to maintain bastion hosts, you can set up [AWS Systems Manager Session Manager](https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager.html) for access to instances. This is beyond the scope of this document.
 
 ### Create Bastion Host A
diff --git a/doc/integration/elasticsearch.md b/doc/integration/elasticsearch.md
index 057cb923a13..698d6e9c38c 100644
--- a/doc/integration/elasticsearch.md
+++ b/doc/integration/elasticsearch.md
@@ -317,7 +317,7 @@ buffered and caught up once unpaused.
 
 ### Setup
 
-TIP: **Tip:**
+NOTE:
 If your index was created with GitLab 13.0 or greater, you can directly
 [trigger the reindex](#trigger-the-reindex-via-the-advanced-search-administration).
 
@@ -404,7 +404,7 @@ To trigger the re-index from `primary` index:
     curl $CLUSTER_URL/$SECONDARY_INDEX/_count => 123123
     ```
 
-    TIP: **Tip:**
+    NOTE:
     Comparing the document count is more accurate than using the index size, as improvements to the storage might cause the new index to be smaller than the original one.
 
 1. After you are confident your `secondary` index is valid, you can process to
@@ -681,7 +681,7 @@ Sidekiq processes](../administration/operations/extra_sidekiq_processes.md).
    Where `ID_FROM` and `ID_TO` are project IDs. Both parameters are optional.
    The above example will index all projects from ID `1001` up to (and including) ID `2000`.
 
-   TIP: **Troubleshooting:**
+   NOTE:
    Sometimes the project indexing jobs queued by `gitlab:elastic:index_projects`
    can get interrupted. This may happen for many reasons, but it's always safe
    to run the indexing task again. It will skip repositories that have
diff --git a/doc/integration/jira_development_panel.md b/doc/integration/jira_development_panel.md
index 0f197961946..7488df3580e 100644
--- a/doc/integration/jira_development_panel.md
+++ b/doc/integration/jira_development_panel.md
@@ -73,7 +73,7 @@ When configuring Jira DVCS Connector:
 
 #### GitLab account configuration for DVCS
 
-TIP: **Tip:**
+NOTE:
 To ensure that regular user account maintenance doesn't impact your integration,
 create and use a single-purpose `jira` user in GitLab.
 
diff --git a/doc/operations/incident_management/alert_integrations.md b/doc/operations/incident_management/alert_integrations.md
index b4597110935..87c7e3b61be 100644
--- a/doc/operations/incident_management/alert_integrations.md
+++ b/doc/operations/incident_management/alert_integrations.md
@@ -102,7 +102,7 @@ can be a nested JSON object. For example:
 { "foo": { "bar": { "baz": 42 } } }
 ```
 
-TIP: **Tip:**
+NOTE:
 Ensure your requests are smaller than the
 [payload application limits](../../administration/instance_limits.md#generic-alert-json-payloads).
 
diff --git a/doc/operations/incident_management/alerts.md b/doc/operations/incident_management/alerts.md
index af5f0763b9d..aca4ef49aec 100644
--- a/doc/operations/incident_management/alerts.md
+++ b/doc/operations/incident_management/alerts.md
@@ -37,7 +37,7 @@ The alert list displays the following information:
   - **Acknowledged**: Someone is actively investigating the problem.
   - **Resolved**: No further work is required.
 
-TIP: **Tip:**
+NOTE:
 Check out a live example available from the
 [`tanuki-inc` project page](https://gitlab-examples-ops-incident-setup-everyone-tanuki-inc.34.69.64.147.nip.io/)
 in GitLab to examine alerts in action.
@@ -67,7 +67,7 @@ Navigate to the Alert details view by visiting the [Alert list](alerts.md)
 and selecting an alert from the list. You need least Developer [permissions](../../user/permissions.md)
 to access alerts.
 
-TIP: **Tip:**
+NOTE:
 To review live examples of GitLab alerts, visit the
 [alert list](https://gitlab.com/gitlab-examples/ops/incident-setup/everyone/tanuki-inc/-/alert_management)
 for this demo project. Select any alert in the list to examine its alert details
diff --git a/doc/operations/incident_management/incidents.md b/doc/operations/incident_management/incidents.md
index aa0840a9cca..4453faf6126 100644
--- a/doc/operations/incident_management/incidents.md
+++ b/doc/operations/incident_management/incidents.md
@@ -121,7 +121,7 @@ display an arrow next to the column name.
 
 Incidents share the [Issues API](../../user/project/issues/index.md).
 
-TIP: **Tip:**
+NOTE:
 For a live example of the incident list in action, visit this
 [demo project](https://gitlab.com/gitlab-examples/ops/incident-setup/everyone/tanuki-inc/-/incidents).
 
diff --git a/doc/push_rules/push_rules.md b/doc/push_rules/push_rules.md
index 69cacd41347..99a5ac8ed3b 100644
--- a/doc/push_rules/push_rules.md
+++ b/doc/push_rules/push_rules.md
@@ -100,7 +100,7 @@ The following options are available.
 | Prohibited file names | **Starter** 7.10 | Any committed filenames that match this regular expression and do not already exist in the repository are not allowed to be pushed. Leave empty to allow any filenames. See [common examples](#prohibited-file-names). |
 | Maximum file size | **Starter** 7.12 | Pushes that contain added or updated files that exceed this file size (in MB) are rejected. Set to 0 to allow files of any size. Files tracked by Git LFS are exempted. |
 
-TIP: **Tip:**
+NOTE:
 GitLab uses [RE2 syntax](https://github.com/google/re2/wiki/Syntax) for regular expressions in push rules, and you can test them at the [regex101 regex tester](https://regex101.com/).
 
 ## Prevent pushing secrets to the repository
diff --git a/doc/ssh/README.md b/doc/ssh/README.md
index dbd2a0e3935..7b0c5f5f16e 100644
--- a/doc/ssh/README.md
+++ b/doc/ssh/README.md
@@ -44,7 +44,7 @@ GitLab supports the use of RSA, DSA, ECDSA, and ED25519 keys.
 - GitLab has [deprecated](https://about.gitlab.com/releases/2018/06/22/gitlab-11-0-released/#support-for-dsa-ssh-keys) DSA keys in GitLab 11.0.
 - As noted in [Practical Cryptography With Go](https://leanpub.com/gocrypto/read#leanpub-auto-ecdsa), the security issues related to DSA also apply to ECDSA.
 
-TIP: **Tip:**
+NOTE:
 Available documentation suggests that ED25519 is more secure. If you use an RSA key, the US National Institute of Science and Technology in [Publication 800-57 Part 3 (PDF)](https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-57Pt3r1.pdf) recommends a key size of at least 2048 bits.
 
 Therefore, our documentation focuses on the use of ED25519 and RSA keys.
diff --git a/doc/subscriptions/gitlab_com/index.md b/doc/subscriptions/gitlab_com/index.md
index b73e1901dd9..5299f1f5f9c 100644
--- a/doc/subscriptions/gitlab_com/index.md
+++ b/doc/subscriptions/gitlab_com/index.md
@@ -48,7 +48,7 @@ Every occupied seat is counted in the subscription, with the following exception
 
 - Members with Guest permissions on a Gold subscription.
 
-TIP: **Tip:**
+NOTE:
 To support the open source community and encourage the development of open
 source projects, GitLab grants access to **Gold** features for all GitLab.com
 **public** projects, regardless of the subscription.
@@ -88,7 +88,7 @@ To subscribe to GitLab.com:
   1. Select the namespace from the drop-down list to associate the subscription.
   1. Proceed to checkout.
 
-TIP: **Tip:**
+NOTE:
 You can also go to the [**My Account**](https://customers.gitlab.com/customers/edit)
 page to add or change the GitLab.com account link.
 
@@ -132,7 +132,7 @@ log in and verify or update:
 - The invoice contact details on the **Account details** page.
 - The credit card on file on the **Payment Methods** page.
 
-TIP: **Tip:**
+NOTE:
 Contact our [support team](https://support.gitlab.com/hc/en-us/requests/new?ticket_form_id=360000071293)
 if you need assistance accessing the Customers Portal or if you need to change
 the contact person who manages your subscription.
diff --git a/doc/subscriptions/self_managed/index.md b/doc/subscriptions/self_managed/index.md
index d541413606e..02dd609803d 100644
--- a/doc/subscriptions/self_managed/index.md
+++ b/doc/subscriptions/self_managed/index.md
@@ -79,7 +79,7 @@ To subscribe to GitLab through a self-managed installation:
 1. After purchase, a license file is sent to the email address associated to the Customers Portal account,
    which must be [uploaded to your GitLab instance](../../user/admin_area/license.md#uploading-your-license).
 
-TIP: **Tip:**
+NOTE:
 If you're purchasing a subscription for an existing **Core** self-managed
 instance, ensure you're purchasing enough seats to
 [cover your users](../../user/admin_area/index.md#administering-users).
@@ -109,7 +109,7 @@ log in and verify or update:
 - The invoice contact details on the **Account details** page.
 - The credit card on file on the **Payment Methods** page.
 
-TIP: **Tip:**
+NOTE:
 Contact our [support team](https://support.gitlab.com/hc/en-us/requests/new?ticket_form_id=360000071293)
 if you need assistance accessing the Customers Portal or if you need to change
 the contact person who manages your subscription.
@@ -158,13 +158,13 @@ We recommend following these steps during renewal:
 1. Determine if you have a need for user growth in the upcoming subscription.
 1. Log in to the [Customers Portal](https://customers.gitlab.com/customers/sign_in) and select the **Renew** button beneath your existing subscription.
 
-   TIP: **Tip:**
+   NOTE:
    If you need to change your [GitLab tier](https://about.gitlab.com/pricing/), contact our sales team via `renewals@gitlab.com` for assistance as this can't be done in the Customers Portal.
 
 1. In the first box, enter the total number of user licenses you’ll need for the upcoming year. Be sure this number is at least **equal to, or greater than** the number of billable users in the system at the time of performing the renewal.
 1. Enter the number of [users over license](#users-over-license) in the second box for the user overage incurred in your previous subscription term.
 
-   TIP: **Tip:**
+   NOTE:
    You can find the _users over license_ in your instance's **Admin** dashboard by clicking on the **Admin Area** in the top bar, or navigating to `/admin`.
 
    The following table describes details of your admin dashboard and renewal terms:
diff --git a/doc/topics/autodevops/customize.md b/doc/topics/autodevops/customize.md
index be7f9071dde..0e662e84f7a 100644
--- a/doc/topics/autodevops/customize.md
+++ b/doc/topics/autodevops/customize.md
@@ -355,7 +355,7 @@ applications.
 | `ROLLOUT_STATUS_DISABLED`               | From GitLab 12.0, used to disable rollout status check because it does not support all resource types, for example, `cronjob`. |
 | `STAGING_ENABLED`                       | From GitLab 10.8, used to define a [deploy policy for staging and production environments](#deploy-policy-for-staging-and-production-environments). |
 
-TIP: **Tip:**
+NOTE:
 After you set up your replica variables using a
 [project variable](../../ci/variables/README.md#gitlab-cicd-environment-variables),
 you can scale your application by redeploying it.
@@ -538,7 +538,7 @@ service:
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-ci-yml/-/merge_requests/160) in GitLab 10.8.
 
-TIP: **Tip:**
+NOTE:
 You can also set this inside your [project's settings](index.md#deployment-strategy).
 
 The normal behavior of Auto DevOps is to use continuous deployment, pushing
@@ -567,7 +567,7 @@ If you define `CANARY_ENABLED` with a non-empty value, then two manual jobs are
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/5415) in GitLab 10.8.
 
-TIP: **Tip:**
+NOTE:
 You can also set this inside your [project's settings](index.md#deployment-strategy).
 
 When you're ready to deploy a new version of your app to production, you may want
@@ -615,7 +615,7 @@ With `INCREMENTAL_ROLLOUT_MODE` set to `manual` and with `STAGING_ENABLED`
 
 ![Rollout and staging enabled](img/rollout_staging_enabled.png)
 
-WARNING: **Deprecation:**
+WARNING:
 Before GitLab 11.4, the presence of the `INCREMENTAL_ROLLOUT_ENABLED` environment
 variable enabled this feature. This configuration is deprecated, and is scheduled to be
 removed in the future.
@@ -624,7 +624,7 @@ removed in the future.
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/7545) in GitLab 11.4.
 
-TIP: **Tip:**
+NOTE:
 You can also set this inside your [project's settings](index.md#deployment-strategy).
 
 This configuration is based on
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md
index 11b8bcdc2f0..2e078e8a2dc 100644
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -151,7 +151,7 @@ as other environment [variables](../../ci/variables/README.md#priority-of-enviro
 If the CI/CD variable is not set and the cluster setting is left blank, the instance-wide **Auto DevOps domain**
 setting is used if set.
 
-TIP: **Tip:**
+NOTE:
 If you use the [GitLab managed app for Ingress](../../user/clusters/applications.md#ingress),
 the URL endpoint should be automatically configured for you. All you must do
 is use its value for the `KUBE_INGRESS_BASE_DOMAIN` variable.
@@ -257,7 +257,7 @@ are available:
   - `master` branch is directly deployed to staging.
   - Manual actions are provided for incremental rollout to production.
 
-TIP: **Tip:**
+NOTE:
 Use the [blue-green deployment](../../ci/environments/incremental_rollouts.md#blue-green-deployment) technique
 to minimize downtime and risk.
 
diff --git a/doc/topics/autodevops/quick_start_guide.md b/doc/topics/autodevops/quick_start_guide.md
index 5226ae576a4..f0eba0ba354 100644
--- a/doc/topics/autodevops/quick_start_guide.md
+++ b/doc/topics/autodevops/quick_start_guide.md
@@ -29,7 +29,7 @@ or Google Drive, or create a new one.
 1. Ensure you've created a [billing account](https://cloud.google.com/billing/docs/how-to/manage-billing-account)
    with Google Cloud Platform.
 
-TIP: **Tip:**
+NOTE:
 Every new Google Cloud Platform (GCP) account receives [$300 in credit](https://console.cloud.google.com/freetrial),
 and in partnership with Google, GitLab is able to offer an additional $200 for new
 GCP accounts to get started with GitLab's Google Kubernetes Engine Integration.
@@ -221,7 +221,7 @@ Kubernetes cluster, color-coded to show their status. Hovering over a square on
 the deploy board displays the state of the deployment, and clicking the square
 takes you to the pod's logs page.
 
-TIP: **Tip:**
+NOTE:
 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 > CI/CD > Environment variables**.
diff --git a/doc/topics/autodevops/stages.md b/doc/topics/autodevops/stages.md
index 2f84b00af61..50b45890e0e 100644
--- a/doc/topics/autodevops/stages.md
+++ b/doc/topics/autodevops/stages.md
@@ -48,7 +48,7 @@ language:
 For the requirements of other languages and frameworks, read the
 [Heroku buildpacks documentation](https://devcenter.heroku.com/articles/buildpacks#officially-supported-buildpacks).
 
-TIP: **Tip:**
+NOTE:
 If Auto Build fails despite the project meeting the buildpack requirements, set
 a project variable `TRACE=true` to enable verbose logging, which may help you
 troubleshoot.
diff --git a/doc/topics/autodevops/upgrading_postgresql.md b/doc/topics/autodevops/upgrading_postgresql.md
index 3304b18a49f..55432ad61fa 100644
--- a/doc/topics/autodevops/upgrading_postgresql.md
+++ b/doc/topics/autodevops/upgrading_postgresql.md
@@ -36,7 +36,7 @@ involves:
    any existing channel 1 database. For more information, see
    [Detected an existing PostgreSQL database](index.md#detected-an-existing-postgresql-database).
 
-TIP: **Tip:**
+NOTE:
 If you have configured Auto DevOps to have staging,
 consider trying out the backup and restore steps on staging first, or
 trying this out on a review app.
@@ -173,7 +173,7 @@ Using the newer version of PostgreSQL deletes
 the older 0.7.1 PostgreSQL. To prevent the underlying data from being
 deleted, you can choose to retain the [persistent volume](#retain-persistent-volumes).
 
-TIP: **Tip:**
+NOTE:
 You can also
 [scope](../../ci/environments/index.md#scoping-environments-with-specs) the
 `AUTO_DEVOPS_POSTGRES_CHANNEL`, `AUTO_DEVOPS_POSTGRES_DELETE_V1` and
diff --git a/doc/topics/git/git_rebase.md b/doc/topics/git/git_rebase.md
index 0b0759534b3..6a4608223b4 100644
--- a/doc/topics/git/git_rebase.md
+++ b/doc/topics/git/git_rebase.md
@@ -129,7 +129,7 @@ message, squash (join multiple commits into one), edit, or delete
 commits. It is handy for changing past commit messages,
 as well as for organizing the commit history of your branch to keep it clean.
 
-TIP: **Tip:**
+NOTE:
 If you want to keep the default branch commit history clean, you don't need to
 manually squash all your commits before merging every merge request;
 with [Squash and Merge](../../user/project/merge_requests/squash_and_merge.md)
diff --git a/doc/topics/web_application_firewall/quick_start_guide.md b/doc/topics/web_application_firewall/quick_start_guide.md
index 78cc31281fe..03b252a0700 100644
--- a/doc/topics/web_application_firewall/quick_start_guide.md
+++ b/doc/topics/web_application_firewall/quick_start_guide.md
@@ -30,7 +30,7 @@ Google account (for example, one that you use to access Gmail, Drive, etc.) or c
 1. To enable the required APIs and related services, follow the steps in the ["Before you begin" section of the Kubernetes Engine docs](https://cloud.google.com/kubernetes-engine/docs/quickstart#before-you-begin).
 1. Make sure you have created a [billing account](https://cloud.google.com/billing/docs/how-to/manage-billing-account).
 
-TIP: **Tip:**
+NOTE:
 Every new Google Cloud Platform (GCP) account receives [$300 in credit](https://console.cloud.google.com/freetrial),
 and in partnership with Google, GitLab is able to offer an additional $200 for new GCP accounts to get started with GitLab's
 Google Kubernetes Engine integration. All you have to do is [follow this link](https://cloud.google.com/partners/partnercredit/?PCN=a0n60000006Vpz4AAC) and apply for credit.
diff --git a/doc/user/admin_area/activating_deactivating_users.md b/doc/user/admin_area/activating_deactivating_users.md
index cd28107803a..1bca1751d2e 100644
--- a/doc/user/admin_area/activating_deactivating_users.md
+++ b/doc/user/admin_area/activating_deactivating_users.md
@@ -65,5 +65,5 @@ NOTE:
 Activating a user changes the user's state to active and consumes a
 [seat](../../subscriptions/self_managed/index.md#billable-users).
 
-TIP: **Tip:**
+NOTE:
 A deactivated user can also activate their account themselves by simply logging back in via the UI.
diff --git a/doc/user/admin_area/broadcast_messages.md b/doc/user/admin_area/broadcast_messages.md
index c6f5d8f7aa3..c96c57a99eb 100644
--- a/doc/user/admin_area/broadcast_messages.md
+++ b/doc/user/admin_area/broadcast_messages.md
@@ -89,7 +89,7 @@ To edit a broadcast message:
 1. From the list of broadcast messages, click the appropriate button to edit the message.
 1. After making the required changes, click the **Update broadcast message** button.
 
-TIP: **Tip:**
+NOTE:
 Expired messages can be made active again by changing their end date.
 
 ## Deleting a broadcast message
diff --git a/doc/user/clusters/applications.md b/doc/user/clusters/applications.md
index f9a9f17840e..d42d3ba9d3d 100644
--- a/doc/user/clusters/applications.md
+++ b/doc/user/clusters/applications.md
@@ -178,7 +178,7 @@ to determine the external endpoint and it should be available within a few minut
 
 After you install Ingress, the external endpoint should be available within a few minutes.
 
-TIP: **Tip:**
+NOTE:
 This endpoint can be used for the
 [Auto DevOps base domain](../../topics/autodevops/index.md#auto-devops-base-domain)
 using the `KUBE_INGRESS_BASE_DOMAIN` environment variable.
diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md
index e2d883bcb41..964e5e35d16 100644
--- a/doc/user/discussions/index.md
+++ b/doc/user/discussions/index.md
@@ -85,7 +85,7 @@ Threads created this way will only appear in the original merge request
 and not when navigating to that commit under your project's
 **Repository > Commits** page.
 
-TIP: **Tip:**
+NOTE:
 When a link of a commit reference is found in a thread inside a merge
 request, it will be automatically converted to a link in the context of the
 current merge request.
diff --git a/doc/user/group/epics/index.md b/doc/user/group/epics/index.md
index af6c5c22ec3..0b64371b0f5 100644
--- a/doc/user/group/epics/index.md
+++ b/doc/user/group/epics/index.md
@@ -105,35 +105,18 @@ steps to create, move, reorder, or delete child epics.
 
 To set a **Start date** and **Due date** for an epic, select one of the following:
 
-- **Fixed**: Enter a fixed value.
-- **From milestones**: Inherit a dynamic value from the milestones that are assigned to the epic's issues.
-  Note that GitLab 12.5 replaced this option with **Inherited**.
-- **Inherited**: Inherit a dynamic value from the epic's issues, child epics, and milestones ([Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/7332) in GitLab 12.5 to replace **From milestones**).
-
-### From milestones
-
-> [Replaced](https://gitlab.com/gitlab-org/gitlab/-/issues/7332) in GitLab 12.5 by **Inherited**.
-
-If you select **From milestones** for the start date, GitLab automatically sets the date to be earliest
-start date across all milestones that are assigned to the issues that belong to the epic.
-If you select **From milestones** for the due date, GitLab sets the date to be the latest due date across
-all milestones that are assigned to those issues.
-
-These are dynamic dates which are recalculated if any of the following occur:
-
-- Milestones are re-assigned to the issues.
-- Milestone dates change.
-- Issues are added or removed from the epic.
+- **Fixed**: enter a fixed value.
+- **Inherited**: inherit a dynamic value from the epic's issues, child epics, and milestones.
 
 ### Inherited
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/7332) in GitLab 12.5 to replace **From milestones**.
 
-If you select:
+If you select **Inherited**:
 
-- **Inherited** for the start date, GitLab scans all child epics and issues assigned to the epic,
+- For the **start date**: GitLab scans all child epics and issues assigned to the epic,
   and sets the start date to match the earliest found start date or milestone.
-- **Inherited** for the due date, GitLab sets the due date to match the latest due date or
+- For the **due date**: GitLab sets the due date to match the latest due date or
   milestone found among its child epics and issues.
 
 These are dynamic dates and recalculated if any of the following occur:
diff --git a/doc/user/group/index.md b/doc/user/group/index.md
index e7cc94ebd9f..998e39fa62c 100644
--- a/doc/user/group/index.md
+++ b/doc/user/group/index.md
@@ -487,7 +487,7 @@ It is currently not possible to rename a namespace if it contains a
 project with [Container Registry](../packages/container_registry/index.md) tags,
 because the project cannot be moved.
 
-TIP: **Tip:**
+NOTE:
 If you want to retain ownership over the original namespace and
 protect the URL redirects, then instead of changing a group's path or renaming a
 username, you can create a new group and transfer projects to it.
diff --git a/doc/user/group/saml_sso/scim_setup.md b/doc/user/group/saml_sso/scim_setup.md
index d519864627c..8e45cabcbed 100644
--- a/doc/user/group/saml_sso/scim_setup.md
+++ b/doc/user/group/saml_sso/scim_setup.md
@@ -132,7 +132,7 @@ configuration. Otherwise, the Okta SCIM app may not work properly.
 1. If you see an **Admin** button in the top right, click the button. This will
    ensure you are in the Admin area.
 
-   TIP: **Tip:**
+   NOTE:
    If you're using the Developer Console, click **Developer Console** in the top
    bar and select **Classic UI**. Otherwise, you may not see the buttons described
    in the following steps:
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index bc9043b507c..f2633749cd3 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -1128,7 +1128,7 @@ These details <em>remain</em> <strong>hidden</strong> until expanded.
 
 Markdown inside these tags is supported as well.
 
-TIP: **Tip:**
+NOTE:
 If your Markdown isn't rendering correctly, try adding
 `{::options parse_block_html="true" /}` to the top of the page, and add
 `markdown="span"` to the opening summary tag like this: `<summary markdown="span">`.
diff --git a/doc/user/packages/container_registry/index.md b/doc/user/packages/container_registry/index.md
index f7ee03f47fe..3e794de22ae 100644
--- a/doc/user/packages/container_registry/index.md
+++ b/doc/user/packages/container_registry/index.md
@@ -426,7 +426,7 @@ delete_image:
     - master
 ```
 
-TIP: **Tip:**
+NOTE:
 You can download the latest `reg` release from
 [the releases page](https://github.com/genuinetools/reg/releases), then update
 the code example by changing the `REG_SHA256` and `REG_VERSION` variables
diff --git a/doc/user/packages/maven_repository/index.md b/doc/user/packages/maven_repository/index.md
index 83993ff3388..e0f5a400977 100644
--- a/doc/user/packages/maven_repository/index.md
+++ b/doc/user/packages/maven_repository/index.md
@@ -653,7 +653,7 @@ The message should show that the package is downloading from the Package Registr
 Downloading from gitlab-maven: http://gitlab.example.com/api/v4/projects/PROJECT_ID/packages/maven/com/mycompany/mydepartment/my-project/1.0-SNAPSHOT/my-project-1.0-20200128.120857-1.pom
 ```
 
-TIP: **Tip:**
+NOTE:
 In the GitLab UI, on the Package Registry page for Maven, you can view and copy these commands.
 
 ### Use Gradle
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index 77a17461947..b6ff850b182 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -378,7 +378,7 @@ project is internal or private, Guest users have all the abilities that are
 mentioned in the [permissions table above](#project-members-permissions) (they
 are unable to browse the project's repository, for example).
 
-TIP: **Tip:**
+NOTE:
 To prevent a guest user from creating projects, as an admin, you can edit the
 user's profile to mark the user as [external](#external-users).
 Beware though that even if a user is external, if they already have Reporter or
diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md
index d5605240cbe..27a2526547c 100644
--- a/doc/user/profile/account/two_factor_authentication.md
+++ b/doc/user/profile/account/two_factor_authentication.md
@@ -18,7 +18,7 @@ password secret.
 
 ## Overview
 
-TIP: **Tip:**
+NOTE:
 When you enable 2FA, don't forget to back up your [recovery codes](#recovery-codes)!
 
 In addition to time-based one time passwords (TOTP), GitLab supports U2F
diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md
index 7c644afbb7d..59113a8bc44 100644
--- a/doc/user/profile/index.md
+++ b/doc/user/profile/index.md
@@ -106,7 +106,7 @@ It is currently not possible to change your username if it contains a
 project with [Container Registry](../packages/container_registry/index.md) tags,
 because the project cannot be moved.
 
-TIP: **Tip:**
+NOTE:
 If you want to retain ownership over the original namespace and
 protect the URL redirects, then instead of changing a group's path or renaming a
 username, you can create a new group and transfer projects to it.
diff --git a/doc/user/project/clusters/add_remove_clusters.md b/doc/user/project/clusters/add_remove_clusters.md
index 4f4034ade7a..d4f5237311a 100644
--- a/doc/user/project/clusters/add_remove_clusters.md
+++ b/doc/user/project/clusters/add_remove_clusters.md
@@ -18,7 +18,7 @@ Watch the webcast [Scalable app deployment with GitLab and Google Cloud Platform
 and learn how to spin up a Kubernetes cluster managed by Google Cloud Platform (GCP)
 in a few clicks.
 
-TIP: **Tip:**
+NOTE:
 Every new Google Cloud Platform (GCP) account receives
 [$300 in credit upon sign up](https://console.cloud.google.com/freetrial).
 In partnership with Google, GitLab is able to offer an additional $200 for new GCP
diff --git a/doc/user/project/description_templates.md b/doc/user/project/description_templates.md
index 27ccd36d9ae..db2631f9596 100644
--- a/doc/user/project/description_templates.md
+++ b/doc/user/project/description_templates.md
@@ -79,7 +79,7 @@ This enables the `Bug` dropdown option when creating or editing issues. When
 to the issue description field. The **Reset template** button discards any
 changes you made after picking the template and returns it to its initial status.
 
-TIP: **Tip:**
+NOTE:
 You can create short-cut links to create an issue using a designated template. For example: `https://gitlab.com/gitlab-org/gitlab/-/issues/new?issuable_template=Feature%20proposal`.
 
 ![Description templates](img/description_templates.png)
@@ -117,7 +117,7 @@ We make use of Description Templates for Issues and Merge Requests within the Gi
 Edition project. Please refer to the [`.gitlab` folder](https://gitlab.com/gitlab-org/gitlab/tree/master/.gitlab)
 for some examples.
 
-TIP: **Tip:**
+NOTE:
 It's possible to use [quick actions](quick_actions.md) within description templates to quickly add
 labels, assignees, and milestones. The quick actions are only executed if the user submitting
 the issue or merge request has the permissions to perform the relevant actions.
diff --git a/doc/user/project/issues/confidential_issues.md b/doc/user/project/issues/confidential_issues.md
index 17412f879f5..02cb0313a74 100644
--- a/doc/user/project/issues/confidential_issues.md
+++ b/doc/user/project/issues/confidential_issues.md
@@ -100,7 +100,7 @@ confidential information prematurely. When the confidential commits are ready
 to be made public, this can be done by opening a merge request from the private
 fork to the public upstream project.
 
-TIP: **Best practice:**
+NOTE:
 If you create a long-lived private fork in the same group or in a sub-group of
 the original upstream, all the users with Developer membership to the public
 project will also have the same permissions in the private project. This way,
diff --git a/doc/user/project/issues/issue_data_and_actions.md b/doc/user/project/issues/issue_data_and_actions.md
index 04aeb991784..960d10b48d5 100644
--- a/doc/user/project/issues/issue_data_and_actions.md
+++ b/doc/user/project/issues/issue_data_and_actions.md
@@ -93,7 +93,7 @@ The assignee(s) can be changed as often as needed. The idea is that the assignee
 responsible for that issue until it's reassigned to someone else to take it from there.
 When assigned to someone, it will appear in their assigned issues list.
 
-TIP: **Tip:**
+NOTE:
 If a user is not member of that project, it can only be
 assigned to them if they created the issue themselves.
 
@@ -136,7 +136,7 @@ Group Labels, which allow you to use the same labels for all projects within the
 group, can be also given to issues. They work exactly the same, but they are immediately
 available to all projects in the group.
 
-TIP: **Tip:**
+NOTE:
 If a label doesn't exist yet, you can click **Edit**, and it opens a dropdown menu
 from which you can select **Create new label**.
 
@@ -203,7 +203,7 @@ Mentions for yourself (the current logged in user), will be highlighted in a dif
 color, allowing you to easily see which comments involve you, helping you focus on
 them quickly.
 
-TIP: **Tip:**
+NOTE:
 Avoid mentioning `@all` in issues and merge requests, as it sends an email notification
 to all the members of that project's group, which can be interpreted as spam.
 
@@ -225,7 +225,7 @@ You can award an emoji to that issue. There are shortcuts to "thumbs_up" and "th
 or you can click on the light gray "face" to choose a different reaction from the
 dropdown list of available [GitLab Flavored Markdown Emoji](../../markdown.md#emoji).
 
-TIP: **Tip:**
+NOTE:
 Posting "+1" as a comment in a thread spams all subscribed participants of that issue,
 clutters the threads, and is not recommended. Awarding an emoji is a way
 to let them know your reaction without spamming them.
diff --git a/doc/user/project/issues/related_issues.md b/doc/user/project/issues/related_issues.md
index 66921739fd6..82b2d4fde52 100644
--- a/doc/user/project/issues/related_issues.md
+++ b/doc/user/project/issues/related_issues.md
@@ -23,7 +23,7 @@ The relationship only shows up in the UI if the user can see both issues.
 
 When you try to close an issue that has open blockers, a warning is displayed.
 
-TIP: **Tip:**
+NOTE:
 To manage related issues through our API, visit the [issue links API documentation](../../../api/issue_links.md).
 
 ## Adding a related issue
diff --git a/doc/user/project/merge_requests/code_quality.md b/doc/user/project/merge_requests/code_quality.md
index 8cffdc881b2..5a98338a81b 100644
--- a/doc/user/project/merge_requests/code_quality.md
+++ b/doc/user/project/merge_requests/code_quality.md
@@ -131,7 +131,7 @@ stages:
   - test
 ```
 
-TIP: **Tip:**
+NOTE:
 This information is automatically extracted and shown right in the merge request widget.
 
 WARNING:
diff --git a/doc/user/project/merge_requests/creating_merge_requests.md b/doc/user/project/merge_requests/creating_merge_requests.md
index 2d4be285871..5adc4ab6b6e 100644
--- a/doc/user/project/merge_requests/creating_merge_requests.md
+++ b/doc/user/project/merge_requests/creating_merge_requests.md
@@ -46,7 +46,7 @@ the merge request.
 
 ![New Merge Request page](img/new_merge_request_page_v12_6.png)
 
-TIP: **Tip:**
+NOTE:
 You can push one or more times to your branch in GitLab before
 creating the merge request.
 
diff --git a/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md b/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md
index 6dc5fe209a2..726a7102663 100644
--- a/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md
+++ b/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md
@@ -132,7 +132,7 @@ specific commit page.
 
 ![MR diff](img/merge_request_diff.png)
 
-TIP: **Tip:**
+NOTE:
 You can append `?w=1` while on the diffs page of a merge request to ignore any
 whitespace changes.
 
diff --git a/doc/user/project/pages/lets_encrypt_for_gitlab_pages.md b/doc/user/project/pages/lets_encrypt_for_gitlab_pages.md
index 1cb7fe2ef22..331f2840ad6 100644
--- a/doc/user/project/pages/lets_encrypt_for_gitlab_pages.md
+++ b/doc/user/project/pages/lets_encrypt_for_gitlab_pages.md
@@ -67,7 +67,7 @@ might be slightly different. Follow the
    sudo certbot certonly -a manual -d example.com --register-unsafely-without-email
    ```
 
-   TIP: **Tip:**
+   NOTE:
    Read through CertBot's documentation on their
    [command line options](https://certbot.eff.org/docs/using.html#certbot-command-line-options).
 
diff --git a/doc/user/project/repository/file_finder.md b/doc/user/project/repository/file_finder.md
index 11fbb9938c6..4f996df5fef 100644
--- a/doc/user/project/repository/file_finder.md
+++ b/doc/user/project/repository/file_finder.md
@@ -40,7 +40,7 @@ the `app/controllers/admin/deploy_keys_controller.rb` file.
 
 Using a fuzzy search, we start by typing letters that get us closer to the file.
 
-TIP: **Tip:**
+NOTE:
 To narrow down your search, include `/` in your search terms.
 
 ![Find file button](img/file_finder_find_file_v12_10.png)