Add latest changes from gitlab-org/gitlab@master

3 files changed, 14 insertions, 14 deletions

diff --git a/doc/user/project/import/gemnasium.md b/doc/user/project/import/gemnasium.md
index 20614bf5cc5..b8ba5e89949 100644
--- a/doc/user/project/import/gemnasium.md
+++ b/doc/user/project/import/gemnasium.md
@@ -44,7 +44,7 @@ some steps to migrate your projects. There is no automatic import since GitLab
 doesn't know anything about any projects which existed on Gemnasium.com.
 Security features are free for public (open-source) projects hosted on GitLab.com.
 
-### If your project is hosted on GitLab (`https://gitlab.com` / self-hosted)
+### If your project is hosted on GitLab (`https://gitlab.com` / self-managed)
 
 You're almost set! If you're already using
 [Auto DevOps](../../../topics/autodevops/), you are already covered.
diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md
index a475dde59fd..80b14c40e0a 100644
--- a/doc/user/project/import/github.md
+++ b/doc/user/project/import/github.md
@@ -1,19 +1,19 @@
 # Import your project from GitHub to GitLab
 
 Using the importer, you can import your GitHub repositories to GitLab.com or to
-your self-hosted GitLab instance.
+your self-managed GitLab instance.
 
 ## Overview
 
 NOTE: **Note:**
 These instructions work for users on GitLab.com, but if you are an
-administrator of a self-hosted GitLab instance or if you are importing from GitHub Enterprise,
+administrator of a self-managed GitLab instance or if you are importing from GitHub Enterprise,
 you must enable [GitHub integration][gh-import]. GitHub integration is the only method for
 importing from GitHub Enterprise. If you are using GitLab.com, you can alternatively import
 GitHub repositories using a [personal access token](#using-a-github-token),
 but this method is not recommended because it cannot associate all user activity
 (such as issues and pull requests) with matching GitLab users.
-If you are an administrator of a self-hosted GitLab instance, you can also use the
+If you are an administrator of a self-managed GitLab instance, you can also use the
 [GitHub rake task](../../../administration/raketasks/github_import.md) to import projects from
 GitHub without the constraints of a Sidekiq worker.
 
@@ -80,7 +80,7 @@ User-matching attempts occur in that order, and if a user is not identified eith
 the user account that is performing the import.
 
 NOTE: **Note:**
-If you are using a self-hosted GitLab instance or if you are importing from GitHub Enterprise, this process requires that you have configured
+If you are using a self-managed GitLab instance or if you are importing from GitHub Enterprise, this process requires that you have configured
 [GitHub integration][gh-import].
 
 1. From the top navigation bar, click **+** and select **New project**.
@@ -95,7 +95,7 @@ NOTE: **Note:**
 Using a personal access token to import projects is not recommended. If you are a GitLab.com user,
 you can use a personal access token to import your project from GitHub, but this method cannot
 associate all user activity (such as issues and pull requests) with matching GitLab users.
-If you are an administrator of a self-hosted GitLab instance or if you are importing from
+If you are an administrator of a self-managed GitLab instance or if you are importing from
 GitHub Enterprise, you cannot use a personal access token.
 The [GitHub integration method (above)](#using-the-github-integration) is recommended for all users.
 Read more in the [How it works](#how-it-works) section.
@@ -137,7 +137,7 @@ Additionally, you can configure GitLab to send pipeline status updates back GitH
 If you import your project using [CI/CD for external repo](../../../ci/ci_cd_for_external_repos/index.md), then both
 of the above are automatically configured. **(PREMIUM)**
 
-## Improving the speed of imports on self-hosted instances
+## Improving the speed of imports on self-managed instances
 
 NOTE: **Note:**
 Admin access to the GitLab server is required.
diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md
index ab2f942e911..a4c844b415d 100644
--- a/doc/user/project/import/index.md
+++ b/doc/user/project/import/index.md
@@ -22,20 +22,20 @@ repository is too large the import can timeout.
 
 There is also the option of [connecting your external repository to get CI/CD benefits](../../../ci/ci_cd_for_external_repos/index.md). **(PREMIUM)**
 
-## Migrating from self-hosted GitLab to GitLab.com
+## Migrating from self-managed GitLab to GitLab.com
 
 If you only need to migrate Git repos, you can [import each project by URL](repo_by_url.md). Issues and merge requests can't be imported.
 
 If you want to retain all metadata like issues and merge requests, you can use
-the [import/export feature](../settings/import_export.md) to export projects from self-hosted GitLab and import those projects into GitLab.com.
+the [import/export feature](../settings/import_export.md) to export projects from self-managed GitLab and import those projects into GitLab.com.
 
 NOTE: **Note:**
-This approach assumes all users from the self-hosted instance have already been migrated.
+This approach assumes all users from the self-managed instance have already been migrated.
 If the users haven't been migrated yet, the user conducting the import
 will take the place of all references to the missing user(s).
 
-If you need to migrate all data over, you can leverage our [API](../../../api/README.md) to migrate from self-hosted to GitLab.com.
-The order of assets to migrate from a self-hosted instance to GitLab is the following:
+If you need to migrate all data over, you can leverage our [API](../../../api/README.md) to migrate from self-managed to GitLab.com.
+The order of assets to migrate from a self-managed instance to GitLab.com is the following:
 
 1. [Users](../../../api/users.md)
 1. [Groups](../../../api/groups.md)
@@ -47,7 +47,7 @@ Keep in mind the limitations of the [import/export feature](../settings/import_e
 You will still need to migrate your Container Registry over a series of
 Docker pulls and pushes and re-run any CI pipelines to retrieve any build artifacts.
 
-## Migrating between two self-hosted GitLab instances
+## Migrating between two self-managed GitLab instances
 
 The best method for migrating from one GitLab instance to another,
 perhaps from an old server to a new server for example, is to
@@ -55,4 +55,4 @@ perhaps from an old server to a new server for example, is to
 then restore it on the new server.
 
 In the event of merging two GitLab instances together (for example, both instances have existing data on them and one can't be wiped),
-refer to the instructions in [Migrating from self-hosted GitLab to GitLab.com](#migrating-from-self-hosted-gitlab-to-gitlabcom).
+refer to the instructions in [Migrating from self-managed GitLab to GitLab.com](#migrating-from-self-managed-gitlab-to-gitlabcom).