resolve merge conflict

Author: mattbriggs

articles/aks/quickstart-event-grid.md

@@ -21,7 +21,7 @@ In this quickstart, you create an AKS cluster and subscribe to AKS events.
 * [Azure CLI][azure-cli-install] or [Azure PowerShell][azure-powershell-install] installed.
 
 > [!NOTE]
-> In case there are issues specifically with EventGrid notifications, as can be seen here [Service Outages](https://azure.status.microsoft/status), please note that AKS operations wont be impacted and they are independent of Event Grid outages. 
+> In case there are issues specifically with EventGrid notifications, as can be seen here [Service Outages](https://azure.status.microsoft/status), please note that AKS operations won't be impacted and they are independent of Event Grid outages. 
 
 ## Create an AKS cluster
 

articles/azure-monitor/app/java-standalone-upgrade-from-2x.md

@@ -102,7 +102,7 @@ The telemetry processors perform the following actions (in order):
 
    Then it deletes the attribute named `tempPath`, and the attribute appears as a custom dimension.
 
-```
+```json
 {
   "preview": {
     "processors": [

articles/azure-netapp-files/application-volume-group-concept.md

@@ -11,27 +11,27 @@ ms.author: anfdocs
 
 # Understand Azure NetApp Files application volume groups 
 
-Application volume groups are essential to understand for managing data and optimizing storage solutions. 
+In managing data and optimizing storage solutions, understanding how an application volume group functions is crucial. 
 
 An application volume group is a framework designed to streamline the deployment of application volumes. It acts as a cohesive entity, bringing together related volumes to enhance efficiency, manageability, ease of administration, and volume placement relative to compute resources.
 
-An application volume group provides technical improvements to simplify and standardize the volume deployment process for your application, ensuring optimal placement in the regional or zonal infrastructure while according to best practices for the selected application or workload. 
+Application volume group provides technical improvements to simplify and standardize the volume deployment process for your application, ensuring optimal placement in the regional or zonal infrastructure and in accordance with best practices for the selected application or workload. 
 
-Application volume group deploys volumes in a single atomic operation using a predefined naming convention that allows administrators to easily identify the specific purpose of the volumes in the application volume group. 
+Application volume group deploys volumes in a single atomic operation using a predefined naming convention that allows you to easily identify the specific purpose of the volumes in the application volume group. 
 
 ## Key components 
 
 Learning about the key components of application volume groups is essential to understanding application volume groups. 
 
 ### Volumes 
 
-Individual volumes are the building blocks within an application volume group. Volumes store application data and are organized based on specific characteristics and usage patterns.
+The fundamental building blocks within an application volume group are individual volumes. These volumes store application data and are organized based on specific characteristics and usage patterns.
 
 The following diagram captures an example layout of volumes deployed by an application volume group, which includes application volume groups provisioned in a secondary availability zone.
 
 :::image type="content" source="./media/application-volume-group-concept/application-volume-group-layout.png" alt-text="Diagram of zonal application volume group deployment." lightbox="./media/application-volume-group-concept/application-volume-group-layout.png":::
 
-Volumes are assigned names by application volume group according to a template and user input describing the purpose and deployment type.
+Volumes are assigned names by application volume group according to a template and based on user input describing the purpose and deployment type.
 
 ### Grouping logic
 
@@ -43,7 +43,7 @@ Volumes are placed following best practices and in optimal infrastructure locati
 
 ### Policies
 
-Application volume group operates under predefined policies that govern the placement of the grouped volumes. These policies can include performance optimization, data protection mechanisms, and scalability rules, which can't be followed with individual volume deployment.
+Application volume group operates under predefined policies that govern the placement of the grouped volumes. These policies can include performance optimization, data protection mechanisms, and scalability rules, which can't be followed using individual volume deployment.
 
 #### Performance optimization
 
@@ -59,23 +59,23 @@ Volume placement within the application volume group allows you to optimize data
 
 #### Cost optimization
 
-Volume placement strategies within the application volume group enable you to optimize storage costs by matching workload requirements with appropriate storage tiers. Administrators can leverage tiered storage offerings within Azure NetApp Files, such as Standard and Premium tiers, to balance performance and cost-effectiveness for different application workloads. By placing volumes on the most cost-effective storage tier that meets performance requirements, you can maximize resource utilization and minimize operational expenses. Volumes can be moved to different performance tiers at any moment and without service interruptions to align performance and cost with changing requirements.
+Volume placement strategies within the application volume group enable you to optimize storage costs by matching workload requirements with appropriate storage tiers. You can leverage tiered storage offerings within Azure NetApp Files, such as Standard and Premium tiers, to balance performance and cost-effectiveness for different application workloads. By placing volumes on the most cost-effective storage tier that meets performance requirements, you can maximize resource utilization and minimize operational expenses. Volumes can be moved to different performance tiers at any moment and without service interruptions to align performance and cost with changing requirements.
 
 #### Flexibility
 
 After deployment, volume sizes and throughput settings can be adjusted like any other volume at any time without service interruption. This is a key attribute of Azure NetApp Files.
 
 #### Compliance and data residency
 
-Volume placement within the application volume group enables organizations to address compliance and data residency requirements by specifying the geographical location or Azure region where data should be stored. Administrators can ensure that volumes are provisioned in compliance with regulatory mandates or organizational policies governing data sovereignty, privacy, and residency, thus mitigating compliance risks, and ensuring data governance.
+Volume placement within the application volume group enables organizations to address compliance and data residency requirements by specifying the geographical location or Azure region where data should be stored. You can ensure that volumes are provisioned in compliance with regulatory mandates or organizational policies governing data sovereignty, privacy, and residency, thereby mitigating compliance risks and ensuring data governance.
 
 #### Constrained zone resource availability
 
-Upon execution of volume deployment application volume group detects available resources and applies logic to place volumes in the most optimal locations. In resource-constrained zones, volumes can share storage endpoints:
+Upon execution of volume deployment, application volume group detects available resources and applies logic to place volumes in the most optimal locations. In resource-constrained zones, volumes can share storage endpoints:
 
 :::image type="content" source="./media/application-volume-group-concept/resource-constrained-layout.png" alt-text="Diagram of constrained zone deployment." lightbox="./media/application-volume-group-concept/resource-constrained-layout.png":::
 
-
+## Summary 
 
 Application volume group in Azure NetApp Files empowers you to optimize deployment procedures, application performance, availability, cost, and compliance for application workloads. Strategically allocating storage resources and leveraging advanced placement strategies enables you to enhance the agility, resilience, and efficiency of your storage infrastructure to meet evolving business needs.
 
@@ -85,7 +85,7 @@ Adhering to best practices improves the efficacy of your application volume grou
 
 ### Define clear grouping criteria
 
-Establish defined criteria for grouping volumes within an application volume group. Definition ensures that the applied logic aligns with the specific needs and characteristics of the associated application.
+Establish well defined criteria for grouping volumes within an application volume group. Definition ensures that the applied logic aligns with the specific needs and characteristics of the associated application.
 
 ### Prepare for the deployment
 

articles/azure-netapp-files/application-volume-group-oracle-introduction.md

@@ -62,11 +62,11 @@ High availability deployments include volumes in two availability zones, for whi
 
 A fully built deployment with eight data volumes and all optional volumes in a zone with ample resource availability can resemble:
 
-:::image type="content" source="./media/application-volume-group-oracle-introduction/eight-volume-deployment.png" alt-text="Diagram of eight data volume layout." lightbox="./media/application-volume-group-oracle-introduction/eight-volume-deployment.png":::
+:::image type="content" source="./media/application-volume-group-oracle-introduction/oracle-built-environment.png" alt-text="Diagram of Oracle deployment." lightbox="./media/application-volume-group-oracle-introduction/oracle-built-environment.png":::
 
 In resource-constrained zones, volumes might be deployed on shared storage endpoints due to the aforementioned anti-affinity and no-grouping algorithms. This diagram depicts an example volume layout in a resource-constrained zone: 
 
-:::image type="content" source="./media/application-volume-group-oracle-introduction/oracle-built-environment.png" alt-text="Diagram of Oracle deployment." lightbox="./media/application-volume-group-oracle-introduction/oracle-built-environment.png":::
+:::image type="content" source="./media/application-volume-group-oracle-introduction/eight-volume-deployment.png" alt-text="Diagram of eight data volume layout." lightbox="./media/application-volume-group-oracle-introduction/eight-volume-deployment.png":::
 
 In resource-constrained zones, the volumes are deployed on shared storage endpoints while maintaining the anti-affinity and no-grouping rules. The resulting layout shows the log and log-mirror volumes on private storage endpoints while the data volumes share storage-endpoints. The log and log-mirror volumes do not share storage-endpoints.
 

articles/azure-netapp-files/media/application-volume-group-concept/application-volume-group-layout.png

@@ -49,7 +49,7 @@ Publishing locations for individual SDK packages:
 | Identity | [npm](https://www.npmjs.com/package/@azure/communication-identity) | [NuGet](https://www.NuGet.org/packages/Azure.Communication.Identity)| [PyPi](https://pypi.org/project/azure-communication-identity/)| [Maven](https://search.maven.org/search?q=a:azure-communication-identity) | -| -| -|
 | Phone Numbers | [npm](https://www.npmjs.com/package/@azure/communication-phone-numbers) | [NuGet](https://www.NuGet.org/packages/Azure.Communication.PhoneNumbers)| [PyPi](https://pypi.org/project/azure-communication-phonenumbers/)| [Maven](https://search.maven.org/search?q=a:azure-communication-phonenumbers) | -| -| -|
 | Chat | [npm](https://www.npmjs.com/package/@azure/communication-chat)| [NuGet](https://www.NuGet.org/packages/Azure.Communication.Chat) | [PyPi](https://pypi.org/project/azure-communication-chat/) | [Maven](https://search.maven.org/search?q=a:azure-communication-chat) | [GitHub](https://github.com/Azure/azure-sdk-for-ios/releases)| [Maven](https://search.maven.org/search?q=a:azure-communication-chat) | -|
-| SMS  [npm](https://www.npmjs.com/package/@azure/communication-sms) | [NuGet](https://www.NuGet.org/packages/Azure.Communication.Sms)| [PyPi](https://pypi.org/project/azure-communication-sms/) | [Maven](https://search.maven.org/artifact/com.azure/azure-communication-sms) | -| -| -|
+| SMS | [npm](https://www.npmjs.com/package/@azure/communication-sms) | [NuGet](https://www.NuGet.org/packages/Azure.Communication.Sms)| [PyPi](https://pypi.org/project/azure-communication-sms/) | [Maven](https://search.maven.org/artifact/com.azure/azure-communication-sms) | -| -| -|
 | Email | [npm](https://www.npmjs.com/package/@azure/communication-email) | [NuGet](https://www.NuGet.org/packages/Azure.Communication.Email)| [PyPi](https://pypi.org/project/azure-communication-email/) | [Maven](https://search.maven.org/artifact/com.azure/azure-communication-email) | -| -| -|
 | Calling | [npm](https://www.npmjs.com/package/@azure/communication-calling) | [NuGet](https://github.com/Azure/Communication/blob/master/releasenotes/acs-calling-windowsclient-sdk-release-notes.md) | -| - | [CocoaPods](https://github.com/Azure/Communication/releases) | [Maven](https://github.com/Azure/Communication/blob/master/releasenotes/acs-calling-android-sdk-release-notes.md)| -|
 | Call Automation |[npm](https://www.npmjs.com/package/@azure/communication-call-automation)|[NuGet](https://www.NuGet.org/packages/Azure.Communication.CallAutomation/)|[PyPi](https://pypi.org/project/azure-communication-callautomation/)|[Maven](https://search.maven.org/artifact/com.azure/azure-communication-callautomation)

articles/azure-netapp-files/media/application-volume-group-concept/resource-constrained-layout.png

@@ -7,7 +7,7 @@ ms.topic: include
 ms.service: azure-communication-services
 ---
 
-In this quickstart, you'll learn how to chat in a Teams meeting using the Azure Communication Services Chat SDK for C#.
+In this quickstart, you learn how to chat in a Teams meeting using the Azure Communication Services Chat SDK for C#.
 
 ## Sample code
 Find the code for this quickstart on [GitHub](https://github.com/Azure-Samples/communication-services-dotnet-quickstarts/tree/main/ChatTeamsInteropQuickStart).
@@ -22,12 +22,12 @@ Find the code for this quickstart on [GitHub](https://github.com/Azure-Samples/c
 
 ## Joining the meeting chat 
 
-A Communication Services user can join a Teams meeting as an anonymous user using the Calling SDK. Joining the meeting will add them as a participant to the meeting chat as well, where they can send and receive messages with other users in the meeting. The user will not have access to chat messages that were sent before they joined the meeting and they will not be able to send or receive messages after the meeting ends. To join the meeting and start chatting, you can follow the next steps.
+A Communication Services user can join a Teams meeting as an anonymous user using the Calling SDK. Joining the meeting adds them as a participant to the meeting chat as well, where they can send and receive messages with other users in the meeting. The user won't have access to chat messages that were sent before they joined the meeting, and they won't be able to send or receive messages after the meeting ends. To join the meeting and start chatting, you can follow the next steps.
 
 ## Run the code
-You can build and run the code on Visual Studio. Please note the solution platforms we support `x64`,`x86` and `ARM64`. 
+You can build and run the code on Visual Studio. Note the solution platforms we support: `x64`,`x86`, and `ARM64`. 
 
-1. Open an instance of PowerShell, Windows Terminal, Command Prompt or equivalent and navigate to the directory that you'd like to clone the sample to.
+1. Open an instance of PowerShell, Windows Terminal, Command Prompt, or equivalent and navigate to the directory that you'd like to clone the sample to.
 2. `git clone https://github.com/Azure-Samples/Communication-Services-dotnet-quickstarts.git`
 3. Open the project ChatTeamsInteropQuickStart/ChatTeamsInteropQuickStart.csproj in Visual Studio.
 4. Install the following NuGet packages versions (or higher):
@@ -39,15 +39,15 @@ Install-Package Azure.Communication.Identity -Version 1.0.1
 
 ```
 
-5. With the Communication Services resource procured in pre-requisites, add the connectionstring to the **ChatTeamsInteropQuickStart/MainPage.xaml.cs** file. 
+5. With the Communication Services resource procured in prerequisites, add the connectionstring to the **ChatTeamsInteropQuickStart/MainPage.xaml.cs** file. 
 
 ``` csharp
-//Azure Communication Services resource connection string i.e = "endpoint=https://your-resource.communication.azure.net/;accesskey=your-access-key";
+//Azure Communication Services resource connection string, i.e., = "endpoint=https://your-resource.communication.azure.net/;accesskey=your-access-key";
 private const string connectionString_ = "";
 ```
 
 > [!IMPORTANT]
-> * Select the proper platform from the 'Solution Platforms' dropdown list in Visual Studio <b>before</b> running the code. i.e `x64`
+> * Select the proper platform from the 'Solution Platforms' dropdown list in Visual Studio <b>before</b> running the code, i.e., `x64`
 > * Make sure you have the 'Developer Mode' in Windows 10 enabled [(Developer Settings)](/windows/apps/get-started/enable-your-device-for-development)
 >  
 >  *The next steps will not work if this is not configured properly*
@@ -143,6 +143,7 @@ The Teams meeting link can be retrieved using Graph APIs, detailed in [Graph doc
 
 You can also get the required meeting link from the **Join Meeting** URL in the Teams meeting invite itself.
 A Teams meeting link looks like this: `https://teams.microsoft.com/l/meetup-join/meeting_chat_thread_id/1606337455313?context=some_context_here`. 
+If your teams link has a different format to this, you need to retrieve the thread ID using the Graph API.
 
 :::image type="content" source="../join-teams-meeting-chat-quickstart-windows.png" alt-text="Screenshot of the completed csharp Application.":::
 

articles/communication-services/concepts/sdk-options.md

@@ -446,7 +446,7 @@ Below are the list of operators currently supported on Azure Cosmos DB for Mongo
 <tr><td><code>$facet</code></td><td><img src="media/compatibility/yes-icon.svg" alt="Yes">Yes</td></tr>
 <tr><td><code>$fill</code></td><td><img src="media/compatibility/no-icon.svg" alt="No">No</td></tr>
 <tr><td><code>$geoNear</code></td><td><img src="media/compatibility/no-icon.svg" alt="No">No</td></tr>
-<tr><td><code>$graphLookup</code></td><td><img src="media/compatibility/no-icon.svg" alt="No">No</td></tr>
+<tr><td><code>$graphLookup</code></td><td><img src="media/compatibility/yes-icon.svg" alt="Yes">Yes</td></tr>
 <tr><td><code>$group</code></td><td><img src="media/compatibility/yes-icon.svg" alt="Yes">Yes</td></tr>
 <tr><td><code>$indexStats</code></td><td><img src="media/compatibility/yes-icon.svg" alt="Yes">Yes</td></tr>
 <tr><td><code>$limit</code></td><td><img src="media/compatibility/yes-icon.svg" alt="Yes">Yes</td></tr>