Clean up merge conflicts

Author: kraigb

articles/cognitive-services/text-analytics/quickstarts/text-analytics-sdk-v2.md

@@ -40,6 +40,62 @@ Use the Text Analytics client library version `3.0-preview` to perform:
 [!INCLUDE [Python quickstart](../includes/quickstarts/v3/python-sdk.md)]
 ::: zone-end
 
+::: zone pivot="programming-language-csharp"
+
+> [!IMPORTANT]
+> * The latest preview version of the Text Analytics API is `3.0-preview`, which includes a public preview for improved [Sentiment Analysis](../how-tos/text-analytics-how-to-sentiment-analysis.md#sentiment-analysis-versions-and-features) and [Named Entity Recognition (NER)](../how-tos/text-analytics-how-to-entity-linking.md#named-entity-recognition-versions-and-features). The latest stable version is `2.1`.
+>    * Be sure to only follow the instructions for the version you are using.
+> * The code in this article uses synchronous methods and un-secured credentials storage for simplicity reasons. For production scenarios, we recommend using the batched asynchronous methods for performance and scalability. See the reference documentation below.
+
+[!INCLUDE [C# quickstart](../includes/quickstarts/csharp-sdk.md)]
+
+::: zone-end
+
+::: zone pivot="programming-language-java"
+
+> [!IMPORTANT]
+> * This quickstart is only for version `3.0-preview` of the Text Analytics client library, which includes a public preview for improved [Sentiment Analysis](../how-tos/text-analytics-how-to-sentiment-analysis.md#sentiment-analysis-versions-and-features) and [Named Entity Recognition (NER)](../how-tos/text-analytics-how-to-entity-linking.md#named-entity-recognition-versions-and-features).
+>    * Be sure to only follow the instructions for the version you are using.
+> * The code in this article uses synchronous methods and un-secured credentials storage for simplicity reasons. For production scenarios, we recommend using the batched asynchronous methods for performance and scalability. See the reference documentation below.
+
+[!INCLUDE [Java quickstart](../includes/quickstarts/java-sdk.md)]
+
+::: zone-end
+
+::: zone pivot="programming-language-javascript"
+
+> [!IMPORTANT]
+> * The latest preview version of the Text Analytics API is `3.0-preview`, which includes a public preview for improved [Sentiment Analysis](../how-tos/text-analytics-how-to-sentiment-analysis.md#sentiment-analysis-versions-and-features) and [Named Entity Recognition (NER)](../how-tos/text-analytics-how-to-entity-linking.md#named-entity-recognition-versions-and-features). The latest stable version is `2.1`.
+>    * Be sure to only follow the instructions for the version you are using.
+> * The code in this article uses synchronous methods and un-secured credentials storage for simplicity reasons. For production scenarios, we recommend using the batched asynchronous methods for performance and scalability. See the reference documentation below.
+
+[!INCLUDE [NodeJS quickstart](../includes/quickstarts/nodejs-sdk.md)]
+
+::: zone-end
+
+::: zone pivot="programming-language-python"
+
+> [!IMPORTANT]
+> * The latest preview version of the Text Analytics API is `3.0-preview`, which includes a public preview for improved [Sentiment Analysis](../how-tos/text-analytics-how-to-sentiment-analysis.md#sentiment-analysis-versions-and-features) and [Named Entity Recognition (NER)](../how-tos/text-analytics-how-to-entity-linking.md#named-entity-recognition-versions-and-features). The latest stable version is `2.1`.
+>    * Be sure to only follow the instructions for the version you are using.
+> * The code in this article uses synchronous methods and un-secured credentials storage for simplicity reasons. For production scenarios, we recommend using the batched asynchronous methods for performance and scalability. See the reference documentation below. 
+
+[!INCLUDE [Python quickstart](../includes/quickstarts/python-sdk.md)]
+
+::: zone-end
+
+::: zone pivot="programming-language-other"
+
+## Additional language support
+
+If you've clicked this tab, you probably didn't see a quickstart in your favorite programming language. Don't worry, we have additional quickstarts available. Use the table to find the right sample for your programming language.
+
+| Language | Available version | 
+|----------|------------------------|
+| Ruby     | [Version 2.1](ruby-sdk.md)          | 
+| Go       | [Version 2.1](go-sdk.md)          | 
+
+::: zone-end
 
 ## Clean up resources
 

articles/cognitive-services/text-analytics/quickstarts/text-analytics-sdk.md

@@ -147,7 +147,21 @@ groups:
   - id: text-analytics-language-detection
     title: Language Detection
   - id: text-analytics-sentiment-analysis
-    title: Sentiment Analysis    
+    title: Sentiment Analysis
+- id: programming-languages-set-functions
+  title: Programming languages
+  prompt: Choose a programming language
+  pivots:
+  - id: programming-language-csharp
+    title: C#
+  - id: programming-language-javascript
+    title: JavaScript
+  - id: programming-language-powershell
+    title: PowerShell 
+  - id: programming-language-python
+    title: Python 
+  - id: programming-language-typescript
+    title: TypeScript      
 - id: programming-languages-set-functions01
   title: Programming languages
   prompt: Choose a programming language
@@ -162,6 +176,20 @@ groups:
     title: Python
   - id: programming-language-typescript
     title: TypeScript
+- id: programming-languages-text-analytics
+  title: Programming languages
+  prompt: Choose a programming language.
+  pivots:
+  - id: programming-language-csharp
+    title: C#
+  - id: programming-language-python
+    title: Python
+  - id: programming-language-javascript
+    title: javascript
+  - id: programming-language-java
+    title: Java 
+  - id: programming-language-other
+    title: Other languages...    
 - id: programming-languages-set-diberry-3core
   title: Programming languages
   prompt: Choose a programming language