Automatic merge of gitlab-org/gitlab-ce master

doc/administration/geo/disaster_recovery/index.md

-# Disaster Recovery **(PREMIUM ONLY)**
+# Disaster Recovery (Geo) **(PREMIUM ONLY)**
 
 Geo replicates your database, your Git repositories, and few other assets.
 We will support and replicate more data in the future, that will enable you to

doc/administration/geo/replication/index.md

-# Geo Replication **(PREMIUM ONLY)**
+# Replication (Geo) **(PREMIUM ONLY)**
 
 > - Introduced in GitLab Enterprise Edition 8.9.
 > - Using Geo in combination with
@@ -6,7 +6,7 @@
 >   is considered **Generally Available** (GA) in
 >   [GitLab Premium](https://about.gitlab.com/pricing/) 10.4.
 
-Geo is the solution for widely distributed development teams.
+Replication with Geo is the solution for widely distributed development teams.
 
 ## Overview
 

doc/ci/variables/README.md

@@ -94,7 +94,10 @@ This means that the value of the variable will be hidden in job logs,
 though it must match certain requirements to do so:
 
 - The value must be in a single line.
-- The value must only consist of characters from the Base64 alphabet ([RFC4648](https://tools.ietf.org/html/rfc4648)) with the addition of `@` and `:`.
+- The value must only consist of characters from the Base64 alphabet (RFC4648).
+
+  [In GitLab 12.2](https://gitlab.com/gitlab-org/gitlab-ce/issues/63043)
+  and newer, `@` and `:` are also valid values.
 - The value must be at least 8 characters long.
 - The value must not use variables.
 
@@ -509,7 +512,7 @@ Below you can find supported syntax reference:
 1. Checking for an empty variable
 
    Examples:
-  
+
    - `$VARIABLE == ""`
    - `$VARIABLE != ""` (introduced in GitLab 11.11)
 

doc/user/project/import/gitlab_com.md

 # Project importing from GitLab.com to your private GitLab instance
 
-You can import your existing GitLab.com projects to your GitLab instance. But keep in mind that it is possible only if
-GitLab.com integration is enabled on your GitLab instance.
+You can import your existing GitLab.com projects to your GitLab instance, but keep in
+mind that it is possible only if GitLab.com integration is enabled on your GitLab instance.
 [Read more about GitLab.com integration for self-managed GitLab instances](../../../integration/gitlab.md).
 
 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 [project export](../settings/import_export.md)
+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)
 
-![New project page](img/gitlab_new_project_page.png)
+![New project page](img/gitlab_new_project_page_v12_2.png)
 
-Click on the "Import projects from GitLab.com" link and you will be redirected to GitLab.com
+Go to the **Import Projects** tab, then click on **GitLab.com**, and you will be redirected to GitLab.com
 for permission to access your projects. After accepting, you'll be automatically redirected to the importer.
 
 ![Importer page](img/gitlab_importer.png)
 
-To import a project, you can simple click "Import". The importer will import your repository and issues.
+To import a project, click "Import". The importer will import your repository and issues.
 Once the importer is done, a new GitLab project will be created with your imported data.