Merge branch '325196-aqualls-deprecation-doc' into 'master'

Revise overview page to indicate deprecation

See merge request gitlab-org/gitlab!58133

doc/user/admin_area/settings/project_integration_management.md

@@ -40,7 +40,7 @@ If this is the first time you are setting up instance-level settings for an inte
 When you make further changes to the instance defaults:
 
 - They are immediately applied to all groups and projects that have the integration set to use default settings.
-- They are immediately applied to newer groups and projects, created since you last saved defaults for the
+- They are immediately applied to newer groups and projects, created after you last saved defaults for the
   integration. If your instance-level default setting has the **Enable integration** toggle turned
   on, the integration is automatically enabled for all such groups and projects.
 - Groups and projects with custom settings selected for the integration are not immediately affected and may
@@ -82,7 +82,7 @@ When you make further changes to the group defaults:
 
 - They are immediately applied to all subgroups and projects belonging to the group that have the integration
   set to use default settings.
-- They are immediately applied to newer subgroups and projects, created since you last saved defaults for the
+- They are immediately applied to newer subgroups and projects, even those created after you last saved defaults for the
   integration. If your group-level default setting has the **Enable integration** toggle turned on,
   the integration is automatically enabled for all such subgroups and projects.
 

doc/user/project/integrations/index.md

@@ -12,11 +12,14 @@ You can find the available integrations under your project's
 
 ## Integrations
 
-Integrations allow you to integrate GitLab with other applications.
-They are a bit like plugins in that they allow a lot of freedom in
-adding functionality to GitLab.
-
-Learn more [about integrations](overview.md).
+Like plugins, integrations allow you to integrate GitLab with other applications, adding additional features.
+For more information, read the
+[overview of integrations](overview.md) or learn how to manage your integrations:
+
+- *For GitLab 13.3 and later,* read [Project integration management](../../admin_area/settings/project_integration_management.md).
+- *For GitLab 13.2 and earlier,* read [Service Templates](services_templates.md),
+  which are deprecated and [scheduled to be removed](https://gitlab.com/gitlab-org/gitlab/-/issues/268032)
+  in GitLab 14.0.
 
 ## Project webhooks
 

doc/user/project/integrations/jira.md

@@ -54,11 +54,8 @@ project can interact with _all_ Jira projects in that instance, once configured.
 - Other features, you do not have to explicitly associate a GitLab project with any single Jira
   project.
 
-If you have one Jira instance, you can pre-fill the settings. For more information, see the
-documentation for:
-
-- [Project integration management](../../admin_area/settings/project_integration_management.md).
-- [Services Templates](services_templates.md).
+If you have a single Jira instance, you can pre-fill the settings. For more information, read the
+documentation for [central administration of project integrations](../../admin_area/settings/project_integration_management.md).
 
 To enable the Jira service in GitLab, you must:
 

doc/user/project/integrations/overview.md

@@ -72,13 +72,6 @@ supported by `push_hooks` and `tag_push_hooks` events aren't executed.
 The number of branches or tags supported can be changed via
 [`push_event_hooks_limit` application setting](../../../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls).
 
-## Service templates
-
-Service templates are a way to set predefined values for a project integration across
-all new projects on the instance.
-
-Read more about [Service templates](services_templates.md).
-
 ## Project integration management
 
 Project integration management lets you control integration settings across all projects
@@ -87,6 +80,19 @@ instance configuration or provide custom settings.
 
 Read more about [Project integration management](../../admin_area/settings/project_integration_management.md).
 
+### Service templates
+
+[Service templates](services_templates.md) were a way to set predefined values for
+a project integration across all new projects on the instance. They are deprecated and
+[scheduled to be removed](https://gitlab.com/gitlab-org/gitlab/-/issues/268032)
+in GitLab 14.0.
+
+GitLab recommends you use [project integration management](../../admin_area/settings/project_integration_management.md)
+instead of service templates. GitLab versions 13.3 and later provide
+[instance-level integrations](../../admin_area/settings/project_integration_management.md#project-integration-management)
+you can use.
+instead.
+
 ## Troubleshooting integrations
 
 Some integrations use service hooks for integration with external applications. To confirm which ones use service hooks, see the [integrations listing](#integrations-listing) above. GitLab stores details of service hook requests made within the last 2 days. To view details of the requests, go to that integration's configuration page.

doc/user/project/integrations/services_templates.md

@@ -36,10 +36,11 @@ does not provide central administration of integration settings.
 ## Central administration of project integrations
 
 A new set of features is being introduced in GitLab to provide more control over
-how integrations are configured at the instance, group, and project level.
+how integrations are configured at the instance, group, and project level. For
+more information, read more about:
 
-[Read more about setting up project integration management](../../admin_area/settings/project_integration_management.md)
-(introduced in GitLab 13.3) and [our plans for managing integrations](https://gitlab.com/groups/gitlab-org/-/epics/2137).
+- [Setting up project integration management](../../admin_area/settings/project_integration_management.md) (introduced in GitLab 13.3)
+- [Our plans for managing integrations](https://gitlab.com/groups/gitlab-org/-/epics/2137).
 
 ## Enable a service template