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

Author: Banani-Rath

.openpublishing.redirection.json

@@ -5275,6 +5275,16 @@
       "redirect_url": "/azure/app-service-mobile",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/application-gateway/web-application-firewall-troubleshoot.md",
+      "redirect_url": "/azure/web-application-firewall/ag/web-application-firewall-troubleshoot",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/application-gateway/waf-overview.md",
+      "redirect_url": "/azure/web-application-firewall/ag/ag-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/application-gateway/application-gateway-create-url-route-portal.md",
       "redirect_url": "/azure/application-gateway/create-url-route-portal",

articles/active-directory-b2c/user-overview.md

@@ -1,27 +1,30 @@
 ---
-title: Overview of user accounts in Azure Active Directory B2C | Microsoft Docs
-description: Learn about user accounts in Azure Active Directory B2C.
+title: Overview of user accounts in Azure Active Directory B2C
+description: Learn about the types of user accounts that can be used in Azure Active Directory B2C.
 services: active-directory-b2c
 author: mmacy
 manager: celestedg
 
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 11/30/2018
+ms.date: 11/05/2019
 ms.author: marsma
 ms.subservice: B2C
 ---
 
 # Overview of user accounts in Azure Active Directory B2C
 
-In Azure Active Directory B2C (Azure AD B2C), you can use different types of accounts. Azure Active Directory, Azure Active Directory B2B, and Azure Active Directory B2C share in the types of user accounts that can be used.
+In Azure Active Directory B2C (Azure AD B2C), there are several types of accounts that can be created. Azure Active Directory, Active Directory B2B, and Active Directory B2C share in the types of user accounts that can be used.
 
 The following types of accounts are available:
 
 - **Work account** - A work account can access resources in a tenant, and with an administrator role, can manage tenants.
 - **Guest account** - A guest account can only be a Microsoft account or an Azure Active Directory user that can be used to access applications or manage tenants.
-- **Consumer account** - A consumer account is created by going through a sign-up user flow in an Azure AD B2C application or by using Azure AD Graph API, and is used by users of the applications that are registered with Azure AD B2C.
+- **Consumer account** - A consumer account is used by a user of the applications you've registered with Azure AD B2C. Consumer accounts can be created by:
+  - The user going through a sign-up user flow in an Azure AD B2C application
+  - Using Azure AD Graph API
+  - Using the Azure portal
 
 ## Work account
 
@@ -69,7 +72,7 @@ You can also use the [Microsoft Graph API](https://docs.microsoft.com/graph/api/
 
 ## Consumer user
 
-The consumer user can sign in to applications secured by Azure AD B2C, but cannot access Azure resources such as the Azure portal.  The consumer user can use a local account or federated accounts, such as Facebook or Twitter. A consumer account is created by using a [sign-up or sign-in user flow](../active-directory-b2c/active-directory-b2c-reference-policies.md).
+The consumer user can sign in to applications secured by Azure AD B2C, but cannot access Azure resources such as the Azure portal. The consumer user can use a local account or federated accounts, such as Facebook or Twitter. A consumer account is created by using a [sign-up or sign-in user flow](../active-directory-b2c/active-directory-b2c-reference-policies.md), using the Azure AD Graph API, or by using the Azure portal.
 
 You can specify the data that is collected when a consumer user account is created by using custom user attributes. For more information, see [Define custom attributes in Azure Active Directory B2C](../active-directory-b2c/active-directory-b2c-reference-custom-attr.md).
 

articles/api-management/api-management-howto-developer-portal-customize.md

@@ -121,10 +121,10 @@ To make your portal and its latest changes available to visitors, you need to pu
 
 ## Visit the published portal
 
-After you publish the portal, you can access it at the same URL as the administrative panel, for example `https://contoso-api.portal.azure-api.net`. Open it in a new browser tab to view it as an external visitor.
+After you publish the portal, you can access it at the same URL as the administrative panel, for example `https://contoso-api.developer.azure-api.net`. View it in a separate browser session (incognito / private browsing mode) as an external visitor.
 
 ## Next steps
 
 Learn more about the developer portal:
 
-- [Azure API Management developer portal overview](api-management-howto-developer-portal.md)
+- [Azure API Management developer portal overview](api-management-howto-developer-portal.md)

articles/app-service/containers/deploy-container-github-action.md

@@ -3,55 +3,64 @@ title: Deploy your container from a CI/CD pipeline with GitHub Actions - Azure A
 description: Learn how to use GitHub Actions to deploy your container to App Service
 services: app-service
 documentationcenter: ''
-author: jasonfreeberg
-writer: 
-manager: 
-editor: 
+author: cephalin
+manager: gwallace
 
-ms.assetid: 
 ms.service: app-service
 ms.workload: na
 ms.tgt_pltfrm: na
 ms.devlang: na
 ms.topic: article
-ms.date: 10/09/2019
+ms.date: 10/25/2019
 ms.author: jafreebe
+ms.reviewer: ushan
 
 ---
 
-# GitHub Actions for deploying to Web App for Containers
+# Deploy a custom container to App Service using GitHub Actions
 
-[GitHub Actions](https://help.github.com/en/articles/about-github-actions) gives you the flexibility to build an automated software development lifecycle workflow. With the Azure App Service Actions for GitHub, you can automate your workflow to deploy [Azure Web Apps for Containers](https://azure.microsoft.com/services/app-service/containers/) using GitHub Actions.
+[GitHub Actions](https://help.github.com/en/articles/about-github-actions) gives you the flexibility to build an automated software development lifecycle workflow. With the [Azure App Service Action for Containers](https://github.com/Azure/webapps-container-deploy), you can automate your workflow to deploy apps as [custom containers to App Service](https://azure.microsoft.com/services/app-service/containers/) using GitHub Actions.
 
 > [!IMPORTANT]
 > GitHub Actions is currently in beta. You must first [sign-up to join the preview](https://github.com/features/actions) using your GitHub account.
 > 
 
 A workflow is defined by a YAML (.yml) file in the `/.github/workflows/` path in your repository. This definition contains the various steps and parameters that make up the workflow.
 
-For an Azure Web App container workflow, the file has three sections:
+For an Azure App Service container workflow, the file has three sections:
 
 |Section  |Tasks  |
 |---------|---------|
-|**Authentication** | 1. Define a service principal <br /> 2. Create a GitHub secret |
-|**Build** | 1. Set up the environment <br /> 2. Build the container image |
-|**Deploy** | 1. Deploy the container image |
+|**Authentication** | 1. Define a service principal. <br /> 2. Create a GitHub secret. |
+|**Build** | 1. Set up the environment. <br /> 2. Build the container image. |
+|**Deploy** | 1. Deploy the container image. |
 
 ## Create a service principal
 
 You can create a [service principal](https://docs.microsoft.com/azure/active-directory/develop/app-objects-and-service-principals#service-principal-object) by using the [az ad sp create-for-rbac](https://docs.microsoft.com/cli/azure/ad/sp?view=azure-cli-latest#az-ad-sp-create-for-rbac) command in the [Azure CLI](https://docs.microsoft.com/cli/azure/). You can run this command using [Azure Cloud Shell](https://shell.azure.com/) in the Azure portal or by selecting the **Try it** button.
 
 ```azurecli-interactive
-az ad sp create-for-rbac --name "myApp" --role contributor --scopes /subscriptions/<SUBSCRIPTION_ID>/resourceGroups/<RESOURCE_GROUP>/providers/Microsoft.Web/sites/<APP_NAME> --sdk-auth
+az ad sp create-for-rbac --name "myApp" --role contributor \
+                            --scopes /subscriptions/{subscription-id}/resourceGroups/{resource-group} \
+                            --sdk-auth
+                            
+  # Replace {subscription-id}, {resource-group} with the subscription, resource group details of the WebApp
 ```
 
-In this example, replace the placeholders in the resource with your subscription ID, resource group and web app name. The output is the role assignment credentials that provides access to your Web App. Copy this JSON object, which you can use to authenticate from GitHub.
+The output is a JSON object with the role assignment credentials that provide access to your App Service app similar to below. Copy this JSON object to authenticate from GitHub.
 
-> [!NOTE]
-> You do not need to create a service principal if you decide to use publish profile for authentication.
+ ```azurecli 
+  {
+    "clientId": "<GUID>",
+    "clientSecret": "<GUID>",
+    "subscriptionId": "<GUID>",
+    "tenantId": "<GUID>",
+    (...)
+  }
+```
 
 > [!IMPORTANT]
-> It is always a good practice to grant minimum access. This is why the scope in the previous example is limited to the specific web app and not the entire resource group.
+> It is always a good practice to grant minimum access. You could restrict scope in the above Az CLI command to the specific App Service app and the Azure Container Registry where the container images are pushed to.
 
 ## Configure the GitHub secret
 
@@ -77,7 +86,7 @@ The below example uses user-level credentials i.e. Azure Service Principal for d
     - REGISTRY_USERNAME
     - REGISTRY_PASSWORD
 
-5. You will see the secrets as shown below once defined.
+5. You see the secrets as shown below once defined.
 
     ![container secrets](../media/app-service-github-actions/app-service-secrets-container.png)
 
@@ -99,7 +108,7 @@ jobs:
       uses: actions/checkout@master
     
     - name: 'Login via Azure CLI'
-      uses: azure/actions/login@v1
+      uses: azure/login@v1
       with:
         creds: ${{ secrets.AZURE_CREDENTIALS }}
     
@@ -114,19 +123,19 @@ jobs:
         docker push contoso.azurecr.io/nodejssampleapp:${{ github.sha }}
 ```
 
-## Deploy to Web App Container
+## Deploy to an App Service container
 
-To deploy your image to a web app container, you will need to use the `Azure/appservice-actions/webapp@master` action. This action has 5 parameters:
+To deploy your image to a custom container in App Service, use the `azure/webapps-container-deploy@v1` action. This action has five parameters:
 
 | **Parameter**  | **Explanation**  |
 |---------|---------|
-| **app-name** | (Required) Name of the Azure Web App | 
+| **app-name** | (Required) Name of the App Service app | 
 | **slot-name** | (Optional) Enter an existing Slot other than the Production slot |
-| **images** | (Required) Specify the fully qualified container image(s) name. For example, 'myregistry.azurecr.io/nginx:latest' or 'python:3.7.2-alpine/'. For multi-container scenario multiple container image names can be provided (multi-line separated) |
-| **configuration-file** | (Optional) Path of the Docker-Compose file. Should be a fully qualified path or relative to the default working directory. Required for multi-container scenario |
-| **container-command** | (Optional) Enter the start up command. For ex. dotnet run or dotnet filename.dll |
+| **images** | (Required) Specify the fully qualified container image(s) name. For example, 'myregistry.azurecr.io/nginx:latest' or 'python:3.7.2-alpine/'. For a multi-container app, multiple container image names can be provided (multi-line separated) |
+| **configuration-file** | (Optional) Path of the Docker-Compose file. Should be a fully qualified path or relative to the default working directory. Required for multi-container apps. |
+| **container-command** | (Optional) Enter the start-up command. For ex. dotnet run or dotnet filename.dll |
 
-Below is the sample workflow to build and deploy a Node.js Web app to Azure Web App Container.
+Below is the sample workflow to build and deploy a Node.js app to a custom container in App Service.
 
 ```yaml
 on: [push]
@@ -142,7 +151,7 @@ jobs:
       uses: actions/checkout@master
 
     - name: 'Login via Azure CLI'
-      uses: azure/actions/login@v1
+      uses: azure/login@v1
       with:
         creds: ${{ secrets.AZURE_CREDENTIALS }}
 
@@ -170,7 +179,7 @@ jobs:
 
 You can find our set of Actions grouped into different repositories on GitHub, each one containing documentation and examples to help you use GitHub for CI/CD and deploy your apps to Azure.
 
-- [Azure login](https://github.com/Azure/actions)
+- [Azure login](https://github.com/Azure/login)
 
 - [Azure WebApp](https://github.com/Azure/webapps-deploy)
 
@@ -182,4 +191,6 @@ You can find our set of Actions grouped into different repositories on GitHub, e
 
 - [K8s deploy](https://github.com/Azure/k8s-deploy)
 
-- [Starter Workflows](https://github.com/actions/starter-workflows)
+- [Starter CI Workflows](https://github.com/actions/starter-workflows)
+
+- [Starter workflows to deploy to Azure](https://github.com/Azure/actions-workflow-samples)