resolve conflicts

Author: mumian

articles/azure-cache-for-redis/managed-redis/managed-redis-architecture.md

@@ -74,11 +74,11 @@ Each SKU of Azure Managed Redis is configured to run a specific number of Redis
 |  Tiers      | Flash Optimized |   Memory Optimized   |    Balanced   |   Compute Optimized  |
 |:-----------:|:-------------------:|:--------------------:|:--------------------:|:--------------------:|
 | Size (GB)   | vCPUs/primary shards | vCPUs/primary shards | vCPUs/primary shards | vCPUs/primary shards |
-|    0.5      |       -      |    -          |          2/1         |           -          |
-|     1       |       -      |           -          |          2/1         |           -          |
-|     3       |        -      |         -          |         2/1          |       4/2            |
-|     6       |       -      |          -          |          2/1         |           4/2        |
-|     12      |       -      |         2/1         |          4/2         |           8/6        |
+|    0.5      |       -      |    -          |          2/2         |           -          |
+|     1       |       -      |           -          |          2/2         |           -          |
+|     3       |        -      |         -          |         2/2          |       4/2            |
+|     6       |       -      |          -          |          2/2         |           4/2        |
+|     12      |       -      |         2/2         |          4/2         |           8/6        |
 |     24      |       -      |          4/2          |          8/6         |           16/12          |
 |     60      |       -      |          8/6          |          16/12         |           32/24         |
 |     120      |       -      |          16/12       |       32/24         |           64/48          |

articles/azure-cache-for-redis/managed-redis/managed-redis-how-to-import-export-data.md

@@ -85,9 +85,7 @@ Export allows you to export the data stored in Azure Managed Redis. You can use
 
    > [!IMPORTANT]
    >
-   > - Export works with page blobs that are supported by both classic and Resource Manager storage accounts.
-   > - Azure Managed Redis does not support exporting to ADLS Gen2 storage accounts.
-   > - If your cache data export to Firewall-enabled storage accounts fails, refer to [What if I have firewall enabled on my storage account?](#what-if-i-have-firewall-enabled-on-my-storage-account)
+   > If your cache data export to Firewall-enabled storage accounts fails, refer to [What if I have firewall enabled on my storage account?](#what-if-i-have-firewall-enabled-on-my-storage-account)
    >
    > For more information, see [Azure storage account overview](/azure/storage/common/storage-account-overview).
    >

articles/azure-functions/functions-scenarios.md

@@ -8,7 +8,7 @@ ms.custom:
   - devx-track-python
 ms.collection: 
   - ce-skilling-ai-copilot
-ms.date: 07/25/2024
+ms.date: 12/19/2024
 zone_pivot_groups: programming-languages-set-functions
 ---
 
@@ -55,8 +55,7 @@ public static async Task Run([BlobTrigger("catalog-uploads/{name}", Source = Blo
 }
 ```
 
-+ [Upload and analyze a file with Azure Functions and Blob Storage](../storage/blobs/blob-upload-function-trigger.md?tabs=dotnet)
-+ [Automate resizing uploaded images using Event Grid](../event-grid/resize-images-on-storage-blob-upload-event.md?tabs=dotnet)
++ [Upload and analyze a file with Azure Functions and Blob Storage](../storage/blobs/blob-upload-function-trigger.md)
 + [Trigger Azure Functions on blob containers using an event subscription](functions-event-grid-blob-trigger.md?pivots=programming-language-csharp)
 ::: zone-end
 
@@ -65,15 +64,18 @@ public static async Task Run([BlobTrigger("catalog-uploads/{name}", Source = Blo
 ::: zone-end
 
 ::: zone pivot="programming-language-javascript" 
-+ [Upload and analyze a file with Azure Functions and Blob Storage](../storage/blobs/blob-upload-function-trigger.md?tabs=nodejsv10)
-+ [Automate resizing uploaded images using Event Grid](../event-grid/resize-images-on-storage-blob-upload-event.md?tabs=nodejsv10)
++ [Upload and analyze a file with Azure Functions and Blob Storage](../storage/blobs/blob-upload-function-trigger-javascript.md)
 + [Trigger Azure Functions on blob containers using an event subscription](functions-event-grid-blob-trigger.md?pivots=programming-language-javascript)
 ::: zone-end
 
 ::: zone pivot="programming-language-powershell" 
 + [Trigger Azure Functions on blob containers using an event subscription](functions-event-grid-blob-trigger.md?pivots=programming-language-powershell)
 ::: zone-end
 
+::: zone pivot="programming-language-typescript" 
++ [Trigger Azure Functions on blob containers using an event subscription](functions-event-grid-blob-trigger.md?pivots=programming-language-typescript)
+::: zone-end
+
 ::: zone pivot="programming-language-java" 
 + [Trigger Azure Functions on blob containers using an event subscription](functions-event-grid-blob-trigger.md?pivots=programming-language-java)
 ::: zone-end
@@ -286,9 +288,8 @@ public static async Task<IActionResult> Run(
 + Article: [Create serverless APIs in Visual Studio using Azure Functions and API Management integration](./openapi-apim-integrate-visual-studio.md) 
 + Training: [Expose multiple function apps as a consistent API by using Azure API Management](/training/modules/build-serverless-api-with-functions-api-management/)
 + Sample: [Implement the geode pattern by deploying the API to geodes in distributed Azure regions.](https://github.com/mspnp/geode-pattern-accelerator)
-+ [Azure Functions HTTP trigger](functions-bindings-http-webhook.md?pivots=programming-language-csharp)
++ Article: [Azure Functions HTTP trigger](functions-bindings-http-webhook.md?pivots=programming-language-csharp)
 + Sample: [Web application with a C# API and Azure SQL DB on Static Web Apps and Functions](/samples/azure-samples/todo-csharp-sql-swa-func/todo-csharp-sql-swa-func/)
-+ [Azure Functions HTTP trigger](functions-bindings-http-webhook.md?pivots=programming-language-csharp)
 ::: zone-end
 
 ::: zone pivot="programming-language-python" 
@@ -302,10 +303,12 @@ public static async Task<IActionResult> Run(
 ::: zone pivot="programming-language-powershell" 
 + [Azure Functions HTTP trigger](functions-bindings-http-webhook.md?pivots=programming-language-powershell)
 ::: zone-end
-
+::: zone pivot="programming-language-typescript" 
++ [Azure Functions HTTP trigger](functions-bindings-http-webhook.md?pivots=programming-language-typescript)
+::: zone-end
 ::: zone pivot="programming-language-java"
 + Training: [Develop Java serverless Functions on Azure using Maven](/training/modules/develop-azure-functions-app-with-maven-plugin/)
-+ [Azure Functions HTTP trigger](functions-bindings-http-webhook.md?pivots=programming-language-java)
++ Article: [Azure Functions HTTP trigger](functions-bindings-http-webhook.md?pivots=programming-language-java)
 ::: zone-end  
 
 ## Build a serverless workflow
@@ -325,6 +328,11 @@ Functions is often the compute component in a serverless workflow topology, such
 + Training: [Deploy serverless APIs with Azure Functions, Logic Apps, and Azure SQL Database](/training/modules/deploy-backend-apis/)
 ::: zone-end
 
+::: zone pivot="programming-language-typescript" 
++ Quickstart: [Create your first durable function in Azure using JavaScript](./durable/quickstart-ts-vscode.md)
++ Training: [Deploy serverless APIs with Azure Functions, Logic Apps, and Azure SQL Database](/training/modules/deploy-backend-apis/)
+::: zone-end
+
 ::: zone pivot="programming-language-python" 
 + Quickstart: [Create your first durable function in Azure using Python](./durable/quickstart-python-vscode.md)
 + Training: [Deploy serverless APIs with Azure Functions, Logic Apps, and Azure SQL Database](/training/modules/deploy-backend-apis/)
@@ -344,7 +352,9 @@ There are processes where you might need to log, audit, or perform some other op
 
 [ ![Diagram of a function being used to respond to database changes.](./media/functions-scenarios/respond-to-database-changes.png) ](./media/functions-scenarios/respond-to-database-changes-expanded.png#lightbox)
 
- Consider the following examples:
+::: zone pivot="programming-language-csharp,programming-language-javascript,programming-language-python" 
+Consider these examples:
+::: zone-end
 
 ::: zone pivot="programming-language-csharp" 
 + Article: [Connect Azure Functions to Azure Cosmos DB using Visual Studio Code](functions-add-output-binding-cosmos-db-vs-code.md?pivots=programming-language-csharp&tabs=isolated-process)
@@ -370,7 +380,7 @@ For example, you can use triggers on Azure Storage queues as a way to chain toge
 
 [ ![Diagram of Azure Functions in a reliable message system.](./media/functions-scenarios/create-reliable-message-systems.png) ](./media/functions-scenarios/create-reliable-message-systems-expanded.png#lightbox)
 
- The following article shows how to write output to a storage queue.
+These articles show how to write output to a storage queue:
 
 ::: zone pivot="programming-language-csharp" 
 + Article: [Connect Azure Functions to Azure Storage using Visual Studio Code](functions-add-output-binding-storage-queue-vs-code.md?pivots=programming-language-csharp&tabs=isolated-process)
@@ -408,7 +418,9 @@ And these articles show how to trigger from an Azure Service Bus queue or topic.
 ::: zone pivot="programming-language-javascript" 
 + [Azure Service Bus trigger for Azure Functions](functions-bindings-service-bus-trigger.md?pivots=programming-language-javascript)
 ::: zone-end
-
+::: zone pivot="programming-language-typescript" 
++ [Azure Service Bus trigger for Azure Functions](functions-bindings-service-bus-trigger.md?pivots=programming-language-typescript)
+::: zone-end
 ::: zone pivot="programming-language-python" 
 + [Azure Service Bus trigger for Azure Functions](functions-bindings-service-bus-trigger.md?pivots=programming-language-python)
 ::: zone-end

articles/azure-netapp-files/azure-netapp-files-introduction.md

@@ -11,7 +11,7 @@ ms.author: anfdocs
 
 # What is Azure NetApp Files?
 
-Azure NetApp Files is an Azure native, first-party, enterprise-class, high-performance file storage service. It provides _Volumes as a service_ for which you can create NetApp accounts, capacity pools, and volumes. You can also select service and performance levels and manage data protection. You can create and manage high-performance, highly available, and scalable file shares by using the same protocols and tools that you're familiar with and rely on on-premises.
+Azure NetApp Files is an Azure native, first-party, enterprise-class, high-performance file storage service. It provides _Volumes as a service_, which you can create within a NetApp account and a capacity pool, and share to clients using SMB and NFS. You can also select service and performance levels and manage data protection. You can create and manage high-performance, highly available, and scalable file shares by using the same protocols and tools that you're familiar with and rely on on-premises.
 
 Key attributes of Azure NetApp Files are:
 

articles/azure-vmware/attach-azure-netapp-files-to-azure-vmware-solution-hosts.md

@@ -11,7 +11,7 @@ ms.custom: "references_regions, engagement-fy23"
 
 [Azure NetApp Files](../azure-netapp-files/azure-netapp-files-introduction.md) is an enterprise-class, high-performance, metered file storage service. The service supports the most demanding enterprise file-workloads in the cloud: databases, SAP, and high-performance computing applications, with no code changes. For more information on Azure NetApp Files, see [Azure NetApp Files](../azure-netapp-files/index.yml) documentation. 
 
-[Azure VMware Solution](./introduction.md) supports attaching Network File System (NFS) datastores as a persistent storage option. You can create NFS datastores with Azure NetApp Files volumes and attach them to clusters of your choice. You can also create virtual machines (VMs) for optimal cost and performance.  
+[Azure VMware Solution](./introduction.md) supports attaching Network File System (NFS) datastores as a persistent storage option. You can create NFS datastores with Azure NetApp Files volumes and attach them to clusters of your choice. You can also create virtual machines (VMs) on different Azure NetApp Files datastores for optimal cost and performance.  
 
 By using NFS datastores backed by Azure NetApp Files, you can expand your storage instead of scaling the clusters. You can also use Azure NetApp Files volumes to replicate data from on-premises or primary VMware vSphere environments for the secondary site. 
 

articles/azure-vmware/configure-pure-cloud-block-store.md

@@ -12,7 +12,7 @@ ms.date: 3/06/2024
 
 ## Pure Cloud Block Store for Azure VMware Solution
 
-Pure Cloud Block Store, offered by Pure Storage, is one of the external block storage solutions supported by Azure VMware Solution. It helps bridge the gap by allowing customers to provision external block storage as needed to make full use of an Azure VMware Solution deployment without the need to scale out compute resources, while helping customers migrate their on-premises workloads to Azure. Pure Cloud Block Store is a 100% software-delivered product running entirely on native Azure infrastructure that brings all the relevant Purity features and capabilities to Azure. 
+Pure Cloud Block Store, offered by Pure Storage, is one of the partner block storage solutions supported by Azure VMware Solution. It helps bridge the gap by allowing customers to provision external block storage as needed to make full use of an Azure VMware Solution deployment without the need to scale out compute resources, while helping customers migrate their on-premises workloads to Azure. Pure Cloud Block Store is a 100% software-delivered product running entirely on native Azure infrastructure that brings all the relevant Purity features and capabilities to Azure. 
 
 ## Onboarding and support