Merge pull request #301669 from MicrosoftDocs/main

Merged by Learn.Build PR Management system

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

articles/backup/backup-azure-vm-backup-faq.yml

@@ -4,7 +4,7 @@ metadata:
   description: In this article, discover answers to common questions about backing up Azure VMs with the Azure Backup service.
   ms.topic: faq
   ms.service: azure-backup
-  ms.date: 06/12/2025
+  ms.date: 06/23/2025
   author: jyothisuri
   ms.author: jsuri
   ms.custom: build-2025
@@ -265,7 +265,7 @@ sections:
 
       - question: Can I restore an Azure Virtual Machine in a different subscription?
         answer: |
-          Yes, [Cross Subscription Restore now](backup-azure-arm-restore-vms.md#restore-options) allows you to restore Azure VMs from a recovery point in one subscription to another under tenant as per Azure role-based access control (Azure RBAC) rules. Cross Subscription Restore is unsupported from [snapshots](backup-azure-vms-introduction.md#snapshot-creation) and [secondary region](backup-azure-arm-restore-vms.md#restore-in-secondary-region) restores.
+          Yes, [Cross Subscription Restore now](backup-azure-arm-restore-vms.md#restore-options) allows you to restore Azure VMs from a recovery point in one subscription to another under tenant as per Azure role-based access control (Azure RBAC) rules. Cross Subscription Restore is unsupported from [snapshots](backup-azure-vms-introduction.md#snapshot-creation).
 
       - question: Does Cross Subscription Restore support all Azure VM?
         answer: |
@@ -277,7 +277,7 @@ sections:
 
       - question: Can I perform Cross Subscription Restore for Azure VMs running in secondary regions?
         answer: |
-          No, [Cross Subscription Restore](backup-azure-arm-restore-vms.md#restore-options) does not support restore from [secondary regions](backup-azure-arm-restore-vms.md#restore-in-secondary-region).
+          Yes.
 
       - question: Can I use Enhanced policy for Cross Subscription Restore?
         answer: |

articles/backup/backup-support-matrix-iaas.md

@@ -2,7 +2,7 @@
 title: Support matrix for Azure VM backups
 description: Get a summary of support settings and limitations for backing up Azure VMs by using the Azure Backup service.
 ms.topic: reference
-ms.date: 06/19/2025
+ms.date: 06/23/2025
 ms.custom:
   - references_regions
   - linux-related-content
@@ -195,7 +195,7 @@ Backup of VMs with SSE and CMK encryption using HSM | Supported. <br><br> You mu
 **Component** | **Support**
 --- | ---
 Azure VM data disks | Support for backup of Azure VMs is up to 32 disks.<br><br> Support for backup of Azure VMs with unmanaged disks or classic VMs is deprecated. <br><br> *Note that backup support for disks in Azure Classic Storage is no longer available. To ensure continued functionality, migrate these disks to Azure Resource Manager (ARM) Storage, as Classic Storage accounts don't support ARM-based Virtual Machines (VMs). Also, backup for all Classic VMs is set to be deprecated on September 30, 2025. To prevent disruptions, migrate Classic VMs and associated disks to ARM Storage before this timeline.*
-Data disk size | Individual disk size can be up to 64 TB and a maximum of 512 TB combined for all disks in a VM.
+Data disk size | Individual disk size can be up to 64 TB and a maximum of 512 TB combined for all disks in a VM. <br><br> Note that it's available only in specific regions - East Asia, North Europe, West Europe, East US 2, North Central US, West Central US, West US 3, Central US.
 Storage type | Standard HDD, Standard SSD, Premium SSD. <br><br>  Backup and restore of [zone-redundant storage disks](/azure/virtual-machines/disks-redundancy#zone-redundant-storage-for-managed-disks) is supported.
 Managed disks | Supported.
 Encrypted disks | Supported.<br/><br/> Azure VMs enabled with Azure Disk Encryption can be backed up (with or without the Microsoft Entra app).<br/><br/> Encrypted VMs can't be recovered at the file or folder level. You must recover the entire VM.<br/><br/> You can enable encryption on VMs that Azure Backup is already protecting. <br><br> You can back up and restore disks encrypted via platform-managed keys or customer-managed keys. You can also assign a disk-encryption set while restoring in the same region. That is, providing a disk-encryption set while performing cross-region restore is currently not supported. However, you can assign the disk-encryption set to the restored disk after the restore is complete.

articles/backup/restore-azure-encrypted-virtual-machines.md

@@ -2,7 +2,7 @@
 title: Restore encrypted Azure VMs
 description: Describes how to restore encrypted Azure VMs with the Azure Backup service.
 ms.topic: how-to
-ms.date: 04/14/2025
+ms.date: 06/23/2025
 author: jyothisuri
 ms.author: jsuri
 ---
@@ -59,6 +59,11 @@ Do one of the following actions:
 
 Reinstall the ADE extension so the data disks are open and mounted.
 
+>[!Note]
+>If an Azure VM uses disks size >= 4097 GB, or includes > 16 disks, the restore job fails to restore ADE settings on the restored disk. The restored disk remains encrypted with ADE, as it was at the restoration point,but the ADE configuration doesn't apply to the restored disk.
+>
+>To re-enable ADE, create a new Azure VM from the restored disk and then re-encrypt it using ADE.
+
 ## Cross Region Restore for an encrypted Azure VM
 
 Azure Backup supports Cross Region Restore of encrypted Azure VMs to the [Azure paired regions](../reliability/cross-region-replication-azure.md). Learn how to [enable Cross Region Restore](backup-create-rs-vault.md#set-cross-region-restore) for an encrypted VM.

articles/iot-operations/deploy-iot-ops/overview-deploy.md

@@ -16,17 +16,7 @@ When you deploy Azure IoT Operations, you install a suite of services on an Azur
 
 ## Supported environments
 
-Microsoft supports the following environments for Azure IoT Operations deployments.
-
-| Environment | Minimum version | Availability |
-| ----------- | --------------- | ------------ |
-| K3s on Ubuntu 24.04 | K3s version 1.31.1 | General availability |
-| Azure Kubernetes Service (AKS) Edge Essentials on Windows 11 IoT Enterprise | AksEdge-K3s-1.29.6-1.8.202.0 | Public preview |
-| Azure Kubernetes Service (AKS) on Azure Local | Azure Stack HCI OS, version 23H2, build 2411 | Public preview |
-| Tanzu Kubernetes release (TKr) on Tanzu Kubernetes Grid with a management cluster 2.5.2| TKr version 1.28.11| General availability|
-
->[!IMPORTANT]
->Support for Azure IoT Operations deployments is only available on version 1.28.11 of TKr.
+[!INCLUDE [supported-environments-table](../includes/supported-environments-table.md)]
 
 >[!NOTE]
 >Billing usage records are collected on any environment where Azure IoT Operations is installed, regardless of support or availability levels.

articles/iot-operations/includes/supported-environments-table.md

@@ -0,0 +1,19 @@
+---
+author: dominicbetts
+ms.author: dobett
+ms.topic: include
+ms.service: iot-operations
+ms.date: 06/20/2025
+---
+
+Microsoft supports the following environments for Azure IoT Operations deployments.
+
+| Environment | Minimum version | Availability |
+| ----------- | --------------- | ------------ |
+| K3s on Ubuntu 24.04 | K3s version 1.31.1 | General availability |
+| Azure Kubernetes Service (AKS) Edge Essentials on Windows 11 IoT Enterprise | AksEdge-K3s-1.29.6-1.8.202.0 | Public preview |
+| Azure Kubernetes Service (AKS) on Azure Local | Azure Stack HCI OS, version 23H2, build 2411 | Public preview |
+| Tanzu Kubernetes release (TKr) on Tanzu Kubernetes Grid with a management cluster 2.5.2| TKr version 1.28.11| General availability|
+
+>[!IMPORTANT]
+>Support for Azure IoT Operations deployments is only available on version 1.28.11 of TKr.

articles/iot-operations/includes/supported-environments.md

@@ -10,4 +10,4 @@ ms.custom:
 ---
 
 > [!IMPORTANT]
-> Currently, K3s on Ubuntu 24.04 is the only generally available platform for deploying Azure IoT Operations in production. To learn more, see [Supported environments](../deploy-iot-ops/overview-deploy.md#supported-environments).
+> Currently, K3s on Ubuntu 24.04 and Tanzu Kubernetes are the only platforms for deploying Azure IoT Operations in production. To learn more, see [Supported environments](../deploy-iot-ops/overview-deploy.md#supported-environments).

articles/iot-operations/overview-iot-operations.md

@@ -123,17 +123,7 @@ To secure communication between devices and the cloud through isolated network e
 
 ## Supported environments
 
-Microsoft supports the following environments for Azure IoT Operations deployments.
-
-| Environment | Minimum version | Availability |
-| ----------- | --------------- | ------------ |
-| K3s on Ubuntu 24.04 | K3s version 1.31.1 | General availability |
-| Azure Kubernetes Service (AKS) Edge Essentials on Windows 11 IoT Enterprise | AksEdge-K3s-1.29.6-1.8.202.0 | Public preview |
-| Azure Kubernetes Service (AKS) on Azure Local | Azure Stack HCI OS, version 23H2, build 2411 | Public preview |
-| Tanzu Kubernetes release (TKr) on Tanzu Kubernetes Grid with a management cluster 2.5.2| TKr version 1.28.11| General availability|
-
->[!IMPORTANT]
->Support for Azure IoT Operations deployments is only available on version 1.28.11 of TKr.
+[!INCLUDE [supported-environments-table](includes/supported-environments-table.md)]
 
 ## Supported regions
 

articles/iot-operations/troubleshoot/iot-operations-faq.yml

@@ -35,7 +35,7 @@ sections:
       answer: For information on high availability across availability zones and regions for ADR, see [Reliability in Azure Device Registry](../../reliability/reliability-device-registry.md).
     - question: |
          On which platforms is Azure IoT Operations supported?
-      answer: Currently, K3s on Ubuntu 24.04 is the only generally available platform for deploying Azure IoT Operations in production. To learn more, see [Supported environments](../deploy-iot-ops/overview-deploy.md#supported-environments).
+      answer: Currently, K3s on Ubuntu 24.04 and Tanzu Kubernetes are the only platforms for deploying Azure IoT Operations in production. To learn more, see [Supported environments](../deploy-iot-ops/overview-deploy.md#supported-environments).
     - question: |
          Can I migrate my IoT Edge workloads to Azure IoT Operations?
       answer: Azure IoT Edge isn't an Azure Arc-enabled service like Azure IoT Operations is. Instead, IoT Edge is deeply integrated with and relies on Azure IoT Hub primitives such as device twins and direct methods for its functionality. While Azure IoT Operations can achieve outcomes similar to IoT Edge in some scenarios, the two services have fundamentally different architectures. As a result, there isn't a direct migration path for transitioning IoT Edge workload modules to Azure IoT Operations. 

articles/sap/workloads/integration-get-started.md

@@ -4,7 +4,7 @@ description: Learn about the various integration points in the Microsoft ecosyst
 ms.service: sap-on-azure
 ms.subservice: sap-vm-workloads
 ms.topic: concept-article
-ms.date: 12/15/2022
+ms.date: 06/22/2025
 author: MartinPankraz
 ms.author: mapankra
 
@@ -234,7 +234,7 @@ Discover partner offerings for SAP security on the [Azure Marketplace](https://a
 
 #### Microsoft Sentinel for SAP
 
-Microsoft Sentinel integrates natively with Microsoft Defender XDR in the Defender portal. See the integration in action with [Automatic attack disruption for SAP](../../sentinel/sap/deployment-attack-disrupt.md).
+Microsoft Sentinel integrates directly with Microsoft Defender XDR and the Microsoft Defender portal. SAP solutions are available in the Defender portal as part of [Microsoft's unified security operations platform](/unified-secops-platform/), and with [Microsoft Sentinel in the Defender portal](/azure/sentinel/microsoft-sentinel-defender-portal).
 
 For more information about [SAP certified](https://www.sap.com/dmc/exp/2013_09_adpd/enEN/#/solutions?id=s:33db1376-91ae-4f36-a435-aafa892a88d8) threat monitoring with Microsoft Sentinel for SAP, see the following Microsoft resources:
 

articles/sap/workloads/rise-integration-security.md

@@ -53,7 +53,7 @@ It can be used with any data source that Defender XDR and Sentinel support, incl
    This image shows an example of the Microsoft Security Copilot experience using a prompt to investigate an SAP incident.
 :::image-end:::
 
-In addition to that the Security Copilot experience is embedded on the Defender XDR portal. Next to an AI-generated summary, recommendations and remediation like password reset for SAP are provided out-of-the-box. Learn more about automatic SAP attack disruption [here](../../sentinel/sap/deployment-attack-disrupt.md).
+In addition to that, the Security Copilot experience is embedded on the Defender XDR portal, with an out-of-the-box AI-generated summary and recommendations for SAP. 
 
 :::image type="complex" source="./media/sap-rise-integration/sap-rise-security-copilot-defender-portal.png" alt-text="Screenshot of embedded Security Copilot experience in Defender with SAP RISE/ECS incidents." lightbox="./media/sap-rise-integration/sap-rise-security-copilot-defender-portal.png":::
    This image shows an example of Microsoft Security Copilot analyzing an incident detected on SAP RISE through Defender XDR. Data ingestion is done through the Microsoft Sentinel solution for SAP applications.