Merge pull request #153817 from MicrosoftDocs/master

4/08 PM Publish

Author: huypub

.openpublishing.redirection.json

@@ -870,6 +870,11 @@
       "redirect_url": "/azure/active-directory-b2c/custom-policy-ui-customization",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory-b2c/custom-policy-trust-frameworks.md",
+      "redirect_url": "/azure/active-directory-b2c/custom-policy-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory-b2c/active-directory-b2c-ui-customization-custom-dynamic.md",
       "redirect_url": "/azure/active-directory-b2c/custom-policy-ui-customization-dynamic",

articles/active-directory-b2c/TOC.yml

@@ -79,20 +79,21 @@
         href: tokens-overview.md
       - name: Request access token
         href: access-tokens.md
-  - name: Policy keys
-    href: policy-keys-overview.md
-  - name: User flow and policy
+  - name: User experience
+    expanded: true
     items:
-    - name: User flows
+    - name: User flows and custom policies
       href: user-flow-overview.md
-    - name: Custom policies
+    - name: Custom policy overview
       href: custom-policy-overview.md
   - name: User accounts
     href: user-overview.md
   - name: User profile attributes
     href: user-profile-attributes.md
   - name: Identity Protection and Conditional Access
     href: conditional-access-identity-protection-overview.md
+  - name: Policy keys
+    href: policy-keys-overview.md
 - name: How-to guides
   items:
   - name: App integration
@@ -268,8 +269,6 @@
       href: add-api-connector.md
   - name: Custom policy
     items:
-    - name: Custom policy overview
-      href: custom-policy-trust-frameworks.md
     - name: Get started with custom policies
       href: custom-policy-get-started.md
     - name: Custom email verification

articles/active-directory-b2c/analytics-with-application-insights.md

@@ -248,7 +248,7 @@ To fit your business needs, you might want to record more claims. To add a claim
 
 ### Manipulate claims
 
-You can use [input claims transformations](custom-policy-trust-frameworks.md#manipulating-your-claims) to modify the input claims or generate new ones before sending them to Application Insights. In the following example, the technical profile includes the `CheckIsAdmin` input claims transformation.
+You can use [input claims transformations](custom-policy-overview.md#manipulating-your-claims) to modify the input claims or generate new ones before sending them to Application Insights. In the following example, the technical profile includes the `CheckIsAdmin` input claims transformation.
 
 ```xml
 <TechnicalProfile Id="AppInsights-SignInComplete">
@@ -265,7 +265,7 @@ You can use [input claims transformations](custom-policy-trust-frameworks.md#man
 
 ### Add events
 
-To add an event, create a new technical profile that includes the `AppInsights-Common` technical profile. Then add the new technical profile as an orchestration step to the [user journey](custom-policy-trust-frameworks.md#orchestration-steps). Use the [Precondition](userjourneys.md#preconditions) element to trigger the event when you're ready. For example, report the event only when users run through multifactor authentication.
+To add an event, create a new technical profile that includes the `AppInsights-Common` technical profile. Then add the new technical profile as an orchestration step to the [user journey](custom-policy-overview.md#orchestration-steps). Use the [Precondition](userjourneys.md#preconditions) element to trigger the event when you're ready. For example, report the event only when users run through multifactor authentication.
 
 ```xml
 <TechnicalProfile Id="AppInsights-MFA-Completed">

articles/active-directory-b2c/best-practices.md

@@ -22,7 +22,7 @@ The following best practices and recommendations cover some of the primary aspec
 
 | Best practice | Description |
 |--|--|
-| Choose user flows for most scenarios | The Identity Experience Framework of Azure AD B2C is the core strength of the service. Policies fully describe identity experiences such as sign-up, sign-in, or profile editing. To help you set up the most common identity tasks, the Azure AD B2C portal includes predefined, configurable policies called user flows. With user flows, you can create great user experiences in minutes, with just a few clicks. [Learn when to use user flows vs. custom policies](custom-policy-overview.md#comparing-user-flows-and-custom-policies).|
+| Choose user flows for most scenarios | The Identity Experience Framework of Azure AD B2C is the core strength of the service. Policies fully describe identity experiences such as sign-up, sign-in, or profile editing. To help you set up the most common identity tasks, the Azure AD B2C portal includes predefined, configurable policies called user flows. With user flows, you can create great user experiences in minutes, with just a few clicks. [Learn when to use user flows vs. custom policies](user-flow-overview.md#comparing-user-flows-and-custom-policies).|
 | App registrations | Every application (web, native) and API that is being secured must be registered in Azure AD B2C. If an app has both a web and native version of iOS and Android, you can register them as one application in Azure AD B2C with the same client ID. Learn how to [register OIDC, SAML, web, and native apps](./tutorial-register-applications.md?tabs=applications). Learn more about [application types that can be used in Azure AD B2C](./application-types.md). |
 | Move to monthly active users billing | Azure AD B2C has moved from monthly active authentications to monthly active users (MAU) billing. Most customers will find this model cost-effective. [Learn more about monthly active users billing](https://azure.microsoft.com/updates/mau-billing/). |