Add latest changes from gitlab-org/gitlab@master

3 files changed, 18 insertions, 20 deletions

diff --git a/doc/user/project/integrations/bamboo.md b/doc/user/project/integrations/bamboo.md
index f9ce716d94f..85cab40626d 100644
--- a/doc/user/project/integrations/bamboo.md
+++ b/doc/user/project/integrations/bamboo.md
@@ -41,7 +41,7 @@ integration in GitLab.
 1. Select **Atlassian Bamboo**.
 1. Ensure the **Active** checkbox is selected.
 1. Enter the base URL of your Bamboo server. For example, `https://bamboo.example.com`.
-1. Optional. Clear the **Enable SSL verification** checkbox to disable [SSL verification](index.md#manage-ssl-verification).
+1. Optional. Clear the **Enable SSL verification** checkbox to disable [SSL verification](index.md#ssl-verification).
 1. Enter the [build key](#identify-the-bamboo-build-plan-build-key) from your Bamboo
    build plan.
 1. If necessary, enter a username and password for a Bamboo user that has
diff --git a/doc/user/project/integrations/index.md b/doc/user/project/integrations/index.md
index b18730d1d3b..6fb30c43b23 100644
--- a/doc/user/project/integrations/index.md
+++ b/doc/user/project/integrations/index.md
@@ -11,15 +11,15 @@ This page contains information about configuring project integrations on GitLab.
 
 You can integrate with external applications to add functionality to GitLab.
 
-You can view and manage integrations at the [instance level](../../../administration/settings/project_integration_management.md#manage-instance-level-default-settings-for-a-project-integration) or the
-[group level](#manage-group-level-default-settings-for-a-project-integration).
-For any project, you can:
+You can view and manage integrations at the:
 
-- Inherit the instance-level or group-level settings.
-- Use custom settings.
+- [Instance level](../../../administration/settings/project_integration_management.md#manage-instance-level-default-settings-for-a-project-integration) (self-managed GitLab)
+- [Group level](#manage-group-level-default-settings-for-a-project-integration)
 
-Integration management at the instance and group level replaces service templates, which
-were [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/268032) in GitLab 14.0.
+You can use:
+
+- [Instance-level or group-level default settings for a project integration](#use-instance-level-or-group-level-default-settings-for-a-project-integration)
+- [Custom settings for a project or group integration](#use-custom-settings-for-a-project-or-group-integration)
 
 ## Manage group-level default settings for a project integration
 
@@ -109,19 +109,8 @@ To use custom settings for a project or group integration:
 1. Complete the fields.
 1. Select **Save changes**.
 
-## Manage SSL verification
-
-By default, the SSL certificate for outgoing HTTP requests is verified based on
-an internal list of Certificate Authorities. This means the certificate cannot
-be self-signed.
-
-You can turn off SSL verification in the configuration settings for [webhooks](webhooks.md#configure-a-webhook-in-gitlab)
-and some integrations.
-
 ## Available integrations
 
-You can configure the following integrations.
-
 | Integration                                                                 | Description                                                           | Integration hooks      |
 |-----------------------------------------------------------------------------|-----------------------------------------------------------------------|------------------------|
 | [Asana](asana.md)                                                           | Add commit messages as comments to Asana tasks.                       | **{dotted-circle}** No |
@@ -181,6 +170,15 @@ supported by `push_hooks` and `tag_push_hooks` events are not executed.
 To change the number of supported branches or tags, configure the
 [`push_event_hooks_limit` setting](../../../api/settings.md#list-of-settings-that-can-be-accessed-via-api-calls).
 
+## SSL verification
+
+By default, the SSL certificate for outgoing HTTP requests is verified based on
+an internal list of certificate authorities. The SSL certificate cannot
+be self-signed.
+
+You can disable SSL verification when you configure
+[webhooks](webhooks.md#configure-a-webhook-in-gitlab) and some integrations.
+
 ## Related topics
 
 - [Integration development guidelines](../../../development/integrations/index.md)
diff --git a/doc/user/project/integrations/webhooks.md b/doc/user/project/integrations/webhooks.md
index 8e7f8bcd67d..50683af2616 100644
--- a/doc/user/project/integrations/webhooks.md
+++ b/doc/user/project/integrations/webhooks.md
@@ -60,7 +60,7 @@ To configure a webhook for a project or group:
    The URL must be percent-encoded if it contains one or more special characters.
 1. In **Secret token**, enter the [secret token](#validate-payloads-by-using-a-secret-token) to validate payloads.
 1. In the **Trigger** section, select the [events](webhook_events.md) to trigger the webhook.
-1. Optional. Clear the **Enable SSL verification** checkbox to disable [SSL verification](index.md#manage-ssl-verification).
+1. Optional. Clear the **Enable SSL verification** checkbox to disable [SSL verification](index.md#ssl-verification).
 1. Select **Add webhook**.
 
 ## Mask sensitive portions of webhook URLs