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

…to tamram-stg46

articles/active-directory/active-directory-saas-amazon-web-service.md

@@ -57,20 +57,35 @@ To configure the integration of Amazon Web Service (AWS) into Azure AD, you need
 
 ### To add Amazon Web Service (AWS) from the gallery, perform the following steps:
 
-1. In the **Azure Management Portal**, on the left navigation pane, click **Active Directory**. <br><br>
+1. In the **Azure Management Portal**, on the left navigation pane, click **Active Directory**.
+
 ![Active Directory][1]
 
 2. From the **Directory** list, select the directory for which you want to enable directory integration.
 
-3. To open the applications view, in the directory view, click **Applications** in the top menu.<br><br>
+3. To open the applications view, in the directory view, click **Applications** in the top menu.
+
+
 ![Applications][2]
-4. Click **Add** at the bottom of the page.<br><br>
+
+4. Click **Add** at the bottom of the page.
+
+
 ![Applications][3]
-5. On the **What do you want to do** dialog, click **Add an application from the gallery**.<br><br>
+
+5. On the **What do you want to do** dialog, click **Add an application from the gallery**.
+
+
 ![Applications][4]
-6. In the search box, type **Amazon Web Service (AWS)**.<br><br>
+
+6. In the search box, type **Amazon Web Service (AWS)**.
+
+
 ![Applications][5]
-7. In the results pane, select **Amazon Web Service (AWS)**, and then click **Complete** to add the application.<br><br>
+
+7. In the results pane, select **Amazon Web Service (AWS)**, and then click **Complete** to add the application.
+
+
 ![Applications][6]
 
 
@@ -94,29 +109,47 @@ To configure and test Azure AD single sign-on with Amazon Web Service (AWS), you
 The objective of this section is to enable Azure AD single sign-on in the Azure AD portal and to configure single sign-on in your Amazon Web Service (AWS) application.<br>
 Your Amazon Web Service (AWS) application expects the SAML assertions in a specific format, which requires you to add custom attribute mappings to your **saml token attributes** configuration. 
 The following screenshot shows an example for this.
-<br><br> ![Configure Single Sign-On][27]
+
+
+![Configure Single Sign-On][27]
 
 **To configure Azure AD single sign-on with Amazon Web Service (AWS), perform the following steps:**
 
-1. In the Azure AD portal, on the **Amazon Web Service (AWS)** application integration page, click **Configure single sign-on** to open the **Configure Single Sign-On**  dialog.<br><br>
+1. In the Azure AD portal, on the **Amazon Web Service (AWS)** application integration page, click **Configure single sign-on** to open the **Configure Single Sign-On**  dialog.
+
+
 ![Configure Single Sign-On][7]
 
-2. On the **How would you like users to sign on to Amazon Web Service (AWS)** page, select **Azure AD Single Sign-On**, and then click **Next**.<br><br>
+2. On the **How would you like users to sign on to Amazon Web Service (AWS)** page, select **Azure AD Single Sign-On**, and then click **Next**.
+
+
 ![Configure Single Sign-On][8]
 
-3. On the **Configure App Settings** dialog page, click Next. <br><br>![Configure App Settings][9]
+3. On the **Configure App Settings** dialog page, click Next. 
+
+![Configure App Settings][9]
 
-4. On the **Configure single sign-on at Amazon Web Service (AWS)** page, click **Download metadata**, and then save the metadata file locally on your computer.<br><br>![Configure Single Sign-On][10]
+4. On the **Configure single sign-on at Amazon Web Service (AWS)** page, click **Download metadata**, and then save the metadata file locally on your computer.
+
+![Configure Single Sign-On][10]
 
 5. In a different browser window, sign-on to your Amazon Web Service (AWS) company site as administrator.
 
-6. Click **Console Home**. <br><br> ![Configure Single Sign-On][11]
+6. Click **Console Home**. 
+
+![Configure Single Sign-On][11]
+
+7. Click **Identity and Access Management**. 
+
+![Configure Single Sign-On][12]
+
+8. Click **Identity Providers**, and then click **Create Provider**. 
 
-7. Click **Identity and Access Management**. <br><br> ![Configure Single Sign-On][12]
+![Configure Single Sign-On][13]
 
-8. Click **Identity Providers**, and then click **Create Provider**. <br><br> ![Configure Single Sign-On][13]
+9. On the **Configure Provider** dialog page, perform the following steps: 
 
-9. On the **Configure Provider** dialog page, perform the following steps: <br><br> ![Configure Single Sign-On][14]
+![Configure Single Sign-On][14]
 
      9.1. As **Provider Type**, select **SAML**.
 
@@ -127,68 +160,108 @@ The following screenshot shows an example for this.
      9.4. Click **Next Step**.
 
 
-10. On the **Verify Provider Information** dialog page, click **Create**. <br><br> ![Configure Single Sign-On][15]
+10. On the **Verify Provider Information** dialog page, click **Create**. 
 
-11. Click **Roles**, and then click **Create New Role**. <br><br> ![Configure Single Sign-On][16]
+![Configure Single Sign-On][15]
+
+11. Click **Roles**, and then click **Create New Role**. 
+
+![Configure Single Sign-On][16]
+
+12. On the **Set Role Name** dialog, perform the following steps: 
+
+![Configure Single Sign-On][17]
 
-12. On the **Set Role Name** dialog, perform the following steps: <br><br> ![Configure Single Sign-On][17]
      12.1. In the **Role Name** textbox, type a role name (e.g.: *TestUser*).
 
      12.2. Click **Next Step**.
 
-13. On the **Select Role Type** dialog, perform the following steps: <br><br> ![Configure Single Sign-On][18]
+13. On the **Select Role Type** dialog, perform the following steps: 
+
+![Configure Single Sign-On][18]
 
      13.1. Select **Role For Identity Provider Access**.
 
      13.2. In the **Grant Web Single Sign-On (WebSSO) access to SAML providers** section, click **Select**.
 
 
-14. On the **Establish Trust** dialog, perform the following steps:  <br><br> ![Configure Single Sign-On][19]
+14. On the **Establish Trust** dialog, perform the following steps:  
+
+![Configure Single Sign-On][19]
 
      14.1. As SAML provider, select the SAML provider you have created previousley (e.g.: *WAAD*) 
 
      14.2. Click **Next Step**.
 
 
-15. On the **Verify Role Trust** dialog, click **Next Step**.  <br><br> ![Configure Single Sign-On][32]
+15. On the **Verify Role Trust** dialog, click **Next Step**.  
+
+![Configure Single Sign-On][32]
+
 
+16. On the **Attach Policy** dialog, click **Next Step**.  
 
-16. On the **Attach Policy** dialog, click **Next Step**.  <br><br> ![Configure Single Sign-On][33]
+![Configure Single Sign-On][33]
 
 
-17. On the **Review** dialog, click **Create Role**.  <br><br> ![Configure Single Sign-On][34]
+17. On the **Review** dialog, perform the following steps:   
 
+![Configure Single Sign-On][34]
 
-15. On the Azure AD portal, select the single sign-on configuration confirmation, and then click **Next**.<br><br>![What is Azure AD Connect][20]
+     17.1. Copy the **Role ARN** value.
 
-16. On the **Single sign-on confirmation** page, click **Complete** to close the **Configure single sign-on** dialog.<br><br>![What is Azure AD Connect][22]
+     17.2. Copy the **Trusted Entities** ARN value.
 
+     17.2. Click **Create Role**. 
 
-17. In the menu on the top, click **Attributes** to open the **SAML Token Attributes** dialog. <br><br> ![Configure Single Sign-On][21]
+18. On the Azure AD portal, select the single sign-on configuration confirmation, and then click **Next**.
 
-18. Click **add user attribute**. <br><br> ![Configure Single Sign-On][23]
+![What is Azure AD Connect][20]
 
-19. On the Add User Attribute dialog, perform the following steps. <br><br> ![Configure Single Sign-On][24] 
+19. On the **Single sign-on confirmation** page, click **Complete** to close the **Configure single sign-on** dialog.
+
+![What is Azure AD Connect][22]
+
+
+20. In the menu on the top, click **Attributes** to open the **SAML Token Attributes** dialog. 
+
+![Configure Single Sign-On][21]
+
+21. Click **add user attribute**. 
+
+![Configure Single Sign-On][23]
+
+22. On the Add User Attribute dialog, perform the following steps. 
+
+![Configure Single Sign-On][24] 
 
      19.1. In the **Attribute Name** textbox, type **https://aws.amazon.com/SAML/Attributes/Role**.
 
-     19.2. In the **Attribute Value** textbox, type **arn:aws:iam::214510765665:role/Admin,arn:aws:iam::214510765665:saml-provider/WAAD**.
+     19.2. In the **Attribute Value** textbox, type **[the Role ARN value],[the Trusted Entity ARN value]**.
+
+     >[AZURE.TIP] These are the values you have copied from the Review dialog when you have created your role. 
 
      19.3. Click **Complete** to close the **Add User Attribute** dialog.
 
-20. Click **add user attribute**. <br><br> ![Configure Single Sign-On][23]
+23. Click **add user attribute**. 
 
+![Configure Single Sign-On][23]
 
-21. On the Add User Attribute dialog, perform the following steps. <br><br> ![Configure Single Sign-On][25] 
+
+24. On the Add User Attribute dialog, perform the following steps. 
+
+![Configure Single Sign-On][25] 
 
      21.1. In the **Attribute Name** textbox, type **https://aws.amazon.com/SAML/Attributes/RoleSessionName**.
 
-     21.2. In the **Attribute Value** list, select **user:mail**.
+     21.2. In the **Attribute Value** textbox, type **mail**.
 
      21.3. Click **Complete** to close the **Add User Attribute** dialog.
 
 
-22. Click **Apply Changes**. <br><br> ![Configure Single Sign-On][26]
+25. Click **Apply Changes**. 
+
+![Configure Single Sign-On][26]
 
 
 
@@ -201,30 +274,47 @@ In the Users list, select **Britta Simon**.<br>![Creating an Azure AD test user]
 
 **To create a test user in Azure AD, perform the following steps:**
 
-1. In the **Azure Management Portal**, on the left navigation pane, click **Active Directory**.<br>
+1. In the **Azure Management Portal**, on the left navigation pane, click **Active Directory**.
+
+
 ![Creating an Azure AD test user](./media/active-directory-saas-amazon-web-service/create_aaduser_02.png) 
 
 2. From the **Directory** list, select the directory for which you want to enable directory integration.
 
-3. To display the list of users, in the menu on the top, click **Users**.<br>![Creating an Azure AD test user](./media/active-directory-saas-amazon-web-service/create_aaduser_03.png) 
+3. To display the list of users, in the menu on the top, click **Users**.
+
+![Creating an Azure AD test user](./media/active-directory-saas-amazon-web-service/create_aaduser_03.png) 
 
-4. To open the **Add User** dialog, in the toolbar on the bottom, click **Add User**. <br>![Creating an Azure AD test user](./media/active-directory-saas-amazon-web-service/create_aaduser_04.png) 
+4. To open the **Add User** dialog, in the toolbar on the bottom, click **Add User**. 
+
+![Creating an Azure AD test user](./media/active-directory-saas-amazon-web-service/create_aaduser_04.png) 
+
+5. On the **Tell us about this user** dialog page, perform the following steps: 
+
+![Creating an Azure AD test user](./media/active-directory-saas-amazon-web-service/create_aaduser_05.png) 
 
-5. On the **Tell us about this user** dialog page, perform the following steps: <br>![Creating an Azure AD test user](./media/active-directory-saas-amazon-web-service/create_aaduser_05.png) 
   1. As Type Of User, select New user in your organization.
   2. In the User Name **textbox**, type **BrittaSimon**.
   3. Click Next.
 
-6.  On the **User Profile** dialog page, perform the following steps: <br>![Creating an Azure AD test user](./media/active-directory-saas-amazon-web-service/create_aaduser_06.png) 
+6.  On the **User Profile** dialog page, perform the following steps: 
+
+![Creating an Azure AD test user](./media/active-directory-saas-amazon-web-service/create_aaduser_06.png) 
+
   1. In the **First Name** textbox, type **Britta**.  
   2. In the **Last Name** txtbox, type, **Simon**.
   3. In the **Display Name** textbox, type **Britta Simon**.
   4. In the **Role** list, select **User**.
   5. Click **Next**.
 
-7. On the **Get temporary password** dialog page, click **create**.<br>![Creating an Azure AD test user](./media/active-directory-saas-amazon-web-service/create_aaduser_07.png) 
+7. On the **Get temporary password** dialog page, click **create**.
+
+![Creating an Azure AD test user](./media/active-directory-saas-amazon-web-service/create_aaduser_07.png) 
 
-8. On the **Get temporary password** dialog page, perform the following steps:<br>![Creating an Azure AD test user](./media/active-directory-saas-amazon-web-service/create_aaduser_08.png) 
+8. On the **Get temporary password** dialog page, perform the following steps:
+
+![Creating an Azure AD test user](./media/active-directory-saas-amazon-web-service/create_aaduser_08.png) 
+
   1. Write down the value of the **New Password**.
   2. Click **Complete**.   
 
@@ -237,13 +327,21 @@ The objective of this section is to create a user called Britta Simon in Amazon
 
 1. Log in to your **Amazon Web Service (AWS)** company site as administrator.
 
-2. Click the **Console Home** icon. <br><br> ![Configure Single Sign-On][11]
+2. Click the **Console Home** icon. 
+
+![Configure Single Sign-On][11]
+
+3. Click Identity and Access Management. 
+
+![Configure Single Sign-On][28]
+
+4. In the Dashboard, click Users, and then click Create New Users. 
 
-3. Click Identity and Access Management. <br><br> ![Configure Single Sign-On][28]
+![Configure Single Sign-On][29]
 
-4. In the Dashboard, click Users, and then click Create New Users. <br><br> ![Configure Single Sign-On][29]
+5. On the Create User dialog, perform the following steps: 
 
-5. On the Create User dialog, perform the following steps: <br><br> ![Configure Single Sign-On][30]
+![Configure Single Sign-On][30]
 
      5.1. In the **Enter User Names** textboxes, type Brita Simon's user name in Azure AD.
 
@@ -255,20 +353,28 @@ The objective of this section is to create a user called Britta Simon in Amazon
 ### Assigning the Azure AD test user
 
 The objective of this section is to enabling Britta Simon to use Azure single sign-on by granting her access to Amazon Web Service (AWS).
-<br><br>![Assign User][31]
+
+![Assign User][31]
 
 **To assign Britta Simon to CloudPassage, perform the following steps:**
 
-1. On the Azure portal, to open the applications view, in the directory view, click **Applications** in the top menu.<br>
-<br><br>![Assign User][26]
+1. On the Azure portal, to open the applications view, in the directory view, click **Applications** in the top menu.
+
+![Assign User][26]
+
 2. In the applications list, select **Amazon Web Service (AWS)**.
-<br><br>![Assign User][27]
-1. In the menu on the top, click **Users**.<br>
-<br><br>![Assign User][25]
+
+![Assign User][27]
+
+1. In the menu on the top, click **Users**.
+
+![Assign User][25]
+
 1. In the Users list, select **Britta Simon**.
 
 2. In the toolbar on the bottom, click **Assign**.
-<br><br>![Assign User][29]
+
+![Assign User][29]
 
 ### Testing Single Sign-On
 

articles/active-directory/active-directory-v2-devquickstarts-dotnet-web.md

@@ -96,6 +96,7 @@ public void ConfigureAuth(IAppBuilder app)
 									 Authority = String.Format(CultureInfo.InvariantCulture, aadInstance, "common", "/v2.0"),
 									 RedirectUri = redirectUri,
 									 Scope = "openid",
+									 ResponseType = "id_token",
 									 PostLogoutRedirectUri = redirectUri,
 									 TokenValidationParameters = new TokenValidationParameters
 									 {

articles/app-service-api/app-service-api-dotnet-triggers.md

@@ -1,15 +1,15 @@
 <properties 
 	pageTitle="Azure App Service API app triggers" 
 	description="This article demonstrates how to implement triggers in an API App" 
-	services="app-service\api" 
+	services="app-service" 
 	documentationCenter=".net" 
 	authors="guangyang"
 	manager="wpickett" 
 	editor="jimbe"/>
 
 <tags 
-	ms.service="app-service-api" 
-	ms.workload="web" 
+	ms.service="app-service" 
+	ms.workload="na" 
 	ms.tgt_pltfrm="dotnet" 
 	ms.devlang="na" 
 	ms.topic="article" 

articles/app-service-api/app-service-api-nodejs-api-app.md

@@ -9,7 +9,7 @@
 
 <tags
 	ms.service="app-service-api"
-	ms.workload="web"
+	ms.workload="na"
 	ms.tgt_pltfrm="na"
 	ms.devlang="nodejs"
 	ms.topic="get-started-article"

articles/app-service-api/app-service-api-optimize-for-logic-apps.md

@@ -2,15 +2,15 @@
 <properties
 	pageTitle="Enhance your API App for Logic Apps"
 	description="This article demonstrates how to decorate your API App to work nicely with Logic Apps"
-	services="app-service\api"
+	services="app-service"
 	documentationCenter=".net"
 	authors="sameerch"
 	manager="wpickett"
 	editor="jimbe"/>
 
 <tags
-	ms.service="app-service-api"
-	ms.workload="web"
+	ms.service="app-service"
+	ms.workload="na"
 	ms.tgt_pltfrm="dotnet"
 	ms.devlang="na"
 	ms.topic="article"