Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

6 files changed, 7 insertions, 16 deletions

diff --git a/doc/user/project/import/clearcase.md b/doc/user/project/import/clearcase.md
index 27a84476590..120c64e00f2 100644
--- a/doc/user/project/import/clearcase.md
+++ b/doc/user/project/import/clearcase.md
@@ -31,7 +31,7 @@ _Taken from the slides [ClearCase and the journey to Git](https://docplayer.net/
 
 ## Why migrate
 
-ClearCase can be difficult to manage both from a user and an admin perspective.
+ClearCase can be difficult to manage both from a user and an administrator perspective.
 Migrating to Git/GitLab there is:
 
 - **No licensing costs**, Git is GPL while ClearCase is proprietary.
diff --git a/doc/user/project/import/gemnasium.md b/doc/user/project/import/gemnasium.md
deleted file mode 100644
index 37460da1289..00000000000
--- a/doc/user/project/import/gemnasium.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: 'index.md'
-remove_date: '2021-08-15'
----
-
-This document was deleted.
-
-<!-- This redirect file can be deleted after <2021-08-15>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
\ No newline at end of file
diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md
index e67b6a45280..1ab343d75fb 100644
--- a/doc/user/project/import/github.md
+++ b/doc/user/project/import/github.md
@@ -179,8 +179,8 @@ Sidekiq workers that process the following queues:
 
 For an optimal experience, it's recommended having at least 4 Sidekiq processes (each running a number of threads equal
 to the number of CPU cores) that *only* process these queues. It's also recommended that these processes run on separate
-servers. For 4 servers with 8 cores this means you can import up to 32 objects (e.g., issues) in parallel.
+servers. For 4 servers with 8 cores this means you can import up to 32 objects (for example, issues) in parallel.
 
 Reducing the time spent in cloning a repository can be done by increasing network throughput, CPU capacity, and disk
-performance (e.g., by using high performance SSDs) of the disks that store the Git repositories (for your GitLab instance).
+performance (by using high performance SSDs, for example) of the disks that store the Git repositories (for your GitLab instance).
 Increasing the number of Sidekiq workers will *not* reduce the time spent cloning repositories.
diff --git a/doc/user/project/import/gitlab_com.md b/doc/user/project/import/gitlab_com.md
index f7eb5e43a79..f25b29317a7 100644
--- a/doc/user/project/import/gitlab_com.md
+++ b/doc/user/project/import/gitlab_com.md
@@ -15,7 +15,7 @@ To get to the importer page you need to go to "New project" page.
 
 NOTE:
 If you are interested in importing Wiki and Merge Request data to your new instance,
-you'll need to follow the instructions for [exporting a project](../settings/import_export.md#exporting-a-project-and-its-data)
+you'll need to follow the instructions for [exporting a project](../settings/import_export.md#export-a-project-and-its-data)
 
 ![New project page](img/gitlab_new_project_page_v12_2.png)
 
diff --git a/doc/user/project/import/jira.md b/doc/user/project/import/jira.md
index 07419080d7d..3e0faec0a49 100644
--- a/doc/user/project/import/jira.md
+++ b/doc/user/project/import/jira.md
@@ -46,7 +46,7 @@ GitLab project that you wish to import into.
 
 ### Jira integration
 
-This feature uses the existing GitLab [Jira integration](../integrations/jira.md).
+This feature uses the existing GitLab [Jira integration](../../../integration/jira/index.md).
 
 Make sure you have the integration set up before trying to import Jira issues.
 
@@ -68,7 +68,7 @@ To import Jira issues to a GitLab project:
    The **Import from Jira** option is only visible if you have the [correct permissions](#permissions).
 
    The following form appears.
-   If you've previously set up the [Jira integration](../integrations/jira.md), you can now see
+   If you've previously set up the [Jira integration](../../../integration/jira/index.md), you can now see
    the Jira projects that you have access to in the dropdown.
 
    ![Import issues from Jira form](img/jira/import_issues_from_jira_form_v13_2.png)
diff --git a/doc/user/project/import/phabricator.md b/doc/user/project/import/phabricator.md
index 6a1370f3301..80f2d6d7e62 100644
--- a/doc/user/project/import/phabricator.md
+++ b/doc/user/project/import/phabricator.md
@@ -36,4 +36,4 @@ of the project being imported into, then the user will be linked.
 
 ## Enable this feature
 
-Enable Phabricator as an [import source](../../admin_area/settings/visibility_and_access_controls.md#import-sources) in the Admin Area.
+Enable Phabricator as an [import source](../../admin_area/settings/visibility_and_access_controls.md#configure-allowed-import-sources) in the Admin Area.