Add latest changes from gitlab-org/gitlab@master

6 files changed, 19 insertions, 58 deletions

diff --git a/doc/integration/azure.md b/doc/integration/azure.md
index 71f6c2cf3a0..6340713970a 100644
--- a/doc/integration/azure.md
+++ b/doc/integration/azure.md
@@ -164,7 +164,7 @@ Remove some of the existing configuration and add new configuration as shown.
 
 ::EndTabs
 
-For more information on other customizations, see [`gitlab_username_claim`](index.md#authentication-sources).
+For more information on other customizations, see [`gitlab_username_claim`](omniauth.md#per-provider-configuration).
 
 ## Register an Azure application
 
diff --git a/doc/integration/external-issue-tracker.md b/doc/integration/external-issue-tracker.md
index 07f260bbde5..49bd1e362e5 100644
--- a/doc/integration/external-issue-tracker.md
+++ b/doc/integration/external-issue-tracker.md
@@ -10,8 +10,8 @@ GitLab has its own [issue tracker](../user/project/issues/index.md),
 but you can also configure an external issue tracker per GitLab project.
 You can then use:
 
-- The external issue tracker only
 - The external issue tracker with the GitLab issue tracker
+- The external issue tracker only
 
 With an external tracker, you can use the format `CODE-123` to mention
 external issues in GitLab merge requests, commits, and comments where:
diff --git a/doc/integration/index.md b/doc/integration/index.md
index e2c73433006..b6cf9013228 100644
--- a/doc/integration/index.md
+++ b/doc/integration/index.md
@@ -10,50 +10,26 @@ You can integrate GitLab with external applications for enhanced functionality.
 
 ## Project integrations
 
-Applications like Jira, Pivotal Tracker, and Slack are available
-as [project integrations](../user/project/integrations/index.md).
+Applications like Jenkins, Jira, and Slack are available as [project integrations](../user/project/integrations/index.md).
 
 ## Issue trackers
 
-You can use an [external issue tracker](external-issue-tracker.md) with the GitLab
-issue tracker or use an external issue tracker only.
+You can configure an [external issue tracker](external-issue-tracker.md) and use:
 
-## Authentication sources
+- The external issue tracker with the GitLab issue tracker
+- The external issue tracker only
 
-You can integrate GitLab with the following authentication sources:
+## Authentication providers
 
-- Enable the [Auth0 OmniAuth](auth0.md) provider.
-- Enable sign-in with [Bitbucket](bitbucket.md) accounts.
-- Authenticate with [Kerberos](kerberos.md).
-- Enable sign-in with [LDAP](../administration/auth/ldap/index.md).
-- Enable creating [OAuth 2.0](oauth_provider.md) applications.
-- Use [OmniAuth](omniauth.md) to enable sign-in through:
-  - Azure
-  - Bitbucket
-  - Crowd
-  - Facebook
-  - GitHub
-  - GitLab.com
-  - Google
-  - SAML
-  - Twitter
-- Use GitLab as an [OpenID Connect](openid_connect_provider.md) identity provider.
-- Authenticate with [Vault](vault.md) through GitLab OpenID Connect.
-- Configure GitLab as a [SAML 2.0](saml.md) service provider.
+You can integrate GitLab with authentication providers like LDAP and SAML.
 
-## Security enhancements
+For more information, see [GitLab authentication and authorization](../administration/auth).
 
-You can integrate GitLab with the following security enhancements:
+## Security improvements
 
-- [Akismet](akismet.md) to reduce spam.
-- Google [reCAPTCHA](recaptcha.md) to verify new users.
+Solutions like Akismet and reCAPTCHA are available for spam protection.
 
-GitLab also provides features to improve the security of your own application.
-For more details, see [Secure your application](../user/application_security/index.md).
-
-## Security partners
-
-You can integrate GitLab with the following security partners:
+You can also integrate GitLab with the following security partners:
 
 <!-- vale gitlab.Spelling = NO -->
 
@@ -74,23 +50,8 @@ You can integrate GitLab with the following security partners:
 
 <!-- vale gitlab.Spelling = YES -->
 
-## Continuous integration
-
-You can integrate GitLab with the following external applications for continuous integration:
-
-- [Jenkins](jenkins.md) CI.
-- [Datadog](datadog.md) to monitor for CI/CD job failures and performance issues.
-
-## Feature enhancements
-
-You can integrate GitLab with the following feature enhancements:
-
-- Add GitLab actions to [Gmail actions buttons](gmail_action_buttons_for_gitlab.md).
-- Configure [PlantUML](../administration/integration/plantuml.md)
-or [Kroki](../administration/integration/kroki.md) to use diagrams in AsciiDoc and Markdown documents.
-- Attach merge requests to [Trello](trello_power_up.md) cards.
-- Enable integrated code intelligence powered by [Sourcegraph](sourcegraph.md).
-- Add [Elasticsearch](advanced_search/elasticsearch.md) for [advanced search](../user/search/advanced_search.md).
+GitLab can check your application for security vulnerabilities.
+For more information, see [Secure your application](../user/application_security/secure_your_application.md).
 
 ## Troubleshooting
 
@@ -99,7 +60,7 @@ When working with integrations, you might encounter the following issues.
 ### SSL certificate errors
 
 When you use a self-signed certificate to integrate GitLab with external applications, you might
-encounter SSL certificate errors in different parts of the application.
+encounter SSL certificate errors in different parts of GitLab.
 
 As a workaround, do one of the following:
 
diff --git a/doc/integration/jenkins.md b/doc/integration/jenkins.md
index a65ca3a20ba..260bb3f7108 100644
--- a/doc/integration/jenkins.md
+++ b/doc/integration/jenkins.md
@@ -130,7 +130,7 @@ with your Jenkins server URL and authentication information.
    - Merge request
    - Tag push
 1. Enter the **Jenkins server URL**.
-1. Optional. Clear the **Enable SSL verification** checkbox to disable [SSL verification](../user/project/integrations/index.md#manage-ssl-verification).
+1. Optional. Clear the **Enable SSL verification** checkbox to disable [SSL verification](../user/project/integrations/index.md#ssl-verification).
 1. Enter the **Project name**.
    The project name should be URL-friendly, where spaces are replaced with underscores. To ensure
    the project name is valid, copy it from your browser's address bar while viewing the Jenkins
diff --git a/doc/integration/jira/configure.md b/doc/integration/jira/configure.md
index 8072ae2432f..1903cca0c63 100644
--- a/doc/integration/jira/configure.md
+++ b/doc/integration/jira/configure.md
@@ -24,8 +24,8 @@ Prerequisites:
 You can enable the Jira issue integration by configuring your project settings in GitLab.
 You can also configure these settings at the:
 
+- [Instance level](../../administration/settings/project_integration_management.md#manage-instance-level-default-settings-for-a-project-integration) (self-managed GitLab)
 - [Group level](../../user/project/integrations/index.md#manage-group-level-default-settings-for-a-project-integration)
-- [Instance level](../../administration/settings/project_integration_management.md#manage-instance-level-default-settings-for-a-project-integration) for self-managed GitLab
 
 To configure your project settings in GitLab:
 
diff --git a/doc/integration/security_partners/index.md b/doc/integration/security_partners/index.md
index e89f88becbc..49244d68ace 100644
--- a/doc/integration/security_partners/index.md
+++ b/doc/integration/security_partners/index.md
@@ -1,9 +1,9 @@
 ---
-redirect_to: '../index.md#security-partners'
+redirect_to: '../index.md#security-improvements'
 remove_date: '2023-10-05'
 ---
 
-This document was moved to [another location](../index.md#security-partners).
+This document was moved to [another location](../index.md#security-improvements).
 
 <!-- This redirect file can be deleted after <2023-10-05>. -->
 <!-- Redirects that point to other docs in the same project expire in three months. -->