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

Author: sethmanheim

.openpublishing.redirection.json

@@ -9,7 +9,7 @@ manager: celestedg
 ms.service: active-directory
 ms.workload: identity
 ms.topic: conceptual
-ms.date: 09/25/2019
+ms.date: 01/30/2020
 ms.author: marsma
 ms.subservice: B2C
 ---
@@ -28,6 +28,9 @@ If you use [user flows](user-flow-overview.md), you can change the look of your
 
 You use the [Azure portal](tutorial-customize-ui.md) to configure the UI customization for user flows.
 
+> [!TIP]
+> If you want to modify only the banner logo, background image, and background color of your user flow pages, you can try the [Company branding (preview)](#company-branding-preview) feature described later in this article.
+
 ### Custom policies
 
 If you're using [custom policies](custom-policy-overview.md) to provide sign-up or sign-in, password reset, or profile-editing in your application, use [policy files to customize the UI](custom-policy-ui-customization.md).
@@ -146,6 +149,60 @@ The following table lists the HTML fragments that Azure AD B2C merges into the `
 | Multi-factor authentication | Customers can verify their phone numbers (using text or voice) during sign-up or sign-in. |
 | Error | Provides error information to the customer. |
 
+## Company branding (preview)
+
+You can customize your user flow pages with a banner logo, background image, and background color by using Azure Active Directory [Company branding](../active-directory/fundamentals/customize-branding.md).
+
+To customize your user flow pages, you first configure company branding in Azure Active Directory, then you enable it in the page layouts of your user flows in Azure AD B2C.
+
+[!INCLUDE [preview note](../../includes/active-directory-b2c-public-preview.md)]
+
+### Configure company branding
+
+Start by setting the banner logo, background image, and background color within **Company branding**.
+
+1. Sign in to the [Azure portal](https://portal.azure.com).
+1. Select the **Directory + subscription** filter in the top menu, and then select the directory that contains your Azure AD B2C tenant.
+1. In the Azure portal, search for and select **Azure AD B2C**.
+1. Under **Manage**, select **Company branding**.
+1. Follow the steps in [Add branding to your organization's Azure Active Directory sign-in page](../active-directory/fundamentals/customize-branding.md).
+
+Keep these things in mind when you configure company branding in Azure AD B2C:
+
+* Company branding in Azure AD B2C is currently limited to **background image**, **banner logo**, and **background color** customization. The other properties in the company branding pane, for example those in **Advanced settings**, are *not supported*.
+* In your user flow pages, the background color is shown before the background image is loaded. We recommended you choose a background color that closely matches the colors in your background image for a smoother loading experience.
+* The banner logo appears in the verification emails sent to your users when they initiate a sign-up user flow.
+
+### Enable branding in user flow pages
+
+Once you've configured company branding, enable it in your user flows.
+
+1. In the left menu of the Azure portal, select **Azure AD B2C**.
+1. Under **Policies**, select **User flows (policies)**.
+1. Select the user flow for which you'd like to enable company branding. Company branding is **not supported** for the *Sign in v1* and *Profile editing v1* user flow types.
+1. Under **Customize**, select **Page layouts**, and then select the layout you'd like to brand. For example, select **Unified sign up or sign in page**.
+1. For the **Page Layout Version (Preview)**, choose version **1.2.0** or above.
+1. Select **Save**.
+
+If you'd like to brand all pages in the user flow, set the page layout version for each page layout in the user flow.
+
+![Page layout selection in Azure AD B2C in the Azure portal](media/customize-ui-overview/portal-02-page-layout-select.png)
+
+This annotated example shows a custom banner logo and background image on a *Sign up and sign in* user flow page that uses the Ocean Blue template:
+
+![Branded sign-up/sign-in page served by Azure AD B2C](media/customize-ui-overview/template-ocean-blue-branded.png)
+
+### Use company branding assets in custom HTML
+
+To use your company branding assets in custom HTML, add the following tags outside the `<div id="api">` tag:
+
+```HTML
+<img data-tenant-branding-background="true" />
+<img data-tenant-branding-logo="true" alt="Company Logo" />
+```
+
+The image source is replaced with that of the background image and banner logo. As described in the [Get started with custom HTML and CSS](#get-started-with-custom-html-and-css) section, use CSS classes to style and position the assets on the page .
+
 ## Localize content
 
 You localize your HTML content by enabling [language customization](user-flow-language-customization.md) in your Azure AD B2C tenant. Enabling this feature allows Azure AD B2C to forward the OpenID Connect parameter `ui-locales` to your endpoint. Your content server can use this parameter to provide language-specific HTML pages.

articles/active-directory-b2c/customize-ui-overview.md

@@ -13,7 +13,7 @@ metadata:
   ms.collection: collection
   author: mmacy
   ms.author: marsma
-  ms.date: 08/29/2019
+  ms.date: 01/28/2020
 
 # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | whats-new
 
@@ -27,7 +27,7 @@ landingContent:
       - linkListType: overview
         links:
           - text: What is Azure AD B2C?
-            url: active-directory-b2c-overview.md
+            url: overview.md
           - text: Technical & feature overview
             url: technical-overview.md
       - linkListType: get-started
@@ -49,13 +49,13 @@ landingContent:
       - linkListType: quickstart
         links:
           - text: Set up sign-in
-            url: active-directory-b2c-quickstarts-web-app.md
+            url: quickstart-web-app-dotnet.md
       - linkListType: tutorial
         links:
           - text: Authenticate users a .NET web application
-            url: active-directory-b2c-tutorials-web-app.md
+            url: tutorial-web-app-dotnet.md
           - text: Grant API access to a .NET web application
-            url: active-directory-b2c-tutorials-web-api.md
+            url: tutorial-web-api-dotnet.md
           - text: Enable enterprise and social login
             url: tutorial-add-identity-providers.md
       - linkListType: download
@@ -69,13 +69,13 @@ landingContent:
       - linkListType: quickstart
         links:
           - text: Set up sign-in
-            url: active-directory-b2c-quickstarts-desktop-app.md
+            url: quickstart-single-page-app.md
       - linkListType: tutorial
         links:
           - text: Authenticate users in a single-page app
-            url: active-directory-b2c-tutorials-spa.md
+            url: tutorial-single-page-app.md
           - text: Grant API access to a single-page app
-            url: active-directory-b2c-tutorials-spa-webapi.md
+            url: tutorial-single-page-app-webapi.md
           - text: Enable enterprise and social login
             url: tutorial-add-identity-providers.md
       - linkListType: download
@@ -89,13 +89,13 @@ landingContent:
       - linkListType: quickstart
         links:
           - text: Set up sign-in
-            url: active-directory-b2c-quickstarts-desktop-app.md
+            url: quickstart-native-app-desktop.md
       - linkListType: tutorial
         links:
           - text: Authenticate users in native clients
-            url: active-directory-b2c-tutorials-desktop-app.md
+            url: tutorial-desktop-app.md
           - text: Grant API access to native clients
-            url: active-directory-b2c-tutorials-desktop-app-webapi.md
+            url: tutorial-desktop-app-webapi.md
           - text: Enable enterprise and social login
             url: tutorial-add-identity-providers.md
       - linkListType: download
@@ -109,15 +109,15 @@ landingContent:
       - linkListType: concept
         links:
           - text: Introduction to user flows
-            url: active-directory-b2c-reference-policies.md
+            url: user-flow-overview.md
       - linkListType: how-to-guide
         links:
           - text: Sign up and sign in users
             url: tutorial-create-user-flows.md
           - text: Customize the user interface
             url: customize-ui-overview.md
           - text: Enable sign-in with Facebook
-            url: active-directory-b2c-setup-fb-app.md
+            url: identity-provider-facebook.md
       - linkListType: video
         links:
           - text: How to configure basic policies (9:41)
@@ -129,17 +129,17 @@ landingContent:
       - linkListType: concept
         links:
           - text: Introduction to custom policies
-            url: active-directory-b2c-overview-custom.md
+            url: custom-policy-overview.md
       - linkListType: how-to-guide
         links:
           - text: Sign up and sign in users
-            url: active-directory-b2c-get-started-custom.md
+            url: custom-policy-get-started.md
           - text: Customize the user interface
-            url: active-directory-b2c-ui-customization-custom.md
+            url: custom-policy-ui-customization.md
           - text: Enable sign-in with Azure AD multi-tenant
-            url: active-directory-b2c-setup-commonaad-custom.md
+            url: identity-provider-azure-ad-multi-tenant-custom.md
           - text: Add your own business logic with REST APIs
-            url: active-directory-b2c-rest-api-validation-custom.md
+            url: custom-policy-rest-api-claims-validation.md
       - linkListType: video
         links:
           - text: Advanced use cases with Azure AD B2C (4:54)

articles/active-directory-b2c/index.yml

@@ -25,7 +25,7 @@ Azure Active Directory B2C (Azure AD B2C) provides cloud identity management to
 
 - [Visual Studio 2019](https://www.visualstudio.com/downloads/) with the **ASP.NET and web development** workload.
 - A social account from either Facebook, Google, or Microsoft.
-- [Download a zip file](https://github.com/Azure-Samples/active-directory-b2c-dotnet-desktop/archive/master.zip) or clone the sample web app from GitHub.
+- [Download a zip file](https://github.com/Azure-Samples/active-directory-b2c-dotnet-desktop/archive/msalv3.zip) or clone the [Azure-Samples/active-directory-b2c-dotnet-desktop](https://github.com/Azure-Samples/active-directory-b2c-dotnet-desktop) repository from GitHub.
 
     ```
     git clone https://github.com/Azure-Samples/active-directory-b2c-dotnet-desktop.git