Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)

Author: tynevi

articles/active-directory/conditional-access/controls.md

@@ -15,7 +15,7 @@ ms.devlang: na
 ms.topic: article
 ms.tgt_pltfrm: na
 ms.workload: identity
-ms.date: 03/23/2019
+ms.date: 06/15/2019
 ms.author: joflore
 ms.reviewer: calebb
 
@@ -124,11 +124,13 @@ Providers currently offering a compatible service include:
 
 - [Duo Security](https://duo.com/docs/azure-ca)
 - [Entrust Datacard](https://www.entrustdatacard.com/products/authentication/intellitrust)
+- [GSMA](https://mobileconnect.io/azure/)
 - [Ping Identity](https://documentation.pingidentity.com/pingid/pingidAdminGuide/index.shtml#pid_c_AzureADIntegration.html)
 - RSA
 - [SecureAuth](https://docs.secureauth.com/pages/viewpage.action?pageId=47238992#)
 - [Silverfort](https://www.silverfort.io/company/using-silverfort-mfa-with-azure-active-directory/)
 - [Symantec VIP](https://help.symantec.com/home/VIP_Integrate_with_Azure_AD)
+- [Thales (Gemalto)](https://resources.eu.safenetid.com/help/AzureMFA/Azure_Help/Index.htm)
 - [Trusona](https://www.trusona.com/docs/azure-ad-integration-guide)
 
 For more information on those services, contact the providers directly.

articles/aks/supported-kubernetes-versions.md

@@ -92,12 +92,15 @@ Supported Version List
 ----------------------
 1.12.*2*, 1.12.*3*, 1.11.*5*, 1.11.*6*
 
+> [!NOTE]
+> Customers should not pin cluster creation, CI or other automated jobs to specific patch releases. 
+
 ### Communications
 
 * For new **minor** versions of Kubernetes
-  * All users are notified of the new version and what version will be removed.
-  * Customers running the version **to be removed** will be notified that they have **60 days** to upgrade to a
-    supported release (e.g. minor version).
+  * All users are notified publicly of the new version and what version will be removed.
+  * When a new patch version is released, the oldest patch release is removed at the same time.
+  * Customers have **60 days** from the public notification date to upgrade to a supported minor version release.
 * For new **patch** versions of Kubernetes
   * All users are notified of the new patch version being released and to upgrade to the latest patch release.
   * Users have **30 days** to upgrade to a newer, supported patch release. Users have **30 days** to upgrade to

articles/azure-functions/functions-dotnet-dependency-injection.md

@@ -31,7 +31,7 @@ Before you can use dependency injection, you must install the following NuGet pa
 
 To register services, you can create a method to configure and add components to an `IFunctionsHostBuilder` instance.  The Azure Functions host creates an instance of `IFunctionsHostBuilder` and passes it directly into your method.
 
-To register the method, add the `FunctionsStartup` assembly attribute that specifies the type name used during startup.
+To register the method, add the `FunctionsStartup` assembly attribute that specifies the type name used during startup. Also code is referencing a prerelease of [Microsoft.Azure.Cosmos](https://www.nuget.org/packages/Microsoft.Azure.Cosmos/) on Nuget.
 
 ```csharp
 [assembly: FunctionsStartup(typeof(MyNamespace.Startup))]

articles/azure-monitor/app/sampling.md

@@ -48,7 +48,7 @@ If Adaptive or Fixed rate sampling are in operation, Ingestion sampling is disab
 
 Adaptive sampling is available for the Application Insights SDK for ASP.NET v 2.0.0-beta3 and later, Microsoft.ApplicationInsights.AspNetCore SDK v 2.2.0-beta1 and later, and is enabled by default.
 
-Adaptive sampling affects the volume of telemetry sent from your web server app to the Application Insights service endpoint. The volume is adjusted automatically to keep within a specified maximum rate of traffic, and is controlled via the setting `MaxTelemetryItemsPerSecond`. If the application produces a low amount of telemetry, such as when debugging or due to low usage, items won't get sampled as long as volume is below `MaxTelemetryItemsPerSecond`. As the volume of telemetry increases, sampling rate is adjusted so as to achieve the target volume.
+Adaptive sampling affects the volume of telemetry sent from your web server app to the Application Insights service endpoint. The volume is adjusted automatically to keep within a specified maximum rate of traffic, and is controlled via the setting `MaxTelemetryItemsPerSecond`. If the application produces a low amount of telemetry, such as when debugging or due to low usage, items won't be dropped by the sampling processor as long as volume is below `MaxTelemetryItemsPerSecond`. As the volume of telemetry increases, sampling rate is adjusted so as to achieve the target volume.
 
 To achieve the target volume, some of the generated telemetry is discarded. But like other types of sampling, the algorithm retains related telemetry items. For example, when you're inspecting the telemetry in Search, you'll be able to find the request related to a particular exception.
 

articles/backup/backup-azure-monitoring-use-azuremonitor.md

@@ -24,7 +24,7 @@ The [built-in monitoring and alerting article](backup-azure-monitoring-built-in-
 ## Using Log Analytics Workspace
 
 > [!NOTE]
-> Data from Azure VM backups, MAB Agent, System Center DPM (SC-DPM), SQL backups in Azure VMs  is being pumped to the Log Analytics workspace via diagnostic settings. Support for Azure File share backups, Microsoft Azure Backup Server (MABS) is coming soon.
+> Data from Azure VM backups, MAB Agent, System Center DPM (SC-DPM), SQL backups in Azure VMs, and Azure File Share backups is being pumped to the Log Analytics workspace via diagnostic settings. Support for Microsoft Azure Backup Server (MABS) is coming soon.
 
 We are leveraging the capabilities of two Azure services - **Diagnostic settings** (to send data from multiple Azure Resource Manager resources to another resource) and **Log Analytics** (LA - to generate custom alerts where you can define other notification channels using Action groups) for monitoring at scale. The following sections detail on how to use LA to monitor Azure Backup at scale.
 

articles/cognitive-services/Speech-Service/batch-transcription.md

@@ -97,6 +97,40 @@ Polling for transcription status may not be the most performant, or provide the
 
 For more details, see [Webhooks](webhooks.md).
 
+## Speaker Separation (Diarization)
+
+Diarization is the process of separating speakers in a piece of audio. Our Batch pipeline supports Diarization and is capable of recognizing two speakers on mono channel recordings.
+
+To request that your audio transcription request is processed for diarization, you simply have to add the relevant parameter in the HTTP request as shown below.
+
+ ```json
+{
+  "recordingsUrl": "<URL to the Azure blob to transcribe>",
+  "models": [{"Id":"<optional acoustic model ID>"},{"Id":"<optional language model ID>"}],
+  "locale": "<locale to us, for example en-US>",
+  "name": "<user defined name of the transcription batch>",
+  "description": "<optional description of the transcription>",
+  "properties": {
+    "AddWordLevelTimestamps" : "True",
+    "AddDiarization" : "True"
+  }
+}
+```
+
+Word level timestamps would also have to be 'turned on' as the parameters in the above request indicate. 
+
+The corresponding audio will contain the speakers identified by a number (currently we support only two voices, so the speakers will be identified as 'Speaker 1 'and 'Speaker 2') followed by the transcription output.
+
+Also note that Diarization is not available in Stereo recordings. Furthermore, all JSON output will contain the Speaker tag. If diarization is not used, it will show 'Speaker: Null' in the JSON output.
+
+Supported locales are listed below.
+
+| Language | locale |
+|--------|-------|
+| English | en-US |
+| Chinese | zh-CN |
+| Deutsch | de-DE |
+
 ## Sentiment
 
 Sentiment is a new feature in Batch Transcription API and is an important feature in the call center domain. Customers can use the `AddSentiment` parameters to their requests to 
@@ -107,7 +141,7 @@ Sentiment is a new feature in Batch Transcription API and is an important featur
 4.	Pinpoint what went well when turning negative calls to positive
 5.	Identify what customers like and what they dislike about a product or a service
 
-Sentiment is scored per audio segment where an audio segment is defined as the time lapse between the start of the utterance (offset) and the detection silence of end of byte stream. The entire text within that segment is used to calculate sentiment. We DO NOT calculate any aggregate sentiment values for the entire call or the entire speech of each channel. These are left to the domain owner to further apply.
+Sentiment is scored per audio segment where an audio segment is defined as the time lapse between the start of the utterance (offset) and the detection silence of end of byte stream. The entire text within that segment is used to calculate sentiment. We DO NOT calculate any aggregate sentiment values for the entire call or the entire speech of each channel. These aggregations are left to the domain owner to further apply.
 
 Sentiment is applied on the lexical form.
 
@@ -146,7 +180,7 @@ A JSON output sample looks like below:
   ]
 }
 ```
-The features uses a Sentiment model which is currently in Beta.
+The feature uses a Sentiment model, which is currently in Beta.
 
 ## Sample code
 

articles/cognitive-services/Speech-Service/how-to-custom-speech-test-data.md

@@ -133,11 +133,11 @@ If there are uncommon terms without standard pronunciations that your users will
 
 This includes examples of a spoken utterance, and a custom pronunciation for each:
 
-| Spoken form | Recognized/displayed form |
+| Recognized/displayed form | Spoken form |
 |--------------|--------------------------|
-| three c p o | 3CPO |  
-| c n t k | CNTK |
-| i triple e | IEEE |
+| 3CPO | three c p o |  
+| CNTK | c n t k |
+| IEEE | i triple e |
 
 The spoken form is the phonetic sequence spelled out. It can be composed of letter, words, syllables, or a combination of all three.
 

articles/container-registry/TOC.yml

@@ -89,12 +89,14 @@
         href: container-registry-auth-aks.md
     - name: Content trust
       href: container-registry-content-trust.md
-  - name: Build and patch
+  - name: ACR Tasks
     items:
-      - name: ACR Tasks
+      - name: ACR Tasks overview
         href: container-registry-tasks-overview.md
       - name: Multi-step tasks
         href: container-registry-tasks-multi-step.md
+      - name: Use with managed identity
+        href: container-registry-tasks-authentication-managed-identity.md
   - name: Registries and other Azure services
     items:
       - name: Azure Container Instances