Add latest changes from gitlab-org/gitlab@master

3 files changed, 31 insertions, 21 deletions

diff --git a/doc/integration/jira/configure.md b/doc/integration/jira/configure.md
index c825b584b57..2533ce2b643 100644
--- a/doc/integration/jira/configure.md
+++ b/doc/integration/jira/configure.md
@@ -59,6 +59,28 @@ To configure your project:
 Your GitLab project can now interact with all Jira projects in your instance and the project now
 displays a Jira link that opens the Jira project.
 
+## Create a Jira Cloud API token
+
+To [integrate with Jira](index.md) in Atlassian Cloud, you must create an API token.
+
+To create a Jira Cloud API token:
+
+1. Sign in to [Atlassian](https://id.atlassian.com/manage-profile/security/api-tokens)
+   from an account with **write** access to Jira projects.
+
+   The link opens the **API tokens** page. Alternatively, from your Atlassian
+   profile, select **Account Settings > Security > Create and manage API tokens**.
+
+1. Select **Create API token**.
+1. In the dialog, enter a label for your token and select **Create**.
+
+To copy the API token, select **Copy** and paste the token somewhere safe.
+
+To configure GitLab, you need:
+
+- The newly created token
+- The email address you used when you created the token
+
 ## Migrate from Jira Server to Jira Cloud in GitLab
 
 To migrate from Jira Server to Jira Cloud in GitLab and maintain your Jira integration:
@@ -68,7 +90,7 @@ To migrate from Jira Server to Jira Cloud in GitLab and maintain your Jira integ
 1. Select **Jira**.
 1. In **Web URL**, enter the new Jira site URL (for example, `https://myjirasite.atlassian.net`).
 1. In **Username or Email**, enter the username or email registered on your Jira profile.
-1. [Create an API token](jira_cloud_configuration.md), and copy that value.
+1. [Create an API token](#create-a-jira-cloud-api-token), and copy that value.
 1. In **Password or API token**, paste the API token value.
 1. Optional. Select **Test settings** to check if the connection is working.
 1. Select **Save changes**.
diff --git a/doc/integration/jira/index.md b/doc/integration/jira/index.md
index 3ec4c7aee87..41d6cda4c84 100644
--- a/doc/integration/jira/index.md
+++ b/doc/integration/jira/index.md
@@ -64,7 +64,7 @@ The authentication method in Jira depends on whether you host Jira on your own s
   how to [set up a user in Jira Server](jira_server_configuration.md).
 - **Jira on Atlassian cloud** supports authentication through an API token. When connecting to Jira on
   Atlassian cloud, an email and API token are required. For more information, see
-  [Create a Jira Cloud API token](jira_cloud_configuration.md).
+  [Create a Jira Cloud API token](configure.md#create-a-jira-cloud-api-token).
 
 ## Privacy considerations
 
diff --git a/doc/integration/jira/jira_cloud_configuration.md b/doc/integration/jira/jira_cloud_configuration.md
index 9d52368f528..83321df0420 100644
--- a/doc/integration/jira/jira_cloud_configuration.md
+++ b/doc/integration/jira/jira_cloud_configuration.md
@@ -1,23 +1,11 @@
 ---
-stage: Manage
-group: Integrations
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
+redirect_to: 'configure.md#create-a-jira-cloud-api-token'
+remove_date: '2023-07-07'
 ---
 
-# Create a Jira Cloud API token **(FREE)**
+This document was moved to [another location](configure.md#create-a-jira-cloud-api-token).
 
-You need an API token to [integrate with Jira](index.md)
-in Atlassian Cloud. To create the API token:
-
-1. Sign in to [Atlassian](https://id.atlassian.com/manage-profile/security/api-tokens)
-   using an account with *write* access to Jira projects.
-
-   The link opens the API tokens page. Alternatively, to go to this page from your Atlassian
-   profile, select **Account Settings > Security > Create and manage API tokens**.
-1. Select **Create API token**.
-1. In the dialog, enter a label for your token and select **Create**.
-1. To copy the API token, select **Copy**, then paste the token somewhere safe.
-
-You need the newly created token, and the email
-address you used when you created it, when you
-[configure GitLab](configure.md).
+<!-- This redirect file can be deleted after <2023-07-07>. -->
+<!-- Redirects that point to other docs in the same project expire in three months. -->
+<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
+<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->