Merge branch 'main' into patch-1

docs/TOC.yml

@@ -12,8 +12,6 @@
     href: plugins-are-apps.md
   - name: Data, Privacy, and Security
     href: data-privacy-security.md
-- name: Extend Microsoft Copilot or build your own
-  href: build-or-extend.md
 - name: Extensibility guide for ISVs
   href: /microsoft-cloud/dev/copilot/isv-extensibility-story?context=/microsoft-365-copilot/extensibility/context
 - name: Get started
@@ -31,6 +29,8 @@
   items:
   - name: Microsoft Graph connectors in Copilot for Microsoft 365
     href: overview-graph-connector.md
+  - name: Enhancing Microsoft Copilot Discovery with Graph Connector Content
+    href: /microsoftsearch/enhancing-microsoft-copilot-discovery-with-graph-connector-content?context=/microsoft-365-copilot/extensibility/context
   - name: Connectors experiences
     href: /graph/connecting-external-content-experiences?context=/microsoft-365-copilot/extensibility/context
   - name: Connectors API
@@ -84,6 +84,8 @@
       href: /power-automate/flow-plugins-m365?context=/microsoft-365-copilot/extensibility/context
     - name: Prompts
       href: /ai-builder/create-a-custom-prompt?context=/microsoft-365-copilot/extensibility/context
+    - name: Learning path
+      href: /training/paths/build-plugins-connectors-microsoft-copilot-microsoft-365/
   - name: Debug with developer mode in Copilot
     href: debugging-copilot-plugin.md
 - name: Build your own copilot

docs/docfx.json

@@ -45,7 +45,8 @@
       "permissioned-type": "public",
       "uhfHeaderId": "MSDocsHeader-M365-IT",
       "ms.service": "microsoft-365-copilot",
-      "ms.subservice": "developer"
+      "ms.subservice": "developer",
+      "ms.collection": "ce-skilling-ai-copilot"
     },
     "fileMetadata": {},
     "template": [],

docs/feedback.md

@@ -13,12 +13,12 @@ In this doc you will find help and resources needed for Copilot for Microsoft 36
 
 ## Developer support channels
 
-To inquire about general questions related to Copilot and Copilot samples use the following community groups. Use the [Microsoft 365 Admin Center](https://admin.microsoft.com/Adminportal/Home#/homepage) for any business-critical issues that need SLA(service level agreement) based support and [Microsoft Q&A](/answers/tags/465/copilot-m365.html) for general questions.
+To inquire about general questions related to Copilot and Copilot samples use the following community groups. Use the [Microsoft 365 Admin Center](https://admin.microsoft.com/Adminportal/Home#/homepage) for any business-critical issues that need SLA(service level agreement) based support and [Microsoft Q&A](/answers/tags/466/copilot-m365-development) for general questions.
 
 | **Support channel category** | **Channel** |
 |:------------|:------------|
 | Microsoft Copilot for Microsoft 365 service issues, development issues, and limited advisory support. | If you have a Premier/Unified support agreement for Microsoft 365, visit the [Microsoft 365 Admin Center](https://admin.microsoft.com/Adminportal/Home#/homepage) and use the Support menu to open a service request. |
-| General questions about Microsoft Copilot for Microsoft 365 | If you have general questions on Microsoft Copilot for Microsoft 365, submit your questions on [Microsoft Q&A](/answers/tags/465/copilot-m365.html). |
+| General questions about Microsoft Copilot for Microsoft 365 | If you have general questions on Microsoft Copilot for Microsoft 365, submit your questions on [Microsoft Q&A](/answers/tags/466/copilot-m365-development). |
 | Developer community help | [Microsoft Q&A](/answers/) exists as the home of technical questions and answers for Microsoft products. Use the [Microsoft Copilot for Microsoft 365 Development](/answers/tags/466/copilot-m365-development.html) tag to post questions, connect with other developers, and submit answers. |
 | Extensibility samples | Submit issues and ask general questions related to samples using the respective Microsoft Copilot for Microsoft 365 [extensibility samples](samples.md) GitHub repositories. |
 

docs/includes/preview-disclaimer-copilot-no-license.md

@@ -7,4 +7,5 @@ ms.topic: include
 
 > [!IMPORTANT]
 >
-> Custom engine copilots are conversational Teams bots with custom LLM, therefore they don't require Copilot for Microsoft 365 license to build, debug and deploy.
+> - Custom engine copilots are conversational Teams bots with custom LLM, therefore they don't require Copilot for Microsoft 365 license to build, debug and deploy.
+> - The cost of a custom engine copilot depends on the Azure services consumed in the app. To estimate the cost, visit the [Azure Pricing Calculator](https://azure.microsoft.com/pricing/calculator/).

docs/includes/preview-disclaimer-copilot.md

@@ -5,6 +5,6 @@ ms.topic: include
 
 <!-- markdownlint-disable MD041-->
 
-> [!IMPORTANT]
+> [!WARNING]
 >
-> Declarative copilots for Microsoft 365 are in private preview.
+> Declarative copilots for Microsoft 365 are in **private preview**.

docs/openapi-document-guidance.md

@@ -11,13 +11,13 @@ ms.date: 05/21/2024
 
 Plugins let Microsoft Copilot work with web services and get real-time information. Copilot uses this information to extend its skills. With a plugin, a user can bring real-time data from their line of business (LOB) system on to the Copilot.
 
-A plugin is comprised of a web service, its OpenAPI description, and a manifest file. The plugin manifest informs Copilot about the plugin's capabilities. The plugin manifest includes an OpenAPI description for the web service. The OpenAPI description is important because it describes to Copilot how to connect to the web service. For optimal plugin performance with Copilot, provide a clear and meaningful OpenAPI description. This document explains the elements that make an OpenAPI description effective for a plugin that extends Copilot.
+A plugin is comprised of an API service, its OpenAPI description, and a manifest file. The plugin manifest informs Copilot about the API's capabilities. The plugin manifest includes an OpenAPI description for the API service. The OpenAPI description is important because it describes to Copilot how to connect to the API. For optimal plugin performance with Copilot, provide a clear and meaningful OpenAPI description. This document explains the elements that make an OpenAPI description effective for a plugin that extends Copilot.
 
-Here, we presume that you have a web service and an OpenAPI description for the web service.
+Here, we presume that you have an API and an OpenAPI description for it.
 
 **OpenAPI Validation**: A good first step is to verify that your OpenAPI description follows the rules of the [OpenAPI Specification](https://swagger.io/resources/open-api/). You can use [Hidi](https://github.com/microsoft/OpenAPI.NET/blob/vnext/src/Microsoft.OpenApi.Hidi/readme.md), a command line tool that can validate OpenAPI descriptions among other use cases, or any other tool of choice. A valid OpenAPI description not only works well with Copilot but also makes sure that your OpenAPI description can work with other tools.
 
-**The info section**: The description field is optional in the OpenAPI specification, but it's essential for an OpenAPI description that is meant to extend Copilot skills. Copilot needs the description field to know what the API does and when to use the plugin. Always have a description field and make it brief but clear. For example, here's an info section of a repairs shop web service OpenAPI description.
+**The info section**: The description field is optional in the OpenAPI specification, but it's essential for an OpenAPI description that is meant to extend Copilot skills. Copilot needs the description field to know what the API does and when to use the plugin. When generating a plugin manifest from an OpenAPI document, the description in the info section is used as the description for the plugin manifest. It is thus important to always have a description field that is brief and clear. For example, here's an info section of a repairs shop OpenAPI description.
 
 ```yaml
 info: