Merge pull request #300234 from MicrosoftDocs/repo_sync_working_branch

Taojunshen · web-flow · commit 1edbf6ac339a · 2025-05-23T00:37:48.000+08:00
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
diff --git a/articles/api-management/sap-api.md b/articles/api-management/sap-api.md
@@ -116,7 +116,7 @@ Choose one of the following methods to import your API to API Management:
     |---------|---------| 
     |`HEAD /`     | Enables the client to exchange cross-site request forgery (CSRF) tokens with the SAP server when required.<br/><br/>SAP also allows CSRF token exchange via the GET verb.<br/><br/> CSRF token exchange isn’t covered in this article. See an [example API Management policy snippet](https://github.com/Azure/api-management-policy-snippets/blob/master/examples/Get%20X-CSRF%20token%20from%20SAP%20gateway%20using%20send%20request.policy.xml) to broker token exchange.     |
 
-    :::image type="content" source="media/sap-api/head-root-operation.png" alt-text="Sceenshot that shows the operation for fetching tokens.":::
+    :::image type="content" source="media/sap-api/head-root-operation.png" alt-text="Screenshot that shows the operation for fetching tokens.":::
 
 - `GET /`
 
diff --git a/articles/azure-maps/media/power-bi-visual/country-region-borders-off.png b/articles/azure-maps/media/power-bi-visual/country-region-borders-off.png
diff --git a/articles/azure-maps/media/power-bi-visual/country-region-borders-on.png b/articles/azure-maps/media/power-bi-visual/country-region-borders-on.png
diff --git a/articles/azure-maps/media/power-bi-visual/show-labels-off.png b/articles/azure-maps/media/power-bi-visual/show-labels-off.png
diff --git a/articles/azure-maps/media/power-bi-visual/show-labels-on.png b/articles/azure-maps/media/power-bi-visual/show-labels-on.png
diff --git a/articles/azure-maps/power-bi-visual-get-started.md b/articles/azure-maps/power-bi-visual-get-started.md
@@ -91,11 +91,11 @@ Take the following steps to load the Azure Maps visual:
 
     :::image type="content" source="media/power-bi-visual/show-labels-off.png" alt-text="A screenshot of the Azure Maps visual displaying a map with the show labels setting turned off in the style section of the format pane in Power BI." lightbox="media/power-bi-visual/show-labels-off.png":::
 
-1. You can also show or hide country borders, state or province borders, county borders, building, and road details in the **Format** pane. The following two images show maps with the **Country borders** settings turned on and off:
+1. You can also show or hide country/region borders, state or province borders, county borders, building, and road details in the **Format** pane. The following two images show maps with the **Country/Region borders** settings turned on and off:
 
-    :::image type="content" source="media/power-bi-visual/country-borders-on.png" alt-text="A screenshot of the Azure Maps visual displaying a map with the country borders setting turned on in the style section of the format pane in Power BI." lightbox="media/power-bi-visual/country-borders-on.png":::
+    :::image type="content" source="media/power-bi-visual/country-region-borders-on.png" alt-text="A screenshot of the Azure Maps visual displaying a map with the country/region borders setting turned on in the style section of the format pane in Power BI." lightbox="media/power-bi-visual/country-region-borders-on.png":::
 
-    :::image type="content" source="media/power-bi-visual/country-borders-off.png" alt-text="A screenshot of the Azure Maps visual displaying a map with the country borders setting turned off in the style section of the format pane in Power BI." lightbox="media/power-bi-visual/country-borders-off.png":::
+    :::image type="content" source="media/power-bi-visual/country-region-borders-off.png" alt-text="A screenshot of the Azure Maps visual displaying a map with the country/region borders setting turned off in the style section of the format pane in Power BI." lightbox="media/power-bi-visual/country-region-borders-off.png":::
 
 ## Fields pane buckets
 
@@ -124,15 +124,15 @@ The following settings are available in the **Style** section:
 |-------------|--------------|
 | Style       | The style of the map. The dropdown list contains [blank and blank accessible], [grayscale dark], [grayscale light], [high contrast dark], [high contrast light], [night], [road], [road shaded relief], [satellite] and [satellite road labels]. |
 | Labels | A toggle switch that allows you to show or hide map labels. For more information, see item number five in the previous section titled [Use the Azure Maps Power BI visual](#use-the-azure-maps-power-bi-visual). |
-| Country borders | A toggle switch that controls the visibility of country borders. |
+| Country/Region borders | A toggle switch that controls the visibility of country/region borders. |
 | State or province borders | A toggle switch that controls the visibility of the borders for the first-level administrative divisions, such as state or province borders. |
 | County borders | A toggle switch that controls the visibility of the borders for the second-level administrative divisions, such as county borders. |
 | Buildings | A toggle switch that controls the visibility of building footprints |
 | Road details | A toggle switch that adjusts the level of detail for visible roads. Turning this off will reduce the number of roads shown on the map. |
 
 The availability of the above toggles depends on the selected style. Below is a table showing the supported options for different styles:
 
-| Map styles | Labels | Country borders | State or province borders | County borders | Buildings | Road details |
+| Map styles | Labels | Country/Region borders | State or province borders | County borders | Buildings | Road details |
 |-|-|-|-|-|-|-|
 | [blank and blank accessible] | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ |
 | [grayscale dark] | ✅ | ✅ | ✅ | ❌ | ✅ | ✅ |
diff --git a/articles/azure-resource-manager/bicep/visual-studio-code.md b/articles/azure-resource-manager/bicep/visual-studio-code.md
@@ -256,17 +256,17 @@ To use deployment pane:
 
     - Select the show deployment pane button on the upper right corner as shown in the following screenshot:  
 
-        :::image type="content" source="./media/visual-studio-code/visual-studio-code-open-deployment-pane.png" alt-text="Sceenshot of the open deployment pane button.":::
+        :::image type="content" source="./media/visual-studio-code/visual-studio-code-open-deployment-pane.png" alt-text="Screenshot of the open deployment pane button.":::
   
         By default, VS Code opens the deployment pane on the side. To open it in a new tab, hold <kbd>Alt</kbd> while selecting the button.
   
     - Another way to open the deployment pane is through the command palette. Press <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>P</kbd>, then select either **Show Deployment Pane** or **Show Deployment Pane to the Side**.
   
-        :::image type="content" source="./media/visual-studio-code/visual-studio-code-show-deployment-pane.png" alt-text="Sceenshot of show deployment pane in command palette.":::
+        :::image type="content" source="./media/visual-studio-code/visual-studio-code-show-deployment-pane.png" alt-text="Screenshot of show deployment pane in command palette.":::
   
     The following screenshot shows a successful deployment with the Bicep file validation results.
   
-    :::image type="content" source="./media/visual-studio-code/visual-studio-code-deployment-pane.png" alt-text="Sceenshot of deployment pane in Visual Studio Code.":::
+    :::image type="content" source="./media/visual-studio-code/visual-studio-code-deployment-pane.png" alt-text="Screenshot of deployment pane in Visual Studio Code.":::
   
 1. Select **Change Scope** to define the deployment scope. After authentication, you're able to select the subscription and the resource group of your desired deployment.
 1. Select **Pick JSON Parameters File** to select a JSON parameter file.  
diff --git a/articles/backup/backup-azure-system-state-troubleshoot.md b/articles/backup/backup-azure-system-state-troubleshoot.md
@@ -65,7 +65,7 @@ To install Windows Server Backup using PowerShell, run the following command:
 
 To install Windows Server Backup using Server Manager, follow these steps:
 
-1. In **Server Manger**, select **Add roles and features**. The **Add roles and features wizard** appears.
+1. In **Server Manager**, select **Add roles and features**. The **Add roles and features wizard** appears.
 
     ![Dashboard](./media/backup-azure-system-state-troubleshoot/server_management.jpg)
 
diff --git a/articles/dev-box/how-to-customize-devbox-azure-image-builder.md b/articles/dev-box/how-to-customize-devbox-azure-image-builder.md
@@ -170,7 +170,7 @@ To use VM Image Builder with Azure Compute Gallery, make sure you have an existi
 
 1. Create a file to store your template definition, such as c:/temp/mytemplate.txt.
 
-1. Copy the following Azure Resource Manger template for VM Image Builder into your new template file.
+1. Copy the following Azure Resource Manager template for VM Image Builder into your new template file.
 
    This template indicates the source image and the customizations applied. It installs Choco and VS Code, and also indicates the image distribution location.
 
diff --git a/articles/load-balancer/basic/ipv6-configure-template-json.md b/articles/load-balancer/basic/ipv6-configure-template-json.md
@@ -1,5 +1,5 @@
 ---
-title: Deploy an IPv6 dual stack application with Basic Load Balancer in Azure virtual network - Resource Manger template
+title: Deploy an IPv6 dual stack application with Basic Load Balancer in Azure virtual network - Resource Manager template
 titlesuffix: Azure Virtual Network
 description: This article shows how to deploy an IPv6 dual stack application in Azure virtual network using Azure Resource Manager VM templates.
 services: load-balancer
diff --git a/articles/operator-nexus/howto-azure-operator-nexus-prerequisites.md b/articles/operator-nexus/howto-azure-operator-nexus-prerequisites.md
@@ -1,6 +1,6 @@
 ---
-title: "Azure Operator Nexus: Before you start Network Fabric Controller and Cluster Manger creation"
-description: Prepare for create the Azure Operator Nexus Network Fabric Controller and Cluster Manger.
+title: "Azure Operator Nexus: Before you start Network Fabric Controller and Cluster Manager creation"
+description: Prepare for create the Azure Operator Nexus Network Fabric Controller and Cluster Manager.
 author: JAC0BSMITH
 ms.author: jacobsmith
 ms.service: azure-operator-nexus
diff --git a/articles/operator-nexus/howto-configure-cluster.md b/articles/operator-nexus/howto-configure-cluster.md
@@ -15,7 +15,7 @@ This article describes how to create a Cluster by using the Azure Command Line I
 
 ## Prerequisites
 
-- Verify that Network Fabric Controller and Cluster Manger exist in your Azure region
+- Verify that Network Fabric Controller and Cluster Manager exist in your Azure region
 - Verify that Network Fabric is successfully provisioned
 
 ## API guide and metrics
diff --git a/articles/sap/workloads/sap-higher-availability-architecture-scenarios.md b/articles/sap/workloads/sap-higher-availability-architecture-scenarios.md
@@ -260,7 +260,7 @@ Assuming a typical Azure scenario of one SAP application server instance in a VM
 
 
   > [!NOTE]
-  > The Autostart parameter has certain shortcomings as well. Specifically, the parameter triggers the start of an SAP ABAP or Java instance when the related Windows or Linux service of the instance is started. That sequence occurs when the operating system boots up. However, restarts of SAP services are also a common occurrence for SAP Software Lifecycle Management functionality such as Software Update Manger (SUM) or other updates or upgrades. These functionalities are not expecting an instance to be restarted automatically. Therefore, the Autostart parameter should be disabled before you run such tasks. The Autostart parameter also should not be used for SAP instances that are clustered, such as ASCS/SCS/CI.
+  > The Autostart parameter has certain shortcomings as well. Specifically, the parameter triggers the start of an SAP ABAP or Java instance when the related Windows or Linux service of the instance is started. That sequence occurs when the operating system boots up. However, restarts of SAP services are also a common occurrence for SAP Software Lifecycle Management functionality such as Software Update Manager (SUM) or other updates or upgrades. These functionalities are not expecting an instance to be restarted automatically. Therefore, the Autostart parameter should be disabled before you run such tasks. The Autostart parameter also should not be used for SAP instances that are clustered, such as ASCS/SCS/CI.
   >
   >
 
diff --git a/articles/traffic-manager/configure-multivalue-routing-method-template.md b/articles/traffic-manager/configure-multivalue-routing-method-template.md
@@ -75,7 +75,7 @@ To find more templates that are related to Azure Traffic Manager, see [Azure Qui
 
 ## Validate the deployment
 
-1. Use [Get-AzTrafficManagerProfile](/powershell/module/az.trafficmanager/get-aztrafficmanagerprofile) to verify that the nested endpoints were added to the profile. For `-Name`, enter the name of the parent Traffic Manger profile you entered when deploying the template.
+1. Use [Get-AzTrafficManagerProfile](/powershell/module/az.trafficmanager/get-aztrafficmanagerprofile) to verify that the nested endpoints were added to the profile. For `-Name`, enter the name of the parent Traffic Manager profile you entered when deploying the template.
 
     ```azurepowershell-interactive
     Get-AzTrafficManagerProfile -ResourceGroupName myResourceGroup -Name tmprofileparent-1 | Select Endpoints
diff --git a/articles/traffic-manager/traffic-manager-FAQs.md b/articles/traffic-manager/traffic-manager-FAQs.md
@@ -92,7 +92,7 @@ For example, if your Traffic Manager profile name is **label1**, then **label1.t
 
 ### What version of TLS is required by Traffic Manager?
 
-The Microsoft implementation of older TLS versions is not known to be vulnerable, however, TLS 1.2 and later offer improved security with features such as perfect forward secrecy and stronger cipher suites. To enhance security and provide best-in-class encryption for your data, Traffic Manger requires interactions with services to be secured using Transport Layer Security (TLS) 1.2 or later before February 28,2025. Traffic Manger support for TLS 1.0 and 1.1 will end on this date. This date might be different than the [Azure-wide TLS 1.0 and TLS 1.1 retirement date](https://azure.microsoft.com/updates?id=update-retirement-tls1-0-tls1-1-versions-azure-services).
+The Microsoft implementation of older TLS versions is not known to be vulnerable, however, TLS 1.2 and later offer improved security with features such as perfect forward secrecy and stronger cipher suites. To enhance security and provide best-in-class encryption for your data, Traffic Manager requires interactions with services to be secured using Transport Layer Security (TLS) 1.2 or later before February 28,2025. Traffic Manager support for TLS 1.0 and 1.1 will end on this date. This date might be different than the [Azure-wide TLS 1.0 and TLS 1.1 retirement date](https://azure.microsoft.com/updates?id=update-retirement-tls1-0-tls1-1-versions-azure-services).
 
 **Recommended action** 
 
@@ -521,7 +521,7 @@ One of the metrics provided by Traffic Manager is the health status of endpoints
 
 Nested Traffic Manager profiles can be configured using both the Azure Resource Manager and the classic Azure REST APIs, Azure PowerShell cmdlets and cross-platform Azure CLI commands. They're also supported via the new Azure portal.
 
-### How many layers of nesting does Traffic Manger support?
+### How many layers of nesting does Traffic Manager support?
 
 You can nest profiles up to 10 levels deep. 'Loops' aren't permitted.
 
diff --git a/articles/traffic-manager/traffic-manager-nested-profiles.md b/articles/traffic-manager/traffic-manager-nested-profiles.md
@@ -116,7 +116,7 @@ In this example, the **East US** endpoint is unhealthy, because it doesn't satis
 
 * [How do I configure nested profiles?](./traffic-manager-faqs.md#traffic-manager-nested-profiles)
 
-* [How many layers of nesting does Traffic Manger support?](./traffic-manager-faqs.md#how-many-layers-of-nesting-does-traffic-manger-support)
+* [How many layers of nesting does Traffic Manager support?](./traffic-manager-faqs.md#how-many-layers-of-nesting-does-traffic-manager-support)
 
 * [Can I mix other endpoint types with nested child profiles, in the same Traffic Manager profile?](./traffic-manager-faqs.md#can-i-mix-other-endpoint-types-with-nested-child-profiles-in-the-same-traffic-manager-profile)
 
diff --git a/articles/update-manager/extended-security-updates.md b/articles/update-manager/extended-security-updates.md
@@ -35,7 +35,7 @@ To enroll in Windows Server 2012 Extended Security Updates on Arc connected mach
 ## Next steps
 
 - Learn about the [supported regions for Azure VMs and Arc-enabled servers](supported-regions.md).
-- Learn on the [Update sources, types](support-matrix.md) managed by Azure Update Manger.
+- Learn on the [Update sources, types](support-matrix.md) managed by Azure Update Manager.
 - Know more on [supported OS and system requirements for machines managed by Azure Update Manager](support-matrix-updates.md).
 - Learn on [Automatic VM guest patching](support-matrix-automatic-guest-patching.md).
 - Learn more on [unsupported OS and Custom VM images](unsupported-workloads.md).
diff --git a/articles/update-manager/scheduled-patching.md b/articles/update-manager/scheduled-patching.md
@@ -292,7 +292,7 @@ For example, if a maintenance window is of 3 hours and starts at 3:00 PM, the fo
 
 > [!NOTE]
 > - Azure Update Manager doesn't stop installing the new updates if it's approaching the end of the maintenance window.
-> - Azure Update Manger doesn't terminate in-progress updates if the maintenance window is exceeded and only the remaining updates that must be installed aren't attempted. We recommend that you re-evaluate the duration of your maintenance window to ensure all the updates are installed . 
+> - Azure Update Manager doesn't terminate in-progress updates if the maintenance window is exceeded and only the remaining updates that must be installed aren't attempted. We recommend that you re-evaluate the duration of your maintenance window to ensure all the updates are installed . 
 > - If the maintenance window is exceeded on Windows, it's often because a service pack update is taking a long time to install.
 
 
diff --git a/articles/update-manager/security-awareness-ubuntu-support.md b/articles/update-manager/security-awareness-ubuntu-support.md
@@ -35,7 +35,7 @@ You can continue to use the Azure Update Manager [capabilities](updates-maintena
  
 ## Next steps
 -- Learn about the [supported regions for Azure VMs and Arc-enabled servers](supported-regions.md).
-- Learn on the [Update sources, types](support-matrix.md) managed by Azure Update Manger.
+- Learn on the [Update sources, types](support-matrix.md) managed by Azure Update Manager.
 - Know more on [supported OS and system requirements for machines managed by Azure Update Manager](support-matrix-updates.md).
 - Learn on [Automatic VM guest patching](support-matrix-automatic-guest-patching.md).
 - Learn more on [unsupported OS and Custom VM images](unsupported-workloads.md).
diff --git a/articles/update-manager/support-matrix-automatic-guest-patching.md b/articles/update-manager/support-matrix-automatic-guest-patching.md
@@ -29,7 +29,7 @@ For VMs created from customized images even if the Patch orchestration mode is s
 ## Next steps
 
 - Learn about the [supported regions for Azure VMs and Arc-enabled servers](supported-regions.md).
-- Learn on the [Update sources, types](support-matrix.md) managed by Azure Update Manger.
+- Learn on the [Update sources, types](support-matrix.md) managed by Azure Update Manager.
 - Know more on [supported OS and system requirements for machines managed by Azure Update Manager](support-matrix-updates.md).
 - Learn more on [unsupported OS and Custom VM images](unsupported-workloads.md).
 - Learn more on how to [configure Windows Update settings](configure-wu-agent.md) to work with Azure Update Manager. 
diff --git a/articles/update-manager/support-matrix-updates.md b/articles/update-manager/support-matrix-updates.md
@@ -342,7 +342,7 @@ The following table lists the operating systems supported on [Azure Arc-enabled
 ## Next steps
 
 - Learn about the [supported regions for Azure VMs and Arc-enabled servers](supported-regions.md).
-- Learn on the [Update sources, types](support-matrix.md) managed by Azure Update Manger.
+- Learn on the [Update sources, types](support-matrix.md) managed by Azure Update Manager.
 - Learn on [Automatic VM guest patching](support-matrix-automatic-guest-patching.md).
 - Learn more on [unsupported OS and Custom VM images](unsupported-workloads.md).
 - Learn about [security vulnerabilities and Ubuntu Pro support](security-awareness-ubuntu-support.md).
diff --git a/articles/update-manager/supported-regions.md b/articles/update-manager/supported-regions.md
@@ -60,7 +60,7 @@ China | ChinaEast </br> ChinaEast3 </br>  ChinaNorth </br> ChinaNorth3 </br> Chi
 
 ## Next steps
 
-- Learn on the [Update sources, types](support-matrix.md) managed by Azure Update Manger.
+- Learn on the [Update sources, types](support-matrix.md) managed by Azure Update Manager.
 - Know more on [supported OS and system requirements for machines managed by Azure Update Manager](support-matrix-updates.md).
 - Learn on [Automatic VM guest patching](support-matrix-automatic-guest-patching.md).
 - Learn more on [unsupported OS and Custom VM images](unsupported-workloads.md).
diff --git a/articles/update-manager/unsupported-workloads.md b/articles/update-manager/unsupported-workloads.md
@@ -29,7 +29,7 @@ The following table lists the workloads that aren't supported.
 ## Next steps
 
 - Learn about the [supported regions for Azure VMs and Arc-enabled servers](supported-regions.md).
-- Learn on the [Update sources, types](support-matrix.md) managed by Azure Update Manger.
+- Learn on the [Update sources, types](support-matrix.md) managed by Azure Update Manager.
 - Know more on [supported OS and system requirements for machines managed by Azure Update Manager](support-matrix-updates.md).
 - Learn on [Automatic VM guest patching](support-matrix-automatic-guest-patching.md).
 - Learn more on how to [configure Windows Update settings](configure-wu-agent.md) to work with Azure Update Manager. 
diff --git a/articles/virtual-desktop/whats-new.md b/articles/virtual-desktop/whats-new.md
@@ -1190,7 +1190,7 @@ On September 30, 2021, the Azure Virtual Desktop web client will no longer suppo
 
 ### Microsoft Intune preview
 
-We've started the preview for Microsoft Intune support in Windows 10 Enterprise multi-session. Intune support lets you manage your Windows 10 VMs with the same tools as your local devices. Learn more at our [Microsoft Endpoint Manger documentation](/mem/intune/fundamentals/windows-virtual-desktop-multi-session).
+We've started the preview for Microsoft Intune support in Windows 10 Enterprise multi-session. Intune support lets you manage your Windows 10 VMs with the same tools as your local devices. Learn more at our [Microsoft Endpoint Manager documentation](/mem/intune/fundamentals/windows-virtual-desktop-multi-session).
 
 ### FSLogix version 2105 preview
 
diff --git a/articles/virtual-wan/route-maps-about.md b/articles/virtual-wan/route-maps-about.md
diff --git a/includes/elastic-san-regions.md b/includes/elastic-san-regions.md
diff --git a/includes/policy/reference/bycat/policies-azure-load-testing.md b/includes/policy/reference/bycat/policies-azure-load-testing.md
diff --git a/includes/policy/reference/bycat/policies-machine-learning.md b/includes/policy/reference/bycat/policies-machine-learning.md
diff --git a/includes/policy/reference/byrp/microsoft.loadtestservice.md b/includes/policy/reference/byrp/microsoft.loadtestservice.md
diff --git a/includes/policy/reference/byrp/microsoft.machinelearningservices.md b/includes/policy/reference/byrp/microsoft.machinelearningservices.md
