Repo sync

content/copilot/concepts/index.md

@@ -19,6 +19,7 @@ children:
   - /billing
   - /about-enterprise-accounts-for-copilot-business
   - /policies
+  - /mcp-management
   - /network-settings
   - /copilot-metrics
 contentType: concepts

content/copilot/concepts/mcp-management.md

@@ -0,0 +1,51 @@
+---
+title: MCP server usage in your company
+shortTitle: MCP management
+intro: 'You can manage MCP server usage to provide your developers with valuable tools while maintaining security and compliance.'
+versions:
+  feature: copilot
+topics:
+  - Copilot
+contentType: concepts
+---
+
+You can manage Model Context Protocol (MCP) server usage in your organization or enterprise by configuring a series of MCP policies on {% data variables.product.prodname_dotcom_the_website %}. Through these policies, you can allow or block MCP server usage entirely, or restrict access to a list of servers that you define in an MCP registry.
+
+## MCP registries
+
+An MCP registry is a directory of MCP servers that acts like a catalog for IDEs and {% data variables.product.prodname_copilot_short %}. Each registry entry points to a server's manifest, which describes the tools, resources, and prompts that server provides.
+
+After you create your MCP registry, you can make it available to your company, allowing you to:
+* Curate a catalog of MCP servers your developers can discover and use without context switching
+* Restrict access to unapproved servers for increased security and compliance
+* Provide clarity to developers when a server is blocked by policy
+
+## MCP policy settings
+
+The following settings let you control how MCP servers are discovered and accessed in your organization or enterprise:
+
+* **MCP servers in {% data variables.product.prodname_copilot_short %}**: Manage the use of MCP servers for all users with {% data variables.product.prodname_copilot_short %} seats in your organization or enterprise.
+* **MCP Registry URL**: Specify the URL of your MCP registry, allowing your developers to discover and use approved MCP servers in supported surfaces.
+* **Restrict MCP access to registry servers**: Choose whether to allow all MCP servers or restrict access to only those listed in your configured registry.
+
+## Supported surfaces
+
+MCP management features are supported as follows:
+
+| Surface | Registry display | Allowlist enforcement |
+|---|:---:|:---:|
+| {% data variables.copilot.copilot_cli_short %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} |
+| {% data variables.copilot.copilot_coding_agent %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} |
+| Eclipse | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
+| JetBrains | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
+| {% data variables.product.prodname_vs %} | {% octicon "x" aria-label="Not supported" %} | {% octicon "x" aria-label="Not supported" %} |
+| {% data variables.product.prodname_vscode_shortname %} | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
+| {% data variables.product.prodname_vscode_shortname %} Insiders | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
+| Xcode | {% octicon "check" aria-label="Supported" %} | {% octicon "check" aria-label="Supported" %} |
+
+> [!NOTE]
+> For Eclipse, JetBrains, and Xcode, MCP management features are supported in the pre-release versions of {% data variables.product.prodname_copilot_short %}.
+
+## Next steps
+
+To create your own MCP registry, see [AUTOTITLE](/copilot/how-tos/administer-copilot/manage-mcp-usage/configure-mcp-registry).

content/copilot/how-tos/administer-copilot/index.md

@@ -9,8 +9,8 @@ topics:
 children:
   - /manage-for-organization
   - /manage-for-enterprise
+  - /manage-mcp-usage
   - /download-activity-report
-  - /configure-mcp-server-access
 redirect_from:
   - /copilot/how-tos/administer
 contentType: how-tos