Merge branch 'master' of https://github.com/Microsoft/azure-docs-pr into cert3

Author: cherylmc

articles/azure-government/TOC.md

@@ -36,3 +36,4 @@
 ## [Pricing](https://azure.microsoft.com/pricing/)
 ## [Trial](https://azuregov.microsoft.com/trial/azuregovtrial)
 ## [Blog](https://blogs.msdn.microsoft.com/azuregov/)
+## [Azure Government Website](https://azure.microsoft.com/overview/clouds/government/)

articles/hdinsight/hdinsight-component-versioning.md

@@ -1,6 +1,6 @@
 ---
 title: Hadoop components & versions - Azure HDInsight | Microsoft Docs
-description: HDInsight supports multiple deployable Hadoop cluster components and versions. See the Hadoop and HortonWorks Data Platform (HDP) distribution versions supported.
+description: Learn the Hadoop components and versions in HDInsight and the service levels available in this cloud distribution of HortonWorks Data Platform.
 services: hdinsight
 editor: cgronlun
 manager: jhubbard
@@ -20,7 +20,7 @@ ms.author: saurinsh
 ---
 # What are the different Hadoop components and versions available with HDInsight?
 
-Find out about the different service levels offered by HDInsight, as well as the versions of different Hadoop components included.
+Learn about the service levels offered for Azure HDInsight, as well as the Hadoop ecosystem components and versions included. Each HDInsight version is a cloud distribution of a version of the HortonWorks Data Platform (HDP).
 
 ## HDInsight Standard and HDInsight Premium
 
@@ -110,7 +110,7 @@ The SLA is defined in terms of a "Support Window". A Support Window refers to th
 * Formula 1: Add 180 days to the date HDInsight cluster version X was released.
 * Formula 2: Add 90 days to the date HDInsight cluster version X+1 (the subsequent version after X) is made available in the Portal.
 
-The **Deprecation Date** is the date after which the cluster version cannot be created on HDInsight. Starting July 31st 2017, you cannot resize a cluster after it's deprecation date. 
+The **Deprecation Date** is the date after which the cluster version cannot be created on HDInsight. Starting July 31st 2017, you cannot resize a cluster after it's deprecation date.
 
 > [!NOTE]
 > Windows-based HDInsight cluster (including version 2.1, 3.0, 3.1, 3.2 and 3.3) run on Azure Guest OS Family 4, which uses the 64-bit version of Windows Server 2012 R2 and supports .NET Framework 4.0, 4.5, 4.5.1, and 4.5.2.

articles/logic-apps/TOC.md

@@ -17,9 +17,11 @@
 ## Build
 ### [Create a connector](logic-apps-create-api-app.md)
 ### [Use File System connector](logic-apps-using-file-connector.md)
+### [Use SAP connector](logic-apps-using-sap-connector.md)
 ### [Visual Studio tools](logic-apps-deploy-from-vs.md)
 ### [Using Azure functions](logic-apps-azure-functions.md)
 ### [Logic apps as callable endpoints](logic-apps-http-endpoint.md)
+### [Loops, scopes, and debatching](logic-apps-loops-and-scopes.md)
 ### [Using your custom API](logic-apps-custom-hosted-api.md)
 ### [Exception handling](logic-apps-exception-handling.md)
 ### [Exception handling scenario](logic-apps-scenario-error-and-exception-handling.md)
@@ -41,6 +43,7 @@
 ### [Using certificates](logic-apps-enterprise-integration-certificates.md)
 ### [Add partners](logic-apps-enterprise-integration-partners.md)
 ### [Add schemas](logic-apps-enterprise-integration-schemas.md)
+### [Store metadata](logic-apps-enterprise-integration-metadata.md)
 ### [AS2 integration](logic-apps-enterprise-integration-as2.md)
 ### [AS2 encoding](logic-apps-enterprise-integration-as2-encode.md)
 ### [AS2 decoding](logic-apps-enterprise-integration-as2-decode.md)
@@ -62,12 +65,14 @@
 
 ## Manage
 ### [Use Visual Studio Cloud Explorer](logic-apps-manage-from-vs.md)
+### [Secure your logic app](logic-apps-securing-a-logic-app.md)
 ### [Monitor logic apps](logic-apps-monitor-your-logic-apps.md)
 ### [Monitor B2B messages](logic-apps-monitor-b2b-message.md)
 #### [AS2 tracking schema](logic-apps-track-integration-account-as2-tracking-schemas.md)
 #### [X12 tracking schema](logic-apps-track-integration-account-x12-tracking-schema.md)
 #### [Custom tracking schema](logic-apps-track-integration-account-custom-tracking-schema.md)
 #### [Track B2B messages](logic-apps-track-b2b-messages-omsportal.md)
+#### [Query OMS portal](logic-apps-track-b2b-messages-omsportal-query-filter-control-number.md)
 
 ### [Integration accounts](logic-apps-enterprise-integration-accounts.md)
 ### [Pricing](logic-apps-pricing.md)

articles/logic-apps/logic-apps-enterprise-integration-metadata.md

@@ -25,18 +25,18 @@ Partners, agreements, schemas, maps added to an integration account, store metad
 
 ## How to Store metadata 
 
-1. Create an [Integration Account](../logic-apps/logic-apps-enterprise-integration-create-integration-account.md)   
+1. Create an [Integration Account](logic-apps-enterprise-integration-create-integration-account.md)   
 
-2. Add a [partner](logic-apps-enterprise-integration-partners.md#how-to-create-a-partner) or an [agreement](../logic-apps/logic-apps-enterprise-integration-agreements.md#how-to-create-agreements) or a [schema](logic-apps-enterprise-integration-schemas.md) in integration account
+2. Add a [partner](logic-apps-enterprise-integration-partners.md#how-to-create-a-partner) or an [agreement](logic-apps-enterprise-integration-agreements.md#how-to-create-agreements) or a [schema](logic-apps-enterprise-integration-schemas.md) in integration account
 
 3. Select a parter or an agreement, or a schema. select **Edit as JSON** and enter metadata details    
 ![Enter metadata](media/logic-apps-enterprise-integration-metadata/image1.png)  
 
 ## Call **Integration Account Artifact LookUp** from a logic app
 
-1. Create a [Logic App](../logic-apps/logic-apps-create-a-logic-app.md)
+1. Create a [Logic App](logic-apps-create-a-logic-app.md)
 
-2. [Link](../logic-apps/logic-apps-enterprise-integration-create-integration-account.md#how-to-link-an-integration-account-to-a-logic-app) Logic App with an Integration Account    
+2. [Link](logic-apps-enterprise-integration-create-integration-account.md#how-to-link-an-integration-account-to-a-logic-app) Logic App with an Integration Account    
 
 3. Create a trigger, for example using *Request* or *HTTP* before searching for **Integration Account Artifact LookUp**.  Search **integration** to look for **Integration Account Artifact LookUp** 
 ![Search lookup](media/logic-apps-enterprise-integration-metadata/image2.png) 
@@ -59,4 +59,4 @@ Partners, agreements, schemas, maps added to an integration account, store metad
 
 
 ## Next steps
-* [Learn more about agreements](../logic-apps/logic-apps-enterprise-integration-agreements.md "Learn about enterprise integration agreements")  
+* [Learn more about agreements](logic-apps-enterprise-integration-agreements.md "Learn about enterprise integration agreements")  

articles/logic-apps/logic-apps-securing-a-logic-app.md

@@ -85,7 +85,7 @@ A valid IP range takes the format `192.168.1.1/255`.  If you want the logic app
 
 #### Setting IP ranges on the resource definition
 
-If you are using a [deployment template](../logic-apps/logic-apps-create-deploy-template.md) to automate your deployments, the IP range settings can be configured on the resource template.  
+If you are using a [deployment template](logic-apps-create-deploy-template.md) to automate your deployments, the IP range settings can be configured on the resource template.  
 
 ``` json
 {
@@ -138,7 +138,7 @@ This setting can be configured within the resource settings of the Azure portal:
 
 #### Setting IP ranges on the resource definition
 
-If you are using a [deployment template](../logic-apps/logic-apps-create-deploy-template.md) to automate your deployments, the IP range settings can be configured on the resource template.  
+If you are using a [deployment template](logic-apps-create-deploy-template.md) to automate your deployments, the IP range settings can be configured on the resource template.  
 
 ``` json
 {
@@ -252,15 +252,15 @@ When working with an HTTP, HTTP + Swagger (Open API), or Webhook action, you can
 
 ### Restricting access to logic app IP addresses
 
-All calls from logic apps come from a specific set of IP addresses per region.  You can add additional filtering to only accept requests from those designated IP addresses.  A list of those IP addresses can be found [in this article](../logic-apps/logic-apps-limits-and-config.md#configuration).
+All calls from logic apps come from a specific set of IP addresses per region.  You can add additional filtering to only accept requests from those designated IP addresses.  A list of those IP addresses can be found [in this article](logic-apps-limits-and-config.md#configuration).
 
 ### On-premises connectivity
 
 Logic apps provides integration with a number of services to provide secure and reliable on-premises communication.
 
 #### On-premises data gateway
 
-Many of the managed connectors from logic apps provide secure connectivity to on-premises systems, including File System, SQL, SharePoint, DB2, and more.  The gateway leverages encrypted channels via Azure Service Bus to relay data on-premises, and all traffic originates from secure outbound traffic from the gateway agent.  More details on how the gateway works [in this article](../logic-apps/logic-apps-gateway-install.md#how-the-gateway-works).
+Many of the managed connectors from logic apps provide secure connectivity to on-premises systems, including File System, SQL, SharePoint, DB2, and more.  The gateway leverages encrypted channels via Azure Service Bus to relay data on-premises, and all traffic originates from secure outbound traffic from the gateway agent.  More details on how the gateway works [in this article](logic-apps-gateway-install.md#how-the-gateway-works).
 
 #### Azure API Management
 
@@ -271,7 +271,7 @@ Many of the managed connectors from logic apps provide secure connectivity to on
 You can use the on-premises hybrid connection feature for Azure API and Web apps to communicate on-premises.  Details on hybrid connections and how to configure can be found [in this article](../app-service-web/web-sites-hybrid-connection-get-started.md).
 
 ## Next steps
-[Create a deployment template](../logic-apps/logic-apps-create-deploy-template.md)  
+[Create a deployment template](logic-apps-create-deploy-template.md)  
 [Exception handling](logic-apps-exception-handling.md)  
-[Monitor your logic apps](../logic-apps/logic-apps-monitor-your-logic-apps.md)  
-[Diagnosing logic app failures and issues](../logic-apps/logic-apps-diagnosing-failures.md)  
+[Monitor your logic apps](logic-apps-monitor-your-logic-apps.md)  
+[Diagnosing logic app failures and issues](logic-apps-diagnosing-failures.md)