Skip to content

Commit 462f0b6

Browse files
Learn Build Service GitHub AppLearn Build Service GitHub App
authored andcommitted
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents 63114a0 + bf80e72 commit 462f0b6

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

articles/azure-resource-manager/management/resource-name-rules.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,7 @@ In the following tables, the term alphanumeric refers to:
492492
> | scheduledQueryRules | resource group | 1-260 | Can't use:<br>`*<>%{}&:\\?/#|` or control characters <br><br>Can't end with space or period. |
493493
> | metricAlerts | resource group | 1-260 | Can't use:<br>`*#&+:<>?@%{}\/|` or control characters <br><br>Can't end with space or period. |
494494
> | activityLogAlerts | resource group | 1-260 | Can't use:<br>`<>*%{}&:\\?+/#|` or control characters <br><br>Can't end with space or period. |
495+
> | PrometheusAlerts | resource group | 1-260 | Can't use:<br>`<>*%{}&:\\?+/#|` or control characters <br><br>Can't end with space or period. |
495496
496497
## Microsoft.IoTCentral
497498

articles/backup/backup-azure-file-folder-backup-faq.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
description: Addresses common questions about backing up files and folders with Azure Backup.
55
ms.topic: faq
66
ms.service: azure-backup
7-
ms.date: 08/14/2023
7+
ms.date: 10/25/2024
88
author: AbhishekMallick-MS
99
ms.author: v-abhmallick
1010
title: Frequently asked questions - Microsoft Azure Recovery Services (MARS) agent
@@ -28,9 +28,9 @@ sections:
2828
- If you want to register your MARS agent or restore data from the primary region, select **Primary Region**, *confirm* that you're using the latest Recovery Services Agent, and then select **Download**.
2929
- If you're doing an alternate server restore from the backup data in the secondary region using Cross Region Restore, then select **Secondary Region** to download the vault credentials.
3030
31-
:::image type="content" source="./media/backup-azure-file-folder-backup-faq/download-vault-credentials.png" alt-text="Screenshot shows how to initiate downloading vault credential file.":::
31+
:::image type="content" source="./media/backup-azure-file-folder-backup-faq/download-vault-credentials.png" alt-text="Screenshot shows how to initiate downloading vault credential file." lightbox="./media/backup-azure-file-folder-backup-faq/download-vault-credentials.png":::
3232
33-
:::image type="content" source="./media/backup-azure-file-folder-backup-faq/download-vault-credential-file.png" alt-text="Screenshot shows the Download option for vault credential files in secondary region.":::
33+
:::image type="content" source="./media/backup-azure-file-folder-backup-faq/download-vault-credential-file.png" alt-text="Screenshot shows the Download option for vault credential files in secondary region." lightbox="./media/backup-azure-file-folder-backup-faq/download-vault-credential-file.png":::
3434
>[!Note]
3535
>You can't use this secondary region vault credential for registration of the MARS agent.
3636

articles/backup/backup-azure-restore-key-secret.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Restore Key Vault key & secret for encrypted VM
33
description: Learn how to restore Key Vault key and secret in Azure Backup using PowerShell
44
ms.topic: how-to
55
ms.custom: devx-track-azurepowershell
6-
ms.date: 02/28/2023
6+
ms.date: 09/04/2024
77
author: AbhishekMallick-MS
88
ms.author: v-abhmallick
99
---

articles/backup/offline-backup-server-previous-versions.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Offline backup for Data Protection Manager (DPM) and Microsoft Azure Backup Server (MABS) - previous versions
33
description: With Azure Backup, you can send data off the network by using the Azure Import/Export service. This article explains the offline backup workflow for previous versions of DPM and Azure Backup Server.
44
ms.topic: how-to
5-
ms.date: 01/23/2023
5+
ms.date: 10/25/2024
66
author: AbhishekMallick-MS
77
ms.author: v-abhmallick
88
ms.service: azure-backup
@@ -23,8 +23,7 @@ The offline-seeding process of Azure Backup is tightly integrated with the [Azur
2323
> The process of offline backup for the Microsoft Azure Recovery Services (MARS) Agent is distinct from DPM and MABS. For information on using offline backup with the MARS Agent, see [Offline backup workflow in Azure Backup](backup-azure-backup-import-export.md). Offline backup isn't supported for system state backups done by using the Azure Backup Agent.
2424
>
2525
26-
## Offline backup process
27-
26+
## Offline backup workflow
2827
With the offline-seeding capability of Azure Backup and the Azure Import/Export service, it's simple to upload the data offline to Azure by using disks. The offline backup process involves the following steps:
2928

3029
> [!div class="checklist"]
@@ -279,6 +278,6 @@ After the import job finishes, initial backup data is available in your storage
279278
280279
At the time of the next scheduled backup, Azure Backup performs incremental backup over the initial backup copy.
281280
282-
## Next steps
281+
## Next step
283282
284-
* For any questions about the Azure Import/Export service workflow, see [Use the Microsoft Azure Import/Export service to transfer data to Blob storage](../import-export/storage-import-export-service.md).
283+
* [Frequently asked questions about the Azure Import/Export service workflow](../import-export/storage-import-export-service.md).

0 commit comments

Comments
 (0)