resolve conflict

b-ahibbard · b-ahibbard · commit 90a31c4f6143 · 2025-08-19T12:55:40.000-04:00
diff --git a/articles/azure-netapp-files/whats-new.md b/articles/azure-netapp-files/whats-new.md
@@ -25,7 +25,7 @@ Azure NetApp Files is updated regularly. This article provides a summary about t
     
 * [File access logs](manage-file-access-logs.md) is now generally available (GA)
 
-    File access logs provide enterprise-grade visibility into file-level operations across SMB3, NFSv4.1, and dual-protocol volumes. This capability enhances security, reliability, and operational insight by capturing detailed access activity—including user identity, operation type, and timestamps. Organizations can use file access logs to monitor access patterns, detect unauthorized activity, support compliance investigations, and optimize data usage. By integrating this feature, you strengthen your security posture and align with the [Well-Architected Framework's best practices for operational excellence](/well-architected/service-guides/azure-netapp-files#operational-excellence).
+    File access logs provide enterprise-grade visibility into file-level operations across SMB3, NFSv4.1, and dual-protocol volumes. This capability enhances security, reliability, and operational insight by capturing detailed access activity—including user identity, operation type, and timestamps. Organizations can use file access logs to monitor access patterns, detect unauthorized activity, support compliance investigations, and optimize data usage. By integrating this feature, you strengthen your security posture and align with the Well-Architected Framework's best practices for operational excellence.
 
 * [Flexible service level](manage-cool-access.md?tabs=flexible#register-the-feature) now supports storage with cool access (Preview)
 
diff --git a/articles/backup/azure-backup-architecture-for-sap-hana-backup.md b/articles/backup/azure-backup-architecture-for-sap-hana-backup.md
@@ -2,7 +2,7 @@
 title: Azure Backup architecture for SAP HANA Backup
 description: Learn about Azure Backup architecture for SAP HANA backup.
 ms.topic: overview
-ms.date: 06/05/2025
+ms.date: 08/19/2025
 ms.service: azure-backup
 author: AbhishekMallick-MS
 ms.author: v-mallicka
@@ -169,4 +169,5 @@ The restore architecture explains the different permissions required during the
 - [Restore SAP HANA databases on Azure VMs using Azure portal](./sap-hana-db-restore.md) and [Azure CLI](tutorial-sap-hana-restore-cli.md).
 - Manage SAP HANA databases that are backed up by Azure Backup using [Azure portal](./sap-hana-db-manage.md) and [Azure CLI](tutorial-sap-hana-manage-cli.md).
 - Restore SAP HANA System Replication on Azure VMs using [Azure portal](sap-hana-database-with-hana-system-replication-backup.md) and [Azure CLI](quick-restore-hana-cli.md).
+- [Troubleshoot SAP HANA snapshot backup jobs on Azure Backup](sap-hana-database-instance-troubleshoot.md).
 - [Well-architected data reliability enhancement for SAP HANA](/azure/well-architected/sap/design-areas/data-platform#use-data-backups).
diff --git a/articles/backup/sap-hana-backup-support-matrix.md b/articles/backup/sap-hana-backup-support-matrix.md
@@ -2,7 +2,7 @@
 title: SAP HANA Backup support matrix
 description: In this article, learn about the supported scenarios and limitations when you use Azure Backup to back up SAP HANA databases on Azure VMs.
 ms.topic: reference
-ms.date: 06/10/2025
+ms.date: 08/19/2025
 ms.custom: references_regions 
 ms.service: azure-backup
 author: AbhishekMallick-MS
@@ -96,4 +96,5 @@ The following table lists the required parameters for adding/removing SAP HANA i
 - Manage SAP HANA databases that are backed up by Azure Backup using [Azure portal](./sap-hana-db-manage.md) and [Azure CLI](tutorial-sap-hana-manage-cli.md).
 - Restore SAP HANA System Replication on Azure VMs using [Azure portal](sap-hana-database-with-hana-system-replication-backup.md) and [Azure CLI](quick-restore-hana-cli.md).
 - [Well-architected data reliability enhancement for SAP HANA](/azure/well-architected/sap/design-areas/data-platform#use-data-backups).
-- Learn how to [troubleshoot common issues when backing up SAP HANA databases](./backup-azure-sap-hana-database-troubleshoot.md)
+- [Troubleshoot common issues when backing up SAP HANA databases](./backup-azure-sap-hana-database-troubleshoot.md)
+- [Troubleshoot SAP HANA snapshot backup jobs on Azure Backup](sap-hana-database-instance-troubleshoot.md).
diff --git a/articles/backup/sap-hana-database-about.md b/articles/backup/sap-hana-database-about.md
@@ -2,7 +2,7 @@
 title: About the SAP HANA database backup on Azure VMs
 description: In this article, you'll learn about backing up SAP HANA databases that are running on Azure virtual machines.
 ms.topic: overview
-ms.date: 06/05/2025
+ms.date: 08/19/2025
 ms.service: azure-backup
 author: AbhishekMallick-MS
 ms.author: v-mallicka
@@ -110,3 +110,4 @@ Learn how to:
 - Manage SAP HANA databases that are backed up by Azure Backup using [Azure portal](./sap-hana-db-manage.md) and [Azure CLI](tutorial-sap-hana-manage-cli.md).
 - Restore SAP HANA System Replication on Azure VMs using [Azure portal](sap-hana-database-with-hana-system-replication-backup.md) and [Azure CLI](quick-restore-hana-cli.md).
 - [Well-architected data reliability enhancement for SAP HANA](/azure/well-architected/sap/design-areas/data-platform#use-data-backups).
+- [Troubleshoot SAP HANA snapshot backup jobs on Azure Backup](sap-hana-database-instance-troubleshoot.md).
diff --git a/articles/backup/sap-hana-database-instance-troubleshoot.md b/articles/backup/sap-hana-database-instance-troubleshoot.md
@@ -2,7 +2,7 @@
 title: Troubleshoot SAP HANA databases instance backup errors
 description: This article describes how to troubleshoot common errors that might occur when you use Azure Backup to back up SAP HANA database instances.
 ms.topic: troubleshooting
-ms.date: 09/30/2024
+ms.date: 08/19/2025
 ms.service: azure-backup
 author: AbhishekMallick-MS
 ms.author: v-mallicka
@@ -13,7 +13,9 @@ ms.author: v-mallicka
 
 This article provides troubleshooting information to back up SAP HANA databases instances on Azure Virtual Machines. For more information on the SAP HANA backup scenarios we currently support, see [Scenario support](sap-hana-backup-support-matrix.md#scenario-support).
 
-## Common user errors
+## Common backup errors for SAP HANA database instances
+
+This section describes common errors that you might encounter when you back up SAP HANA database instances using Azure Backup. It also provides recommended actions to resolve these errors.
 
 ### Error code: UserErrorVMIdentityNotEnabled
 
@@ -139,6 +141,28 @@ Azure VM and retry the operation. For more information, see the [Azure workload
 
 **Recommended action**: Select another snapshot recovery point. For more information, see the [SAP HANA database backup troubleshooting article](https://aka.ms/HANASnapshotTSGuide).
 
+### OperationCancelledBecauseSameOperationQueuedUserError
+
+**Error code**: `OperationCancelledBecauseSameOperationQueuedUserError`
+
+**Error message**: This error happens to prevent multiple backups triggering on the same database/datasource. The next backup should finish successfully once the concurrent task/backup  is completed. 
+
+**Cause**: In some cases, where there are large numbers of databases in the same container, backups will trigger and get queued. The queue will cause the backup to start with a delay. So, it'll not be evident from start time and end time which task is concurrent.
+
+**Recommended action**: You need to reduce frequency on certain databases or distribute it to another container instead of having a single container.
+
+### UserErrorWLBackupFilesystemTypeNotSupported
+
+**Error code**: `UserErrorWLBackupFilesystemTypeNotSupported`
+
+**Error message**: File Systems `ext3` and `xfs` are currently supported. The operation fails for any other File System.
+
+**Recommended action**: Ensure that you're using the supported File System
+
+## Common restore errors for SAP HANA database instances
+
+This section describes common errors that you might encounter when you restore SAP HANA database instances using Azure Backup. It also provides recommended actions to resolve these errors.
+
 ### UserErrorRestoreDiskIncompatible
 
 **Error message**: The restored disk type is not supported by the target vm.
@@ -149,7 +173,7 @@ Azure VM and retry the operation. For more information, see the [Azure workload
  
 **Error message**: Snapshot based point in time restore operation could not be started because one of the previous restore steps is not complete
 
-**Cause**: Snapshot attach and mount or SystemDB recovery isn't done on the target VM.
+**Cause**: Snapshots attach and mount or SystemDB recovery isn't done on the target VM.
 
 **Recommended action**:  Retry the operation after completing a snapshot attach and mount operation on the target machine. 
 
@@ -159,30 +183,12 @@ Azure VM and retry the operation. For more information, see the [Azure workload
 
 **Recommended action**: Retry the restore operation after you stop protection of the databases on the target machine and ensure that the *Backint path is empty*. [Learn more about Backint path](https://aka.ms/HANABackupConfigurations).
 
-### OperationCancelledBecauseSameOperationQueuedUserError
-
-**Error code**: `OperationCancelledBecauseSameOperationQueuedUserError`
-
-**Error message**: This error happens to prevent multiple backups triggering on the same database/datasource. The next backup should finish successfully once the concurrent task/backup  is completed. 
-
-**Cause**: In some cases, where there are large numbers of databases in the same container, backups will trigger and get queued. The queue will cause the backup to start with a delay. So, it'll not be evident from start time and end time which task is concurrent.
-
-**Recommended action**: You need to reduce frequency on certain databases or distribute it to another container instead of having a single container.
-
-### UserErrorWLBackupFilesystemTypeNotSupported
-
-**Error code**: `UserErrorWLBackupFilesystemTypeNotSupported`
-
-**Error message**: File Systems `ext3` and `xfs` are currently supported. The operation fails for any other File System.
-
-**Recommended action**: Ensure that you're using the supported File System
-
 ## Appendix
 
 **Perform restoration actions in SAP HANA studio**
 
 1. Recover System database from data snapshot using HANA Studio. See this [SAP documentation](https://help.sap.com/docs/SAP_HANA_COCKPIT/afa922439b204e9caf22c78b6b69e4f2/9fd053d58cb94ac69655b4ebc41d7b05.html).
-1. Run the pre-registration script to reset the user credentials.
+1. Run the preregistration script to reset the user credentials.
 1. Once done, recover all tenant databases from a data snapshot using HANA Studio. See this [HANA documentation](https://help.sap.com/docs/SAP_HANA_COCKPIT/afa922439b204e9caf22c78b6b69e4f2/b2c283094b9041e7bdc0830c06b77bf8.html).
 
 ## Next steps
diff --git a/articles/backup/sap-hana-database-instances-backup.md b/articles/backup/sap-hana-database-instances-backup.md
@@ -2,7 +2,7 @@
 title: Back up SAP HANA database instances on Azure VMs
 description: In this article, you'll learn how to back up SAP HANA database instances that are running on Azure virtual machines.
 ms.topic: how-to
-ms.date: 06/05/2025
+ms.date: 08/19/2025
 ms.service: azure-backup
 author: AbhishekMallick-MS
 ms.author: v-mallicka
@@ -148,4 +148,5 @@ Learn how to:
 
 - [Restore SAP HANA database instance snapshots on Azure VMs using Azure portal](sap-hana-database-instances-restore.md).
 - [Manage SAP HANA databases on Azure VMs using Azure portal](sap-hana-database-manage.md).
-- [Manage SAP HANA databases that are backed up by Azure Backup using Azure CLI](tutorial-sap-hana-manage-cli.md).
+- [Manage SAP HANA databases that are backed up by Azure Backup using Azure CLI](tutorial-sap-hana-manage-cli.md).
+- [Troubleshoot SAP HANA snapshot backup jobs on Azure Backup](sap-hana-database-instance-troubleshoot.md).
diff --git a/articles/backup/sap-hana-database-instances-restore.md b/articles/backup/sap-hana-database-instances-restore.md
@@ -2,7 +2,7 @@
 title: Restore SAP HANA database instances on Azure VMs
 description: In this article, you'll learn how to restore SAP HANA database instances on Azure virtual machines.
 ms.topic: how-to
-ms.date: 06/05/2025
+ms.date: 08/19/2025
 ms.service: azure-backup
 author: AbhishekMallick-MS
 ms.author: v-mallicka
@@ -146,3 +146,4 @@ The managed disk snapshots don't get transferred to the Recovery Services vault.
 - [About SAP HANA database backup on Azure VMs](sap-hana-db-about.md).
 - [Manage SAP HANA database instances on Azure VMs using Azure portal](sap-hana-database-manage.md).
 - [Manage SAP HANA databases that are backed up by Azure Backup using Azure CLI](tutorial-sap-hana-manage-cli.md).
+- [Troubleshoot SAP HANA snapshot backup jobs on Azure Backup](sap-hana-database-instance-troubleshoot.md).
diff --git a/articles/backup/sap-hana-database-manage.md b/articles/backup/sap-hana-database-manage.md
@@ -2,7 +2,7 @@
 title: Manage backed up SAP HANA databases on Azure VMs
 description: In this article, you'll learn common tasks for managing and monitoring SAP HANA databases that are running on Azure virtual machines.
 ms.topic: how-to
-ms.date: 06/05/2025
+ms.date: 08/19/2025
 ms.service: azure-backup
 author: AbhishekMallick-MS
 ms.author: v-mallicka
@@ -319,3 +319,4 @@ The Azure Backup service currently doesn't modify the HANA backup catalog as per
 ## Next steps
 
 - [Troubleshoot common issues with SAP HANA database backups](./backup-azure-sap-hana-database-troubleshoot.md)
+- [Troubleshoot SAP HANA snapshot backup jobs on Azure Backup](sap-hana-database-instance-troubleshoot.md).
diff --git a/articles/logic-apps/expression-functions-reference.md b/articles/logic-apps/expression-functions-reference.md
@@ -2079,15 +2079,15 @@ formatNumber(<number>, <format>, <locale>?)
 Suppose that you want to format the number `1234567890`. This example formats that number as the string "1,234,567,890.00".
 
 ```
-formatNumber(1234567890, '0,0.00', 'en-us')
+formatNumber(1234567890, '#,##0.00', 'en-US')
 ```
 
 *Example 2"
 
 Suppose that you want to format the number `1234567890`. This example formats the number to the string "1.234.567.890,00".
 
 ```
-formatNumber(1234567890, '0,0.00', 'is-is')
+formatNumber(1234567890, '#,##0.00', 'is-IS')
 ```
 
 *Example 3*
@@ -2103,7 +2103,7 @@ formatNumber(17.35, 'C2')
 Suppose that you want to format the number `17.35`. This example formats the number to the string "17,35 kr".
 
 ```
-formatNumber(17.35, 'C2', 'is-is')
+formatNumber(17.35, 'C2', 'is-IS')
 ```
 
 ## G
diff --git a/articles/update-manager/security-awareness-ubuntu-support.md b/articles/update-manager/security-awareness-ubuntu-support.md
@@ -5,7 +5,7 @@ author: habibaum
 ms.author: v-uhabiba
 ms.service: azure-update-manager
 ms.topic: overview
-ms.date: 02/26/2025
+ms.date: 08/07/2025
 
 # Customer intent: "As an IT administrator managing Ubuntu servers, I want to upgrade to Ubuntu Pro or migrate to a newer LTS version, so that I can ensure ongoing security updates and reduce vulnerabilities in my environment."
 ---
@@ -30,15 +30,22 @@ Azure Update Manager assesses both Azure and Arc-enabled VMs to identify availab
 
 :::image type="content" source="./media/security-awareness-ubuntu-support/ubuntu-pro-subscription-inline.png" alt-text="Screenshot of recommendation to subscribe to Ubuntu Pro in Azure Update Manager." lightbox="./media/security-awareness-ubuntu-support/ubuntu-pro-subscription-expanded.png":::
 
+## How to enable Ubuntu Pro
+
+You can perform an in-place upgrade to Ubuntu Pro on your existing VMs without downtime.
+
+> [!TIP]
+> For detailed instructions, follow the [official guide on how to upgrade to Ubuntu Pro for virtual machines on Azure](/azure/virtual-machines/workloads/canonical/ubuntu-pro-in-place-upgrade).
+
 You can continue to use the Azure Update Manager [capabilities](updates-maintenance-schedules.md) to remain secure after migrating to a supported model from Canonical.
 
 > [!NOTE]
 > For detailed information on Ubuntu LTS release cycles, end-of-support dates, and official upgrade paths, see the [Canonical Ubuntu LTS end of standard support guidance](/azure/virtual-machines/workloads/canonical/ubuntu-els-guidance).
-> - Ubuntu offers 20.04 LTS and 22.04 LTS as a migration from 18.04 LTS. [Learn more](https://ubuntu.com/18-04/azure).
+> - Ubuntu offers 22.04 LTS and 24.04 LTS as a migration from 20.04 LTS. [Learn more](https://ubuntu.com/20-04/azure).
 
  
 ## Next steps
--- Learn about the [supported regions for Azure VMs and Arc-enabled servers](supported-regions.md).
+- Learn about the [supported regions for Azure VMs and Arc-enabled servers](supported-regions.md).
 - Learn on the [Update sources, types](support-matrix.md) managed by Azure Update Manager.
 - Know more on [supported OS and system requirements for machines managed by Azure Update Manager](support-matrix-updates.md).
 - Learn on [Automatic VM guest patching](support-matrix-automatic-guest-patching.md).
