Skip to content

Commit 9aa967a

Browse files
authored
Sync release hotfixes with main
Sync release hotfixes with main
2 parents 700e6d8 + 502ef62 commit 9aa967a

12 files changed

+42
-40
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ These license terms are an agreement between you and Microsoft Corporation (or o
6868

6969
**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).
7070

71-
**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:
71+
**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:
7272

7373
**a) Australia.** You have statutory guarantees under the Australian Consumer Law and nothing in this agreement is intended to affect those rights.
7474

@@ -86,7 +86,7 @@ Subject to the foregoing clause ii., Microsoft will only be liable for slight ne
8686
**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.**
8787

8888
**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.
89-
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.**
89+
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.**
9090

9191
**Please note: As this software is distributed in Canada, some of the clauses in this agreement are provided below in French.**
9292

AKS-Arc/encrypt-etcd-secrets.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,6 @@ If you encounter any errors with the KMS plugin, follow the procedure on the [Tr
105105

106106
## Next steps
107107

108-
- [Encrypt etcd secrets for Kubernetes clusters in AKS on Windows Server](encrypt-secrets.md)
108+
- [Create Kubernetes clusters](aks-create-clusters-cli.md#deploy-the-application-and-load-balancer)
109109
- [Deploy a Linux application on a Kubernetes cluster](deploy-linux-application.md)
110-
- [Deploy a Windows Server application on a Kubernetes cluster](deploy-windows-application.md)
110+

azure-local/assurance/azure-stack-hipaa-guidance.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: HIPAA guidance for Azure Local
33
description: Learn about HIPAA compliance using Azure Local.
4-
ms.date: 12/27/2024
4+
ms.date: 04/09/2025
55
ms.topic: conceptual
66
ms.service: azure-local
77
ms.author: nguyenhung
@@ -94,7 +94,7 @@ If you're using Microsoft Entra ID to manage identity and access to the platform
9494

9595
#### SIEM integration
9696

97-
Microsoft Defender for Cloud and Microsoft Sentinel is natively integrated with Arc-enabled Azure Local machines. You can enable and onboard your logs to Microsoft Sentinel, which provides security information event management (SIEM) and security orchestration automated response (SOAR) capability. Microsoft Sentinel, like other Azure cloud services, complies with many well-established security standards such as HIPAA and HITRUST, which can help you with your accreditation process. Additionally, Azure Local provides a native syslog event forwarder to send the system events to third party SIEM solutions.
97+
Microsoft Defender for Cloud and Microsoft Sentinel is natively integrated with Arc-enabled servers. You can enable and onboard your logs to Microsoft Sentinel, which provides security information event management (SIEM) and security orchestration automated response (SOAR) capability. Microsoft Sentinel, like other Azure cloud services, complies with many well-established security standards such as HIPAA and HITRUST, which can help you with your accreditation process. Additionally, Azure Local provides a native syslog event forwarder to send the system events to third party SIEM solutions.
9898

9999
#### Azure Local Insights
100100

azure-local/assurance/azure-stack-iso27001-guidance.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: ISO 27001 guidance for Azure Local
33
description: Learn about ISO 27001 compliance using Azure Local.
4-
ms.date: 12/27/2024
4+
ms.date: 04/09/2025
55
ms.topic: conceptual
66
ms.service: azure-local
77
ms.author: nguyenhung
@@ -124,7 +124,7 @@ If you're using Microsoft Entra ID to manage identity and access to the platform
124124

125125
#### SIEM integration
126126

127-
Microsoft Defender for Cloud and Microsoft Sentinel is natively integrated with Arc-enabled Azure Local machines. You can enable and onboard your logs to Microsoft Sentinel, which provides security information event management (SIEM) and security orchestration automated response (SOAR) capability. Microsoft Sentinel, like other Azure cloud services, also complies with many well-established security standards such as ISO/IEC 27001, which can help you with your certification process. Additionally, Azure Local provides a native syslog event forwarder to send the system events to the third party SIEM solutions.
127+
Microsoft Defender for Cloud and Microsoft Sentinel is natively integrated with Arc-enabled servers. You can enable and onboard your logs to Microsoft Sentinel, which provides security information event management (SIEM) and security orchestration automated response (SOAR) capability. Microsoft Sentinel, like other Azure cloud services, also complies with many well-established security standards such as ISO/IEC 27001, which can help you with your certification process. Additionally, Azure Local provides a native syslog event forwarder to send the system events to the third party SIEM solutions.
128128

129129
### Monitoring
130130

azure-local/assurance/azure-stack-pci-dss-guidance.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: PCI DSS guidance for Azure Local
33
description: Learn about PCI DSS compliance using Azure Local.
4-
ms.date: 12/27/2024
4+
ms.date: 04/09/2025
55
ms.topic: conceptual
66
ms.service: azure-local
77
ms.author: nguyenhung
@@ -149,7 +149,7 @@ If you're using Microsoft Entra ID to manage identity and access to the platform
149149

150150
#### SIEM integration
151151

152-
Microsoft Defender for Cloud and Microsoft Sentinel is natively integrated with Arc-enabled Azure Local machines. You can enable and onboard your logs to Microsoft Sentinel, which provides security information event management (SIEM) and security orchestration automated response (SOAR) capability. Microsoft Sentinel, like other Azure cloud services, complies with many well-established security standards such as PCI DSS, HITRUST, and FedRAMP Authorization, which can help you with your accreditation process. Additionally, Azure Local provides a native syslog event forwarder to send the system events to third party SIEM solutions.
152+
Microsoft Defender for Cloud and Microsoft Sentinel is natively integrated with Arc-enabled servers. You can enable and onboard your logs to Microsoft Sentinel, which provides security information event management (SIEM) and security orchestration automated response (SOAR) capability. Microsoft Sentinel, like other Azure cloud services, complies with many well-established security standards such as PCI DSS, HITRUST, and FedRAMP Authorization, which can help you with your accreditation process. Additionally, Azure Local provides a native syslog event forwarder to send the system events to third party SIEM solutions.
153153

154154
#### Azure Local Insights
155155

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: alkohli
66
ms.topic: how-to
77
ms.service: azure-local
88
ms.custom: references_regions
9-
ms.date: 02/14/2025
9+
ms.date: 04/03/2025
1010
---
1111

1212
# System requirements for Azure Local
@@ -45,6 +45,8 @@ Here are the Azure requirements for your Azure Local instance:
4545

4646
## Machine and storage requirements
4747

48+
Microsoft Support may only be provided for Azure Local running on hardware listed in the [Azure Local catalog, or successor](https://aka.ms/azurelocalcatalog).
49+
4850
Before you begin, make sure that the physical machine and storage hardware used to deploy Azure Local meets the following requirements:
4951

5052
|Component|Minimum|

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ms.author: alkohli
66
ms.topic: how-to
77
ms.service: azure-local
88
ms.custom: references_regions
9-
ms.date: 02/06/2025
9+
ms.date: 04/03/2025
1010
---
1111

1212
# 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
2727

2828
## Device requirements
2929

30-
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.
30+
Microsoft Support may only be provided for Azure Local running on hardware listed in the [Azure Local catalog, or successor](https://aka.ms/azurelocalcatalog).
3131

3232
The following table lists the requirements for the small hardware:
3333

0 commit comments

Comments
 (0)