Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ta

Author: gitName

.openpublishing.redirection.json

@@ -1,5 +1,10 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/network-watcher/nsg-flow-logs-rest.md",
+      "redirect_url": "/previous-versions/azure/network-watcher/nsg-flow-logs-rest",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/automation/update-management/configure-alerts.md",
       "redirect_url": "/azure/update-manager/manage-alerts",

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/api-management/get-started-create-service-instance.md

@@ -5,7 +5,7 @@ author: dlepow
 ms.service: azure-api-management
 ms.topic: quickstart
 ms.custom: mvc, mode-portal, devdivchpfy22
-ms.date: 12/11/2023
+ms.date: 03/12/2025
 ms.author: danlep
 ---
 
@@ -46,12 +46,16 @@ Sign in to the [Azure portal](https://portal.azure.com).
    | **Resource name**                | A unique name for your API Management instance. The name can't be changed later. The service name refers to both the service and the corresponding Azure resource. <br/><br/> The service name is used to generate a default domain name: *\<name\>.azure-api.net.* If you would like to configure a custom domain name later, see [Configure a custom domain](configure-custom-domain.md). |
    | **Organization name**   | The name of your organization. This name is used in many places, including the title of the developer portal and sender of notification emails. |                                                         
    | **Administrator email** | The email address to which all system notifications from **API Management** will be sent.   |  
-   | **Pricing tier**        | Select **Developer** tier to evaluate the service. This tier isn't for production use. For more information about scaling the API Management tiers, see [upgrade and scale](upgrade-and-scale.md). |
+   | **Pricing tier**        | Select a [tier](api-management-features.md) with the features you need. The **Basic v2** tier is an economical choice for development and testing scenarios and is deployed in a few minutes.  |
+   | **Units**  | The number of units of capacity for the selected pricing tier. For evaluating API Management, you can accept the default value of 1 unit. |
 
-1. Select **Review + create**.
+1. On the **Monitor + secure** tab, optionally select one or more recommended add-in services to use with API Management. These services incur extra costs. For example, select **Log Analytics** to define a Log Analytics workspace you can target for API Management logs. 
 
-    > [!TIP]
-    > It can take 30 to 40 minutes to create and activate an API Management service in this tier. To quickly find a newly created service, select **Pin to dashboard**.
+1. On the **Managed identity** tab, we recommend selecting the checkbox to enable a system-assigned identity for your API Management instance. A managed identity generated by Microsoft Entra ID allows your API Management instance to easily and securely access other Microsoft Entra protected resources, such as Azure Key Vault. Azure manages this identity, so you don't have to provision or rotate any credentials.
+
+1. Optionally, on the **Tags** tab, add tags to your API Management instance. Tags are key-value pairs that help you organize and manage your Azure resources.
+
+1. On the **Review + install** tab, review the settings you selected. If you need to make changes, go back to the previous tabs. If everything looks good, select **Create**.
 
 [!INCLUDE [api-management-navigate-to-instance](../../includes/api-management-navigate-to-instance.md)]
 

articles/api-management/media/get-started-create-service-instance/create-api-management-instance-1.png

@@ -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