Merge pull request #3603 from MicrosoftDocs/main638803334678708832sync_temp

For protected branch, push strategy should use PR and merge to target branch method to work around git push error

Author: learn-build-service-prod[bot]

AKS-Arc/aks-edge-software-license-terms.md

@@ -68,7 +68,7 @@ These license terms are an agreement between you and Microsoft Corporation (or o
 
 **10. APPLICABLE LAW AND PLACE TO RESOLVE DISPUTES.** If you acquired the software in the United States or Canada, the laws of the state or province where you live (or, if a business, where your principal place of business is located) govern the interpretation of this agreement, claims for its breach, and all other claims (including consumer protection, unfair competition, and tort claims), regardless of conflict of laws principles, except that the FAA governs everything related to arbitration. If you acquired the software in any other country, its laws apply, except that the FAA governs everything related to arbitration. If U.S. federal jurisdiction exists, you and Microsoft consent to exclusive jurisdiction and venue in the federal court in King County, Washington for all disputes heard in court (excluding arbitration). If not, you and Microsoft consent to exclusive jurisdiction and venue in the Superior Court of King County, Washington for all disputes heard in court (excluding arbitration).
 
-**11. CONSUMER RIGHTS; REGIONAL VARIATIONS.** This agreement describes certain legal rights. You may have other rights, including consumer rights, under the laws of your state, province, or country. Separate and apart from your relationship with Microsoft, you may also have rights with respect to the party from which you acquired the software. This agreement does not change those other rights if the laws of your state, province, or country do not permit it to do so. For example, if you acquired the software in one of the below regions, or mandatory country law applies, then the following provisions apply to you:
+**11. CONSUMER RIGHTS; REGIONAL VARIATIONS.** This agreement describes certain legal rights. You may have other rights, including consumer rights, under the laws of your state, province, or country/region. Separate and apart from your relationship with Microsoft, you may also have rights with respect to the party from which you acquired the software. This agreement does not change those other rights if the laws of your state, province, or country/region do not permit it to do so. For example, if you acquired the software in one of the below regions, or mandatory country/region law applies, then the following provisions apply to you:
 
 **a) Australia.** You have statutory guarantees under the Australian Consumer Law and nothing in this agreement is intended to affect those rights.
 
@@ -86,7 +86,7 @@ Subject to the foregoing clause ii., Microsoft will only be liable for slight ne
 **13. LIMITATION ON AND EXCLUSION OF DAMAGES. IF YOU HAVE ANY BASIS FOR RECOVERING DAMAGES DESPITE THE PRECEDING DISCLAIMER OF WARRANTY, YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES.**
 
 **This limitation applies to (a) anything related to the software, services, content (including code) on third party Internet sites, or third party applications; and (b) claims for breach of contract, warranty, guarantee, or condition; strict liability, negligence, or other tort; or any other claim; in each case to the extent permitted by applicable law.
-It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your state, province, or country may not allow the exclusion or limitation of incidental, consequential, or other damages.**
+It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your state, province, or country/region may not allow the exclusion or limitation of incidental, consequential, or other damages.**
 
 **Please note: As this software is distributed in Canada, some of the clauses in this agreement are provided below in French.**
 

azure-local/concepts/system-requirements-23h2.md

@@ -6,7 +6,7 @@ ms.author: alkohli
 ms.topic: how-to
 ms.service: azure-local
 ms.custom: references_regions
-ms.date: 02/14/2025
+ms.date: 04/03/2025
 ---
 
 # System requirements for Azure Local
@@ -45,6 +45,8 @@ Here are the Azure requirements for your Azure Local instance:
 
 ## Machine and storage requirements
 
+Microsoft Support may only be provided for Azure Local running on hardware listed in the [Azure Local catalog, or successor](https://aka.ms/azurelocalcatalog).
+
 Before you begin, make sure that the physical machine and storage hardware used to deploy Azure Local meets the following requirements:
 
 |Component|Minimum|

azure-local/concepts/system-requirements-small-23h2.md

@@ -6,7 +6,7 @@ ms.author: alkohli
 ms.topic: how-to
 ms.service: azure-local
 ms.custom: references_regions
-ms.date: 02/06/2025
+ms.date: 04/03/2025
 ---
 
 # System requirements for small form factor deployments of Azure Local (Preview)
@@ -27,7 +27,7 @@ The certified devices are listed in the [Azure Local Catalog](https://aka.ms/Azu
 
 ## Device requirements
 
-The device must be listed in the [Azure Local Catalog](https://aka.ms/AzureStackHCICatalog) which indicates that the device has passed the Windows Server certification and the extra qualifications.
+Microsoft Support may only be provided for Azure Local running on hardware listed in the [Azure Local catalog, or successor](https://aka.ms/azurelocalcatalog).
 
 The following table lists the requirements for the small hardware:
 

azure-stack/user/pattern-cross-cloud-scale-on-premises-data.md

@@ -99,7 +99,7 @@ Azure Stack Hub works with both Azure Active Directory (Azure AD) and Active Dir
 
 #### Ensure compliance, and data sovereignty
 
-Azure Stack Hub lets you run the same service across multiple countries as you would if using a public cloud. Deploying the same app in datacenters in each country allows data sovereignty requirements to be met. This capability ensures personal data is kept within each country's borders.
+Azure Stack Hub lets you run the same service across multiple countries/regions as you would if using a public cloud. Deploying the same app in datacenters in each country/region allows data sovereignty requirements to be met. This capability ensures personal data is kept within each country/region's borders.
 
 #### Azure Stack Hub - security posture