Add latest changes from gitlab-org/gitlab@master

1 files changed, 27 insertions, 25 deletions

diff --git a/doc/integration/jira/index.md b/doc/integration/jira/index.md
index 7d10b41aaea..05350bd2ac8 100644
--- a/doc/integration/jira/index.md
+++ b/doc/integration/jira/index.md
@@ -6,18 +6,18 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Jira **(FREE ALL)**
 
-If your organization uses [Jira](https://www.atlassian.com/software/jira),
-you can [migrate your issues from Jira to GitLab](../../user/project/import/jira.md).
+You can [import your Jira issues to GitLab](../../user/project/import/jira.md).
 If you want to continue to use Jira, you can integrate Jira with GitLab instead.
 
 ## Jira integrations
 
-GitLab offers two types of Jira integrations. You can use one or both integrations
-[depending on the capabilities you need](#jira-integration-capabilities).
+GitLab offers two Jira integrations. You can use one or both integrations
+[depending on the features you need](#feature-availability).
 
 ### Jira issue integration
 
-You can use the [Jira issue integration](configure.md) developed by GitLab with Jira Cloud, Jira Data Center, or Jira Server. With this integration, you can:
+You can use the [Jira issue integration](configure.md) developed by GitLab with
+Jira Cloud, Jira Data Center, or Jira Server. With this integration, you can:
 
 - View and search Jira issues directly in GitLab.
 - Refer to Jira issues by ID in GitLab commits and merge requests.
@@ -25,38 +25,40 @@ You can use the [Jira issue integration](configure.md) developed by GitLab with
 
 ### Jira development panel
 
-You can use the [Jira development panel](development_panel.md) to [view GitLab activity for an issue](https://support.atlassian.com/jira-software-cloud/docs/view-development-information-for-an-issue/)
+You can use the [Jira development panel](development_panel.md) to
+[view GitLab activity for an issue](https://support.atlassian.com/jira-software-cloud/docs/view-development-information-for-an-issue/)
 including related branches, commits, and merge requests. To configure the Jira development panel:
 
 - **For Jira Cloud**, use the [GitLab for Jira Cloud app](connect-app.md) developed and maintained by GitLab.
 - **For Jira Data Center or Jira Server**, use the [Jira DVCS connector](dvcs/index.md) developed and maintained by Atlassian.
 
-## Jira integration capabilities
+## Feature availability
 
-This table shows the capabilities available with the Jira issue integration and the Jira development panel:
+This table shows the features available with the Jira issue integration and the Jira development panel:
 
-| Capability | Jira issue integration | Jira development panel |
+| Feature | Jira issue integration | Jira development panel |
 |-|-|-|
-| Mention a Jira issue ID in a GitLab commit or merge request, and a link to the Jira issue is created | **{check-circle}** Yes | **{dotted-circle}** No |
-| Mention a Jira issue ID in GitLab, and the Jira issue shows the GitLab issue or merge request | **{check-circle}** Yes, a Jira comment with the GitLab issue or merge request title links to GitLab. The first mention is also added to the Jira issue under **Web links** | **{check-circle}** Yes, in the issue's [development panel](https://support.atlassian.com/jira-software-cloud/docs/view-development-information-for-an-issue/) |
-| Mention a Jira issue ID in a GitLab commit message, and the Jira issue shows the commit message | **{check-circle}** Yes, the entire commit message is displayed in the Jira issue as a comment and under **Web links**. Each message links back to the commit in GitLab | **{check-circle}** Yes, in the issue's development panel and optionally with a custom comment on the Jira issue by using [Jira Smart Commits](https://confluence.atlassian.com/fisheye/using-smart-commits-960155400.html) |
-| Mention a Jira issue ID in a GitLab branch name, and the Jira issue shows the branch name | **{dotted-circle}** No | **{check-circle}** Yes, in the issue's development panel |
-| Add time tracking to a Jira issue | **{dotted-circle}** No | **{check-circle}** Yes, time can be specified by using Jira Smart Commits |
-| Use a Git commit or merge request to transition or close a Jira issue |**{check-circle}** Yes, only a single transition type. Typically configured to close the issue by setting it to **Done** | **{check-circle}** Yes, transition to any state by using Jira Smart Commits |
-| [View a list of Jira issues](issues.md#view-jira-issues) | **{check-circle}** Yes | **{dotted-circle}** No |
-| [Create a Jira issue for a vulnerability](configure.md#create-a-jira-issue-for-a-vulnerability) | **{check-circle}** Yes | **{dotted-circle}** No |
-| Create a GitLab branch from a Jira issue | **{dotted-circle}** No | **{check-circle}** Yes, in the issue's development panel |
-| Sync GitLab deployments to Jira issues | **{dotted-circle}** No | **{check-circle}** Yes, in the issue's development panel. Mention a Jira issue ID in a GitLab merge request, branch name, or any of the last 5,000 commits made to the branch after the last successful deployment to the environment |
+| Mention a Jira issue ID in a GitLab commit or merge request, and a link to the Jira issue is created. | **{check-circle}** Yes | **{dotted-circle}** No |
+| Mention a Jira issue ID in GitLab, and the Jira issue shows the GitLab issue or merge request. | **{check-circle}** Yes, a Jira comment with the GitLab issue or merge request title links to GitLab. The first mention is also added to **Web links** in the Jira issue. | **{check-circle}** Yes, in the Jira issue's [development panel](https://support.atlassian.com/jira-software-cloud/docs/view-development-information-for-an-issue/). |
+| Mention a Jira issue ID in a GitLab commit, and the Jira issue shows the commit message. | **{check-circle}** Yes, the entire commit message is displayed in the Jira issue as a comment and in **Web links**. Each message links back to the commit in GitLab. | **{check-circle}** Yes, in the Jira issue's development panel. A custom comment is possible with [Jira Smart Commits](https://confluence.atlassian.com/fisheye/using-smart-commits-960155400.html). |
+| Mention a Jira issue ID in a GitLab branch name, and the Jira issue shows the branch name. | **{dotted-circle}** No | **{check-circle}** Yes, in the Jira issue's development panel. |
+| Add time tracking to a Jira issue. | **{dotted-circle}** No | **{check-circle}** Yes, with Jira Smart Commits. |
+| Use a GitLab commit or merge request to transition a Jira issue. |**{check-circle}** Yes, only a single transition. Typically used to close the Jira issue. | **{check-circle}** Yes, transition the Jira issue to any state with Jira Smart Commits. |
+| [View a list of Jira issues](issues.md#view-jira-issues). | **{check-circle}** Yes | **{dotted-circle}** No |
+| [Create a Jira issue for a vulnerability](configure.md#create-a-jira-issue-for-a-vulnerability). | **{check-circle}** Yes | **{dotted-circle}** No |
+| Create a GitLab branch from a Jira issue. | **{dotted-circle}** No | **{check-circle}** Yes, in the Jira issue's development panel. |
+| Mention a Jira issue ID in a GitLab merge request, branch name, or any of the last 5,000 commits to the branch after the last successful deployment to the environment to sync a GitLab deployment to a Jira issue. | **{dotted-circle}** No | **{check-circle}** Yes, in the Jira issue's development panel. |
 
 ## Privacy considerations
 
-All Jira integrations share data with Jira to make it visible outside of GitLab.
-If you integrate a private GitLab project with Jira, the private data is
-shared with users who have access to your Jira project.
+All Jira integrations share data outside of GitLab.
+If you integrate a private GitLab project with Jira, the private
+data is shared with users who have access to your Jira project.
 
-The [Jira issue integration](configure.md) posts GitLab data in the form of comments in Jira issues.
-The GitLab for Jira Cloud app and Jira DVCS connector share this data through the [Jira development panel](development_panel.md).
-This method provides more fine-grained access control because access can be restricted to certain user groups or roles.
+The [Jira issue integration](configure.md) posts GitLab data as comments on Jira issues.
+The [GitLab for Jira Cloud app](connect-app.md) and the [Jira DVCS connector](dvcs/index.md)
+share GitLab data through the [Jira development panel](development_panel.md).
+With the Jira development panel, you can restrict access to certain user groups or roles.
 
 ## Related topics