resolve conflict

Author: b-ahibbard

.gitignore

@@ -26,4 +26,23 @@ AzureMigration.ps1
 *.pdn
 
 # Pycharm
-.idea/*
+.idea/*
+articles/planetary-computer/doc-tree-generator.py
+.gitignore
+articles/planetary-computer/article_links_diagram.md
+articles/planetary-computer/index_helper.py
+articles/planetary-computer/metadata_index.csv
+articles/planetary-computer/broken_link_checker.py
+articles/planetary-computer/broken_links_external.csv
+articles/planetary-computer/broken_links.csv
+articles/planetary-computer/check_orphaned_docs.py
+
+# Python cache files
+*.pyc
+__pycache__/
+articles/planetary-computer/interesting_stats.py
+articles/planetary-computer/locate_text.py
+articles/planetary-computer/image_syntax_checker.py
+articles/planetary-computer/image-file-fixer.py
+articles/planetary-computer/orphaned-media.py
+articles/planetary-computer/orphaned_media_files.txt

.openpublishing.publish.config.json

@@ -140,6 +140,30 @@
             "branch": "main",
             "branch_mapping": {}
         },
+        {
+            "path_to_root": "remote-mcp-functions-dotnet",
+            "url": "https://github.com/Azure-Samples/remote-mcp-functions-dotnet",
+            "branch": "main",
+            "branch_mapping": {}
+        },
+        {
+            "path_to_root": "remote-mcp-functions-typescript",
+            "url": "https://github.com/Azure-Samples/remote-mcp-functions-typescript",
+            "branch": "main",
+            "branch_mapping": {}
+        },
+        {
+            "path_to_root": "remote-mcp-functions-python",
+            "url": "https://github.com/Azure-Samples/remote-mcp-functions-python",
+            "branch": "main",
+            "branch_mapping": {}
+        },
+        {
+            "path_to_root": "remote-mcp-functions-java",
+            "url": "https://github.com/Azure-Samples/remote-mcp-functions-java",
+            "branch": "main",
+            "branch_mapping": {}
+        },
         {
             "path_to_root": "azure-functions-durable-js",
             "url": "https://github.com/Azure/azure-functions-durable-js",
@@ -158,6 +182,12 @@
             "branch": "dev",
             "branch_mapping": {}
         },
+        {
+            "path_to_root": "azure-functions-mongodb-extension",
+            "url": "https://github.com/Azure/Azure-functions-mongodb-extension",
+            "branch": "main",
+            "branch_mapping": {}
+        },
         {
             "path_to_root": "azure-functions-nodejs-v4",
             "url": "https://github.com/Azure/azure-functions-nodejs-samples",

.openpublishing.redirection.json

@@ -2394,6 +2394,11 @@
       "redirect_url": "/azure/architecture/web-apps/guides/multi-region-app-service/multi-region-app-service",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/app-service/app-service-configure-premium-tier.md",
+      "redirect_url": "/azure/app-service/app-service-configure-premium-v4-tier",
+      "redirect_document_id": false
+    },           
     {
       "source_path_from_root": "/articles/public-multi-access-edge-compute-mec/tutorial-create-vm-using-python-sdk.md",
       "redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/tutorial-create-vm-using-python-sdk",
@@ -6851,7 +6856,27 @@
     },
     {
       "source_path_from_root": "/articles/azure-functions/migration.md",
-      "redirect_url": "/azure/azure-functions/migration/migrate-lambda-workloads-overview",
+      "redirect_url": "/azure/azure-functions/migration/migrate-aws-lambda-to-azure-functions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-functions/migration/migrate-lambda-workloads-overview.md",
+      "redirect_url": "/azure/azure-functions/migration/migrate-aws-lambda-to-azure-functions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-functions/migration/discover-lambda-workloads.md",
+      "redirect_url": "/azure/azure-functions/migration/migrate-aws-lambda-to-azure-functions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-functions/migration/assess-lambda-workloads.md",
+      "redirect_url": "/azure/azure-functions/migration/migrate-aws-lambda-to-azure-functions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-functions/migration/migrate-lambda-workloads.md",
+      "redirect_url": "/azure/azure-functions/migration/migrate-aws-lambda-to-azure-functions",
       "redirect_document_id": false
     },
     {

articles/active-directory-b2c/service-limits.md

@@ -186,17 +186,18 @@ As a protection for our customers, Microsoft places some restrictions on telepho
 | 20  | Egypt | 50 | 200 | 
 | 211 |	South Sudan |	10	| 30 |
 | 212 | Morocco | 20 | 100 |
+| 213 | Algeria | 20 | 100 |
 | 216 | Tunisia | 20 | 100 |
 | 221 | Senegal | 10 | 30 |
 | 223 | Mali | 20 | 100 |
 | 224 | Guinea | 20 | 100 |
-| 225 |	Côte d’Ivoire |	10	| 30 |
+| 225 |	Ivory Coast|	10	| 30 |
 | 226 |  Burina Faso   | 10  |  30  |
 | 228 |  Togo  | 10  |  30  |
 | 233 |	Ghana|	10	| 30 |
 | 234 | Nigeria | 20 | 100 |
 | 236 |	Central African Republic  |	10	| 30 |
-| 238 | Cabo Verde | 10 | 30 |
+| 238 | Cape Verde | 10 | 30 |
 | 249 |  Sudan | 10  |  30  |
 | 251 |	Ethiopia  |	10	| 30 |
 | 252 |  Somalia   | 10  |  30  |  
@@ -208,18 +209,21 @@ As a protection for our customers, Microsoft places some restrictions on telepho
 | 261 | Madagascar | 10 | 30 |
 | 263 | Zimbabwe | 10 | 30 |
 | 265 |	Malawi  |	10	| 30 |
+| 373 |	Moldova |	20	| 100 |
 | 375 |	Belarus   |	10	| 30 |
 | 386 | Slovenia | 10 | 50 |
 | 501 |  Belize| 10  |  30  |
 | 502 | Guatemala | 10 | 50 
 | 503 | El Salvador | 10 | 30 |
-| 52 | Mexico | 100 | 500 
+| 52 | Mexico | 100 | 500 |
+| 53 | Cuba | 10 | 30 |
 | 58 |	Venezuela|	10	| 30 |
 | 591 | Bolivia | 10 | 30 |
 | 60 | Malaysia | 50 | 200 |
 | 62 |  Indonesia | 50  |  200 |
 | 63 |  Philippines   | 50  |  200 |
-| 670 |	Timor-Leste  |	10	| 30 |
+| 670 |	East Timor (Timor-Leste)  |	10	| 30 |
+| 675 |	Papua New Guinea  |	10	| 30 |
 | 7 |  Russia | 100  |  1000 |
 | 84 |  Vietnam   | 150  |  500 |
 | 855 |  Cambodia  | 50  |  200 |
@@ -228,8 +232,9 @@ As a protection for our customers, Microsoft places some restrictions on telepho
 | 92 |  Pakistan| 100  |  1000 |
 | 93 |	Afghanistan  |	10	| 30 |
 | 94 |  Sri Lanka | 100  |  500 |
-| 95 |	Myanmar | 10	| 30 |
+| 95 |	Myanmar (Burma) | 10	| 30 |
 | 961 |	Lebanon  |	10	| 30 |
+| 963 |	Syria  |	10	| 30 |
 | 967 |	Yemen	|10	| 30 |
 | 970 |  State of Palestine| 10  |  30  |
 | 972 |	Israel  |	50	| 200 |

articles/api-center/includes/about-mcp-servers.md

@@ -0,0 +1,43 @@
+---
+title: Include file
+description: Include file
+services: api-center
+author: dlepow
+
+ms.service: azure-api-center
+ms.topic: include
+ms.date: 05/12/2025
+ms.author: danlep
+ms.custom: Include file
+---
+
+## About MCP servers
+
+AI agents are becoming widely adopted because of enhanced large language model (LLM) capabilities. However, even the most advanced models face limitations because of their isolation from external data. Each new data source potentially requires custom implementations to extract, prepare, and make data accessible for the models.
+
+The [model context protocol](https://www.anthropic.com/news/model-context-protocol) (MCP) helps solve this problem. MCP is an open standard for connecting AI models and agents with external data sources such as local data sources (databases or computer files) or remote services (systems available over the internet, such as remote databases or APIs).
+
+### MCP architecture
+
+The following diagram illustrates the MCP architecture:
+ 
+:::image type="content" source="media/about-mcp-servers/mcp-architecture.png" alt-text="Diagram of model context protocol (MCP) architecture.":::
+
+The architecture consists of the following components:
+
+| Component      | Description                                                                                     |
+|----------------|-------------------------------------------------------------------------------------------------|
+| **MCP hosts**  | LLM applications such as chat apps or AI assistants in your IDEs (like GitHub Copilot in Visual Studio Code) that need to access external capabilities |
+| **MCP clients**| Protocol clients, inside the host application, that maintain 1:1 connections with servers        |
+| **MCP servers**| Lightweight programs that each expose specific capabilities and provide context, tools, and prompts to clients |
+| **MCP protocol**| Transport layer in the middle        |
+
+MCP follows a client-server architecture where a host application can connect to multiple servers. Whenever your MCP host or client needs a tool, it connects to the MCP server. The MCP server then connects to, for example, a database or an API. MCP hosts and servers connect with each other through the MCP protocol.
+
+### Remote versus local MCP servers
+
+MCP utilizes a client-host-server architecture built on [JSON-RPC 2.0 for messaging](https://modelcontextprotocol.io/docs/concepts/architecture). Communication between clients and servers occurs over defined transport layers, and supports primarily two modes of operation:
+
+* **Remote MCP servers** - MCP clients connect to MCP servers over the internet, establishing a connection using HTTP and server-sent events (SSE), and authorizing the MCP client access to resources on the user's account using OAuth.
+
+* **Local MCP servers** MCP clients connect to MCP servers on the same machine, using standard input/output as a local transport method.

articles/api-center/media/register-discover-mcp-server/mcp-architecture.png renamed to articles/api-center/includes/media/about-mcp-servers/mcp-architecture.png

@@ -14,36 +14,7 @@ ms.author: danlep
 
 This article describes how to use Azure API Center to maintain an inventory (or *registry*) of remote model context protocol (MCP) servers and help stakeholders discover them using the API Center portal. MCP servers expose backend APIs or data sources in a standard way to AI agents and models that consume them.
 
-## About MCP servers
-
-AI agents are becoming widely adopted because of enhanced large language model (LLM) capabilities. However, even the most advanced models face limitations because of their isolation from external data. Each new data source potentially requires custom implementations to extract, prepare, and make data accessible for the models.
-
-The [model context protocol](https://www.anthropic.com/news/model-context-protocol) (MCP) helps solve this problem. MCP is an open standard for connecting AI models and agents with external data sources such as local data sources (databases or computer files) or remote services (systems available over the internet, such as remote databases or APIs).
-
-### MCP architecture
-
-The following diagram illustrates the MCP architecture:
- 
-:::image type="content" source="media/register-discover-mcp-server/mcp-architecture.png" alt-text="Diagram of model context protocol (MCP) architecture.":::
-
-The architecture consists of the following components:
-
-| Component      | Description                                                                                     |
-|----------------|-------------------------------------------------------------------------------------------------|
-| **MCP hosts**  | LLM applications such as chat apps or AI assistants in your IDEs (like GitHub Copilot in Visual Studio Code) that need to access external capabilities |
-| **MCP clients**| Protocol clients, inside the host application, that maintain 1:1 connections with servers        |
-| **MCP servers**| Lightweight programs that each expose specific capabilities and provide context, tools, and prompts to clients |
-| **MCP protocol**| Transport layer in the middle        |
-
-MCP follows a client-server architecture where a host application can connect to multiple servers. Whenever your MCP host or client needs a tool, it connects to the MCP server. The MCP server then connects to, for example, a database or an API. MCP hosts and servers connect with each other through the MCP protocol.
-
-### Remote versus local MCP servers
-
-MCP utilizes a client-host-server architecture built on [JSON-RPC 2.0 for messaging](https://modelcontextprotocol.io/docs/concepts/architecture). Communication between clients and servers occurs over defined transport layers, and supports primarily two modes of operation:
-
-* **Remote MCP servers** - MCP clients connect to MCP servers over the internet, establishing a connection using HTTP and server-sent events (SSE), and authorizing the MCP client access to resources on the user's account using OAuth.
-
-* **Local MCP servers** MCP clients connect to MCP servers on the same machine, using standard input/output as a local transport method.
+[!INCLUDE [about-mcp-servers](includes/about-mcp-servers.md)]
 
 ## MCP servers in your API inventory
 

articles/api-center/register-discover-mcp-server.md

@@ -212,6 +212,8 @@
         href: azure-openai-api-from-specification.md
       - name: Authenticate and authorize to Azure OpenAI
         href: api-management-authenticate-authorize-azure-openai.md
+      - name: Expose REST API as MCP server
+        href: export-rest-mcp-server.md
       - name: Semantic caching for Azure OpenAI API requests
         href: azure-openai-enable-semantic-caching.md
       - name: Protect Azure OpenAI keys
@@ -318,6 +320,8 @@
   items:
   - name: API authentication and authorization options
     href: authentication-authorization-overview.md
+  - name: Protect product APIs with Microsoft Entra ID applications
+    href: applications.md
   - name: Protect your API with Microsoft Entra ID
     href: api-management-howto-protect-backend-with-aad.md
   - name: Protect your API with Azure AD B2C
@@ -620,10 +624,6 @@
   - name: Azure Policy built-ins
     displayName: samples, policies, definitions
     href: ./policy-reference.md
-  - name: Gateway log schema
-    href: gateway-log-schema-reference.md
-  - name: Developer portal audit log schema
-    href: developer-portal-audit-log-schema-reference.md
   - name: Event Grid events schema
     href: ../event-grid/event-schema-api-management.md?toc=/azure/api-management/toc.json&bc=/azure/api-management/breadcrumb/toc.json
   - name: Virtual network configuration
@@ -632,8 +632,6 @@
     href: self-hosted-gateway-settings-reference.md
   - name: Self-hosted gateway Azure Arc configuration
     href: self-hosted-gateway-arc-reference.md
-  - name: Diagnostic logs settings
-    href: diagnostic-logs-reference.md
 - name: Resources
   items:
   - name: FAQ