Skip to content

Commit 68d4f5a

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into us558031-vnet-tbmove
2 parents e39c7b6 + 7539c60 commit 68d4f5a

7 files changed

Lines changed: 93 additions & 91 deletions

File tree

articles/api-management/export-rest-mcp-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Learn more about:
2929

3030
## Limitations
3131

32-
* API Management currently supports MCP server tools, but it doesn't support MCP resources or prompts.
32+
* For MCP servers exposed in API Management from managed REST APIs, API Management currently supports MCP server tools, but it doesn't support MCP resources or prompts.
3333
* API Management currently doesn't support MCP server capabilities in [workspaces](workspaces-overview.md).
3434

3535
## Prerequisites

articles/api-management/expose-existing-mcp-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Learn more about:
3737
* Either no authorization, or authorization protocols that comply with the following standards: [https://modelcontextprotocol.io/specification/2025-06-18/basic/authorization#standards-compliance](https://modelcontextprotocol.io/specification/2025-06-18/basic/authorization#standards-compliance).
3838
* Streamable HTTP or SSE transport types.
3939

40-
* API Management currently supports MCP server tools, but it doesn't support MCP resources or prompts.
40+
* For external MCP servers, API Management currently supports MCP server tools and resources, but it doesn't support MCP prompts.
4141
* API Management currently doesn't support MCP server capabilities in [workspaces](workspaces-overview.md).
4242

4343
## Prerequisites

articles/azure-compute-fleet/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Using Azure Compute Fleet, you can:
4141

4242
- Compute Fleet launches a combination of VM types that have their own considerations. For more information, see [Spot VMs](/azure/virtual-machines/spot-vms) and [Virtual Machines](/azure/virtual-machines/overview) for details.
4343
- Compute Fleet is currently available through [ARM template](quickstart-create-rest-api.md) and in [Azure portal](quickstart-create-portal.md).
44-
- Compute Fleet is available in all Azure public regions, expect those located in the China.
44+
- Compute Fleet is available in all Azure public regions, except those located in the China.
4545
- Compute Fleet can span across multiple-regions.
4646

4747
## Configure your Compute Fleet

articles/index.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
ms.topic: hub-page
1111
author: JnHs
1212
ms.author: jenhayes
13-
ms.date: 01/29/2026
13+
ms.date: 03/02/2026
1414
adobe-target: true
1515
learn-experiments: true
1616
featureFlags:
@@ -395,7 +395,7 @@ productDirectory:
395395
- containers
396396
url: /azure/kubernetes-fleet/
397397
# Card
398-
- title: Azure Quantum (Preview)
398+
- title: Azure Quantum
399399
summary: Experience quantum impact today on Azure
400400
imageSrc: ./media/index/quantum.svg
401401
azureCategories:
@@ -593,7 +593,6 @@ productDirectory:
593593
imageSrc: ./media/index/sql.svg
594594
azureCategories:
595595
- featured
596-
- hybrid
597596
- databases
598597
url: /azure/azure-sql/index
599598
# Card
@@ -602,6 +601,7 @@ productDirectory:
602601
imageSrc: ./media/index/sql-database.svg
603602
azureCategories:
604603
- databases
604+
- hybrid
605605
url: /azure/azure-sql/database/index
606606
# Card
607607
- title: Azure SQL Managed Instance
@@ -750,7 +750,6 @@ productDirectory:
750750
imageSrc: ./media/index/active-directory.svg
751751
azureCategories:
752752
- featured
753-
- hybrid
754753
- identity
755754
- security
756755
url: /entra/identity/
@@ -1111,6 +1110,7 @@ productDirectory:
11111110
imageSrc: ./media/index/defender.svg
11121111
azureCategories:
11131112
- security
1113+
- hybrid
11141114
url: /azure/defender-for-cloud/
11151115
# Card
11161116
- title: Microsoft Defender for IoT
@@ -1165,14 +1165,6 @@ productDirectory:
11651165
azureCategories:
11661166
- hybrid
11671167
url: operator-service-manager/index.yml
1168-
# Card
1169-
- title: Azure Operator Insights
1170-
summary: Analyze network data from multiple sources
1171-
imageSrc: ./media/index/operator-insights.svg
1172-
azureCategories:
1173-
- featured
1174-
- hybrid
1175-
url: operator-insights/index.yml
11761168
# Card
11771169
- title: Load Balancer
11781170
summary: Deliver high availability and network performance to your applications

articles/oracle/oracle-db/oracle-database-regions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ The list below mentions the Azure and corresponding OCI regions with the regiona
5454
| North Europe | Ireland (Dublin) ||| | | || Dual |
5555
| Spain Central | Spain Central (Madrid) ||| | | | | Dual |
5656
| Sweden Central | Sweden Central (Stockholm) ||||||| Dual |
57-
| Switzerland North | Switzerland North (Zurich) ||| | | || Single |
57+
| Switzerland North | Switzerland North (Zurich) ||| | | || Dual |
5858
| UAE Central | UAE Central (Abu Dhabi) ||| | | | | Single |
5959
| UAE North | UAE North (Dubai) |||| | || Dual |
6060
| UK South| UK South (London) ||||||| Dual |
6161
| UK West | UK West (Newport) ||| ||| | Single |
62-
| West Europe | Netherlands Northwest (Amsterdam) |||||| | Single |
62+
| West Europe | Netherlands Northwest (Amsterdam) |||||| | Dual |
6363

6464

6565
## North America (NA)

0 commit comments

Comments
 (0)