Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-search

Author: HeidiSteen

.openpublishing.redirection.json

@@ -50553,6 +50553,10 @@
       "source_path": "articles/aks/use-cosmosdb-osba-mongo-app.md",
       "redirect_url": "/azure/aks/",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cognitive-services/speech-service/ship-application.md",
+      "redirect_url": "/azure/cognitive-services/speech-service/speech-sdk"
     }
   ]
 }

articles/azure-monitor/app/app-map.md

@@ -81,7 +81,7 @@ To view active alerts and the underlying rules that cause the alerts to be trigg
 
 Application Map uses the **cloud role name** property to identify the components on the map. The Application Insights SDK automatically adds the cloud role name property to the telemetry emitted by components. For example, the SDK will add a web site name or service role name to the cloud role name property. However, there are cases where you may want to override the default value. To override cloud role name and change what gets displayed on the Application Map:
 
-### .NET/.NET Core
+# [.NET/.NetCore](#tab/net)
 
 **Write custom TelemetryInitializer as below.**
 
@@ -149,7 +149,27 @@ For [ASP.NET Core](asp-net-core.md#adding-telemetryinitializers) applications, a
 }
 ```
 
-### Node.js
+# [Java](#tab/java)
+
+Starting with Application Insights Java SDK 2.5.0, you can specify the cloud role name
+by adding `<RoleName>` to your `ApplicationInsights.xml` file, e.g.
+
+```XML
+<?xml version="1.0" encoding="utf-8"?>
+<ApplicationInsights xmlns="http://schemas.microsoft.com/ApplicationInsights/2013/Settings" schemaVersion="2014-05-30">
+   <InstrumentationKey>** Your instrumentation key **</InstrumentationKey>
+   <RoleName>** Your role name **</RoleName>
+   ...
+</ApplicationInsights>
+```
+
+If you use Spring Boot with the Application Insights Spring Boot starter, the only required change is to set your custom name for the application in the application.properties file.
+
+`spring.application.name=<name-of-app>`
+
+The Spring Boot starter will automatically assign cloud role name to the value you enter for the spring.application.name property.
+
+# [Node.js](#tab/nodejs)
 
 ```javascript
 var appInsights = require("applicationinsights");
@@ -170,27 +190,7 @@ appInsights.defaultClient.addTelemetryProcessor(envelope => {
 });
 ```
 
-### Java
-
-Starting with Application Insights Java SDK 2.5.0, you can specify the cloud role name
-by adding `<RoleName>` to your `ApplicationInsights.xml` file, e.g.
-
-```XML
-<?xml version="1.0" encoding="utf-8"?>
-<ApplicationInsights xmlns="http://schemas.microsoft.com/ApplicationInsights/2013/Settings" schemaVersion="2014-05-30">
-   <InstrumentationKey>** Your instrumentation key **</InstrumentationKey>
-   <RoleName>** Your role name **</RoleName>
-   ...
-</ApplicationInsights>
-```
-
-If you use Spring Boot with the Application Insights Spring Boot starter, the only required change is to set your custom name for the application in the application.properties file.
-
-`spring.application.name=<name-of-app>`
-
-The Spring Boot starter will automatically assign cloud role name to the value you enter for the spring.application.name property.
-
-### Client/browser-side JavaScript
+# [JavaScript](#tab/javascript)
 
 ```javascript
 appInsights.queue.push(() => {
@@ -200,6 +200,7 @@ appInsights.addTelemetryInitializer((envelope) => {
 });
 });
 ```
+---
 
 ### Understanding cloud role name within the context of the Application Map
 
@@ -216,11 +217,11 @@ For the [official definitions](https://github.com/Microsoft/ApplicationInsights-
 ```
    [Description("Name of the role the application is a part of. Maps directly to the role name in azure.")]
     [MaxStringLength("256")]
-    705: string 	 CloudRole = "ai.cloud.role";
+    705: string      CloudRole = "ai.cloud.role";
     
     [Description("Name of the instance where the application is running. Computer name for on-premises, instance name for Azure.")]
     [MaxStringLength("256")]
-    715: string 	 CloudRoleInstance = "ai.cloud.roleInstance";
+    715: string      CloudRoleInstance = "ai.cloud.roleInstance";
 ```
 
 Alternatively, **cloud role instance** can be helpful for scenarios where **cloud role name** tells you the problem is somewhere in your web front-end, but you might be running your web front-end across multiple load-balanced servers so being able to drill in a layer deeper via Kusto queries and knowing if the issue is impacting all web front-end servers/instances or just one can be extremely important.
@@ -255,7 +256,7 @@ In addition, Application Map only supports up to 1000 separate ungrouped nodes r
 
 To fix this, you'll need to change your instrumentation to properly set the cloud role name, dependency type, and dependency target fields.
 
-* Dependency target should represent the logical name of a dependency. In many cases, it’s equivalent to the server or resource name of the dependency. For example, in the case of HTTP dependencies it is set to the hostname. It should not contain unique IDs or parameters that change from one request to another.
+* Dependency target should represent the logical name of a dependency. In many cases, it's equivalent to the server or resource name of the dependency. For example, in the case of HTTP dependencies it is set to the hostname. It should not contain unique IDs or parameters that change from one request to another.
 
 * Dependency type should represent the logical type of a dependency. For example, HTTP, SQL or Azure Blob are typical dependency types. It should not contain unique IDs.
 

articles/azure-resource-manager/management/azure-subscription-service-limits.md

@@ -2,7 +2,7 @@
 title: Azure subscription limits and quotas
 description: Provides a list of common Azure subscription and service limits, quotas, and constraints. This article includes information on how to increase limits along with maximum values.
 ms.topic: conceptual
-ms.date: 03/26/2020
+ms.date: 04/03/2020
 ---
 
 # Azure subscription and service limits, quotas, and constraints

articles/cognitive-services/Speech-Service/get-started.md

@@ -9,12 +9,12 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: conceptual
-ms.date: 02/26/2020
+ms.date: 04/03/2020
 ms.author: erhopf
 ms.custom: seodec18, seo-javascript-october2019
 ---
 
-# Try the Speech service for free
+# Try the Speech service for free''
 
 In this article, you choose an option to easily test the Speech service free of charge so you can discover what the service can do, and decide whether it's right for your needs. Choose one of the two following options depending on your situation and use-case:
 
@@ -93,4 +93,4 @@ Complete one of our 10-minute quickstarts or check out our SDK samples:
 
 > [!div class="nextstepaction"]
 > [Quickstart: Recognize speech in C#](~/articles/cognitive-services/Speech-Service/quickstarts/speech-to-text-from-microphone.md?pivots=programming-language-csharp&tabs=dotnet)
-> [Speech SDK samples](speech-sdk.md#get-the-samples)
+> [Speech SDK samples](speech-sdk.md#sample-source-code)

articles/cognitive-services/Speech-Service/how-to-migrate-from-bing-speech.md

@@ -9,7 +9,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: conceptual
-ms.date: 03/17/2020
+ms.date: 04/03/2020
 ms.author: nitinme
 
 # Customer intent: As a developer currently using the deprecated Bing Speech, I want to learn the differences between Bing Speech and the Speech service, so that I can migrate my application to the Speech service.
@@ -91,4 +91,4 @@ For Speech service, SDK, and API support, visit the Speech service [support page
 ## See also
 * [Speech service release notes](releasenotes.md)
 * [What is the Speech service](overview.md)
-* [Speech service and Speech SDK documentation](speech-sdk.md#get-the-sdk)
+* [Speech service and Speech SDK documentation](speech-sdk.md#get-the-speech-sdk)

articles/cognitive-services/Speech-Service/includes/get-speech-sdk-android.md

@@ -0,0 +1,43 @@
+---
+author: IEvangelist
+ms.service: cognitive-services
+ms.topic: include
+ms.date: 03/27/2020
+ms.author: dapine
+---
+
+:::row:::
+    :::column span="3":::
+        When developing for Android, there are two Speech SDKs available. The Java Speech SDK is available natively as an Android package, or the .NET Speech SDK could be used with **Xamarin.Android** as it implements .NET Standard 2.0.
+    :::column-end:::
+    :::column:::
+        <br>
+        <div class="icon is-large">
+            <img alt="Android" src="https://docs.microsoft.com/media/logos/logo_android.svg" width="60px">
+        </div>
+    :::column-end:::
+:::row-end:::
+
+# [Android Studio](#tab/android-studio)
+
+[!INCLUDE [get-speech-sdk-dotnet](get-speech-sdk-java.md)]
+
+# [Xamarin.Android](#tab/android-xamarin)
+
+:::row:::
+    :::column span="3":::
+        Xamarin.Android exposes the complete Android SDK for .NET developers. Build fully native Android apps using C# or F# in Visual Studio. For more information, see <a href="https://docs.microsoft.com/xamarin/android/" target="_blank">Xamarin.Android <span class="docon docon-navigate-external x-hidden-focus"></span></a>
+    :::column-end:::
+    :::column:::
+        <br>
+        <div class="icon is-large">
+            <img alt="Xamarin" src="https://docs.microsoft.com/media/logos/logo_xamarin.svg" width="60px">
+            &nbsp; ❤️ &nbsp;
+            <img alt="Android" src="https://docs.microsoft.com/media/logos/logo_android.svg" width="60px">
+        </div>
+    :::column-end:::
+:::row-end:::
+
+[!INCLUDE [get-speech-sdk-dotnet](get-speech-sdk-dotnet.md)]
+
+---

articles/cognitive-services/Speech-Service/includes/get-speech-sdk-browser.md

@@ -0,0 +1,41 @@
+---
+author: IEvangelist
+ms.service: cognitive-services
+ms.topic: include
+ms.date: 03/27/2020
+ms.author: dapine
+---
+
+:::row:::
+    :::column span="3":::
+        The JavaScript Speech SDK is available as an npm package, see <a href="https://www.npmjs.com/package/microsoft-cognitiveservices-speech-sdk" target="_blank">microsoft-cognitiveservices-speech-sdk <span class="docon docon-navigate-external x-hidden-focus"></span></a> and it's companion GitHub repository <a href="https://github.com/Microsoft/cognitive-services-speech-sdk-js" target="_blank">cognitive-services-speech-sdk-js <span class="docon docon-navigate-external x-hidden-focus"></span></a>.
+    :::column-end:::
+    :::column:::
+        <br>
+        <div class="icon is-large">
+            <img alt="JavaScript" src="https://docs.microsoft.com/media/logos/logo_js.svg"  width="60px">
+        </div>
+    :::column-end:::
+:::row-end:::
+
+> [!TIP]
+> Although the JavaScript Speech SDK is available as an npm package, thus both client web browsers and Node.js can consume it - consider the various architectural implications of each environment. For example, the <a href="https://en.wikipedia.org/wiki/Document_Object_Model" target="_blank">document object model (DOM) <span class="docon docon-navigate-external x-hidden-focus"></span></a> is not available for server-side applications just as the <a href="https://nodejs.org/api/fs.html" target="_blank">file system <span class="docon docon-navigate-external x-hidden-focus"></span></a> is not available to client-side applications.
+
+### Node.js Package Manager (NPM)
+
+To install the JavaScript Speech SDK, run the following `npm install` command below.
+
+```nodejs
+npm install microsoft-cognitiveservices-speech-sdk
+```
+
+### HTML script tag
+
+Alternatively, you could directly include a `<script>` tag in the HTMLs `<head>` element, relying on the <a href="https://www.jsdelivr.com/package/npm/microsoft-cognitiveservices-speech-sdk" target="_blank">**JSDelivr** NPM syndicate <span class="docon docon-navigate-external x-hidden-focus"></span></a>.
+
+```html
+<script src="https://cdn.jsdelivr.net/npm/[email protected]/distrib/lib/microsoft.cognitiveservices.speech.sdk.min.js">
+</script>
+```
+
+For more information, see the <a href="https://github.com/Azure-Samples/cognitive-services-speech-sdk/tree/master/quickstart/javascript/browser" target="_blank">Web Browser Speech SDK quickstart <span class="docon docon-navigate-external x-hidden-focus"></span></a>.

articles/cognitive-services/Speech-Service/includes/get-speech-sdk-cpp.md

@@ -0,0 +1,45 @@
+---
+author: IEvangelist
+ms.service: cognitive-services
+ms.topic: include
+ms.date: 03/27/2020
+ms.author: dapine
+---
+
+:::row:::
+    :::column span="3":::
+        The C++ Speech SDK is available on Windows, Linux, and macOS. For more information, see <a href="https://www.nuget.org/packages/Microsoft.CognitiveServices.Speech" target="_blank">Microsoft.CognitiveServices.Speech <span class="docon docon-navigate-external x-hidden-focus"></span></a>.
+    :::column-end:::
+    :::column:::
+        <br>
+        <div class="icon is-large">
+            <img alt="C++" src="https://docs.microsoft.com/media/logos/logo_Cplusplus.svg" width="60px">
+        </div>
+    :::column-end:::
+:::row-end:::
+
+#### C++ NuGet package
+
+The C++ Speech SDK can be installed from the **Package Manager** with the following `Install-Package` command.
+
+```powershell
+Install-Package Microsoft.CognitiveServices.Speech
+```
+
+#### C++ binaries and header files
+
+Alternatively, the C++ Speech SDK can be installed from binaries. Download the SDK as a <a href="https://aka.ms/csspeech/linuxbinary" target="_blank">.tar package <span class="docon docon-navigate-external x-hidden-focus"></span></a> and unpack the files in a directory of your choice. The contents of this package (which include header files for both x86 and x64 target architectures) are structured as follows:
+
+  | Path                   | Description                                          |
+  |------------------------|------------------------------------------------------|
+  | `license.md`           | License                                              |
+  | `ThirdPartyNotices.md` | Third-party notices                                  |
+  | `include`              | Header files for C++                                 |
+  | `lib/x64`              | Native x64 library for linking with your application |
+  | `lib/x86`              | Native x86 library for linking with your application |
+
+  To create an application, copy or move the required binaries (and libraries) into your development environment. Include them as required in your build process.
+
+#### Additional resources
+
+- <a href="https://github.com/Azure-Samples/cognitive-services-speech-sdk/tree/master/quickstart/cpp" target="_blank">Windows, Linux, and macOS quickstart C++ source code <span class="docon docon-navigate-external x-hidden-focus"></span></a>

articles/cognitive-services/Speech-Service/includes/get-speech-sdk-dotnet.md

@@ -0,0 +1,37 @@
+---
+author: IEvangelist
+ms.service: cognitive-services
+ms.topic: include
+ms.date: 03/27/2020
+ms.author: dapine
+---
+
+:::row:::
+    :::column span="3":::
+        The .NET Speech SDK is available as a NuGet package and implements .NET Standard 2.0, for more information, see <a href="https://www.nuget.org/packages/Microsoft.CognitiveServices.Speech" target="_blank">Microsoft.CognitiveServices.Speech <span class="docon docon-navigate-external x-hidden-focus"></span></a>.
+    :::column-end:::
+    :::column:::
+        <br>
+        <div class="icon is-large">
+            <img alt="C#" src="https://docs.microsoft.com/media/logos/logo_Csharp.svg" width="60px">
+        </div>
+    :::column-end:::
+:::row-end:::
+
+#### C# NuGet Package
+
+The .NET Speech SDK can be installed from the **.NET Core CLI** with the following `dotnet add` command.
+
+```dotnetcli
+dotnet add package Microsoft.CognitiveServices.Speech
+```
+
+The .NET Speech SDK can be installed from the **Package Manager** with the following `Install-Package` command.
+
+```powershell
+Install-Package Microsoft.CognitiveServices.Speech
+```
+
+#### Additional resources
+
+- <a href="https://github.com/Azure-Samples/cognitive-services-speech-sdk/tree/master/quickstart/csharp" target="_blank">.NET Core, .NET Framework, Unity, UWP, and Xamarin quickstart C# source code <span class="docon docon-navigate-external x-hidden-focus"></span></a>