Skip to content

Commit 05e93c9

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into gwerror
2 parents cee01ed + 3d1c515 commit 05e93c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+645
-479
lines changed

articles/api-management/api-management-key-concepts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ API Management integrates with many complementary Azure services to create enter
136136
* **[Azure Monitor](api-management-howto-use-azure-monitor.md)** for logging, reporting, and alerting on management operations, systems events, and API requests​
137137
* **[Application Insights](api-management-howto-app-insights.md)** for live metrics, end-to-end tracing, and troubleshooting
138138
* **[Virtual networks](virtual-network-concepts.md)**, **[private endpoints](private-endpoint.md)**, **[Application Gateway](api-management-howto-integrate-internal-vnet-appgateway.md)**, and **[Azure Front Door](front-door-api-management.md)** for network-level protection​
139-
* **[Azure Defender for APIs](protect-with-defender-for-apis.md)** and **[Azure DDoS Protection](protect-with-ddos-protection.md)** for runtime protection against malicious attacks​
139+
* **[Microsoft Defender for APIs](protect-with-defender-for-apis.md)** and **[Azure DDoS Protection](protect-with-ddos-protection.md)** for runtime protection against malicious attacks​
140140
* **Microsoft Entra ID** for [developer authentication](api-management-howto-aad.md) and [request authorization](api-management-howto-protect-backend-with-aad.md)
141141
* **[Event Hubs](api-management-howto-log-event-hubs.md)** for streaming events​
142142
* **[Azure Redis](api-management-howto-cache-external.md)** for caching responses​ with Azure Cache for Redis or Azure Managed Redis​

articles/backup/archive-tier-support.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Azure Backup - Archive tier overview
33
description: Learn about Archive tier support for Azure Backup.
44
ms.topic: overview
5-
ms.date: 03/19/2025
5+
ms.date: 05/07/2025
66
ms.custom: references_regions
77
ms.service: azure-backup
88
author: jyothisuri
@@ -135,6 +135,14 @@ You can also filter from the list of all recovery points as per *daily*, *weekly
135135

136136
:::image type="content" source="./media/archive-tier-support/filter-vm-recovery-points-by-age.png" alt-text="Screenshot shows how to filter recovery points for an Azure VM by daily, weekly, monthly, and yearly." lightbox="./media/archive-tier-support/filter-vm-recovery-points-by-age.png":::
137137

138+
### Can I retrieve snapshot to Standard Tier Permanently after the recovery point is moved to Archive Tier?
139+
140+
No, after moving the recovery point to the archive tier, it can't return to the standard tier permanently. Rehydration provides the only method to place the RP in the standard tier for a specified duration during restore. The recovery point remains in the archive tier.
141+
142+
>[!Note]
143+
>You can do the rehydration process during the restore from a recovery point only.
144+
145+
138146
## Next steps
139147

140148
- [Use Archive tier](use-archive-tier-support.md).

articles/backup/backup-azure-vms-encryption.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Back up and restore encrypted Azure VMs
33
description: Describes how to back up and restore encrypted Azure VMs with the Azure Backup service.
44
ms.topic: how-to
5-
ms.date: 04/14/2025
5+
ms.date: 05/07/2025
66
ms.service: azure-backup
77
author: jyothisuri
88
ms.author: jsuri
@@ -120,6 +120,10 @@ Learn about the [different available roles](/azure/key-vault/general/rbac-guide?
120120

121121
For Azure RBAC enabled key vaults, you can create custom role with the following set of permissions. Learn [how to create custom role](../active-directory/roles/custom-create.md).
122122

123+
>[!Note]
124+
>When you use Azure Government, ensure that the Key Vault Administrator role is assigned to the Backup Fairfax Entra Application to enable proper access and functionality.
125+
126+
123127
| Action | Description |
124128
| --- | --- |
125129
| Microsoft.KeyVault/vaults/keys/backup/action | Creates the backup file of a key. |

articles/backup/selective-disk-backup-restore.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Selective disk backup and restore for Azure virtual machines
33
description: In this article, learn about selective disk backup and restore using the Azure virtual machine backup solution.
44
ms.topic: how-to
5-
ms.date: 02/10/2025
5+
ms.date: 05/07/2025
66
ms.custom: references_regions, devx-track-azurecli, devx-track-azurepowershell, engagement-fy24
77
ms.service: azure-backup
88
author: jyothisuri
@@ -329,7 +329,8 @@ Selective disk restore is an added functionality you get when you enable the sel
329329

330330
- The OS disk is included by default in the VM backup and restore, and can't be excluded.
331331
- Selective disk restore is supported only for recovery points created after the disk exclusion capability is enabled.
332-
- Backups with the disk exclude setting **ON** only support the **Disk restore** option. **VM restore** or **Replace Existing** restore options aren't supported in this case.
332+
- Backups with the disk exclude setting **ON** only support the **Disk restore** option. **VM restore** or **Replace Existing** restore options aren't supported in this case, and the options during restore becomes unavailable. If you choose a Restore Point (RP) containing all disks before configuring disk exclusion during restore, VM restore and replace existing options become available.
333+
333334

334335
![The option to restore VM and replace existing aren't available during the restore operation](./media/selective-disk-backup-restore/options-not-available.png)
335336

0 commit comments

Comments
 (0)