Merge pull request #292503 from MicrosoftDocs/main

Merge main to live, 4 AM

Author: v-ccolin

articles/backup/azure-file-share-support-matrix.md

@@ -2,7 +2,7 @@
 title: Support Matrix for Azure file share backup by using Azure Backup
 description: Provides a summary of support settings and limitations when backing up Azure file shares.
 ms.topic: reference
-ms.date: 11/27/2024
+ms.date: 12/31/2024
 ms.custom: references_regions, engagement-fy24
 ms.service: azure-backup
 author: AbhishekMallick-MS
@@ -99,13 +99,19 @@ Cross Subscription Backup (CSB) for Azure File share (preview) is currently avai
 
 ## Backup limits
 
+| Setting                                                      | Limit |
+| --- | --- |
+| Maximum number of discoveries of containers that can be backed up to Recovery Services Vault per day  | 50 |
+| Maximum number of inquiries for protectable items under the given container per day | 25 |
+| Maximum number of Configure backup per day | 200 |
+| Maximum number of on-demand backups per day | 10 |
+
 **Choose a backup tier**:
 
 # [Snapshot tier](#tab/snapshot-tier)
 
 | Setting                                      | Limit |
 | -------------------------------------------- | ----- |
-| Maximum  number of on-demand backups per day | 10   |
 | Maximum  number of scheduled backups per day | 6    |
 
 # [Vault-standard tier (preview)](#tab/vault-tier)
@@ -115,17 +121,23 @@ Cross Subscription Backup (CSB) for Azure File share (preview) is currently avai
 | Maximum size of file share              | 8 TB      |
 | Maximum number of files in a file share | 8 million |
 
+>[!Note]
+>If you have multiple backups scheduled per day, only the last scheduled backup of the day is transferred to the vault.
+
 ---
 
 ## Restore limits
 
+| Setting | Limit |
+| --- | --- |
+| Maximum number of restore per day                           | 20      |
+
 **Choose a backup tier**:
 
 # [Snapshot tier](#tab/snapshot-tier)
 
 | Setting                                                      | Limit   |
 | ------------------------------------------------------------ | ------- |
-| Maximum number of restore per day                           | 20      |
 | Maximum size of a file (if the destination account is in a Vnet) | 1TB |
 | Maximum  number of individual files or folders per restore, if ILR (Item level recovery)                         | 99      |
 | Maximum  recommended restore size per restore for large file shares | 15  TiB |

articles/backup/backup-azure-files.md

@@ -2,7 +2,7 @@
 title: Back up Azure File shares in the Azure portal
 description: Learn how to use the Azure portal to back up Azure File shares in the Recovery Services vault
 ms.topic: how-to
-ms.date: 12/20/2024
+ms.date: 12/31/2024
 ms.service: azure-backup
 ms.custom: engagement-fy23
 author: AbhishekMallick-MS
@@ -232,7 +232,7 @@ To run an on-demand backup, follow these steps:
 
 * Don't delete snapshots created by Azure Backup. Deleting snapshots can result in loss of recovery points and/or restore failures.
 
-* Don't remove the lock taken on the storage account by Azure Backup. Deletion of the lock can make your storage account prone to accidental deletion.
+* Don't remove the lock taken on the storage account by Azure Backup. Deletion of the lock can make your storage account prone to accidental deletion. Learn more [about protect your resources with lock](/azure/azure-resource-manager/management/lock-resources).
 
 ## Next steps
 

articles/backup/backup-azure-integrate-microsoft-defender-using-logic-apps.md

@@ -3,7 +3,7 @@ title: Integrate Microsoft Defender's ransomware alerts to preserve Azure Backup
 description: Learn how to integrate Microsoft Defender for Cloud and Azure Backup using logic app.
 ms.topic: how-to
 ms.custom: references_regions
-ms.date: 12/30/2022
+ms.date: 03/13/2024
 ms.service: azure-backup
 author: AbhishekMallick-MS
 ms.author: v-abhmallick

articles/backup/backup-azure-reserved-pricing-optimize-cost.md

@@ -3,7 +3,7 @@ title: Optimize costs for Azure Backup Storage with reserved capacity
 description: This article explains about how to optimize costs for Azure Backup Storage with reserved capacity.
 ms.topic: how-to
 ms.service: azure-backup
-ms.date: 11/01/2023
+ms.date: 04/16/2024
 ms.custom: engagement-fy24
 author: AbhishekMallick-MS
 ms.author: v-abhmallick

articles/backup/protect-backups-from-ransomware-faq.yml

@@ -4,7 +4,7 @@ metadata:
   description: In this article, discover answers to protect backups from ransomware with Azure Backup.
   ms.topic: faq
   ms.service: azure-backup
-  ms.date: 11/30/2024
+  ms.date: 12/04/2024
   author: AbhishekMallick-MS
   ms.author: v-abhmallick
 

articles/backup/scripts/microsoft-azure-recovery-services-powershell-all.md

@@ -3,7 +3,7 @@ title: Script Sample - Configuring Backup for on-premises Windows server
 description: Learn how to use a script to configure Backup for on-premises Windows server.
 ms.topic: sample
 ms.custom: devx-track-azurepowershell
-ms.date: 06/23/2021
+ms.date: 12/03/2024
 author: AbhishekMallick-MS
 ms.author: v-abhmallick
 ---

articles/deployment-environments/toc.yml

@@ -61,9 +61,15 @@ items:
 - name: Configure the ADE extensibility model
   expanded: false
   items:
-    - name: Configure container image to execute deployments
-      href: how-to-configure-extensibility-model-custom-image.md
-      displayName: custom image, container, custom runner, extensibility, ARM, Bicep, Terraform, Pulumi 
+    - name: Configure ARM or Bicep container image
+      displayName: custom image, container, custom runner, extensibility, ARM, Bicep
+      href: /azure/deployment-environments/how-to-configure-extensibility-model-custom-image?tabs=sample%2Cprivate-registry&pivots=arm-bicep
+    - name: Configure Terraform container image
+      displayName: custom image, container, custom runner, extensibility, Terraform
+      href: /azure/deployment-environments/how-to-configure-extensibility-model-custom-image?tabs=custom%2Cprivate-registry&pivots=terraform
+    - name: Configure Pulumi container image
+      displayName: custom image, container, custom runner, extensibility, Pulumi
+      href: /azure/deployment-environments/how-to-configure-extensibility-model-custom-image?tabs=sample%2Cprivate-registry&pivots=pulumi
     - name: Troubleshoot custom image errors and warnings
       displayName: custom image, container, custom runner, extensibility, ARM, Bicep, Terraform, Pulumi
       href: troubleshoot-custom-image-logs-errors.md 

articles/hdinsight/kafka/kafka-mirrormaker-2-0-guide.md

@@ -42,7 +42,7 @@ The summary of the broker setup process is as follows:
 
 **MirrorCheckpointConnector:**
 
-  1. Consumes offset-syncsr.
+  1. Consumes offset-syncs.
   1. Emits checkpoints to enable failover points.
 
 **MirrorHeartBeatConnector:**

articles/iot-hub/how-to-cloud-to-device-messaging.md

@@ -6,7 +6,7 @@ author: kgremban
 ms.author: kgremban
 ms.service: azure-iot-hub
 ms.topic: how-to
-ms.date: 06/20/2024
+ms.date: 12/19/2024
 zone_pivot_groups: iot-hub-howto-c2d-1
 ms.custom: [amqp, mqtt, "Role: Cloud Development", "Role: IoT Device"]
 ---

articles/migrate/concepts-assessment-calculation.md

@@ -33,7 +33,7 @@ There are three types of assessments you can create using Azure Migrate: Discove
 **Azure VMware Solution (AVS)** | Assessments to migrate your on-premises servers to [Azure VMware Solution (AVS)](../azure-vmware/introduction.md). You can assess your on-premises [VMware VMs](how-to-set-up-appliance-vmware.md) for migration to Azure VMware Solution (AVS) using this assessment type. [Learn more](concepts-azure-vmware-solution-assessment-calculation.md)
 
 > [!NOTE]
-> If the number of Azure VM or AVS assessments are incorrect on the Discovery and assessment tool, click on the total number of assessments to navigate to all the assessments and recalculate the Azure VM or AVS assessments. The Discovery and assessment tool will then show the correct count for that assessment type. 
+> If the number of Azure VM or AVS assessments are incorrect on the Discovery and assessment tool, select the total number of assessments to navigate to all the assessments and recalculate the Azure VM or AVS assessments. The Discovery and assessment tool will then show the correct count for that assessment type. 
 
 Assessments you create with Azure Migrate are a point-in-time snapshot of data. An Azure VM assessment provides two sizing criteria options: