resolve merge conflict

Author: Kat-Campise

articles/synapse-analytics/quickstart-connect-synapse-link-cosmos-db.md

@@ -1,6 +1,6 @@
 ---
-title: Connect to Synapse Link for Cosmos DB
-description: How to connect a Cosmos DB to a Synapse workspace with Synapse Link
+title: Connect to Synapse Link for Azure Cosmos DB
+description: How to connect a Azure Cosmos DB to a Synapse workspace with Synapse Link
 services: synapse-analytics 
 author: ArnoMicrosoft
 ms.service: synapse-analytics 
@@ -24,7 +24,11 @@ Before you connect an Azure Cosmos DB account to your workspace, there are a few
 
 ## Enable Azure Cosmos DB analytical store
 
-To run large-scale analytics into Azure Cosmos DB without impacting your operational performance, we recommend enabling  Synapse Link for Azure Cosmos DB which bring HTAP capability to a container and built-in support in Azure Synapse. Follow this quickstart to enable Synapse Link  for Cosmos DB containers.
+To run large-scale analytics into Azure Cosmos DB without impacting your operational performance, we recommend enabling  Synapse Link for Azure Cosmos DB which bring HTAP capability to a container and built-in support in Azure Synapse. Follow this quickstart to enable Synapse Link for Cosmos DB containers.
+
+## Navigate to Synapse Studio 
+
+From your Synapse workspace, select **Launch Synapse Studio**. On the Synapse Studio home page, select **Data** which will take you to the **Data Object Explorer**.
 
 ## Connect an Azure Cosmos DB database to a Synapse workspace 
 
@@ -37,7 +41,7 @@ From the Data Object Explorer, you can directly connect an Azure Cosmos DB datab
 4. Select ***Continue***
 5. Name the linked service. The name will be displayed in the Object Explorer and used by Synapse run-times to connect to the database and containers. We recommend using a friendly name.
 6. Select the **Cosmos DB account name** and **database name**
-7. (Optional) If no region is specified, Synapse run-time operations will be routed toward the nearest region where the analytical store is enabled. However you can set manually which region you want your users to access Cosmos DB analytical store. Select **Additional connection properties** and then **New**. Under **Property Name**, write ***PreferredRegions*** and set the **Value** to the region you want (example: WestUS2, there is no space between words and number)
+7. (Optional) If no region is specified, Synapse run-time operations will be routed toward the nearest region where the analytical store is enabled. However, you can set manually which region you want your users to access Cosmos DB analytical store. Select **Additional connection properties** and then **New**. Under **Property Name**, write ***PreferredRegions*** and set the **Value** to the region you want (example: WestUS2, there is no space between words and number)
 8. Select ***Create***
 
 Azure Cosmos DB database are visible under the tab **Linked** in the Azure Cosmos DB section. You can differentiate an HTAP enabled Azure Cosmos DB container from an OLTP only container with the following icons:
@@ -56,4 +60,5 @@ By right-clicking into a container, you have list of gestures that will trigger
 
 ## Next steps
 
-* [Learn what is supported between Synapse and Azure Cosmos DB](./synapse-link/concept-synapse-link-cosmos-db-support.md)
+* [Learn what is supported between Synapse and Azure Cosmos DB](./synapse-link/concept-synapse-link-cosmos-db-support.md)
+* [Learn how to query an analytical store with Synapse Spark](synapse-link/how-to-query-analytical-store-spark.md)

articles/synapse-analytics/synapse-link/concept-synapse-link-cosmos-db-support.md

@@ -1,5 +1,5 @@
 ---
-title: Azure Synapse Link for Cosmos DB supported features
+title: Azure Synapse Link for Azure Cosmos DB supported features
 description: Understand the current list of actions supported by Azure Synapse Link for Cosmos DB
 services: synapse-analytics 
 author: ArnoMicrosoft
@@ -26,7 +26,7 @@ You can connect to Cosmos DB container without enabling Synapse Link, in which c
 Here is list of the currently supported features within Synapse Link for Cosmos DB. 
 
 | Category              | Description |[Spark](https://docs.microsoft.com/azure/synapse-analytics/sql/on-demand-workspace-overview) | [SQL serverless](https://docs.microsoft.com/azure/synapse-analytics/sql/on-demand-workspace-overview) |
-| :-------------------- | :----------------------------------------------------------- |:----------------------------------------------------------- | :----------------------------------------------------------- | :----------------------------------------------------------- |
+| -------------------- | ----------------------------------------------------------- |----------------------------------------------------------- | ----------------------------------------------------------- | ----------------------------------------------------------- |
 | **Run-time Support** |Support for read or write by Azure Synapse run-time| ✓ | [Contact Us](mailto:[email protected]?subject=[Enable%20Preview%20Feature]%20SQL%20serverless%20for%20Cosmos%20DB)|
 | **Cosmos DB API support** |API support as a Synapse Link| SQL / Mongo DB | SQL / Mongo DB |
 | **Object**  |Objects such as table that can be created, pointing directly to Azure Cosmos DB container| View, Table | View |
@@ -39,7 +39,7 @@ Here is list of the currently supported features within Synapse Link for Cosmos
 ## Supported code-generated actions for Spark
 
 | Gesture              | Description |OLTP |HTAP  |
-| :-------------------- | :----------------------------------------------------------- |:----------------------------------------------------------- |:----------------------------------------------------------- |
+| -------------------- | ----------------------------------------------------------- |----------------------------------------------------------- |----------------------------------------------------------- |
 | **Load to DataFrame** |Load and read data into a Spark DataFrame |X| ✓ |
 | **Create Spark table** |Create a table pointing to an Azure Cosmos DB container|X| ✓ |
 | **Write DataFrame to container** |Write data into a container|✓| ✓ |
@@ -51,12 +51,10 @@ Here is list of the currently supported features within Synapse Link for Cosmos
 ## Supported code-generated actions for SQL serverless
 
 | Gesture              | Description |OLTP |HTAP |
-| :-------------------- | :----------------------------------------------------------- |:----------------------------------------------------------- |:----------------------------------------------------------- |
+| -------------------- | ----------------------------------------------------------- |----------------------------------------------------------- |----------------------------------------------------------- |
 | **Select top 100** |Preview top 100 items from a container|X| ✓ |
 | **Create view** |Create a view to directly have BI access in a container through Synapse SQL|X| ✓ |
 
 ## Next steps
 
-See how to [connect to Synapse Link for Azure Cosmos DB](./how-to-connect-synapse-link-cosmos-db.md)
-
-
+See how to [connect to Synapse Link for Azure Cosmos DB](./how-to-connect-synapse-link-cosmos-db.md)

articles/synapse-analytics/synapse-link/how-to-query-analytical-store-spark.md

@@ -1,5 +1,5 @@
 ---
-title: Query Cosmos DB analytical with Synapse Spark
+title: Query Azure Cosmos DB analytical store with Synapse Spark
 description: How to query Cosmos DB analytical with Synapse Spark
 services: synapse-analytics 
 author: ArnoMicrosoft
@@ -11,7 +11,7 @@ ms.author: acomet
 ms.reviewer: jrasnick
 ---
 
-# Query Cosmos DB analytical with Synapse Spark
+# Query Azure Cosmos DB analytical store with Synapse Spark
 
 This article gives some examples on how you can interact with the analytical store from Synapse gestures. Gestures are visible when you right-click on a container. With gestures, you can quickly generate code and tailor it to your needs. They are also perfect for discovering data with a single click.
 
@@ -32,6 +32,16 @@ df = spark.read.format("cosmos.olap")\
 ​df.show(10)
 ```
 
+The equivalent code gesture in **Scala** would be the following code:
+```java
+// To select a preferred list of regions in a multi-region Cosmos DB account, add option("spark.cosmos.preferredRegions", "<Region1>,<Region2>")
+
+val df_olap = spark.read.format("cosmos.olap").
+    option("spark.synapse.linkedService", "pySparkSamplesDb").
+    option("spark.cosmos.container", "trafficSourceColl").
+    load()
+```
+
 ## Create Spark table
 
 In this gesture, you will create a Spark table pointing to the container you selected. That operation does not incur any data movement. If you decide to delete that table, the underlying container (and corresponding analytical store) won't be impacted. 
@@ -66,6 +76,20 @@ YOURDATAFRAME.write.format("cosmos.oltp")\
     .save()
 ```
 
+The equivalent code gesture in **Scala** would be the following code:
+```java
+// To select a preferred list of regions in a multi-region Cosmos DB account, add option("spark.cosmos.preferredRegions", "<Region1>,<Region2>")
+
+import org.apache.spark.sql.SaveMode
+
+df.write.format("cosmos.oltp").
+    option("spark.synapse.linkedService", "pySparkSamplesDb").
+    option("spark.cosmos.container", "trafficSourceColl"). 
+    option("spark.cosmos.write.upsertEnabled", "true").
+    mode(SaveMode.Overwrite).
+    save()
+```
+
 ## Load streaming DataFrame from container
 In this gesture, you will use Spark Streaming capability to load data from a container into a dataframe. The data will be stored into the primary data lake account (and file system) that you connected to the workspace. 
 
@@ -85,6 +109,21 @@ dfStream = spark.readStream\
     .load()
 ```
 
+The equivalent code gesture in **Scala** would be the following code:
+```java
+// To select a preferred list of regions in a multi-region Cosmos DB account, add .option("spark.cosmos.preferredRegions", "<Region1>,<Region2>")
+
+val dfStream = spark.readStream.
+    format("cosmos.oltp").
+    option("spark.synapse.linkedService", "pySparkSamplesDb").
+    option("spark.cosmos.container", "trafficSourceColl").
+    option("spark.cosmos.changeFeed.readEnabled", "true").
+    option("spark.cosmos.changeFeed.startFromTheBeginning", "true").
+    option("spark.cosmos.changeFeed.checkpointLocation", "/localReadCheckpointFolder").
+    option("spark.cosmos.changeFeed.queryName", "streamTestRevin2").
+    load()
+```
+
 ## Write streaming DataFrame to container
 In this gesture, you will write a streaming dataframe into the Cosmos DB container you selected. If the folder */localReadCheckpointFolder* is not created, it will be automatically created. This operation will impact the transactional performance of Cosmos DB.
 
@@ -104,6 +143,22 @@ streamQuery = dfStream\
 streamQuery.awaitTermination()
 ```
 
+The equivalent code gesture in **Scala** would be the following code:
+```java
+// To select a preferred list of regions in a multi-region Cosmos DB account, add .option("spark.cosmos.preferredRegions", "<Region1>,<Region2>")
+
+val query = dfStream.
+            writeStream.
+            format("cosmos.oltp").
+            outputMode("append").
+            option("checkpointLocation", "/localWriteCheckpointFolder").
+            option("spark.synapse.linkedService", "pySparkSamplesDb").
+            option("spark.cosmos.container", "test2").
+            option("spark.cosmos.connection.mode", "gateway").
+            start()
+
+query.awaitTermination()
+```
 ## Next steps
 
 * [Learn what is supported between Synapse and Azure Cosmos DB](./concept-synapse-link-cosmos-db-support.md)

articles/synapse-analytics/toc.yml

@@ -414,9 +414,9 @@
     items:
     - name: Synapse Link
       items:
-      - name: Connect to Synapse Link for Cosmos DB
+      - name: Connect to Azure Synapse Link for Cosmos DB
         href: ./synapse-link/how-to-connect-synapse-link-cosmos-db.md
-      - name: Query analytical store with Spark
+      - name: Query Azure Cosmos DB analytical store with Synapse Spark
         href: ./synapse-link/how-to-query-analytical-store-spark.md
     - name: Synapse SQL
       items: