Merge pull request #296267 from MicrosoftDocs/main

Merge main to live, 4 AM

Author: v-ccolin

articles/active-directory-b2c/enable-authentication-wpf-desktop-app-options.md

@@ -129,4 +129,4 @@ During the [desktop app registration](configure-authentication-sample-wpf-deskto
 
 ## Next steps
 
-- To learn more, see [MSAL for .NET, UWP, NetCore, and Xamarin configuration options](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki).
+- To learn more, see [MSAL for .NET, UWP and NetCore configuration options](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/wiki).

articles/active-directory-b2c/index-mobile.yml

@@ -50,5 +50,3 @@ landingContent:
         links:
           - text: iOS (Objective-C)
             url: https://github.com/Azure-Samples/active-directory-b2c-ios-native-appauth
-          - text: Xamarin native  
-            url: https://github.com/Azure-Samples/active-directory-b2c-xamarin-native

articles/active-directory-b2c/integrate-with-app-code-samples.md

@@ -47,7 +47,6 @@ The following tables provide links to samples for applications including iOS, An
 | [ios-native-appauth](https://github.com/Azure-Samples/active-directory-b2c-ios-native-appauth) | A sample that shows how you can use a third-party library to build an iOS application in Objective-C that authenticates Microsoft identity users to our Azure AD B2C identity service. |
 | [android-native-appauth](https://github.com/Azure-Samples/active-directory-b2c-android-native-appauth) | A sample that shows how you can use a third-party library to build an Android application that authenticates Microsoft identity users to our B2C identity service and calls a web API using OAuth 2.0 access tokens. |
 | [dotnet-desktop](https://github.com/Azure-Samples/active-directory-b2c-dotnet-desktop) | A sample that shows how a Windows Desktop .NET (WPF) application can sign in a user using Azure AD B2C, get an access token using MSAL.NET and call an API. |
-| [xamarin-native](https://github.com/Azure-Samples/active-directory-b2c-xamarin-native) | A simple Xamarin Forms app showcasing how to use MSAL to authenticate users via Azure Active Directory B2C, and access a Web API with the resulting tokens. |
 
 ## Console/Daemon apps
 

articles/azure-app-configuration/TOC.yml

@@ -40,12 +40,12 @@
       href: quickstart-feature-flag-dotnet-background-service.md
     - name: Java Spring
       href: quickstart-feature-flag-spring-boot.md
-    - name: Azure Functions
-      href: quickstart-feature-flag-azure-functions-csharp.md
     - name: Python
       href: quickstart-feature-flag-python.md
     - name: Node.js
       href: quickstart-feature-flag-javascript.md
+    - name: Azure Functions
+      href: quickstart-feature-flag-azure-functions-csharp.md
     - name: Azure Kubernetes Service
       href: quickstart-feature-flag-azure-kubernetes-service.md
   - name: Service integration
@@ -84,14 +84,14 @@
       href: enable-dynamic-configuration-dotnet.md
     - name: .NET Background Service
       href: enable-dynamic-configuration-dotnet-background-service.md
-    - name: Azure Functions
-      href: enable-dynamic-configuration-azure-functions-csharp.md
     - name: Spring Boot
       href: enable-dynamic-configuration-java-spring-app.md
     - name: Python
       href: enable-dynamic-configuration-python.md
     - name: Node.js
       href: enable-dynamic-configuration-javascript.md
+    - name: Azure Functions
+      href: enable-dynamic-configuration-azure-functions-csharp.md
     - name: Azure Kubernetes Service
       href: enable-dynamic-configuration-azure-kubernetes-service.md
   - name: Enable dynamic configuration using push model

articles/azure-app-configuration/enable-dynamic-configuration-azure-functions-csharp.md

@@ -329,7 +329,7 @@ run().catch(console.error);
     ```
 
     ### [Connection string](#tab/connection-string)
-    Set the environment variable named **AZURE_APPCONFIG_CONNECTION_STRING** to the read-only connection string of your App Configuration store found under *Access keys* of your store in the Azure portal.
+    Set the environment variable named **AZURE_APPCONFIG_CONNECTION_STRING** to the read-only connection string of your App Configuration store found under *Access settings* of your store in the Azure portal.
 
     If you use the Windows command prompt, run the following command and restart the command prompt to allow the change to take effect:
 

articles/azure-app-configuration/quickstart-azure-functions-csharp.md

@@ -2,7 +2,7 @@
 title: About Azure Files backup
 description: Learn how to back up Azure Files in the Recovery Services vault
 ms.topic: overview
-ms.date: 02/27/2025
+ms.date: 03/11/2025
 ms.service: azure-backup
 ms.custom:
   - engagement-fy23
@@ -72,7 +72,7 @@ This section shows the backup flow for Azure Files by using the backup tiers - S
 
 7. If you're using Azure File Sync, the Backup service indicates to the Azure File Sync service the paths of the files being restored, which then triggers a background change detection process on these files. Any changed files sync down to the server endpoint. This process happens in parallel with the original restore to the Azure Files.
 
-   >[!Note]
+   >[!NOTE]
    >Vaulted backup currently doesn't support restore to a File Share registered with File sync service.
 
 8. The backup and restore job monitoring data is pushed to the Azure Backup Monitoring service. This data allows you to monitor cloud backups for your File Shares in a single dashboard. In addition, you can also configure alerts or email notifications when backup health is affected. Emails are sent via the Azure email service.
@@ -87,7 +87,7 @@ For snapshot tier, you incur the following costs:
 
 To get detailed estimates for backing up Azure Files, you can download the detailed [Azure Backup pricing estimator](https://aka.ms/AzureBackupCostEstimates).  
 
->[!Important]
+>[!IMPORTANT]
 >For vaulted backup, you will incur a protected instance fee and charges for backup storage for your standard and premium shares from April 1,2025.
 
 ## How lease snapshot works?
@@ -100,11 +100,11 @@ The following diagram explains the lifecycle of the lease acquired by Azure Back
 
 :::image type="content" source="./media/azure-file-share-backup-overview/backup-lease-lifecycle-diagram.png" alt-text="Diagram explaining the lifecycle of the lease acquired by Azure Backup." border="false":::
 
-## How Cross Subscription Backup for Azure Files (preview) works?
+## How Cross Subscription Backup for Azure Files works?
 
-Cross Subscription Backup (CSB) for Azure Files (preview) enables you to back up File Shares across subscriptions. This feature is useful when you want to centralize backup management for File Shares across different subscriptions. You can back up File Shares from a source subscription to a Recovery Services vault in a target subscription.
+Cross Subscription Backup (CSB) for Azure Files enables you to back up File Shares across subscriptions. This feature is useful when you want to centralize backup management for File Shares across different subscriptions. You can back up File Shares from a source subscription to a Recovery Services vault in a target subscription.
 
-Learn about the [additional prerequisites](backup-azure-files.md#prerequisites) and [steps to configure Cross Subscription Backup for Azure Files (preview)](backup-azure-files.md#configure-the-backup). For information on the supported regions for Cross Subscription Backup, see the [Azure Files backup support matrix](azure-file-share-support-matrix.md#supported-regions-for-cross-subscription-backup-preview).
+Learn about the [additional prerequisites](backup-azure-files.md#prerequisites) and [steps to configure Cross Subscription Backup for Azure Files](backup-azure-files.md#configure-the-backup).
 
 ## Next steps
 

articles/azure-app-configuration/quickstart-javascript-provider.md

@@ -2,7 +2,7 @@
 title: Support Matrix for Azure files backup by using Azure Backup
 description: Provides a summary of support settings and limitations when backing up Azure files.
 ms.topic: reference
-ms.date: 03/06/2025
+ms.date: 03/11/2025
 ms.custom: references_regions, engagement-fy24
 ms.service: azure-backup
 author: jyothisuri
@@ -36,10 +36,6 @@ Migration of  File Shares protected with snapshot backup to vaulted backup is su
 
 ---
 
-### Supported regions for Cross Subscription Backup (preview)
-
-Cross Subscription Backup (CSB) for Azure Files (preview) is currently available in the following regions: East Asia, Southeast Asia, UK South, UK West, Central India.
-
 ## Supported storage accounts
 
 **Choose a backup tier**:

articles/backup/azure-file-share-backup-overview.md

@@ -2,7 +2,7 @@
 title: Back up Azure Files in the Azure portal
 description: Learn how to use the Azure portal to back up Azure Files in the Recovery Services vault
 ms.topic: how-to
-ms.date: 02/27/2025
+ms.date: 03/11/2025
 ms.service: azure-backup
 ms.custom: engagement-fy23
 author: jyothisuri
@@ -15,7 +15,7 @@ This article describes how to back up [Azure Files](../storage/files/storage-fil
 
 Azure Files backup is a native cloud solution that protects your data and eliminates on-premises maintenance overheads. Azure Backup seamlessly integrates with Azure File Sync, centralizing your file share data and backups. The simple, reliable, and secure solution allows you to protect your enterprise file shares using [snapshot](azure-file-share-backup-overview.md?tabs=snapshot) and [vaulted](azure-file-share-backup-overview.md?tabs=vault-standard) backups, ensuring data recovery for accidental or malicious deletion.
 
-[Azure Backup](backup-overview.md) supports configuring [snapshot](azure-file-share-backup-overview.md?tabs=snapshot) and [vaulted](azure-file-share-backup-overview.md?tabs=vault-standard) backups for Azure Files in your storage accounts.  You can:
+[Azure Backup](backup-overview.md) supports configuring [snapshot](azure-file-share-backup-overview.md?tabs=snapshot) and [vaulted](azure-file-share-backup-overview.md?tabs=vault-standard) backups for Azure Files in your storage accounts. You can:
 
 - Define backup schedules and retention settings.
 - Store backup data in the Recovery Service vault, retaining it for up to **10 years**.
@@ -29,8 +29,8 @@ Azure Files backup is a native cloud solution that protects your data and elimin
 * If the storage account access has restrictions, check the firewall settings of the account to ensure the exception **Allow Azure services on the trusted services list to access this storage account** is in grant state. You can refer to [this](../storage/common/storage-network-security.md?tabs=azure-portal#manage-exceptions) link for the steps to grant an exception.
 * Ensure that you allow the **Storage account key access** in the required storage account.
 
->[!Important]
->To perform [Cross Subscription Backup (CSB)  for protecting Azure Files (preview)](azure-file-share-backup-overview.md#how-cross-subscription-backup-for-azure-files-preview-works) in another subscription, ensure you register `Microsoft.RecoveryServices` in the **subscription of the file share** in addition to the given prerequisites. Learn about the [supported regions for Cross Subscription Backup (preview)](azure-file-share-support-matrix.md#supported-regions-for-cross-subscription-backup-preview).
+>[!IMPORTANT]
+>To perform [Cross Subscription Backup (CSB) for protecting Azure Files (preview)](azure-file-share-backup-overview.md#how-cross-subscription-backup-for-azure-files-works) in another subscription, ensure you register `Microsoft.RecoveryServices` in the **subscription of the file share** in addition to the given prerequisites.
 
 
 ## Configure the backup
@@ -59,7 +59,7 @@ To configure backup for multiple file shares from the Recovery Services vault, f
 
 1. On the **Select storage account** pane, by default it list the storage accounts from the current subscription. Select an account, and select **OK**.
 
-   If you want to configure the backup operation with a storage account in a different subscription ([Cross Subscription Backup - preview](azure-file-share-backup-overview.md#how-cross-subscription-backup-for-azure-files-preview-works)), choose the other subscription from the **Subscription** filter. The storage accounts from the selected subscription appear.
+   If you want to configure the backup operation with a storage account in a different subscription ([Cross Subscription Backup](azure-file-share-backup-overview.md#how-cross-subscription-backup-for-azure-files-works)), choose the other subscription from the **Subscription** filter. The storage accounts from the selected subscription appear.
 
    :::image type="content" source="./media/backup-azure-files/azure-file-share-confirm-storage-account.png" alt-text="Screenshot showing to select one of the discovered storage accounts." lightbox="./media/backup-azure-files/azure-file-share-confirm-storage-account.png":::
 
@@ -91,7 +91,7 @@ To configure backup for multiple file shares from the Recovery Services vault, f
 
    1. Configure the *Snapshot retention* and *Vault retention* duration to determine the expiry date of the recovery points.
 
-      >[!Note]
+      >[!NOTE]
       >The *vault tier* provides longer retention than the *snapshot tier*. 
    1. Select **OK** to create the backup policy.
 
@@ -155,7 +155,7 @@ The following steps explain how you can configure backup for individual file sha
 
    1. Configure the *Snapshot retention* and *Vault retention* duration to determine the expiry date of the recovery points.
 
-      >[!Note]
+      >[!NOTE]
       >The *vault tier* provides longer retention than the *snapshot tier*. 
    1. Select **OK** to create the backup policy.
 
@@ -182,7 +182,5 @@ Once the backup configuration is complete, you can [run an on-demand backup](tut
 
 ## Next steps
 
-Learn how to:
-
 * [Restore Azure Files using Azure portal](restore-afs.md).
 * [Manage Azure Files backups using Azure portal](manage-afs-backup.md).