Add latest changes from gitlab-org/gitlab@master

3 files changed, 19 insertions, 26 deletions

diff --git a/doc/user/clusters/agent/ci_cd_tunnel.md b/doc/user/clusters/agent/ci_cd_tunnel.md
index 3cafdabf909..67024f0a816 100644
--- a/doc/user/clusters/agent/ci_cd_tunnel.md
+++ b/doc/user/clusters/agent/ci_cd_tunnel.md
@@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # CI/CD Tunnel
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/327409) in GitLab 14.0.
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/327409) in GitLab 14.1.
 
 The CI/CD Tunnel enables users to access Kubernetes clusters from GitLab CI/CD jobs even if there is no network
 connectivity between GitLab Runner and a cluster. In the current iteration, only CI/CD jobs in the Configuration project
@@ -21,7 +21,7 @@ Prerequisistes:
 
 To create the Tunnel:
 
-1. In your `.gitlab-ci.yml` add a section that creates a `kubectl` compatible configuration file and use it in one
+1. In your `.gitlab-ci.yml` add a section that creates a `kubectl` compatible configuration file (`kubecontext`) and use it in one
    or more jobs:
 
    ```yaml
diff --git a/doc/user/clusters/integrations.md b/doc/user/clusters/integrations.md
index dc8e75edf68..d2861ce2946 100644
--- a/doc/user/clusters/integrations.md
+++ b/doc/user/clusters/integrations.md
@@ -119,7 +119,7 @@ wget https://gitlab.com/gitlab-org/project-templates/cluster-management/-/raw/ma
 helm repo add gitlab https://charts.gitlab.io
 
 # Install Elastic Stack
-helm install prometheus gitlab/elastic-stack -n gitlab-managed-apps --values values.yaml
+helm install elastic-stack gitlab/elastic-stack -n gitlab-managed-apps --values values.yaml
 ```
 
 ### Enable Elastic Stack integration for your cluster
@@ -134,6 +134,6 @@ To enable the Elastic Stack integration for your cluster:
       - For an [instance-level cluster](../instance/clusters/index.md), navigate to your instance's
       **Kubernetes** page.
 1. Select the **Integrations** tab.
-1. Check the **Enable Prometheus integration** checkbox.
+1. Check the **Enable Elastic Stack integration** checkbox.
 1. Click **Save changes**.
 1. Go to the **Health** tab to see your cluster's metrics.
diff --git a/doc/user/project/import/fogbugz.md b/doc/user/project/import/fogbugz.md
index d3d77f16200..982bc6d90e8 100644
--- a/doc/user/project/import/fogbugz.md
+++ b/doc/user/project/import/fogbugz.md
@@ -7,31 +7,24 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Import your project from FogBugz to GitLab **(FREE)**
 
-It only takes a few simple steps to import your project from FogBugz.
-The importer imports all your cases and comments with original case
-numbers and timestamps. You can also map FogBugz users to GitLab users.
+Using the importer, you can import your FogBugz project to GitLab.com
+or to your self-managed GitLab instance.
 
-Follow these steps to import your project from FogBugz:
+The importer imports all of your cases and comments with the original
+case numbers and timestamps. You can also map FogBugz users to GitLab
+users.
 
-1. From your GitLab dashboard, select **New project**.
+To import your project from FogBugz:
 
+1. From your GitLab dashboard, select **New project**.
 1. Select the **FogBugz** button.
-
-  ![FogBugz](img/fogbugz_import_select_fogbogz.png)
-
+   ![FogBugz](img/fogbugz_import_select_fogbogz.png)
 1. Enter your FogBugz URL, email address, and password.
-
-  ![Login](img/fogbugz_import_login.png)
-
-1. Create mapping from FogBugz users to GitLab users.
-
-  ![User Map](img/fogbugz_import_user_map.png)
-
-1. Select the projects you wish to import by selecting the **Import** buttons.
-
-  ![Import Project](img/fogbugz_import_select_project.png)
-
-1. Once the import finishes, click the link to go to the project
+   ![Login](img/fogbugz_import_login.png)
+1. Create a mapping from FogBugz users to GitLab users.
+   ![User Map](img/fogbugz_import_user_map.png)
+1. Select **Import** for the projects you want to import.
+   ![Import Project](img/fogbugz_import_select_project.png)
+1. After the import finishes, click the link to go to the project
    dashboard. Follow the directions to push your existing repository.
-
-  ![Finished](img/fogbugz_import_finished.png)
+   ![Finished](img/fogbugz_import_finished.png)