Final PR updates consolidating pre-build MM integrations

source/about/unified-collaboration.rst

@@ -7,7 +7,6 @@ Unified communication
    :titlesonly:
 
    /about/mattermost-for-microsoft-teams.rst
-   /about/mattermost-google-calendar-integration.rst
 
 Mattermost's Unified Communication solution is designed to provide an extended collaboration experience for technical and operational teams to teams on other collaboration systems.
 

source/configure/enable-ai-copilot.rst

@@ -14,7 +14,7 @@ Mattermost AI Copilot comes preinstalled from Mattermost Server v9.7 or later. Y
 .. note::
   If you're running Mattermost Server v9.6 or earlier, AI Copilot must be installed using the `latest binary available for download from the plugin repository <https://github.com/mattermost/mattermost-plugin-ai/releases>`_ . For an optimized user experience and compatibility, we recommend using AI Copilot with Mattermost v9.7 and later.
 
-  The AI Copilot plugin is compatible with the following :doc:`Mattermost Server versions </deploy/mattermost-changelog>`:
+  The AI Copilot integration is compatible with the following :doc:`Mattermost Server versions </deploy/mattermost-changelog>`:
 
   - v9.6 or later
   - v9.5.2+ (Extended Support Release - ESR)
@@ -27,7 +27,7 @@ Enable
 
 Go to **System Console > Plugins > AI Copilot** to enable this feature.
 
-Once the plugin is installed and enabled, complete configuration in the System Console as described below, then notify your teams that they can use the AI Copilot in any Mattermost team or channel.
+Once the integration is installed and enabled, complete configuration in the System Console as described below, then notify your teams that they can use the AI Copilot in any Mattermost team or channel.
 
 Mattermost configuration
 ~~~~~~~~~~~~~~~~~~~~~~~~

source/configure/plugins-configuration-settings.rst

@@ -861,7 +861,7 @@ Enable call ringing (Beta)
 
 .. config:setting:: integrations-gitlab
   :displayname: GitLab interoperability (Plugins)
-  :systemconsole: Plugins > Zoom
+  :systemconsole: Plugins > GitHub
   :configjson: gitlab
   :environment: N/A
   :description: Connect your GitLab instance to your Mattermost instance.
@@ -877,8 +877,8 @@ See the :doc:`Connect GitLab to Mattermost </integrate/gitlab-interoperability>`
 ----
 
 .. config:setting:: integrations-github
-  :displayname: GitHub interoperability (Plugins)
-  :systemconsole: Plugins > Zoom
+  :displayname: GitHub interoperability (Plugins > GitHub)
+  :systemconsole: Plugins > GitHub
   :configjson: github
   :environment: N/A
   :description: Connect your GitHub instance to your Mattermost instance.
@@ -894,7 +894,7 @@ See the :doc:`Connect GitHub to Mattermost </integrate/github-interoperability>`
 ----
 
 .. config:setting:: integrations-jira
-  :displayname: Jira interoperability (Plugins)
+  :displayname: Jira interoperability (Plugins > Jira)
   :systemconsole: Plugins > Jira
   :configjson: jira
   :environment: N/A
@@ -911,7 +911,7 @@ See the :doc:`Connect Jira to Mattermost </integrate/jira-interoperability>` pro
 ----
 
 .. config:setting:: integrations-legalhold
-  :displayname: Perform legal holds (Plugins)
+  :displayname: Perform legal holds (Plugins > Legal Hold)
   :systemconsole: Plugins > Legal Hold
   :configjson: legal-hold
   :environment: N/A
@@ -925,6 +925,8 @@ Legal hold
 
 See the :doc:`Legal holds </comply/legal-hold>` product documentation for details.
 
+----
+
 MS Teams
 ---------
 

source/guides/integrate-and-extend.rst

@@ -13,7 +13,7 @@ Integrate and extend Mattermost
     ServiceNow interoperability </integrate/servicenow-interoperability>
     Zoom interoperability </integrate/zoom-interoperability>
 
-Mattermost offers many ways to add product functionality, custom-tailor your workflows, and connect Mattermost to your mission-critical tools. 
+Connect Mattermost to your mission-critical tools. 
 
 Interoperability with pre-packaged integrations
 -----------------------------------------------
@@ -24,8 +24,8 @@ Your Mattermost deployment comes with the following integrations you can configu
 * :doc:`GitLab interoperability </integrate/gitlab-interoperability>` - Connect your GitLab instance to your Mattermost instance.
 * :doc:`Jira interoperability </integrate/jira-interoperability>` - Connect your Jira instance to your Mattermost instance.
 * :doc:`Microsoft Teams interoperability </integrate/ms-teams-interoperability>` - Connect your operational workflows through the Mattermost app while staying connected to an all-employee platform, all in one place.
-* :doc:`ServiceNow interoperability </integrate/servicenow-interoperability>` - Connect your ServiceNow to your Mattermost instance.
-* :doc:`Zoom interoperability </integrate/zoom-interoperability>` - Learn how to connect your Zoom instance to your Mattermost instance.
+* :doc:`ServiceNow interoperability </integrate/servicenow-interoperability>` - Connect your ServiceNow instance to your Mattermost instance.
+* :doc:`Zoom interoperability </integrate/zoom-interoperability>` - Connect your Zoom instance to your Mattermost instance.
 
 .. tip::
 

source/integrate/github-interoperability.rst

@@ -86,7 +86,7 @@ A Mattermost system admin must perform the following steps in Mattermost.
 
     - Enter the **GitHub OAuth Client ID** and **GitHub OAuth Client Secret** obtained during registration
     - Regenerate the **At Rest Encryption Key** by selecting **Regenerate**.
-    - (Optional) **GitHub Organization**: Lock the plugin to a single GitHub organization by specifying the name of your GitHub organization.
+    - (Optional) **GitHub Organization**: Lock the integration to a single GitHub organization by specifying the name of your GitHub organization.
     - (GitHub Enterprise Only): Set **Enterprise Base URL** and **Enterprise Upload URL** values to your GitHub Enterprise URLs, e.g. ``https://github.example.com``. These values are often the same.
     - (Mattermost desktop app only) **Display Notification Counters in Left Sidebar**: Display or hide GitHub notification counters in the Mattermost sidebar.
     - (Optional) **Enable Private Repositories**: Enable the ability to work with private repositories. Affected users are notified once private repositories are enabled, and must reconnect their GitHub accounts to gain access to private repositories.
@@ -168,8 +168,8 @@ How do I send notifications when a certain label is applied?
 
 If you want to send notifications to a Mattermost channel when **Severity/Critical** label is applied to any issue in the ``mattermost/mattermost-plugin-github`` repository, run the following slash command to subscribe to these notifications: ``/github subscriptions add mattermost/mattermost-plugin-github issues,label:"Severity/Critical"``
 
-How does the plugin save user data for each connected GitHub user?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+How does the integration save user data for each connected GitHub user?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 GitHub user tokens are AES-encrypted with an **At Rest Encryption Key** configured in Mattermost. Once encrypted, the tokens are saved in the ``PluginKeyValueStore`` table in your Mattermost database.
 

source/integrate/gitlab-interoperability.rst

@@ -57,7 +57,7 @@ Install the GitHub integration from the in-product App Marketplace:
 
  - Enter the **GitLab URL**, **GitLab OAuth Client ID**, and **GitLab OAuth Client Secret** you obtained when `registering the OAuth app in GitLab <#register-an-oauth-app-in-GitLab>`__.
  - Generate a **Webhook Secret** and **At Rest Encryption Key** by selecting **Generate**.
- - (Optional) **GitLab Group**: Lock the plugin to a single GitLab group.
+ - (Optional) **GitLab Group**: Lock the integration to a single GitLab group.
  - (Optional) **Enable Private Repositories**: Enable the ability to work with private repositories. Affected users are notified once private repositories are enabled, and must reconnect their GitLab accounts to gain access to private repositories.
 
 Enable
@@ -115,7 +115,7 @@ For each project you want to receive notifications for or subscribe to, create a
     - Add the webhook.
 
 
-Run the  ``/gitlab settings [setting] [value]`` slash command to update your preferences for the plugin:
+Run the  ``/gitlab settings [setting] [value]`` slash command to update your preferences for the integration:
 
 - Turn personal notifications on or off.
 - Turn reminders on or off when you connect initially each day.