fix merge conflicts

Author: mattbriggs

articles/azure-cache-for-redis/cache-best-practices-enterprise-tiers.md

@@ -139,6 +139,27 @@ You might also see `CROSSSLOT` errors with Enterprise clustering policy. Only th
 
 In Active-Active databases, multi-key write commands (`DEL`, `MSET`, `UNLINK`) can only be run on keys that are in the same slot. However, the following multi-key commands are allowed across slots in Active-Active databases: `MGET`, `EXISTS`, and `TOUCH`. For more information, see [Database clustering](https://docs.redis.com/latest/rs/databases/durability-ha/clustering/#multikey-operations).
 
+## Enterprise Flash Best Practices
+The Enterprise Flash tier utilizes both NVMe Flash storage and RAM. Because Flash storage is lower cost, using the Enterprise Flash tier allows you to trade off some performance for price efficiency. 
+
+On Enterprise Flash instances, 20% of the cache space is on RAM, while the other 80% uses Flash storage. All of the _keys_ are stored on RAM, while the _values_ can be stored either in Flash storage or RAM. The location of the values is determined intelligently by the Redis software. "Hot" values that are accessed fequently are stored on RAM, while "Cold" values that are less commonly used are kept on Flash. Before data is read or written, it must be moved to RAM, becoming "Hot" data. 
+
+Because Redis will optmize for the best performance, the instance will first fill up the available RAM before adding items to Flash storage. This has a few implications for performance:
+- When testing with low memory usage, performance and latency may be significantly better than with a full cache instance because only RAM is being used.
+- As you write more data to the cache, the proportion of data in RAM compared to Flash storage will decrease, typically causing latency and throughput performance to decrease as well.
+
+### Workloads well-suited for the Enterprise Flash tier
+Workloads that are likely to run well on the Enterprise Flash tier often have the following characteristics:
+- Read heavy, with a high ratio of read commands to write commands.
+- Access is focused on a subset of keys which are used much more frequently than the rest of the dataset.
+- Relatively large values in comparison to key names. (Since key names are always stored in RAM, this can become a bottleneck for memory growth.)
+
+### Workloads that are not well-suited for the Enterprise Flash tier
+Some workloads have access characteristics that are less optimized for the design of the Flash tier:
+- Write heavy workloads.
+- Random or uniform data access paterns across most of the dataset.
+- Long key names with relatively small value sizes.
+
 ## Handling Region Down Scenarios with Active Geo-Replication
 
 Active geo-replication is a powerful feature to dramatically boost availability when using the Enterprise tiers of Azure Cache for Redis. You should take steps, however, to prepare your caches if there's a regional outage.

articles/communication-services/concepts/analytics/logs/closed-captions-logs.md

@@ -0,0 +1,56 @@
+---
+title: Azure Communication Services Closed Captions logs
+titleSuffix: An Azure Communication Services concept article
+description: Learn about logging for Azure Communication Services Closed captions.
+author: Kunaal
+services: azure-communication-services
+ms.author: kpunjabi
+ms.date: 02/06/2024
+ms.topic: conceptual
+ms.service: azure-communication-services
+ms.subservice: data
+---
+
+# Azure Communication Services Closed Captions logs
+
+Azure Communication Services offers logging capabilities that you can use to monitor and debug your Communication Services solution. You configure these capabilities through the Azure portal.
+
+The content in this article refers to logs enabled through [Azure Monitor](../../../../azure-monitor/overview.md) (see also [FAQ](../../../../azure-monitor/overview.md#frequently-asked-questions)). To enable these logs for Communication Services, see [Enable logging in diagnostic settings](../enable-logging.md).
+
+## Usage log schema
+
+| Property | Description |
+| --- | --- |
+| TimeGenerated | The timestamp (UTC) of when the log was generated. |
+| OperationName | The operation associated with log record. ClosedCaptionsSummary |
+| Type | The log category of the event. Logs with the same log category and resource type have the same property fields. ACSCallClosedCaptionsSummary |
+| Level | The severity level of the operation. Informational |
+| CorrelationId | The ID for correlated events. Can be used to identify correlated events between multiple tables. |
+| ResourceId | The ID of Azure ACS resource to which a call with closed captions belongs |
+| ResultType | The status of the operation. |
+| SpeechRecognitionSessionId | The ID given to the closed captions this log refers to. |
+| SpokenLanguage | The spoken language of the closed captions. |
+| EndReason | The reason why the closed captions ended. |
+| CancelReason | The reason why the closed captions cancelled. |
+| StartTime | The time that the closed captions started. |
+| Duration | Duration of the closed captions in seconds. |
+
+Here's an example of a closed caption summary log:
+
+```json
+{
+  "TimeGenerated": "2023-11-14T23:18:26.4332392Z",
+  "OperationName": "ClosedCaptionsSummary",
+  "Category": "ACSCallClosedCaptionsSummary",
+  "Level": "Informational",
+  "CorrelationId": "336a0049-d98f-48ca-8b21-d39244c34486",
+  "ResourceId": "d2241234-bbbb-4321-b789-cfff3f4a6666",
+  "ResultType": "Succeeded",
+  "SpeechRecognitionSessionId": "eyJQbGF0Zm9ybUVuZHBvaW50SWQiOiI0MDFmNmUwMC01MWQyLTQ0YjAtODAyZi03N2RlNTA2YTI3NGYiLCJffffffXJjZVNwZWNpZmljSWQiOiIzOTc0NmE1Ny1lNzBkLTRhMTctYTI2Yi1hM2MzZTEwNTk0Mwwwww",
+  "SpokenLanguage": "cn-zh",
+  "EndReason": "Stopped",
+  "CancelReason": "",
+  "StartTime": "2023-11-14T03:04:05.123Z",
+  "Duration": "666.66"
+}
+```

articles/communication-services/toc.yml

@@ -797,6 +797,8 @@ items:
         href: concepts/analytics/logs/rooms-logs.md
       - name: Rooms metrics 
         href: concepts/analytics/rooms-metrics.md
+      - name: Closed captions logs
+        href: concepts/analytics/logs/closed-captions-logs.md
     - name: Service events via EventGrid
       items:
       - name: Overview

articles/communication-services/tutorials/migrating-to-azure-communication-services-calling.md

@@ -22,19 +22,10 @@ However, there are some key differences between them that may affect your choice
 
 ## Key features available in Azure Communication Services Calling SDK
 
--  **Addressing** - Azure Communication Services provides [identities](../concepts/identity-model.md) for authenticating and addressing communication endpoints. These identities are used within Calling APIs, providing clients with a clear view of who is connected to a call (the roster).
--  **Encryption** - The Calling SDK safeguards traffic by encrypting it and preventing tampering along the way.
--  **Device Management and Media enablement** - The SDK manages audio and video devices, efficiently encodes content for transmission, and supports both screen and application sharing.
--  **PSTN calling** - You can use the SDK to initiate voice calling using the traditional Public Switched Telephone Network (PSTN), [using phone numbers acquired either in the Azure portal](../quickstarts/telephony/get-phone-number.md) or programmatically.
--  **Teams Meetings** – Azure Communication Services is equipped to [join Teams meetings](../quickstarts/voice-video-calling/get-started-teams-interop.md) and interact with Teams voice and video calls.
--  **Notifications** - Azure Communication Services provides APIs to notify clients of incoming calls. This enables your application to listen for events (such as incoming calls) even when your application isn't running in the foreground.
--  **User Facing Diagnostics** - Azure Communication Services uses [events](../concepts/voice-video-calling/user-facing-diagnostics.md) to provide insights into underlying issues that might affect call quality. You can subscribe your application to triggers such as weak network signals or muted microphones for proactive issue awareness.
--  **Media Quality Statistics** - Provides comprehensive insights into VoIP and video call [metrics](../concepts/voice-video-calling/media-quality-sdk.md). Metrics include call quality information, empowering developers to enhance communication experiences.
--  **Video Constraints** - Azure Communication Services offers APIs that control [video quality among other parameters](../quickstarts/voice-video-calling/get-started-video-constraints.md) during video calls. The SDK supports different call situations for varied levels of video quality, so developers can adjust parameters like resolution and frame rate.
 
 
 
-| **Feature**                      | **Web (JavaScript)**                                                                                                                                                              | **iOS**                                                                                                                                                                                                            | **Android**                                                                                                                                                                            | **Agnostic**                                                                                                                                 |
+| **Feature**                      | **Web (JavaScript)**                                                                                                                                                              | **iOS**                                                                                                                                                                                                            | **Android**                                                                                                                                                                            | **Platform neutral**                                                                                                                                 |
 |----------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------|
 | **Install**                      | [✔️](../quickstarts/voice-video-calling/getting-started-with-calling.md?tabs=uwp&pivots=platform-web#install-the-package) | [✔️](../quickstarts/voice-video-calling/getting-started-with-calling.md?tabs=uwp&pivots=platform-ios#install-the-package-and-dependencies-with-cocoapods)  | [✔️](../quickstarts/voice-video-calling/getting-started-with-calling.md?tabs=uwp&pivots=platform-android#install-the-package)  |                                                                                                                                              |
 | **Import**                       | [✔️](../quickstarts/voice-video-calling/getting-started-with-calling.md?tabs=uwp&pivots=platform-web#install-the-package) | [✔️](../quickstarts/voice-video-calling/getting-started-with-calling.md?tabs=uwp&pivots=platform-ios#install-the-package-and-dependencies-with-cocoapods)  | [✔️](../quickstarts/voice-video-calling/getting-started-with-calling.md?tabs=uwp&pivots=platform-android#install-the-package)  |                                                                                                                                              |
@@ -71,29 +62,7 @@ However, there are some key differences between them that may affect your choice
 | **Picture-in-picture**           |                                                                                                                                                                                   | [✔️](../how-tos/ui-library-sdk/picture-in-picture.md?tabs=kotlin&pivots=platform-ios)                                                                      | [✔️](../how-tos/ui-library-sdk/picture-in-picture.md?tabs=kotlin&pivots=platform-android)                                      |                                                                                                                                              |
 
 
-**For more information about using the Calling SDK on different platforms, see** [**Calling SDK overview > Detailed capabilities**](../concepts/voice-video-calling/calling-sdk-features.md#detailed-capabilities)**.**
 
-If you're embarking on a new project from the ground up, see the [Quickstart: Add 1:1 video calling to your app](../quickstarts/voice-video-calling/get-started-with-video-calling.md?pivots=platform-web).
-
-
-### Calling support
-
-The Azure Communication Services Calling SDK supports the following streaming configurations:
-
-| Limit                                                                     | Web                                                                                                   | Windows/Android/iOS         |
-|---------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------|-----------------------------|
-| Maximum \# of outgoing local streams that can be sent simultaneously      | 1 video and 1 screen sharing                                                                          | 1 video + 1 screen sharing  |
-| Maximum \# of incoming remote streams that can be rendered simultaneously | 9 videos + 1 screen sharing on desktop browsers\*, 4 videos + 1 screen sharing on web mobile browsers | 9 videos + 1 screen sharing |
-
-## Call Types in Azure Communication Services
-
-Azure Communication Services offers various call types. The type of call you choose impacts your signaling schema, the flow of media traffic, and your pricing model. For more information, see [Voice and video concepts](../concepts/voice-video-calling/about-call-types.md).
-
--   **Voice Over IP (VoIP)** - When a user of your application calls another over an internet or data connection. Both signaling and media traffic are routed over the internet.
--   **Public Switched Telephone Network (PSTN)** - When your users call a traditional telephone number, calls are facilitated via PSTN voice calling. To make and receive PSTN calls, you need to introduce telephony capabilities to your Azure Communication Services resource. Here, signaling and media employ a mix of IP-based and PSTN-based technologies to connect your users.
--   **One-to-One Calls** - When one of your users connects with another through our SDKs. You can establish the call via either VoIP or PSTN.
--   **Group Calls** - When three or more participants connect in a single call. Any combination of VoIP and PSTN-connected users can be on a group call. A one-to-one call can evolve into a group call by adding more participants to the call, and one of these participants can be a bot.
--   **Rooms Call** - A Room acts as a container that manages activity between end-users of Azure Communication Services. It provides application developers with enhanced control over who can join a call, when they can meet, and how they collaborate. For a more comprehensive understanding of Rooms, see the [Rooms overview](../concepts/rooms/room-concept.md).
 
 ::: zone pivot="platform-web"
 [!INCLUDE [Migrating to ACS on WebJS SDK](./includes/twilio-to-acs-video-webjs-tutorial.md)]

articles/connectors/built-in.md

@@ -194,7 +194,7 @@ You can use the following built-in connectors to access specific services and sy
         [![Azure AI Search icon][azure-ai-search-icon]][azure-ai-search-doc]
         \
         \
-        [**Azure API Search**][azure-ai-search-doc]<br>(*Standard workflow only*)
+        [**Azure AI Search**][azure-ai-search-doc]<br>(*Standard workflow only*)
         \
         \
         Connect to AI Search so that you can perform document indexing and search operations in your workflow.

articles/machine-learning/how-to-configure-environment.md

@@ -8,7 +8,7 @@ ms.author: roastala
 ms.service: machine-learning
 ms.subservice: core
 ms.reviewer: larryfr, mattmcinnes
-ms.date: 04/25/2023
+ms.date: 04/08/2024
 ms.topic: how-to
 ms.custom: devx-track-python, devx-track-azurecli, py-fresh-zinc
 ---
@@ -69,17 +69,17 @@ Create a workspace configuration file in one of the following methods:
     [!INCLUDE [sdk v2](includes/machine-learning-sdk-v2.md)]
 
     ```python
-        #import required libraries
-        from azure.ai.ml import MLClient
-        from azure.identity import DefaultAzureCredential
-
-        #Enter details of your Azure Machine Learning workspace
-        subscription_id = '<SUBSCRIPTION_ID>'
-        resource_group = '<RESOURCE_GROUP>'
-        workspace = '<AZUREML_WORKSPACE_NAME>'
-      
-        #connect to the workspace
-        ml_client = MLClient(DefaultAzureCredential(), subscription_id, resource_group, workspace)
+    #import required libraries
+    from azure.ai.ml import MLClient
+    from azure.identity import DefaultAzureCredential
+
+    #Enter details of your Azure Machine Learning workspace
+    subscription_id = '<SUBSCRIPTION_ID>'
+    resource_group = '<RESOURCE_GROUP>'
+    workspace = '<AZUREML_WORKSPACE_NAME>'
+    
+    #connect to the workspace
+    ml_client = MLClient(DefaultAzureCredential(), subscription_id, resource_group, workspace)
     ```
 
 ## Local computer or remote VM environment