check for merge conflicts.

Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into release-ga-lbcd

Author: mbender-ms

articles/active-directory-b2c/password-complexity.md

@@ -83,7 +83,7 @@ Allows you to control the different character types used in the password.
 
 - **2 of 4: Lowercase character, Uppercase character, Number (0-9), Symbol** ensures the password contains at least two character types. For example, a number and a lowercase character.
 - **3 of 4: Lowercase character, Uppercase character, Number (0-9), Symbol** ensures the password contains at least three character types. For example, a number, a lowercase character and an uppercase character.
-- **4 of 4: Lowercase character, Uppercase character, Number (0-9), Symbol** ensures the password contains all for character types.
+- **4 of 4: Lowercase character, Uppercase character, Number (0-9), Symbol** ensures the password contains all four character types.
 
     > [!NOTE]
     > Requiring **4 of 4** can result in end-user frustration. Some studies have shown that this requirement doesn't improve password entropy. See [NIST Password Guidelines](https://pages.nist.gov/800-63-3/sp800-63b.html#appA)

articles/automation/automation-child-runbooks.md

@@ -49,7 +49,7 @@ Currently, PowerShell 5.1 is supported and only certain runbook types can call e
   > * Executing child scripts using `.\child-runbook.ps1` is not supported in PowerShell 7.1 and PowerShell 7.2 
   **Workaround**: Use `Start-AutomationRunbook` ([internal cmdlet](/azure/automation/shared-resources/modules#internal-cmdlets)) or `Start-AzAutomationRunbook` (from [Az.Automation module](/powershell/module/Az.Automation/Start-AzAutomationRunbook)) to start another runbook from parent runbook.
   > * Executing child scripts using Graphical PowerShell Workflow runbooks is not supported.
-  **Workaround**: Use Start-AzAutomationRunbook (from [Az.Automation module](/powershell/module/Az.Automation/Start-AzAutomationRunbook)) from within the parent runbook (via an InlineScript block) to start another runbook.
+  **Workaround**: Use `Start-AzAutomationRunbook` (from [Az.Automation module](/powershell/module/Az.Automation/Start-AzAutomationRunbook)) from within the parent runbook (via an InlineScript block) to start another runbook.
 
 The publish order of runbooks matters only for PowerShell Workflow runbooks.
 

articles/azure-resource-manager/management/relocation/relocation-cosmos-db.md

@@ -1,12 +1,11 @@
 ---
 title: Relocate an Azure Cosmos DB NoSQL account to another region
 description: Learn how to relocate an Azure Cosmos DB NoSQL account to another region.
-author: seesharprun
+author: markjbrown
 ms.topic: how-to
 ms.custom: subject-relocation
-ms.date: 06/11/2024
-ms.author: sidandrews
-ms.reviewer: mjbrown
+ms.date: 06/11/2025
+ms.author: mjbrown
 ---
 
 # Relocate an Azure Cosmos DB NoSQL account to another region

articles/azure-vmware/azure-vmware-solution-known-issues.md

@@ -15,7 +15,8 @@ Refer to the table to find details about resolution dates or possible workaround
 
 |Issue | Date discovered | Workaround | Date resolved |
 | :------------------------------------- | :------------ | :------------- | :------------- |
-| [VMSA-2025-0010](https://support.broadcom.com/web/ecx/support-content-notification/-/external/content/SecurityAdvisories/0/25717) Multiple vulnerabilities (CVE-2025-41225, CVE-2025-41226, CVE-2025-41227, CVE-2025-41228) have been identified in VMware ESXi and vCenter Server. | May 2025 | Microsoft, in collaboration with Broadcom/VMware, has confirmed the applicability of these vulnerabilities to Azure VMware Solution (AVS). Existing security controls, including cloudadmin role restrictions and network isolation, are deemed to significantly mitigate the impact of these vulnerabilities prior to official patching. The vulnerabilities have been adjudicated with a combined adjusted Environmental Score of [6.8](https://www.first.org/cvss/calculator/3.1#CVSS:3.1/AV:L/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H/MAC:L/MPR:N/MUI:N/MS:C/MC:H/MI:H/MA:H) within the Azure VMware Solution. Until the update is fully addressed, customers are advised to exercise additional caution when granting administrative access to guest virtual machines and to actively monitor any administrative activities performed on them. | N/A |
+|[VMSA-2025-0012](https://support.broadcom.com/web/ecx/support-content-notification/-/external/content/SecurityAdvisories/0/25738) Multiple vulnerabilities (CVE-2025-22243, CVE-2025-22244, CVE-2025-22245) have been identified in VMware NSX. | May 2025 | The vulnerability described in the Broadcom document does not apply to Azure VMware Solution due to existing compensating controls mitigate the risk of exploitation. | The upcoming version of NSX will include a patch to address this vulnerability. |
+|[VMSA-2025-0010](https://support.broadcom.com/web/ecx/support-content-notification/-/external/content/SecurityAdvisories/0/25717) Multiple vulnerabilities (CVE-2025-41225, CVE-2025-41226, CVE-2025-41227, CVE-2025-41228) have been identified in VMware ESXi and vCenter Server. | May 2025 | Microsoft, in collaboration with Broadcom/VMware, has confirmed the applicability of these vulnerabilities to Azure VMware Solution (AVS). Existing security controls, including cloudadmin role restrictions and network isolation, are deemed to significantly mitigate the impact of these vulnerabilities prior to official patching. The vulnerabilities have been adjudicated with a combined adjusted Environmental Score of [6.8](https://www.first.org/cvss/calculator/3.1#CVSS:3.1/AV:L/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H/MAC:L/MPR:N/MUI:N/MS:C/MC:H/MI:H/MA:H) within the Azure VMware Solution. Until the update is fully addressed, customers are advised to exercise additional caution when granting administrative access to guest virtual machines and to actively monitor any administrative activities performed on them. | N/A |
 |[VMSA-2025-0007](https://support.broadcom.com/web/ecx/support-content-notification/-/external/content/SecurityAdvisories/0/25683) VMware Tools update addresses an insecure file handling vulnerability (CVE-2025-22247). | May 2025 | To remediate CVE-2025-22247, apply version 12.5.2 of VMware Tools, use the Azure VMware Solution Run command ``Set-Tools-Repo.`` | May 2025 |
 | ESXi hosts may experience operational issues if NSX Layer-2 DFW default rule logging is enabled. More information can be obtained in this Knowledge Base article from Broadcom: [ESXi hosts may experience operational issues if L2 DFW default rule logging is enabled.](https://knowledge.broadcom.com/external/article/326455/esxi-hosts-may-experience-operational-is.html) | May 2025 | It is not recommended to enable logging on the default Layer-2 DFW rule in a Production environment for any sustained period of time. If logging must be enabled on an L2 rule, it is advised to create a new L2 rule specific to the traffic flow in question and enable logging on that rule only. Please see [Broadcom Knowledge Base Article 326455.](https://knowledge.broadcom.com/external/article/326455/esxi-hosts-may-experience-operational-is.html).| N/A |
 | With VMware HCX versions 4.10.3 and earlier, attempts to download upgrade bundles or the Connector OVA directly from the HCX Manager UI (port 443) fail due to the decommissioning of the external image depot server. More information can be obtained in this Knowledge Base article from Broadcom: [Upgrade Bundle Download from 443 UI will Fail in All HCX versions prior to 4.11](https://knowledge.broadcom.com/external/article/395372)| April 2025 | We will begin upgrading all Azure VMware Solution customers to HCX 4.11.0 in the coming weeks, this will provide customers with access to the HCX Connector upgrade bundles, which will be stored on their vSAN datastore. Until then, all customers will need to submit a support request (SR) to obtain the required upgrade bundles. | May 2025 |

articles/backup/back-up-managed-disks-tutorial.md

@@ -2,7 +2,7 @@
 title: Tutorial - Back up Azure Managed Disks using Azure Backup
 description: In this tutorial, learn how to back up Azure Managed Disks from the Azure portal.
 ms.topic: tutorial
-ms.date: 06/11/2024
+ms.date: 06/11/2025
 ms.service: azure-backup
 author: jyothisuri
 ms.author: jsuri
@@ -197,4 +197,4 @@ To run an on-demand disk backup, follow these steps:
 
 ## Next step
 
-- [Restore Azure Managed Disks](restore-managed-disks.md)
+- Restore Managed Disk using [Azure portal](restore-managed-disks.md), [Azure PowerShell](restore-managed-disks-ps.md), [Azure CLI](restore-managed-disks-cli.md), [REST API](backup-azure-dataprotection-use-rest-api-restore-disks.md).

articles/backup/backup-azure-dataprotection-use-rest-api-backup-disks.md

@@ -2,7 +2,7 @@
 title: Back up Azure Disks using Azure Data Protection REST API.
 description: In this article, learn how to configure, initiate, and manage backup operations of Azure Disks using REST API.
 ms.topic: how-to
-ms.date: 04/16/2025
+ms.date: 06/11/2025
 ms.assetid: 6050a941-89d7-4b27-9976-69898cc34cde
 author: jyothisuri
 ms.author: jsuri
@@ -509,7 +509,7 @@ GET "https://management.azure.com/subscriptions/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxx
 
 ## Next steps
 
-[Restore data from an Azure Disk backup](backup-azure-arm-userestapi-restoreazurevms.md)
+Restore Managed Disk using [Azure portal](restore-managed-disks.md), [Azure PowerShell](restore-managed-disks-ps.md), [Azure CLI](restore-managed-disks-cli.md), [REST API](backup-azure-dataprotection-use-rest-api-restore-disks.md).
 
 For more information on the Azure Backup REST APIs, see the following articles:
 

articles/backup/backup-azure-dataprotection-use-rest-api-restore-disks.md

@@ -2,7 +2,7 @@
 title: Restore Azure Disks using Azure Data Protection REST API
 description: In this article, learn how to restore Azure Disks using Azure Data protection REST API.
 ms.topic: how-to
-ms.date: 02/09/2025
+ms.date: 06/11/2025
 ms.assetid: 30f4e7ff-2a55-4a85-be44-55feedc24607
 ms.custom: engagement-fy24
 author: jyothisuri
@@ -11,7 +11,7 @@ ms.author: jsuri
 
 # Restore Azure Disks using Azure Data Protection REST API
 
-This article describes how to restore and create a new [Azure Disks](disk-backup-overview.md) using Azure Backup.
+This article describes how to restore and create a new [Azure Disks](disk-backup-overview.md) by Azure Backup using REST API. You can also restore Managed Disk using [Azure portal](restore-managed-disks.md), [Azure PowerShell](restore-managed-disks-ps.md), [Azure CLI](restore-managed-disks-cli.md).
 
 Azure Disk Backup offers a turnkey solution that provides snapshot lifecycle management for managed disks by automating periodic creation of snapshots and retaining it for configured duration using backup policy. You can manage the disk snapshots with zero infrastructure cost and without the need for custom scripting or any management overhead. This is a crash-consistent backup solution that takes point-in-time backup of a managed disk using incremental snapshots with support for multiple backups per day. It's also an agent-less solution and doesn't impact production application performance. It supports backup and restore of both OS and data disks (including shared disks), whether or not they're currently attached to a running Azure virtual machine.
 

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

@@ -2,7 +2,7 @@
 metadata:
   title: Back up Azure Files FAQ
   description: In this article, discover answers to common questions about how to protect your Azure file shares with the Azure Backup service.
-  ms.date: 01/08/2025
+  ms.date: 06/11/2025
   ms.topic: faq
   ms.service: azure-backup
   author: jyothisuri
@@ -299,6 +299,11 @@ sections:
         answer: |
           When both snapshot and vaulted backups are configured, the expiry date initially reflects the retention period of the snapshot backup. After the snapshot backup expires, the expiry date will update to reflect the retention period of the vaulted backup.
 
+      - question: |
+          Why is the lock recreated during an on-demand backup in Azure?
+        answer: |
+          During an on-demand backup, Azure Backup auto-recreates the deleted lock to protect data and prevent accidental changes or deletions.
+
   - name: Lease snapshots
     questions:
       - question: |

articles/backup/backup-managed-disks-cli.md

@@ -3,7 +3,7 @@ title: Back up Azure Managed Disks using Azure CLI
 description: Learn how to back up Azure Managed Disks using Azure CLI.
 ms.topic: how-to
 ms.custom: devx-track-azurecli, engagement-fy24
-ms.date: 04/23/2025
+ms.date: 06/11/2025
 author: jyothisuri
 ms.author: jsuri
 ---
@@ -496,7 +496,7 @@ az dataprotection job list-from-resourcegraph --datasource-type AzureDisk --stat
 
 ## Next steps
 
-[Restore Azure Managed Disks using Azure CLI](restore-managed-disks-cli.md).
+Restore Managed Disk using [Azure portal](restore-managed-disks.md), [Azure PowerShell](restore-managed-disks-ps.md), [Azure CLI](restore-managed-disks-cli.md).
 
 ## Related content
 

articles/backup/backup-managed-disks-ps.md

@@ -2,7 +2,7 @@
 title: Back up Azure Managed Disks using Azure PowerShell
 description: Learn how to back up Azure Managed Disks using Azure PowerShell.
 ms.topic: how-to
-ms.date: 04/23/2025
+ms.date: 06/11/2025
 ms.custom: devx-track-azurepowershell
 author: jyothisuri
 ms.author: jsuri
@@ -255,7 +255,7 @@ You can also use Az.ResourceGraph to track all jobs across all backup vaults. Us
 
 ## Next steps
 
-[Restore Azure Managed Disks using Azure PowerShell](restore-managed-disks-ps.md).
+Restore Managed Disk using [Azure portal](restore-managed-disks.md), [Azure PowerShell](restore-managed-disks-ps.md), [Azure CLI](restore-managed-disks-cli.md).
 
 ## Related content