Add latest changes from gitlab-org/gitlab@master

15 files changed, 27 insertions, 18 deletions

diff --git a/doc/user/project/integrations/asana.md b/doc/user/project/integrations/asana.md
index b1a4d2a2f78..352f6cdc2bb 100644
--- a/doc/user/project/integrations/asana.md
+++ b/doc/user/project/integrations/asana.md
@@ -39,6 +39,7 @@ Complete these steps in GitLab:
 1. Paste the token you generated in Asana.
 1. Optional. To restrict this setting to specific branches, list them in the **Restrict to branch**
    field, separated with commas.
-1. Select **Save changes** or optionally select **Test settings**.
+1. Optional. Select **Test settings**.
+1. Select **Save changes**.
 
 <!-- ## Troubleshooting -->
diff --git a/doc/user/project/integrations/bamboo.md b/doc/user/project/integrations/bamboo.md
index 23990036f4e..05bdd039f12 100644
--- a/doc/user/project/integrations/bamboo.md
+++ b/doc/user/project/integrations/bamboo.md
@@ -47,8 +47,7 @@ integration in GitLab.
 1. If necessary, enter a username and password for a Bamboo user that has
    access to trigger the build plan. Leave these fields blank if you do not require
    authentication.
-1. Optional. To test the configuration and trigger a build in Bamboo,
-   select **Test Settings**.
+1. Optional. Select **Test settings**.
 1. Select **Save changes**.
 
 ### Identify the Bamboo build plan build key
diff --git a/doc/user/project/integrations/bugzilla.md b/doc/user/project/integrations/bugzilla.md
index f2af4dc6e4d..cb6abaa4c7b 100644
--- a/doc/user/project/integrations/bugzilla.md
+++ b/doc/user/project/integrations/bugzilla.md
@@ -31,7 +31,8 @@ To enable the Bugzilla integration in a project:
      For example, for a project named "My Cool App":
      `https://bugzilla.example.org/enter_bug.cgi#h=dupes%7CMy+Cool+App`.
 
-1. Select **Save changes** or optionally select **Test settings**.
+1. Optional. Select **Test settings**.
+1. Select **Save changes**.
 
 After you configure and enable Bugzilla, a link appears on the GitLab
 project pages. This link takes you to the appropriate Bugzilla project.
diff --git a/doc/user/project/integrations/clickup.md b/doc/user/project/integrations/clickup.md
index 255f0c3f56b..4353749dd33 100644
--- a/doc/user/project/integrations/clickup.md
+++ b/doc/user/project/integrations/clickup.md
@@ -21,7 +21,8 @@ To enable the ClickUp integration in a project:
    - **Issue URL**: The URL to the ClickUp project issue to link to this GitLab project.
      The URL must contain `:id`. GitLab replaces this ID with the issue number.
 
-1. Select **Save changes** or optionally select **Test settings**.
+1. Optional. Select **Test settings**.
+1. Select **Save changes**.
 
 After you have configured and enabled ClickUp, you see the ClickUp link on the GitLab project pages,
 which takes you to your ClickUp project.
diff --git a/doc/user/project/integrations/ewm.md b/doc/user/project/integrations/ewm.md
index 39dd548e7ca..7f87e9fc81f 100644
--- a/doc/user/project/integrations/ewm.md
+++ b/doc/user/project/integrations/ewm.md
@@ -35,7 +35,8 @@ To enable the EWM integration, in a project:
      Append the following fragment to your project area URL: `#action=com.ibm.team.workitem.newWorkItem`.
      For example, `https://example.com/ccm/web/projects/JKE%20Banking#action=com.ibm.team.workitem.newWorkItem`.
 
-1. Select **Save changes** or optionally select **Test settings**.
+1. Optional. Select **Test settings**.
+1. Select **Save changes**.
 
 ## Reference EWM work items in commit messages
 
diff --git a/doc/user/project/integrations/hangouts_chat.md b/doc/user/project/integrations/hangouts_chat.md
index 1cfe1a02692..4046869072d 100644
--- a/doc/user/project/integrations/hangouts_chat.md
+++ b/doc/user/project/integrations/hangouts_chat.md
@@ -61,7 +61,7 @@ To enable the integration in GitLab:
 1. Scroll down to the end of the page where you find a **Webhook** field.
 1. Enter the webhook URL you copied from Google Chat.
 1. Select the events you want to be notified about in your Google Chat space.
-1. Optional. Select **Test settings** to verify the connection.
+1. Optional. Select **Test settings**.
 1. Select **Save changes**.
 
 To test the integration, make a change based on the events you selected and
diff --git a/doc/user/project/integrations/irker.md b/doc/user/project/integrations/irker.md
index df11ed3e57c..c77fffaa1ba 100644
--- a/doc/user/project/integrations/irker.md
+++ b/doc/user/project/integrations/irker.md
@@ -50,8 +50,9 @@ network. For more details, read
    It's prepended to every channel or user provided under **Recipients**, which is not a full URI.
 1. Under **Recipients**, enter the users or channels to receive updates, separated by spaces
    (for example, `#channel1 user1`). For more details, see [Enter irker recipients](#enter-irker-recipients).
-1. Optional. Under **Colorize messages**, select the checkbox. irker will highlight your messages.
-1. Select **Save changes** or optionally select **Test Settings**.
+1. Optional. To highlight messages, select the **Colorize messages** checkbox.
+1. Optional. Select **Test settings**.
+1. Select **Save changes**.
 
 ## Enter irker recipients
 
diff --git a/doc/user/project/integrations/pivotal_tracker.md b/doc/user/project/integrations/pivotal_tracker.md
index e1d48037ba8..c2392061b8f 100644
--- a/doc/user/project/integrations/pivotal_tracker.md
+++ b/doc/user/project/integrations/pivotal_tracker.md
@@ -44,4 +44,5 @@ Complete these steps in GitLab:
 1. Paste the token you generated in Pivotal Tracker.
 1. Optional. To restrict this setting to specific branches, list them in the **Restrict to branch**
    field, separated with commas.
-1. Select **Save changes** or optionally select **Test settings**.
+1. Optional. Select **Test settings**.
+1. Select **Save changes**.
diff --git a/doc/user/project/integrations/pumble.md b/doc/user/project/integrations/pumble.md
index e05ff9489ca..5199d1a9935 100644
--- a/doc/user/project/integrations/pumble.md
+++ b/doc/user/project/integrations/pumble.md
@@ -33,7 +33,7 @@ notifications:
 1. Select the checkboxes corresponding to the GitLab events you want to receive in Pumble.
 1. Paste the **Webhook** URL for the Pumble channel.
 1. Configure the remaining options.
-1. Optional. To test the integration, select **Test settings**.
+1. Optional. Select **Test settings**.
 1. Select **Save changes**.
 
 The Pumble channel begins to receive all applicable GitLab events.
diff --git a/doc/user/project/integrations/redmine.md b/doc/user/project/integrations/redmine.md
index df8a6681e2b..5ef30cf413d 100644
--- a/doc/user/project/integrations/redmine.md
+++ b/doc/user/project/integrations/redmine.md
@@ -24,7 +24,8 @@ To enable the Redmine integration in a project:
      **This URL is not used and removal is planned in a future release.**
      For more information, see [issue 327503](https://gitlab.com/gitlab-org/gitlab/-/issues/327503).
 
-1. Select **Save changes** or optionally select **Test settings**.
+1. Optional. Select **Test settings**.
+1. Select **Save changes**.
 
 After you have configured and enabled Redmine, you see the Redmine link on the GitLab project pages,
 which takes you to your Redmine project.
diff --git a/doc/user/project/integrations/slack.md b/doc/user/project/integrations/slack.md
index 5b769b84663..2ce1e15ff63 100644
--- a/doc/user/project/integrations/slack.md
+++ b/doc/user/project/integrations/slack.md
@@ -56,8 +56,8 @@ to control GitLab from Slack. Slash commands are configured separately.
 1. Leave the **Labels to be notified** field blank to get all notifications, or
    add labels that the issue or merge request must have to trigger a
    notification.
-1. Select **Test settings** to verify your information, and then select
-   **Save changes**.
+1. Optional. Select **Test settings**.
+1. Select **Save changes**.
 
 Your Slack team now starts receiving GitLab event notifications as configured.
 
diff --git a/doc/user/project/integrations/unify_circuit.md b/doc/user/project/integrations/unify_circuit.md
index d20b19a3aaa..4a40a6250f1 100644
--- a/doc/user/project/integrations/unify_circuit.md
+++ b/doc/user/project/integrations/unify_circuit.md
@@ -23,6 +23,7 @@ In GitLab:
 1. Paste the **Webhook URL** that you copied from the Unify Circuit configuration step.
 1. Select the **Notify only broken pipelines** checkbox to notify only on failures.
 1. In the **Branches for which notifications are to be sent** dropdown list, select which types of branches to send notifications for.
-1. Select `Save changes` or optionally select **Test settings**.
+1. Optional. Select **Test settings**.
+1. Select **Save changes**.
 
 Your Unify Circuit conversation now starts receiving GitLab event notifications.
diff --git a/doc/user/project/integrations/webex_teams.md b/doc/user/project/integrations/webex_teams.md
index c755c7a5c17..2388014db06 100644
--- a/doc/user/project/integrations/webex_teams.md
+++ b/doc/user/project/integrations/webex_teams.md
@@ -33,6 +33,7 @@ notifications:
 1. Ensure that the **Active** toggle is enabled.
 1. Select the checkboxes corresponding to the GitLab events you want to receive in Webex Teams.
 1. Paste the **Webhook** URL for the Webex Teams space.
-1. Configure the remaining options and then select **Test settings and save changes**.
+1. Optional. Select **Test settings**.
+1. Select **Save changes**.
 
 The Webex Teams space begins to receive all applicable GitLab events.
diff --git a/doc/user/project/integrations/youtrack.md b/doc/user/project/integrations/youtrack.md
index ee5ca8eca78..b1c7b533c0f 100644
--- a/doc/user/project/integrations/youtrack.md
+++ b/doc/user/project/integrations/youtrack.md
@@ -22,7 +22,8 @@ To enable the YouTrack integration in a project:
    - **Project URL**: The URL to the project in YouTrack.
    - **Issue URL**: The URL to view an issue in the YouTrack project.
      The URL must contain `:id`. GitLab replaces `:id` with the issue number.
-1. Select **Save changes** or optionally select **Test settings**.
+1. Optional. Select **Test settings**.
+1. Select **Save changes**.
 
 After you configure and enable YouTrack, a link appears on the GitLab
 project pages. This link takes you to the appropriate YouTrack project.
diff --git a/doc/user/project/integrations/zentao.md b/doc/user/project/integrations/zentao.md
index 19f6a3e315c..b14b9eac9da 100644
--- a/doc/user/project/integrations/zentao.md
+++ b/doc/user/project/integrations/zentao.md
@@ -52,7 +52,7 @@ Complete these steps in GitLab:
 
    ![ZenTao settings page](img/zentao_product_id.png)
 
-1. To verify the ZenTao connection is working, select **Test settings**.
+1. Optional. Select **Test settings**.
 1. Select **Save changes**.
 
 <!--- end_remove -->