Merge branch 'master' of https://github.com/Azure/azure-content-pr in…

…to FromPrivateRepo

articles/active-directory/active-directory-manage-groups.md

@@ -20,7 +20,7 @@
 
 # Managing access to resources with Azure Active Directory groups
 
-Azure Active Directory (Azure AD) is a comprehensive identity and access management solution that provides a robust set of capabilities to manage access to on-premises and cloud applications and resources including Microsoft online services like Office 365 and a world of non-Microsoft SaaS applications. This article provides an overview, but if you want to start using Azure AD groups right now, follow the instructions in [Managing security groups in Azure AD](active-directory-accessmanagement-manage-groups.md). If you want to see how you can use PowerShell to manage groups in Azure Active directory you can read more in [Azure Active Directory preview cmdlets for group management](https://azure.microsoft.com/en-us/documentation/articles/active-directory-accessmanagement-groups-settings-v2-cmdlets/). 
+Azure Active Directory (Azure AD) is a comprehensive identity and access management solution that provides a robust set of capabilities to manage access to on-premises and cloud applications and resources including Microsoft online services like Office 365 and a world of non-Microsoft SaaS applications. This article provides an overview, but if you want to start using Azure AD groups right now, follow the instructions in [Managing security groups in Azure AD](active-directory-accessmanagement-manage-groups.md). If you want to see how you can use PowerShell to manage groups in Azure Active directory you can read more in [Azure Active Directory preview cmdlets for group management](active-directory-accessmanagement-groups-settings-v2-cmdlets.md). 
 
 
 > [AZURE.NOTE] To use Azure Active Directory, you need an Azure account. If you don't have an account, you can [sign up for a free Azure account](https://azure.microsoft.com/pricing/free-trial/).

articles/app-service-logic/app-service-logic-enterprise-integration-flatfile.md

@@ -1,10 +1,10 @@
-<properties 
-	pageTitle="Learn to encode or decode flat files using the Enterprise Integration Pack and Logic apps| Microsoft Azure App Service | Microsoft Azure" 
-	description="Use the features of Enterprise Integration Pack and Logic apps to encode or decode flat files" 
-	services="app-service\logic" 
+<properties
+	pageTitle="Learn to encode or decode flat files using the Enterprise Integration Pack and Logic apps| Microsoft Azure App Service | Microsoft Azure"
+	description="Use the features of Enterprise Integration Pack and Logic apps to encode or decode flat files"
+	services="app-service\logic"
 	documentationCenter=".net,nodejs,java"
-	authors="msftman" 
-	manager="erikre" 
+	authors="msftman"
+	manager="erikre"
 	editor="cgronlun"/>
 
 <tags 
@@ -20,57 +20,65 @@
 
 ## Overview
 
-You will use the flat file encoding connector from within a Logic app that encodes XML content. You may want to encode XML content before you send it to a business partner in a B2B scenario. The Logic app that you create can get its XML content from a variety of sources including from an HTTP request trigger or from another application or even from one of the many [connectors](../connectors/apis-list.md). Check out the [Logic apps documentation](./app-service-logic-what-are-logic-apps.md "Learn more about Logic apps") for more about the power of Logic apps.  
+You may want to encode XML content before you send it to a business partner in a business-to-business (B2B) scenario. In a logic app made by the Logic Apps feature of the Azure App Service, you can use the flat file encoding connector to do this. The logic app that you create can get its XML content from a variety of sources, including from an HTTP request trigger, from another application, or even from one of the many [connectors](../connectors/apis-list.md). For more information about logic apps, see the [logic apps documentation](./app-service-logic-what-are-logic-apps.md "Learn more about Logic apps").  
 
 ## How to create the flat file encoding connector
 
-Follow these steps to create a Logic app and add a flat file encoding connector to the Logic app
-
-1. Create a Logic app and [link it to your integration account](./app-service-logic-enterprise-integration-accounts.md "Learn to link an integration account to a Logic app") that contains the schema you will use to encode the XML data.  
-2. Add a **Request - When an HTTP request is received** trigger to your Logic app  
-![](./media/app-service-logic-enterprise-integration-flatfile/flatfile-1.png)    
-3. Add the flat file encoding action by:  
--  Select the **plus** sign  
--  Select the **Add an action** link that is presented after you have selected the plus sign  
--  Enter *Flat* in the search box in order to filter all the actions to the one that you want to use   
--  Select the **Flat File Encoding** action from the list   
-![](./media/app-service-logic-enterprise-integration-flatfile/flatfile-2.png)   
-6. Select the **CONTENT** text box on the Flat File Encoding control that pops up  
-![](./media/app-service-logic-enterprise-integration-flatfile/flatfile-3.png)  
-7. Select the body tag as the content that you want to encode. The body tag will populate the content field.     
-![](./media/app-service-logic-enterprise-integration-flatfile/flatfile-4.png)  
-8. Select the **SCHEMA NAME** list box and choose the schema you want to use to encode the input *content* above     
-![](./media/app-service-logic-enterprise-integration-flatfile/flatfile-5.png)  
-9. Save your work   
-![](./media/app-service-logic-enterprise-integration-flatfile/flatfile-6.png)  
-
-At this point, you are finished setting up your flat file encoding connector. In a real world application, you may want to store the encoded data in an LOB application such as SalesForce or send that encoded data to a trading partner. You can easily add an action to send the output of the encoding action to Salesforce or to your trading partner using any one of the other connectors provided. 
-
-You can now test your connector by making a request to the HTTP endpoint and including the XML content in the body of the request.  
+Follow these steps to add a flat file encoding connector to your logic app.
+
+1. Create a logic app and [link it to your integration account](./app-service-logic-enterprise-integration-accounts.md "Learn to link an integration account to a Logic app"). This account contains the schema you will use to encode the XML data.  
+2. Add a **Request - When an HTTP request is received** trigger to your logic app.  
+![Screenshot of trigger to select](./media/app-service-logic-enterprise-integration-flatfile/flatfile-1.png)    
+3. Add the flat file encoding action, as follows:
+
+    a. Select the **plus** sign.
+
+	b. Select the **Add an action** link (appears after you have selected the plus sign).
+
+	c. In the search box, enter *Flat* to filter all the actions to the one that you want to use.
+
+	d. Select the **Flat File Encoding** option from the list.   
+![Screenshot of Flat File Encoding option](./media/app-service-logic-enterprise-integration-flatfile/flatfile-2.png)   
+4. On the **Flat File Encoding** dialog box, select the **Content** text box.  
+![Screenshot of Content text box](./media/app-service-logic-enterprise-integration-flatfile/flatfile-3.png)  
+5. Select the body tag as the content that you want to encode. The body tag will populate the content field.     
+![Screenshot of body tag](./media/app-service-logic-enterprise-integration-flatfile/flatfile-4.png)  
+6. Select the **Schema Name** list box, and choose the schema you want to use to encode the input content.    
+![Screenshot of Schema Name list box](./media/app-service-logic-enterprise-integration-flatfile/flatfile-5.png)  
+7. Save your work.   
+![Screenshot of Save icon](./media/app-service-logic-enterprise-integration-flatfile/flatfile-6.png)  
+
+At this point, you are finished setting up your flat file encoding connector. In a real world application, you may want to store the encoded data in a line-of-business application, such as Salesforce. Or you can send that encoded data to a trading partner. You can easily add an action to send the output of the encoding action to Salesforce, or to your trading partner, by using any one of the other connectors provided.
+
+You can now test your connector by making a request to the HTTP endpoint, and including the XML content in the body of the request.  
 
 ## How to create the flat file decoding connector
 
-### Prerequisite
-You need to have a schema file already uploaded into you integration account in order to complete these steps.
-
-1. Add a **Request - When an HTTP request is received** trigger to your Logic app  
-![](./media/app-service-logic-enterprise-integration-flatfile/flatfile-1.png)    
-2. Add the flat file encoding action by:  
--  Select the **plus** sign  
--  Select the **Add an action** link that is presented after you have selected the plus sign  
--  Enter *Flat* in the search box in order to filter all the actions to the one that you want to use   
--  Select the **Flat File Decoding** action from the list   
-![](./media/app-service-logic-enterprise-integration-flatfile/flatfile-2.png)   
-- Select the **CONTENT** control. This will produce a list of the content from earlier steps that you can use as the content to decode. You will notice the *Body* from the incoming HTTP request is available to be used as the content to decode. Note that you can also enter the content to decode directly into the **CONTENT** control. In this example, I selected *Body* to use the body of the incoming HTTP request from step 1 of the decoding steps.    
-- Select the *Body* tag. Notice the body tag is now in the CONTENT control.
-- Select the name of the Schema that you want to use to decode the content. In this example, I select *OrderFile*. Note that OrderFile is the name of the schema that I uploaded into my integration account at some point before.
-![](./media/app-service-logic-enterprise-integration-flatfile/flatfile-decode-1.png)    
-- Select the **Save** link from the menu to save your work  
-![](./media/app-service-logic-enterprise-integration-flatfile/flatfile-6.png)    
-
-At this point, you are finished setting up your flat file decoding connector. In a real world application, you may want to store the decoded data in an LOB application such as SalesForce. You can easily add an action to send the output of the decoding action to Salesforce. 
+>[AZURE.NOTE] To complete these steps, you need to have a schema file already uploaded into you integration account.
+
+1. Add a **Request - When an HTTP request is received** trigger to your logic app.  
+![Screenshot of trigger to select](./media/app-service-logic-enterprise-integration-flatfile/flatfile-1.png)    
+2. Add the flat file decoding action, as follows:
+
+    a. Select the **plus** sign.
+
+	b. Select the **Add an action** link (appears after you have selected the plus sign).
+
+	c. In the search box, enter *Flat* to filter all the actions to the one that you want to use.
+
+	d. Select the **Flat File Decoding** option from the list.   
+![Screenshot of Flat File Decoding option](./media/app-service-logic-enterprise-integration-flatfile/flatfile-2.png)   
+- Select the **Content** control. This produces a list of the content from earlier steps that you can use as the content to decode. Notice that the *Body* from the incoming HTTP request is available to be used as the content to decode. You can also enter the content to decode directly into the **Content** control.     
+- Select the *Body* tag. Notice the body tag is now in the **Content** control.
+- Select the name of the schema that you want to use to decode the content. The following screenshot shows that *OrderFile* is the selected schema name. This schema name had been uploaded into the integration account previously.
+
+ ![Screenshot of Flat File Decoding dialog box](./media/app-service-logic-enterprise-integration-flatfile/flatfile-decode-1.png)    
+- Save your work.  
+![Screenshot of Save icon](./media/app-service-logic-enterprise-integration-flatfile/flatfile-6.png)    
+
+At this point, you are finished setting up your flat file decoding connector. In a real world application, you may want to store the decoded data in a line-of-business application such as Salesforce. You can easily add an action to send the output of the decoding action to Salesforce.
 
 You can now test your connector by making a request to the HTTP endpoint and including the XML content you want to decode in the body of the request.  
 
-## Learn more
-- [Learn more about the Enterprise Integration Pack](./app-service-logic-enterprise-integration-overview.md "Learn about Enterprise Integration Pack")  
+## Next steps
+- [Learn more about the Enterprise Integration Pack](./app-service-logic-enterprise-integration-overview.md "Learn about Enterprise Integration Pack").  

articles/app-service-logic/app-service-logic-pricing.md

@@ -8,27 +8,27 @@
 	documentationCenter=""/>
 
 <tags
-	ms.service="app-service-logic"
+	ms.service="logic-apps"
 	ms.workload="na"
 	ms.tgt_pltfrm="na"
 	ms.devlang="na"
 	ms.topic="article" 
-	ms.date="07/25/2016"
+	ms.date="07/27/2016"
 	ms.author="klam"/>
 
 # Logic Apps pricing model
 
-Logic Apps allows you to scale and execute a integration workflows in the cloud.  Below are details on the billing and pricing plans for Azure Logic Apps.
+Azure Logic Apps allows you to scale and execute integration workflows in the cloud.  Below are details on the billing and pricing plans for Logic Apps.
 
 ## Consumption pricing
 
-Newly created Logic Apps use a consumption plan. With Logic Apps consumption pricing model, you only pay for what you use.  Logic Apps are not throttled when using a consumption plan.
-All action executions performed in the execution of a logic app instance are metered.
+Newly created Logic Apps use a consumption plan. With the Logic Apps consumption pricing model, you only pay for what you use.  Logic Apps are not throttled when using a consumption plan.
+All actions executed in a run of a logic app instance are metered.
 
 ### What are action executions?
 
-Every step in a logic app definition is an action.  This includes triggers, control flow steps like conditions, scopes, for each loops, and do until loops, calls to connectors and calls to native actions.
-Triggers are just special actions that are designed to instantiate a new instance of logic app when a particular event is received.  There are a number of different behaviors for triggers which could affect how the logic app is metered.
+Every step in a logic app definition is an action.  This includes triggers, control flow steps like conditions, scopes, for each loops, do until loops, calls to connectors and calls to native actions.
+Triggers are just special actions that are designed to instantiate a new instance of a logic app when a particular event occurs.  There are a number of different behaviors for triggers which could affect how the logic app is metered.
 
 -	**Polling trigger** – this trigger continually polls an endpoint until it receives a message that satisfies the criteria for creating a new instance of a logic app.  The polling interval can be configured in the trigger in the Logic Apps designer.  Each polling request, even if it doesn’t create a new instance of a logic app, will count as an action execution.
 
@@ -38,7 +38,7 @@ Triggers are just special actions that are designed to instantiate a new instanc
 
 Trigger executions can be seen in the Logic Apps resource blade in the Trigger History part.
 
-All actions that were executed whether they were successful or failed are metered as an action execution.  Actions that were skipped due to a condition not being met or actions that didn’t execute because the logic app terminated before completion are not counted as action executions.
+All actions that were executed, whether they were successful or failed are metered as an action execution.  Actions that were skipped due to a condition not being met or actions that didn’t execute because the logic app terminated before completion are not counted as action executions.
 
 Actions executed within loops are counted per iteration of the loop.  For example, a single action in a for each loop iterating through a list of 10 items will be counted as the count of items in the list (10) multiplied by the number of actions in the loop (1) plus one for the initiation of the loop which, in this example, would be (10 * 1) + 1 = 11 action executions.
 
@@ -54,15 +54,15 @@ App Service Plans and their daily allowed action executions:
 |---|---|---|---|
 |Action executions per day| 200|10,000|50,000|
 
-To change a Logic App that has an App Service Plan associated with it to a consumption model remove the reference to the App Service Plan in the Logic App definition.  This can be done with a simple call to a PowerShell cmdlet:
+To change a Logic App that has an App Service Plan associated with it to a consumption model remove the reference to the App Service Plan in the Logic App definition.  This can be done with a call to a PowerShell cmdlet:
 
 `Set-AzureRmLogicApp -ResourceGroupName ‘rgname’ -Name ‘wfname’ –UseConsumptionModel -Force`
 
 ## Pricing
 
 For pricing details please see [Logic Apps Pricing](https://azure.microsoft.com/pricing/details/logic-apps/).
 
-## Next Steps
+## Next steps
 
 - [An overview of Logic Apps][whatis]
 - [Create your first logic app][create]