Merge branch 'slack-slash-commands' into 'master'

Update Slack slash commands

See merge request !127341



Merged-by: Lorena Ciutacu <lciutacu@gitlab.com>
Approved-by: Lorena Ciutacu <lciutacu@gitlab.com>
Reviewed-by: Rajendra Kadam <rkadam@gitlab.com>
Co-authored-by: Ashraf Khamis <akhamis@gitlab.com>
Co-authored-by: Luke Duncalfe <lduncalfe@gitlab.com>

doc/operations/incident_management/slack.md

@@ -32,7 +32,7 @@ Prerequisites:
 
 1. Install the [GitLab for Slack app](../../user/project/integrations/gitlab_slack_application.md).
    This way, you can use slash commands in Slack to create and update GitLab incidents.
-1. Enable [Slack notifications](../../user/project/integrations/slack.md). Be sure to enable
+1. Enable [Slack notifications](../../user/project/integrations/gitlab_slack_application.md#slack-notifications). Be sure to enable
    notifications for `Incident` events, and to define a Slack channel to receive the relevant notifications.
 1. Authorize GitLab to take actions on behalf of your Slack user.
    Each user must do this before they can use any of the incident slash commands.

doc/user/project/integrations/index.md

@@ -75,16 +75,16 @@ You can configure the following integrations.
 | [Pumble](pumble.md)                                                         | Send event notifications to a Pumble channel.                         | **{dotted-circle}** No |
 | Pushover                                                                    | Get real-time notifications on your device.                           | **{dotted-circle}** No |
 | [Redmine](redmine.md)                                                       | Use Redmine as the issue tracker.                                     | **{dotted-circle}** No |
-| [Shimo Workspace](shimo.md)                                                 | Use Shimo instead of the GitLab Wiki.                                 | **{dotted-circle}** No |
+| [Shimo](shimo.md) (deprecated)                                              | Use Shimo instead of the GitLab Wiki.                                 | **{dotted-circle}** No |
 | [GitLab for Slack app](gitlab_slack_application.md)                         | Use Slack's official GitLab application.                              | **{dotted-circle}** No |
-| [Slack notifications](slack.md)                                             | Send notifications about project events to Slack.                     | **{dotted-circle}** No |
+| [Slack notifications](slack.md) (deprecated)                                | Send notifications about project events to Slack.                     | **{dotted-circle}** No |
 | [Slack slash commands](slack_slash_commands.md)                             | Enable slash commands in a workspace.                                 | **{dotted-circle}** No |
 | [Squash TM](squash_tm.md)                                                   | Update Squash TM requirements when GitLab issues are modified.        | **{check-circle}** Yes |
 | [Telegram](telegram.md)                                                     | Send notifications about project events to Telegram.                  | **{dotted-circle}** No |
 | [Unify Circuit](unify_circuit.md)                                           | Send notifications about project events to Unify Circuit.             | **{dotted-circle}** No |
 | [Webex Teams](webex_teams.md)                                               | Receive events notifications.                                         | **{dotted-circle}** No |
 | [YouTrack](youtrack.md)                                                     | Use YouTrack as the issue tracker.                                    | **{dotted-circle}** No |
-| [ZenTao](zentao.md)                                                         | Use ZenTao as the issue tracker.                                      | **{dotted-circle}** No |
+| [ZenTao](zentao.md) (deprecated)                                            | Use ZenTao as the issue tracker.                                      | **{dotted-circle}** No |
 
 ### Project webhooks
 

doc/user/project/integrations/slack_slash_commands.md

@@ -12,10 +12,10 @@ For GitLab.com, use the [GitLab for Slack app](gitlab_slack_application.md) inst
 
 You can use [slash commands](gitlab_slack_application.md#slash-commands) to run common GitLab operations,
 like creating an issue, from a [Slack](https://slack.com/) chat environment.
-To use slash commands in Slack, you must configure both Slack and GitLab.
+To run slash commands in Slack, you must configure both Slack and GitLab.
 
-GitLab can also send events (such as `issue created`) to Slack as part of the
-separately configured [Slack notifications](slack.md).
+GitLab can also send events (such as `issue created`) to Slack as part of
+[Slack notifications](gitlab_slack_application.md#slack-notifications).
 
 For a list of available slash commands, see [Slash commands](gitlab_slack_application.md#slash-commands).
 
@@ -25,15 +25,15 @@ Slack slash commands are scoped to a project. To configure Slack slash commands:
 
 1. On the left sidebar, at the top, select **Search GitLab** (**{search}**) to find your project.
 1. Select **Settings > Integrations**.
-1. Select **Slack slash commands**. Leave this browser tab open.
-1. Open a new browser tab, sign in to your Slack team, and [start a new Slash Commands integration](https://my.slack.com/services/new/slash-commands).
-1. Enter a trigger command. We suggest you use the project name.
-   Select **Add Slash Command Integration**.
-1. Complete the rest of the fields in the Slack configuration page using information from the GitLab browser tab.
-   In particular, make sure you copy and paste the **URL**.
-
-   ![Slack setup instructions](img/slack_setup.png)
-
-1. On the Slack configuration page, select **Save Integration** and copy the **Token**.
-1. Go back to the GitLab configuration page and paste in the **Token**.
-1. Ensure the **Active** checkbox is selected and select **Save changes**.
+1. Select **Slack slash commands** and leave this browser tab open.
+1. In a new browser tab, sign in to Slack and [add a new slash command](https://my.slack.com/services/new/slash-commands).
+1. Enter a slash command trigger name. You could use the project name.
+1. Select **Add Slash Command Integration**.
+1. In the Slack browser tab:
+   1. Complete the fields with information from the GitLab browser tab.
+   1. Select **Save Integration** and copy the **Token** value.
+1. In the GitLab browser tab:
+   1. Paste the token and ensure the **Active** checkbox is selected.
+   1. Select **Save changes**.
+
+You can now run slash commands in Slack.

doc/user/project/integrations/webhooks.md

@@ -28,7 +28,7 @@ listens for specific [events](#events) and GitLab sends a POST request with data
 
 Usually, you set up your own [webhook receiver](#create-an-example-webhook-receiver)
 to receive information from GitLab and send it to another app, according to your requirements.
-We have a [built-in receiver](slack.md)
+We have a [built-in receiver](gitlab_slack_application.md#slack-notifications)
 for sending [Slack](https://api.slack.com/incoming-webhooks) notifications per project.
 
 GitLab.com enforces [webhook limits](../../../user/gitlab_com/index.md#webhooks),