Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 10 insertions, 6 deletions

diff --git a/doc/integration/jira/dvcs.md b/doc/integration/jira/dvcs.md
index 89d1d70d6aa..dc23765337b 100644
--- a/doc/integration/jira/dvcs.md
+++ b/doc/integration/jira/dvcs.md
@@ -18,7 +18,7 @@ are accessible.
 - **Jira Cloud**: Your instance must be accessible through the internet.
 - **Jira Server**: Your network must allow access to your instance.
 
-## Smart Commits
+## Smart commits
 
 When connecting GitLab with Jira with DVCS, you can process your Jira issues using
 special commands, called
@@ -74,6 +74,9 @@ your integration.
 1. In the **Name** field, enter a descriptive name for the integration, such as `Jira`.
 1. In the **Redirect URI** field, enter the URI appropriate for your version of GitLab,
    replacing `<gitlab.example.com>` with your GitLab instance domain:
+   - *For GitLab versions 13.0 and later* **and** *Jira versions 8.14 and later,* use the
+     generated `Redirect URL` from
+     [Linking GitLab accounts with Jira](https://confluence.atlassian.com/adminjiraserver/linking-gitlab-accounts-1027142272.html).
    - *For GitLab versions 11.3 and later,* use `https://<gitlab.example.com>/login/oauth/callback`.
      If you use GitLab.com, the URL is `https://gitlab.com/login/oauth/callback`.
    - *For GitLab versions 11.2 and earlier,* use
@@ -99,13 +102,14 @@ it completes, refreshes every 60 minutes:
    - *For Jira Cloud,* go to **Settings (gear) > Products > DVCS accounts**.
 1. To create a new integration, select the appropriate value for **Host**:
    - *For Jira versions 8.14 and later:* Select **GitLab** or
-     <!-- vale gitlab.Substitutions = NO -->
-     **GitLab Self-Hosted**.
-     <!-- vale gitlab.Substitutions = YES -->
+     **GitLab Self-Managed**.
    - *For Jira versions 8.13 and earlier:* Select **GitHub Enterprise**.
 1. For **Team or User Account**, enter either:
-   - The relative path of a top-level GitLab group that you have access to.
-   - The relative path of your personal namespace.
+   - *For Jira versions 8.14 and later:*
+      - The relative path of a top-level GitLab group that you have access to.
+   - *For Jira versions 8.13 and earlier:*
+      - The relative path of a top-level GitLab group that you have access to.
+      - The relative path of your personal namespace.
 
 1. In the **Host URL** field, enter the URI appropriate for your version of GitLab,
    replacing `<gitlab.example.com>` with your GitLab instance domain: