Add latest changes from gitlab-org/gitlab@master

18 files changed, 58 insertions, 58 deletions

diff --git a/doc/user/admin_area/appearance.md b/doc/user/admin_area/appearance.md
index 0575362439f..55dabce7342 100644
--- a/doc/user/admin_area/appearance.md
+++ b/doc/user/admin_area/appearance.md
@@ -15,7 +15,7 @@ By default, the navigation bar has the GitLab logo, but this can be customized w
 any image desired. It is optimized for images 28px high (any width), but any image can be
 used (less than 1MB) and it will automatically be resized.
 
-![navbar header logo screenshot](img/appearance_header_logo_v12_3.png)
+![Navigation bar header logo screenshot](img/appearance_header_logo_v12_3.png)
 
 Once you select and upload an image, click **Update appearance settings** at the bottom
 of the page to activate it in the GitLab instance.
diff --git a/doc/user/admin_area/license.md b/doc/user/admin_area/license.md
index 9a6aff2db0a..1ffaf4e0678 100644
--- a/doc/user/admin_area/license.md
+++ b/doc/user/admin_area/license.md
@@ -72,7 +72,7 @@ gitlab_rails['initial_license_file'] = "/path/to/license/file"
 
 CAUTION: **Caution:**
 These methods will only add a license at the time of installation. Use the
-Admin Area in the web ui to renew or upgrade licenses.
+Admin Area in the web user interface to renew or upgrade licenses.
 
 ---
 
diff --git a/doc/user/admin_area/settings/external_authorization.md b/doc/user/admin_area/settings/external_authorization.md
index 15c827ed243..c5c5f08aea1 100644
--- a/doc/user/admin_area/settings/external_authorization.md
+++ b/doc/user/admin_area/settings/external_authorization.md
@@ -31,7 +31,7 @@ functionality that render cross-project data. That includes:
 This is to prevent performing to many requests at once to the external
 authorization service.
 
-Whenever access is granted or denied this is logged in a logfile called
+Whenever access is granted or denied this is logged in a log file called
 `external-policy-access-control.log`.
 Read more about logs GitLab keeps in the [omnibus documentation](https://docs.gitlab.com/omnibus/settings/logs.html).
 
@@ -60,7 +60,7 @@ The available required properties are:
   requesting authorization if no specific label is defined on the project
 
 When using TLS Authentication with a self signed certificate, the CA certificate
-needs to be trusted by the openssl installation. When using GitLab installed using
+needs to be trusted by the OpenSSL installation. When using GitLab installed using
 Omnibus, learn to install a custom CA in the
 [omnibus documentation](https://docs.gitlab.com/omnibus/settings/ssl.html). Alternatively learn where to install
 custom certificates using `openssl version -d`.
diff --git a/doc/user/admin_area/settings/gitaly_timeouts.md b/doc/user/admin_area/settings/gitaly_timeouts.md
index 775a99d7574..68f359368f0 100644
--- a/doc/user/admin_area/settings/gitaly_timeouts.md
+++ b/doc/user/admin_area/settings/gitaly_timeouts.md
@@ -4,7 +4,7 @@ type: reference
 
 # Gitaly timeouts
 
-![gitaly timeouts](img/gitaly_timeouts.png)
+![Gitaly timeouts](img/gitaly_timeouts.png)
 
 3 timeout types can be configured to make sure that long running
 Gitaly calls don't needlessly take up resources.
diff --git a/doc/user/admin_area/settings/index.md b/doc/user/admin_area/settings/index.md
index 761d640c535..df087722fcf 100644
--- a/doc/user/admin_area/settings/index.md
+++ b/doc/user/admin_area/settings/index.md
@@ -32,7 +32,7 @@ Access the default page for admin area settings by navigating to
 | Option | Description |
 | ------ | ----------- |
 | [Elasticsearch](../../../integration/elasticsearch.md#enabling-elasticsearch) | Elasticsearch integration. Elasticsearch AWS IAM. |
-| [PlantUML](../../../administration/integration/plantuml.md#gitlab) | Allow rendering of PlantUML diagrams in Asciidoc documents. |
+| [PlantUML](../../../administration/integration/plantuml.md#gitlab) | Allow rendering of PlantUML diagrams in AsciiDoc documents. |
 | [Slack application](../../../user/project/integrations/gitlab_slack_application.md#configuration) **(FREE ONLY)** | Slack integration allows you to interact with GitLab via slash commands in a chat window. This option is only available on GitLab.com, though it may be [available for self-managed instances in the future](https://gitlab.com/gitlab-org/gitlab/-/issues/28164). |
 | [Third party offers](third_party_offers.md) | Control the display of third party offers. |
 | [Snowplow](../../../development/telemetry/snowplow.md) | Configure the Snowplow integration. |
diff --git a/doc/user/analytics/productivity_analytics.md b/doc/user/analytics/productivity_analytics.md
index d6efa624aad..653836de8be 100644
--- a/doc/user/analytics/productivity_analytics.md
+++ b/doc/user/analytics/productivity_analytics.md
@@ -10,7 +10,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 Track development velocity with Productivity Analytics.
 
-For many companies, the development cycle is a blackbox and getting an estimate of how
+For many companies, the development cycle is a black box and getting an estimate of how
 long, on average, it takes to deliver features is an enormous endeavor.
 
 While [Value Stream Analytics](../project/cycle_analytics.md) focuses on the entire
diff --git a/doc/user/application_security/dast/index.md b/doc/user/application_security/dast/index.md
index 5661680d737..c6b05a45d1e 100644
--- a/doc/user/application_security/dast/index.md
+++ b/doc/user/application_security/dast/index.md
@@ -471,9 +471,9 @@ DAST can be [configured](#customizing-the-dast-settings) using environment varia
 | `DAST_INCLUDE_ALPHA_VULNERABILITIES` | no | Include alpha passive and active scan rules. Boolean. `true`, `True`, or `1` are considered as true value, otherwise false. Defaults to `false`. |
 | `DAST_USE_AJAX_SPIDER` | no | Use the AJAX spider in addition to the traditional spider, useful for crawling sites that require JavaScript. Boolean. `true`, `True`, or `1` are considered as true value, otherwise false. Defaults to `false`. |
 | `DAST_ZAP_CLI_OPTIONS` | no | ZAP server command-line options. For example, `-Xmx3072m` would set the Java maximum memory allocation pool size. |
-| `DAST_ZAP_GENERATE_CONFIG` | no | The file name of the generated sample ZAP config file for use with `DAST_ZAP_CONFIG_FILE`. |
-| `DAST_ZAP_CONFIG_FILE` | no | Name of config file used to determine thresholds of vulnerability rules. |
-| `DAST_ZAP_CONFIG_URL` | no | URL of config file used to determine thresholds of vulnerability rules. |
+| `DAST_ZAP_GENERATE_CONFIG` | no | The file name of the generated sample ZAP configuration file for use with `DAST_ZAP_CONFIG_FILE`. |
+| `DAST_ZAP_CONFIG_FILE` | no | Name of configuration file used to determine thresholds of vulnerability rules. |
+| `DAST_ZAP_CONFIG_URL` | no | URL of configuration file used to determine thresholds of vulnerability rules. |
 | `DAST_ZAP_LOG_CONFIGURATION` | no | Set to a semicolon-separated list of additional log4j properties for the ZAP Server. For example, `log4j.logger.org.parosproxy.paros.network.HttpSender=DEBUG` |
 
 ### DAST command-line options
diff --git a/doc/user/application_security/dependency_list/index.md b/doc/user/application_security/dependency_list/index.md
index 67665ca57b1..1f730e5f205 100644
--- a/doc/user/application_security/dependency_list/index.md
+++ b/doc/user/application_security/dependency_list/index.md
@@ -31,8 +31,8 @@ Dependencies are displayed with the following information:
 | Field     | Description |
 | --------- | ----------- |
 | Component | The dependency's name and version |
-| Packager  | The packager used to install the depedency |
-| Location  | A link to the packager-specific lockfile in your project that declared the dependency |
+| Packager  | The packager used to install the dependency |
+| Location  | A link to the packager-specific lock file in your project that declared the dependency |
 | License   | Links to dependency's software licenses |
 
 Dependencies shown are initially sorted by the severity of their known vulnerabilities, if any. They
diff --git a/doc/user/application_security/index.md b/doc/user/application_security/index.md
index 2c864e5161d..fd75a72a64e 100644
--- a/doc/user/application_security/index.md
+++ b/doc/user/application_security/index.md
@@ -71,7 +71,7 @@ The scanning tools and vulnerabilities database are updated regularly.
 | Secure scanning tool                                         | Vulnerabilities database updates          |
 |:-------------------------------------------------------------|-------------------------------------------|
 | [Container Scanning](container_scanning/index.md)            | Uses `clair`. The latest `clair-db` version is used for each job by running the [`latest` Docker image tag](https://gitlab.com/gitlab-org/gitlab/blob/438a0a56dc0882f22bdd82e700554525f552d91b/lib/gitlab/ci/templates/Security/Container-Scanning.gitlab-ci.yml#L37). The `clair-db` database [is updated daily according to the author](https://github.com/arminc/clair-local-scan#clair-server-or-local). |
-| [Dependency Scanning](dependency_scanning/index.md)          | Relies on `bundler-audit` (for Rubygems), `retire.js` (for NPM packages), and `gemnasium` (GitLab's own tool for all libraries). Both `bundler-audit` and `retire.js` fetch their vulnerabilities data from GitHub repositories, so vulnerabilities added to `ruby-advisory-db` and `retire.js` are immediately available. The tools themselves are updated once per month if there's a new version. The [Gemnasium DB](https://gitlab.com/gitlab-org/security-products/gemnasium-db) is updated at least once a week. See our [current measurement of time from CVE being issued to our product being updated](https://about.gitlab.com/handbook/engineering/development/performance-indicators/#cve-issue-to-update). |
+| [Dependency Scanning](dependency_scanning/index.md)          | Relies on `bundler-audit` (for Ruby gems), `retire.js` (for NPM packages), and `gemnasium` (GitLab's own tool for all libraries). Both `bundler-audit` and `retire.js` fetch their vulnerabilities data from GitHub repositories, so vulnerabilities added to `ruby-advisory-db` and `retire.js` are immediately available. The tools themselves are updated once per month if there's a new version. The [Gemnasium DB](https://gitlab.com/gitlab-org/security-products/gemnasium-db) is updated at least once a week. See our [current measurement of time from CVE being issued to our product being updated](https://about.gitlab.com/handbook/engineering/development/performance-indicators/#cve-issue-to-update). |
 | [Dynamic Application Security Testing (DAST)](dast/index.md) | The scanning engine is updated on a periodic basis. See the [version of the underlying tool `zaproxy`](https://gitlab.com/gitlab-org/security-products/dast/blob/master/Dockerfile#L1). The scanning rules are downloaded at scan runtime. |
 | [Static Application Security Testing (SAST)](sast/index.md)  | Relies exclusively on [the tools GitLab wraps](sast/index.md#supported-languages-and-frameworks). The underlying analyzers are updated at least once per month if a relevant update is available. The vulnerabilities database is updated by the upstream tools. |
 
@@ -95,7 +95,7 @@ information with several options:
 - [Dismiss vulnerability](#dismissing-a-vulnerability): Dismissing a vulnerability styles it in
   strikethrough.
 - [Create issue](#creating-an-issue-for-a-vulnerability): Create a new issue with the title and
-  description prepopulated with information from the vulnerability report. By default, such issues
+  description pre-populated with information from the vulnerability report. By default, such issues
   are [confidential](../project/issues/confidential_issues.md).
 - [Solution](#solutions-for-vulnerabilities-auto-remediation): For some vulnerabilities,
   a solution is provided for how to fix the vulnerability.
@@ -142,7 +142,7 @@ button from within the vulnerability modal, or by using the action buttons to th
 a vulnerability row in the group security dashboard.
 
 This creates a [confidential issue](../project/issues/confidential_issues.md) in the project the
-vulnerability came from, and prepopulates it with some useful information taken from the vulnerability
+vulnerability came from, and pre-populates it with some useful information taken from the vulnerability
 report. Once the issue is created, you are redirected to it so you can edit, assign, or comment on
 it.
 
diff --git a/doc/user/application_security/offline_deployments/index.md b/doc/user/application_security/offline_deployments/index.md
index 0db0e4ed557..9a2f8768fc0 100644
--- a/doc/user/application_security/offline_deployments/index.md
+++ b/doc/user/application_security/offline_deployments/index.md
@@ -52,7 +52,7 @@ you must update each of the scanners to either reference a different,
 internally-hosted registry or provide access to the individual scanner images.
 
 You must also ensure that your app has access to common package repositories
-that are not hosted on GitLab.com, such as npm, yarn, or rubygems. Packages
+that are not hosted on GitLab.com, such as npm, yarn, or Ruby gems. Packages
 from these repos can be obtained by temporarily connecting to a network or by
 mirroring the packages inside your own offline network.
 
diff --git a/doc/user/application_security/sast/analyzers.md b/doc/user/application_security/sast/analyzers.md
index 34ffe5dfcff..0aa20bf4373 100644
--- a/doc/user/application_security/sast/analyzers.md
+++ b/doc/user/application_security/sast/analyzers.md
@@ -145,7 +145,7 @@ The [Security Scanner Integration](../../../development/integrations/secure.md)
 
 ## Analyzers Data
 
-| Property \ Tool                         | Apex                 | Bandit               | Brakeman             | ESLint security      | Find Sec Bugs        | Flawfinder           | Gosec                | Kubesec Scanner      | NodeJsScan           | Php CS Security Audit   | Security code Scan (.NET)   | Sobelow            | TSLint Security    |
+| Property \ Tool                         | Apex                 | Bandit               | Brakeman             | ESLint security      | Find Sec Bugs        | Flawfinder           | Gosec                | Kubesec Scanner      | NodeJsScan           | PHP CS Security Audit   | Security code Scan (.NET)   | Sobelow            | TSLint Security    |
 | --------------------------------------- | :------------------: | :------------------: | :------------------: | :------------------: | :------------------: | :------------------: | :------------------: | :------------------: | :------------------: | :---------------------: | :-------------------------: | :----------------: | :-------------:    |
 | Severity                                | ✓                    | ✓                    | 𐄂                    | 𐄂                    | ✓                    | 𐄂                    | ✓                    | ✓                    | 𐄂                    | ✓                       | 𐄂                           | 𐄂                  | ✓                  |
 | Title                                   | ✓                    | ✓                    | ✓                    | ✓                    | ✓                    | ✓                    | ✓                    | ✓                    | ✓                    | ✓                       | ✓                           | ✓                  | ✓                  |
diff --git a/doc/user/application_security/secret_detection/index.md b/doc/user/application_security/secret_detection/index.md
index f5d2e627292..c3c4abb9c67 100644
--- a/doc/user/application_security/secret_detection/index.md
+++ b/doc/user/application_security/secret_detection/index.md
@@ -52,11 +52,11 @@ detected, whereas `https://username:password@example.com/path/to/repo` would be
 
 ## Full History Secret Scan
 
-GitLab 12.11 introduced support for scanning the full history of a reposity. This new functionality
+GitLab 12.11 introduced support for scanning the full history of a repository. This new functionality
 is particularly useful when you are enabling Secret Detection in a repository for the first time and you
 want to perform a full secret scan. Running a secret scan on the full history can take a long time,
 especially for larger repositories with lengthy Git histories. We recommend not setting this variable
-as part of your normal job defintion.
+as part of your normal job definition.
 
 A new configuration variable ([`SAST_GITLEAKS_HISTORIC_SCAN`](../sast/#vulnerability-filters))
 can be set to change the behavior of the GitLab Secret Detection scan to run on the entire Git history of a repository.
diff --git a/doc/user/application_security/vulnerabilities/index.md b/doc/user/application_security/vulnerabilities/index.md
index 07e1117eb0b..6c365dd6dfc 100644
--- a/doc/user/application_security/vulnerabilities/index.md
+++ b/doc/user/application_security/vulnerabilities/index.md
@@ -20,7 +20,7 @@ several different ways:
 - [Change the Vulnerability Status](#changing-vulnerability-status) - You can change the
   status of a vulnerability to **Detected**, **Confirmed**, **Dismissed**, or **Resolved**.
 - [Create issue](#creating-an-issue-for-a-vulnerability) - Create a new issue with the
-  title and description prepopulated with information from the vulnerability report.
+  title and description pre-populated with information from the vulnerability report.
   By default, such issues are [confidential](../../project/issues/confidential_issues.md).
 - [Solution](#automatic-remediation-solutions-for-vulnerabilities) - For some vulnerabilities,
   a solution is provided for how to fix the vulnerability.
@@ -42,7 +42,7 @@ the following values:
 You can create an issue for a vulnerability by selecting the **Create issue** button.
 
 This creates a [confidential issue](../../project/issues/confidential_issues.md) in the
-project the vulnerability came from, and prepopulates it with useful information from
+project the vulnerability came from, and pre-populates it with useful information from
 the vulnerability report. After the issue is created, GitLab redirects you to the
 issue page so you can edit, assign, or comment on the issue.
 
diff --git a/doc/user/clusters/crossplane.md b/doc/user/clusters/crossplane.md
index a9a5f768ec8..3a430ad55bd 100644
--- a/doc/user/clusters/crossplane.md
+++ b/doc/user/clusters/crossplane.md
@@ -151,7 +151,7 @@ kubectl describe globaladdress.compute.gcp.crossplane.io gitlab-ad-globaladdress
 
 Resource classes are a way of defining a configuration for the required managed service. We will define the PostgreSQL Resource class
 
-- Define a `gcp-postgres-standard.yaml` resourceclass which contains
+- Define a `gcp-postgres-standard.yaml` resource class which contains
 
 1. A default CloudSQLInstanceClass.
 1. A CloudSQLInstanceClass with labels.
diff --git a/doc/user/feature_highlight.md b/doc/user/feature_highlight.md
index 47f8671afae..9b52c178493 100644
--- a/doc/user/feature_highlight.md
+++ b/doc/user/feature_highlight.md
@@ -3,11 +3,11 @@
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/16379) in GitLab 10.5
 
 Feature highlights are represented by a pulsing blue dot. Hovering over the dot
-will open up callout with more information.
+will display more information.
 They are used to emphasize a certain feature and make something more visible to the user.
 
 You can dismiss any feature highlight permanently by clicking the "Got it" link
-at the bottom of the callout. There isn't a way to restore the feature highlight
+at the bottom of the modal window. There isn't a way to restore the feature highlight
 after it has been dismissed.
 
 ![Clusters feature highlight](img/feature_highlight_example.png)
diff --git a/doc/user/gitlab_com/index.md b/doc/user/gitlab_com/index.md
index 8f52b115a67..6522f5c4053 100644
--- a/doc/user/gitlab_com/index.md
+++ b/doc/user/gitlab_com/index.md
@@ -157,7 +157,7 @@ Below are the shared Runners settings.
 Linux Shared Runners on GitLab.com provide a way to run commands in a CI
 job before the Runner attempts to run `git init` and `git fetch` to
 download a GitLab repository. The
-[pre_clone_script](https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section)
+[`pre_clone_script`](https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section)
 can be used for:
 
 - Seeding the build directory with repository data
@@ -420,37 +420,37 @@ different database servers.
 
 The list of GitLab.com specific settings (and their defaults) is as follows:
 
-| Setting                             | GitLab.com                                                          | Default                               |
-|:------------------------------------|:--------------------------------------------------------------------|:--------------------------------------|
-| archive_command                     | `/usr/bin/envdir /etc/wal-e.d/env /opt/wal-e/bin/wal-e wal-push %p` | empty                                 |
-| archive_mode                        | on                                                                  | off                                   |
-| autovacuum_analyze_scale_factor     | 0.01                                                                | 0.01                                  |
-| autovacuum_max_workers              | 6                                                                   | 3                                     |
-| autovacuum_vacuum_cost_limit        | 1000                                                                | -1                                    |
-| autovacuum_vacuum_scale_factor      | 0.01                                                                | 0.02                                  |
-| checkpoint_completion_target        | 0.7                                                                 | 0.9                                   |
-| checkpoint_segments                 | 32                                                                  | 10                                    |
-| effective_cache_size                | 338688MB                                                            | Based on how much memory is available |
-| hot_standby                         | on                                                                  | off                                   |
-| hot_standby_feedback                | on                                                                  | off                                   |
-| log_autovacuum_min_duration         | 0                                                                   | -1                                    |
-| log_checkpoints                     | on                                                                  | off                                   |
-| log_line_prefix                     | `%t [%p]: [%l-1]`                                                   | empty                                 |
-| log_min_duration_statement          | 1000                                                                | -1                                    |
-| log_temp_files                      | 0                                                                   | -1                                    |
-| maintenance_work_mem                | 2048MB                                                              | 16 MB                                 |
-| max_replication_slots               | 5                                                                   | 0                                     |
-| max_wal_senders                     | 32                                                                  | 0                                     |
-| max_wal_size                        | 5GB                                                                 | 1GB                                   |
-| shared_buffers                      | 112896MB                                                            | Based on how much memory is available |
-| shared_preload_libraries            | pg_stat_statements                                                  | empty                                 |
-| shmall                              | 30146560                                                            | Based on the server's capabilities    |
-| shmmax                              | 123480309760                                                        | Based on the server's capabilities    |
-| wal_buffers                         | 16MB                                                                | -1                                    |
-| wal_keep_segments                   | 512                                                                 | 10                                    |
-| wal_level                           | replica                                                             | minimal                               |
-| statement_timeout                   | 15s                                                                 | 60s                                   |
-| idle_in_transaction_session_timeout | 60s                                                                 | 60s                                   |
+| Setting                               | GitLab.com                                                          | Default                               |
+|:--------------------------------------|:--------------------------------------------------------------------|:--------------------------------------|
+| `archive_command`                     | `/usr/bin/envdir /etc/wal-e.d/env /opt/wal-e/bin/wal-e wal-push %p` | empty                                 |
+| `archive_mode`                        | on                                                                  | off                                   |
+| `autovacuum_analyze_scale_factor`     | 0.01                                                                | 0.01                                  |
+| `autovacuum_max_workers`              | 6                                                                   | 3                                     |
+| `autovacuum_vacuum_cost_limit`        | 1000                                                                | -1                                    |
+| `autovacuum_vacuum_scale_factor`      | 0.01                                                                | 0.02                                  |
+| `checkpoint_completion_target`        | 0.7                                                                 | 0.9                                   |
+| `checkpoint_segments`                 | 32                                                                  | 10                                    |
+| `effective_cache_size`                | 338688MB                                                            | Based on how much memory is available |
+| `hot_standby`                         | on                                                                  | off                                   |
+| `hot_standby_feedback`                | on                                                                  | off                                   |
+| `log_autovacuum_min_duration`         | 0                                                                   | -1                                    |
+| `log_checkpoints`                     | on                                                                  | off                                   |
+| `log_line_prefix`                     | `%t [%p]: [%l-1]`                                                   | empty                                 |
+| `log_min_duration_statement`          | 1000                                                                | -1                                    |
+| `log_temp_files`                      | 0                                                                   | -1                                    |
+| `maintenance_work_mem`                | 2048MB                                                              | 16 MB                                 |
+| `max_replication_slots`               | 5                                                                   | 0                                     |
+| `max_wal_senders`                     | 32                                                                  | 0                                     |
+| `max_wal_size`                        | 5GB                                                                 | 1GB                                   |
+| `shared_buffers`                      | 112896MB                                                            | Based on how much memory is available |
+| `shared_preload_libraries`            | pg_stat_statements                                                  | empty                                 |
+| `shmall`                              | 30146560                                                            | Based on the server's capabilities    |
+| `shmmax`                              | 123480309760                                                        | Based on the server's capabilities    |
+| `wal_buffers`                         | 16MB                                                                | -1                                    |
+| `wal_keep_segments`                   | 512                                                                 | 10                                    |
+| `wal_level`                           | replica                                                             | minimal                               |
+| `statement_timeout`                   | 15s                                                                 | 60s                                   |
+| `idle_in_transaction_session_timeout` | 60s                                                                 | 60s                                   |
 
 Some of these settings are in the process being adjusted. For example, the value
 for `shared_buffers` is quite high and as such we are looking into adjusting it.
diff --git a/doc/user/project/repository/repository_mirroring.md b/doc/user/project/repository/repository_mirroring.md
index bc643301ad9..f75b083e6dc 100644
--- a/doc/user/project/repository/repository_mirroring.md
+++ b/doc/user/project/repository/repository_mirroring.md
@@ -28,7 +28,7 @@ immediate update, unless:
 - The mirror is already being updated.
 - 5 minutes haven't elapsed since its last update.
 
-For security reasons, from [GitLab 12.10 onwards](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27166),
+For security reasons, in [GitLab 12.10 and later](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27166),
 the URL to the original repository is only displayed to users with
 Maintainer or Owner permissions to the mirrored project.
 
diff --git a/doc/user/shortcuts.md b/doc/user/shortcuts.md
index 9834856f721..efa374cf1c3 100644
--- a/doc/user/shortcuts.md
+++ b/doc/user/shortcuts.md
@@ -8,7 +8,7 @@ disqus_identifier: 'https://docs.gitlab.com/ee/workflow/shortcuts.html'
 GitLab has many useful keyboard shortcuts to make it easier to access different features.
 You can see a modal listing keyboard shortcuts within GitLab itself by pressing <kbd>?</kbd>,
 or clicking **Keyboard shortcuts** in the Help menu at the top right.
-From [GitLab 12.8 onwards](https://gitlab.com/gitlab-org/gitlab/-/issues/22113),
+In [GitLab 12.8 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/22113),
 keyboard shortcuts can be disabled using the **Enable**/**Disable** toggle in this modal window.
 
 The [Global Shortcuts](#global-shortcuts) work from any area of GitLab, but you must