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

Author: BethWilke

articles/active-directory-b2c/json-transformations.md

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: reference
-ms.date: 12/10/2019
+ms.date: 04/21/2020
 ms.author: mimart
 ms.subservice: B2C
 ---
@@ -219,6 +219,39 @@ In the following example, the claims transformation extracts the `id` element fr
 - Output claims:
     - **extractedClaim**: 6353399
 
+## GetSingleItemFromJson
+
+Gets the first element from a JSON data.
+
+| Item | TransformationClaimType | Data Type | Notes |
+| ---- | ----------------------- | --------- | ----- |
+| InputClaim | inputJson | string | The ClaimTypes that are used by the claims transformation to get the item from the JSON data. |
+| OutputClaim | key | string | The first element key in the JSON. |
+| OutputClaim | value | string | The first element value in the JSON. |
+
+In the following example, the claims transformation extracts the first element (given name) from the JSON data.
+
+```XML
+<ClaimsTransformation Id="GetGivenNameFromResponse" TransformationMethod="GetSingleItemFromJson">
+  <InputClaims>
+    <InputClaim ClaimTypeReferenceId="json" TransformationClaimType="inputJson" />
+  </InputClaims>
+  <OutputClaims>
+    <OutputClaim ClaimTypeReferenceId="givenNameKey" TransformationClaimType="key" />
+    <OutputClaim ClaimTypeReferenceId="givenName" TransformationClaimType="value" />
+  </OutputClaims>
+</ClaimsTransformation>
+```
+
+### Example
+
+- Input claims:
+  - **inputJson**: {"givenName": "Emilty", "lastName": "Smith"}
+- Output claims:
+  - **key**: givenName
+  - **value**: Emilty
+
+
 ## GetSingleValueFromJsonArray
 
 Gets the first element from a JSON data array.
@@ -290,3 +323,5 @@ Output claim:
   }
 }
 ```
+
+

articles/app-service/webjobs-sdk-how-to.md

@@ -122,7 +122,7 @@ In version 3.*x*, the connection limit defaults to infinite connections. If for
 
 In version 2.*x*, you control the number of concurrent connections to a host by using the [ServicePointManager.DefaultConnectionLimit](/dotnet/api/system.net.servicepointmanager.defaultconnectionlimit#System_Net_ServicePointManager_DefaultConnectionLimit) API. In 2.*x*, you should increase this value from the default of 2 before starting your WebJobs host.
 
-All outgoing HTTP requests that you make from a function by using `HttpClient` flow through `ServicePointManager`. After you reach the value set in `DefaultConnectionLimit`, `ServicePointManager` starts queueing requests before sending them. Suppose your `DefaultConnectionLimit` is set to 2 and your code makes 1,000 HTTP requests. Initially, only two requests are allowed through to the OS. The other 998 are queued until there’s room for them. That means your `HttpClient` might time out because it appears to have made the request, but the request was never sent by the OS to the destination server. So you might see behavior that doesn't seem to make sense: your local `HttpClient` is taking 10 seconds to complete a request, but your service is returning every request in 200 ms. 
+All outgoing HTTP requests that you make from a function by using `HttpClient` flow through `ServicePointManager`. After you reach the value set in `DefaultConnectionLimit`, `ServicePointManager` starts queueing requests before sending them. Suppose your `DefaultConnectionLimit` is set to 2 and your code makes 1,000 HTTP requests. Initially, only two requests are allowed through to the OS. The other 998 are queued until there's room for them. That means your `HttpClient` might time out because it appears to have made the request, but the request was never sent by the OS to the destination server. So you might see behavior that doesn't seem to make sense: your local `HttpClient` is taking 10 seconds to complete a request, but your service is returning every request in 200 ms. 
 
 The default value for ASP.NET applications is `Int32.MaxValue`, and that's likely to work well for WebJobs running in a Basic or higher App Service Plan. WebJobs typically need the Always On setting, and that's supported only by Basic and higher App Service Plans.
 
@@ -420,7 +420,7 @@ static async Task Main()
 }
 ```
 
-For more details, see the [Event Hubs binding](../azure-functions/functions-bindings-event-hubs-output.md#hostjson-settings) article.
+For more details, see the [Event Hubs binding](../azure-functions/functions-bindings-event-hubs-trigger.md#host-json) article.
 
 ### Queue storage trigger configuration
 

articles/automation/TOC.yml

@@ -44,9 +44,9 @@
   items:
     - name: Automation Account
       items:
-        - name: Create Automation account using Azure portal
+        - name: Create from Azure portal
           href: automation-create-standalone-account.md
-        - name: Create Automation account with Resource Manager template
+        - name: Create with Resource Manager template
           href: automation-create-account-template.md
         - name: Manage an Automation Run As account
           href: manage-runas-account.md
@@ -134,7 +134,7 @@
           href: source-control-integration.md
     - name: Configuration Management
       items:
-        - name: Manage State Configuration (DSC)
+        - name: State Configuration (DSC)
           items:
             - name: Overview
               href: automation-dsc-overview.md
@@ -156,21 +156,21 @@
               href: automation-dsc-diagnostics.md
             - name: Troubleshoot issues with DSC
               href: troubleshoot/desired-state-configuration.md
-        - name: Manage Change Tracking and Inventory
+        - name: Change Tracking and Inventory
           items:
             - name: Overview
               href: change-tracking.md
             - name: Supported regions for linked Log Analytics workspace
               href: how-to/region-mappings.md
             - name: Enable Change Tracking and Inventory
               items:
-                - name: Use Azure portal
+                - name: Enable from Azure portal
                   href: automation-onboard-solutions-from-browse.md
-                - name: From an Azure VM
+                - name: Enable from Azure VM
                   href: automation-onboard-solutions-from-vm.md
-                - name: From an Automation account
+                - name: Enable from Automation account
                   href: automation-onboard-solutions-from-automation-account.md
-                - name: From an Automation runbook
+                - name: Enable from Automation runbook
                   href: automation-onboard-solutions.md
             - name: View contents of tracked files
               href: change-tracking-file-contents.md
@@ -206,11 +206,11 @@
           items:
             - name: Use a Resource Manager template
               href: automation-update-management-deploy-template.md
-            - name: Use Azure portal
+            - name: Enable from Azure portal
               href: automation-onboard-solutions-from-browse.md
-            - name: From an Azure VM
+            - name: Enable from an Azure VM
               href: automation-onboard-solutions-from-vm.md
-            - name: From an Automation account
+            - name: Enable from Automation account
               href: automation-onboard-solutions-from-automation-account.md      
         - name: Manage updates for your Azure VMs
           href: automation-tutorial-update-management.md

articles/azure-functions/functions-host-json-v1.md

@@ -143,9 +143,7 @@ Configuration settings for the [Azure Cosmos DB trigger and bindings](functions-
 
 ## eventHub
 
-Configuration settings for [Event Hub triggers and bindings](functions-bindings-event-hubs.md).
-
-[!INCLUDE [functions-host-json-event-hubs](../../includes/functions-host-json-event-hubs.md)]
+Configuration settings for [Event Hub triggers and bindings](functions-bindings-event-hubs-trigger.md#functions-1x).
 
 ## functions
 

articles/azure-functions/functions-host-json.md

@@ -211,7 +211,7 @@ Configuration setting can be found in [bindings for Durable Functions](durable/d
 
 ## eventHub
 
-Configuration settings can be found in [Event Hub triggers and bindings](functions-bindings-event-hubs-output.md#host-json). 
+Configuration settings can be found in [Event Hub triggers and bindings](functions-bindings-event-hubs-trigger.md#host-json). 
 
 ## extensions
 

articles/azure-monitor/platform/customer-managed-keys.md

@@ -573,7 +573,8 @@ All your data is accessible after the key rotation operation including data inge
 
   200 OK
 
-- Recover your *Cluster* resource and your data -- during the soft-delete period, create a *Cluster* resource with the same name and in the same subscription, resource group and region. Follow the [Create Cluster resource](#create-cluster-resource) step to recover your *Cluster* resource. Previously associated workspaces were de-associated from the *Cluster* resource at delete time and you need to [associate your workspaces](#workspace-association-to-cluster-resource) after the recovery.
+- Recover your *Cluster* resource and your data -- 
+A *Cluster* resource that was deleted in the last 14 days is in soft-delete state and can be recovered. This is performed manually by the product group currently. Use your Microsoft channel for recovery requests.
 
 ## Appendix