Fix merge conflicts

Author: RoseHJM

articles/backup/azure-data-lake-storage-backup-support-matrix.md

@@ -56,6 +56,7 @@ Azure Data Lake Storage protection has the following supported scenarios:
 - You can protect the storage account with the vault in another subscription but in the same region as storage account.
 - Azure Data Lake Storage accounts support both Blob and Data File System (DFS) APIs.
 - `$web` container can't be restored as `$web` on the target. Use the **renameTo** option and restore it with a different container name.
+- Cross-subscription backup is supported.
 
 ### Unsupported scenarios and considerations for Azure Data Lake Storage protection
 

articles/backup/backup-azure-database-postgresql-flex-use-rest-api.md

@@ -4,7 +4,7 @@ description: Learn how to back up Azure Database for PostgreSQL - Flexible serve
 ms.topic: concept-article
 ms.custom:
   - ignite-2024
-ms.date: 02/28/2025
+ms.date: 02/12/2026
 ms.assetid: 759ee63f-148b-464c-bfc4-c9e640b7da6b
 author: AbhishekMallick-MS
 ms.author: v-mallicka
@@ -18,11 +18,14 @@ This article describes how to back up Azure Database for PostgreSQL - Flexible S
 For information on the Azure PostgreSQL - Flexible server backup supported scenarios, limitations, and authentication mechanisms, see the [overview document](backup-azure-database-postgresql-flex-overview.md).
 
 ## Prerequisites
+
+Before configuring backup for Azure PostgreSQL - Flexible servers, ensure that the following prerequisites are met:
+
 - [Create a Backup vault](backup-azure-dataprotection-use-rest-api-create-update-backup-vault.md)
 - [Create a PostgreSQL flexible server backup policy](backup-azure-database-postgresql-flex-use-rest-api-create-update-policy.md).
 
 
-## Configure backup
+## Configure backup for PostgreSQL - Flexible servers
 
 Once the vault and policy are created, there're three critical points to consider for an Azure PostgreSQL - Flexible servers protection.
 
@@ -293,7 +296,7 @@ GET https://management.azure.com/subscriptions/00001111-aaaa-2222-bbbb-3333cccc4
 
 ```
 
-## Configure backup request
+## Configure backup request for PostgreSQL - Flexible servers
 
 Once the request is validated, you can submit the same to the [create backup instance API](/rest/api/dataprotection/backup-instances/create-or-update). One of the Azure Backup data protection services protects the Backup instance within the Backup vault. Here, the Azure PostgreSQL flexible server is the backup instance. Use the above-validated request body with minor additions.
 
@@ -448,7 +451,7 @@ Once the operation completes, it returns 200 (OK) with the success message in th
 
 ```
 
-## Stop protection and delete data
+## Stop protection and delete data for PostgreSQL - Flexible servers
 
 To remove the protection on an Azure PostgreSQL database and delete the backup data as well, perform a [delete operation](/rest/api/dataprotection/backup-instances/delete).
 

articles/backup/blob-backup-support-matrix.md

@@ -42,6 +42,8 @@ Operational backup of blobs uses blob point-in-time restore, blob versioning, so
 - Operational backup supports block blobs in standard general-purpose v2 storage accounts only.  Also, any page blobs, append blobs, and premium blobs in your storage account won't be restored and only block blobs will be restored.
 
 - Blob backup is also supported when the storage account has private endpoints.
+  
+- Cross-subscription backup is supported.
 
 **Other limitations**:
 
@@ -60,8 +62,8 @@ Operational backup of blobs uses blob point-in-time restore, blob versioning, so
 - Blob vaulted backup is also supported when the storage account has private endpoints.
 - Storage accounts using NFS 3.0*, and *SFTP protocols* for blobs are currently not supported. 
 - You can take up to five backups per storage account in a day.
-- You can back up storage accounts with *up to 100 containers*, there is no limit on the number of blobs within those containers. You can also select a subset of containers to back up (up to 100 containers).
-  - If your storage account contains more than 100 containers, you need to select *up to 100 containers* to back up.
+- You can back up storage accounts with *up to 1000 containers*, there is no limit on the number of blobs within those containers. You can also select a subset of containers to back up (up to 1000 containers).
+  - If your storage account contains more than 1000 containers, you need to select *up to 1000 containers* to back up.
   - To back up any new containers that get created after backup configuration for the storage account, modify the protection of the storage account. These containers aren't backed up automatically.
 - The storage accounts to be backed up must contain *a minimum of one container*. If the storage account doesn't contain any containers or if no containers are selected, an error may appear when you configure backup.
 - Only `$web` and `$root` system containers are supported for vaulted backup.

articles/backup/tutorial-sql-backup.md

@@ -40,7 +40,7 @@ To discover databases running on a VM, follow these steps:
 
 1. On the **Configure protection** pane, for **Datasource type**, select **SQL in Azure VM**. Then select **Continue**.
 
-   :::image type="content" source="./media/backup-azure-sql-database/configure-sql-backup.png" alt-text="Screenshot that shows selection of a SQL Server database as the datasource for backup.":::
+   :::image type="content" source="./media/backup-azure-sql-database/configure-sql-backup.png" alt-text="Screenshot that shows selection of a SQL Server database as the datasource for backup":::
 
 1. On the **Start: Configure Backup** pane, under **Vault**, choose **Select vault**.
 

articles/dev-box/how-to-configure-customization-tasks.md

@@ -6,8 +6,9 @@ ms.author: rosemalcolm
 ms.service: dev-box
 ms.custom:
   - ignite-2024
+  - ai-usage: ai-assisted
 ms.topic: how-to
-ms.date: 11/05/2024
+ms.date: 02/06/2026
 
 #customer intent: As a Dev Center Admin or Project Admin, I want to create additional tasks in a catalog so that I can create a specific customization in a customization or image definition file.
 ---
@@ -16,19 +17,6 @@ ms.date: 11/05/2024
 
 When you create tasks for Microsoft Dev Box customizations, you can define specific actions for your dev boxes to help ensure a consistent and efficient development environment. Creating new tasks in a catalog allows you to define reusable components tailored to your development teams and add guardrails around the configurations that are possible. This article guides you through creating a catalog for customization tasks, adding tasks, and attaching the catalog to a dev center or project.
 
-## Prerequisites
-
-To complete the steps in this article, you must have:
-
-- A dev center configured with a dev box project.
-- An existing catalog in GitHub or Azure Repos.
-
-## Permissions required to configure customizations
-  
-[!INCLUDE [permissions-for-customizations](includes/permissions-for-customizations.md)]
-
-## What are tasks?
-
 A task performs a specific action, like installing software. Each task consists of one or more PowerShell scripts, along with a task.yaml file that provides parameters and defines how the scripts run. You can also include a PowerShell command in the task.yaml file.
 
 You can store a collection of curated tasks in a catalog attached to your dev center, with each task in a separate folder. Dev Box supports using a GitHub repository or an Azure Repos repository as a catalog. Dev Box scans a specified folder of the catalog recursively to find task definitions.
@@ -43,6 +31,15 @@ Microsoft provides a quickstart catalog to help you get started with customizati
 - Configure applications like installing Visual Studio extensions.
 - Run PowerShell scripts.
 
+## Prerequisites
+
+To complete the steps in this article, you must have:
+
+- A dev center configured with a dev box project.
+- An existing catalog in GitHub or Azure Repos.
+
+For permissions required to configure customizations, see [Permissions for customizations](concept-what-are-dev-box-customizations.md#permissions-for-customizations).
+
 ## Create tasks in a catalog
 
 Tasks, such as installing software or running scripts, are organized into a catalog. You create and manage tasks in a catalog, define new tasks, and attach your catalog to a dev center. With Microsoft's quickstart catalog, you can get started with common tasks like installing software, deploying DSC, cloning repositories, and configuring applications.
@@ -57,27 +54,18 @@ To create and manage tasks for Dev Box team customizations, follow these steps:
 
 1. Attach your repository to your dev center as a catalog.
 
-1. Create a configuration file for those tasks by following the steps in [Write a customization file](./how-to-write-customization-file.md).
+1. Create a configuration file for those tasks by following the steps in [Configure team customizations](how-to-configure-team-customizations.md).
 
 ### Use secrets from an Azure key vault
 
-You can use secrets from your Azure key vault in your YAML configurations to clone private repositories, or with any custom task you author that requires an access token.
-
-Your dev center needs access to your key vault. DevCenter doesn't support service tags, so if your key vault is kept private, you must allow trusted Microsoft services to bypass the firewall.
-
-To configure your key vault secrets for use in your YAML configurations:
-
-1. Ensure that your dev center project's managed identity has the Key Vault Reader role and Key Vault Secrets User role on your key vault.
-
-1. Grant the Key Vault Secrets User role for the key vault secret to each user or user group that should be able to consume the secret during the customization of a dev box. The user or group granted the role must include the managed identity for the dev center, your own user account, and any user or group that needs the secret during the customization of a dev box.
-
-For more information on using key vault secrets in a customization file, see [Clone a private repository by using a customization file](how-to-customizations-connect-resource-repository.md#use-key-vault-secrets-in-customization-files).
+You can use secrets from your Azure key vault in your YAML configurations to clone private repositories or run tasks that require an access token. For detailed configuration steps and examples, see [Connect to Azure resources or clone private repositories](how-to-customizations-connect-resource-repository.md).
 
 ## Attach a catalog
 
-You can attach a catalog to a project to make tasks accessible to the developer team. To attach a catalog to a project, follow the steps in [Add and configure a catalog from GitHub or Azure Repos](../deployment-environments/how-to-configure-catalog.md).
+You can attach a catalog to a project to make tasks accessible to the developer team. To attach a catalog to a project, follow the steps in [Add and manage catalogs in Microsoft Dev Box](how-to-configure-catalog.md).
 
 ## Related content
 
 - [Microsoft Dev Box customizations](concept-what-are-dev-box-customizations.md)
-- [Write a customization file for a dev box](./how-to-write-customization-file.md)
+- [Configure team customizations](how-to-configure-team-customizations.md)
+- [Customizations schema reference](reference-dev-box-customizations.md)