Add latest changes from gitlab-org/gitlab@master

3 files changed, 13 insertions, 12 deletions

diff --git a/doc/user/project/integrations/gitlab_slack_application.md b/doc/user/project/integrations/gitlab_slack_application.md
index ac29a639436..649b0c51818 100644
--- a/doc/user/project/integrations/gitlab_slack_application.md
+++ b/doc/user/project/integrations/gitlab_slack_application.md
@@ -7,11 +7,11 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 # GitLab for Slack app **(FREE SAAS)**
 
 NOTE:
-The GitLab for Slack app is only configurable for GitLab SaaS customers.
-Self-managed GitLab customers should configure
-[Slack slash commands](slack_slash_commands.md) and [Slack notifications](slack.md) instead. See
-[Slack application integration for self-managed instances](https://gitlab.com/groups/gitlab-org/-/epics/1211)
-for our plans to make the app configurable for all GitLab installations.
+This feature is only configurable on GitLab.com.
+For self-managed GitLab instances, use
+[Slack slash commands](slack_slash_commands.md) and [Slack notifications](slack.md) instead.
+For more information about our plans to make this feature configurable for all GitLab installations,
+see [epic 1211](https://gitlab.com/groups/gitlab-org/-/epics/1211).
 
 Slack provides a native application that you can enable with your project's
 integrations on GitLab.com.
diff --git a/doc/user/project/integrations/slack.md b/doc/user/project/integrations/slack.md
index d14401a5c9d..1d452141dbd 100644
--- a/doc/user/project/integrations/slack.md
+++ b/doc/user/project/integrations/slack.md
@@ -7,10 +7,10 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 # Slack notifications integration **(FREE)**
 
 WARNING:
-This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/372411) for GitLab SaaS customers
-in GitLab 15.10 and is [planned for removal](https://gitlab.com/groups/gitlab-org/-/epics/8673).
-GitLab SaaS customers can use the [GitLab for Slack app](gitlab_slack_application.md) instead.
-Self-managed GitLab customers can continue to use this feature.
+This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/372411) on GitLab.com
+in GitLab 15.9 and is [planned for removal](https://gitlab.com/groups/gitlab-org/-/epics/8673).
+For GitLab.com, use the [GitLab for Slack app](gitlab_slack_application.md) instead.
+For self-managed GitLab instances, you can continue to use this feature.
 
 The Slack notifications integration enables your GitLab project to send events
 (such as issue creation) to your existing Slack team as notifications. Setting up
diff --git a/doc/user/project/integrations/slack_slash_commands.md b/doc/user/project/integrations/slack_slash_commands.md
index bfa0ae94341..2563cec2b05 100644
--- a/doc/user/project/integrations/slack_slash_commands.md
+++ b/doc/user/project/integrations/slack_slash_commands.md
@@ -6,6 +6,10 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Slack slash commands **(FREE SELF)**
 
+NOTE:
+This feature is only configurable on self-managed GitLab instances.
+For GitLab.com, use the [GitLab for Slack app](gitlab_slack_application.md) instead.
+
 If you want to control and view GitLab content while you're
 working in Slack, you can use Slack slash commands.
 To use Slack slash commands, you must configure both Slack and GitLab.
@@ -13,9 +17,6 @@ To use Slack slash commands, you must configure both Slack and GitLab.
 GitLab can also send events (for example, `issue created`) to Slack as notifications.
 The [Slack notifications service](slack.md) is configured separately.
 
-NOTE:
-The Slack slash commands are only configurable on self-managed GitLab instances. For GitLab.com, use the [GitLab for Slack app](gitlab_slack_application.md) instead.
-
 ## Configure GitLab and Slack
 
 Slack slash command integrations