Merge pull request #153879 from MicrosoftDocs/master

Merge Master to Live, 4 AM

Author: PMEds28

.openpublishing.redirection.json

@@ -740,6 +740,11 @@
       "redirect_url": "/azure/active-directory-b2c/authorization-code-flow",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/active-directory-b2c/custom-policy-get-started.md",
+      "redirect_url": "/azure/active-directory-b2c/tutorial-create-user-flows?pivots=b2c-custom-policy",
+      "redirect_document_id": true
+    },
     {
       "source_path_from_root": "/articles/active-directory-b2c/active-directory-b2c-how-to-enable-billing.md",
       "redirect_url": "/azure/active-directory-b2c/billing",
@@ -11149,6 +11154,11 @@
       "redirect_url": "/azure/azure-sql/database/connect-query-r",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/azure-sql/database/connect-query-r.md",
+      "redirect_url": "/sql/machine-learning/tutorials/quickstart-r-create-script?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/sql-database/sql-database-connect-query-ruby.md",
       "redirect_url": "/azure/azure-sql/database/connect-query-ruby",
@@ -19264,6 +19274,11 @@
       "redirect_url": "/azure/devtest-labs/use-paas-services",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/digital-twins/how-to-interpret-event-data.md",
+      "redirect_url": "/azure/digital-twins/concepts-notifications",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/digital-twins/how-to-integrate-models.md",
       "redirect_url": "/azure/digital-twins/concepts-ontologies-convert",

articles/active-directory-b2c/TOC.yml

@@ -121,6 +121,9 @@
       href: signin-appauth-ios.md
     - name: Android using App Auth
       href: signin-appauth-android.md
+    - name: Secure API Management API
+      href: secure-api-management.md
+      displayName: apim, api management, migrate, b2clogin.com
   - name: Create a flow
     items:
     - name: Sign-up or sign-in policy
@@ -222,6 +225,15 @@
       href: password-complexity.md
     - name: Disable email verification
       href: disable-email-verification.md
+    - name: Custom email verification
+      items:
+      - name: Mailjet
+        href: custom-email-mailjet.md
+        displayName: Custom email, Custom verification email, Verification email
+      - name: SendGrid
+        href: custom-email-sendgrid.md
+        displayName: Custom email, Custom verification email, Verification email
+      displayName: verification
     - name: Enable MFA
       items:
       - name: Multi-factor authentication
@@ -269,17 +281,6 @@
       href: add-api-connector.md
   - name: Custom policy
     items:
-    - name: Get started with custom policies
-      href: custom-policy-get-started.md
-    - name: Custom email verification
-      items:
-      - name: Mailjet
-        href: custom-email-mailjet.md
-        displayName: Custom email, Custom verification email, Verification email
-      - name: SendGrid
-        href: custom-email-sendgrid.md
-        displayName: Custom email, Custom verification email, Verification email
-      displayName: verification
     - name: Add your own business logic
       items:
       - name: Integrate REST API
@@ -299,101 +300,6 @@
         displayName: troubleshooting, app insights
       - name: Troubleshooting custom policies
         href: troubleshoot-custom-policies.md
-    - name: Reference
-      items:
-      - name: TrustFrameworkPolicy
-        href: trustframeworkpolicy.md
-      - name: BuildingBlocks
-        href: buildingblocks.md
-        items:
-        - name: ClaimsSchema
-          href: claimsschema.md
-        - name: ClaimsTransformations
-          href: claimstransformations.md
-          items:
-          - name: Boolean
-            href: boolean-transformations.md
-          - name: Date
-            href: date-transformations.md
-          - name: General
-            href: general-transformations.md
-          - name: Integer
-            href: integer-transformations.md
-          - name: JSON
-            href: json-transformations.md
-          - name: Phone number
-            href: phone-number-claims-transformations.md
-          - name: External accounts
-            href: social-transformations.md
-          - name: StringCollection
-            href: stringcollection-transformations.md
-          - name: String
-            href: string-transformations.md
-        - name: Predicates
-          href: predicates.md
-        - name: ContentDefinitions
-          href: contentdefinitions.md
-        - name: Localization
-          href: localization.md
-          items:
-          - name: Localization string IDs
-            href: localization-string-ids.md
-        - name: DisplayControls
-          href: display-controls.md
-          items:
-          - name: Verification
-            href: display-control-verification.md
-      - name: ClaimsProviders
-        href: claimsproviders.md
-        items:
-        - name: Technical Profiles
-          href: technicalprofiles.md
-          items:
-          - name: About validation technical profiles
-            href: validation-technical-profile.md
-          - name: Azure Active Directory
-            href: active-directory-technical-profile.md
-          - name: Azure AD Multi-Factor Authentication
-            href: multi-factor-auth-technical-profile.md
-            displayName: mfa
-          - name: Azure AD SSPR
-            href: aad-sspr-technical-profile.md
-          - name: Claims transformation
-            href: claims-transformation-technical-profile.md
-          - name: ID token hint
-            href: id-token-hint.md
-          - name: JWT token issuer
-            href: jwt-issuer-technical-profile.md
-          - name: OAuth1
-            href: oauth1-technical-profile.md
-          - name: OAuth2
-            href: oauth2-technical-profile.md
-          - name: One-time password
-            href: one-time-password-technical-profile.md
-            displayName: otp
-          - name: OpenID Connect
-            href: openid-connect-technical-profile.md
-          - name: Phone factor
-            href: phone-factor-technical-profile.md
-          - name: REST
-            href: restful-technical-profile.md
-          - name: SAML identity provider
-            href: saml-identity-provider-technical-profile.md
-          - name: SAML token issuer
-            href: saml-issuer-technical-profile.md
-          - name: Self-asserted
-            href: self-asserted-technical-profile.md
-          - name: SSO session
-            href: custom-policy-reference-sso.md
-            displayName: single sign-on
-      - name: UserJourneys
-        href: userjourneys.md
-      - name: SubJourneys
-        href: subjourneys.md
-      - name: RelyingParty
-        href: relyingparty.md
-      - name: Claim resolvers
-        href: claim-resolver-overview.md
   - name: UserInfo endpoint
     href: userinfo-endpoint.md
   - name: Partner integration
@@ -458,15 +364,15 @@
     - name: Azure portal
       href: manage-users-portal.md
       displayName: create users, add users, delete users
+    - name: Migrate users
+      href: user-migration.md
+      displayName: bulk import
     - name: Partner integration
       items:
       - name: N8identity
         href: partner-n8identity.md
       - name: Saviynt 
         href: partner-saviynt.md
-  - name: Secure API Management API
-    href: secure-api-management.md
-    displayName: apim, api management, migrate, b2clogin.com
   - name: Logs and monitoring
     items:
     - name: Audit logs
@@ -489,12 +395,105 @@
     - name: User data
       href: manage-user-data.md
       displayName: GDPR
-  - name: Migration
-    items:
-    - name: Migrate users
-      href: user-migration.md
 - name: Reference
   items:
+  - name: Custom policy schema
+    items:
+    - name: TrustFrameworkPolicy
+      href: trustframeworkpolicy.md
+    - name: BuildingBlocks
+      href: buildingblocks.md
+      items:
+      - name: ClaimsSchema
+        href: claimsschema.md
+      - name: ClaimsTransformations
+        href: claimstransformations.md
+        items:
+        - name: Boolean
+          href: boolean-transformations.md
+        - name: Date
+          href: date-transformations.md
+        - name: General
+          href: general-transformations.md
+        - name: Integer
+          href: integer-transformations.md
+        - name: JSON
+          href: json-transformations.md
+        - name: Phone number
+          href: phone-number-claims-transformations.md
+        - name: External accounts
+          href: social-transformations.md
+        - name: StringCollection
+          href: stringcollection-transformations.md
+        - name: String
+          href: string-transformations.md
+      - name: Predicates
+        href: predicates.md
+      - name: ContentDefinitions
+        href: contentdefinitions.md
+      - name: Localization
+        href: localization.md
+        items:
+        - name: Localization string IDs
+          href: localization-string-ids.md
+      - name: DisplayControls
+        href: display-controls.md
+        items:
+        - name: Verification
+          href: display-control-verification.md
+    - name: ClaimsProviders
+      href: claimsproviders.md
+      items:
+      - name: Technical Profiles
+        href: technicalprofiles.md
+        items:
+        - name: About validation technical profiles
+          href: validation-technical-profile.md
+        - name: Azure Active Directory
+          href: active-directory-technical-profile.md
+        - name: Azure AD Multi-Factor Authentication
+          href: multi-factor-auth-technical-profile.md
+          displayName: mfa
+        - name: Azure AD SSPR
+          href: aad-sspr-technical-profile.md
+        - name: Claims transformation
+          href: claims-transformation-technical-profile.md
+        - name: ID token hint
+          href: id-token-hint.md
+        - name: JWT token issuer
+          href: jwt-issuer-technical-profile.md
+        - name: OAuth1
+          href: oauth1-technical-profile.md
+        - name: OAuth2
+          href: oauth2-technical-profile.md
+        - name: One-time password
+          href: one-time-password-technical-profile.md
+          displayName: otp
+        - name: OpenID Connect
+          href: openid-connect-technical-profile.md
+        - name: Phone factor
+          href: phone-factor-technical-profile.md
+        - name: REST
+          href: restful-technical-profile.md
+        - name: SAML identity provider
+          href: saml-identity-provider-technical-profile.md
+        - name: SAML token issuer
+          href: saml-issuer-technical-profile.md
+        - name: Self-asserted
+          href: self-asserted-technical-profile.md
+        - name: SSO session
+          href: custom-policy-reference-sso.md
+          displayName: single sign-on
+    - name: UserJourneys
+      href: userjourneys.md
+    - name: SubJourneys
+      href: subjourneys.md
+    - name: RelyingParty
+      href: relyingparty.md
+    - name: Claim resolvers
+      href: claim-resolver-overview.md
+  - name: Custom policy release notes
+    href: custom-policy-developer-notes.md
   - name: Service limits and restrictions
     href: service-limits.md
   - name: App registrations
@@ -510,8 +509,6 @@
     href: error-codes.md
   - name: Extensions app
     href: extensions-app.md
-  - name: Custom policy (IEF) release notes
-    href: custom-policy-developer-notes.md
   - name: Page layout versions
     href: page-layout.md
     displayName: Page version

articles/active-directory-b2c/active-directory-technical-profile.md

@@ -24,7 +24,7 @@ Azure Active Directory B2C (Azure AD B2C) provides support for the Azure Active
 
 The **Name** attribute of the **Protocol** element needs to be set to `Proprietary`. The **handler** attribute must contain the fully qualified name of the protocol handler assembly `Web.TPEngine.Providers.AzureActiveDirectoryProvider, Web.TPEngine, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null`.
 
-Following [custom policy starter pack](custom-policy-get-started.md#custom-policy-starter-pack) Azure AD technical profiles include the **AAD-Common** technical profile. The Azure AD technical profiles don't specify the protocol because the protocol is configured in the **AAD-Common** technical profile:
+Following [custom policy starter pack](tutorial-create-user-flows.md?pivots=b2c-custom-policy#custom-policy-starter-pack) Azure AD technical profiles include the **AAD-Common** technical profile. The Azure AD technical profiles don't specify the protocol because the protocol is configured in the **AAD-Common** technical profile:
 
 - **AAD-UserReadUsingAlternativeSecurityId** and **AAD-UserReadUsingAlternativeSecurityId-NoError** - Look up a social account in the directory.
 - **AAD-UserWriteUsingAlternativeSecurityId** - Create a new social account.

articles/active-directory-b2c/add-identity-provider.md

@@ -23,7 +23,7 @@ On the sign-up or sign-in page, Azure AD B2C presents a list of external identit
 
 ![Mobile sign-in example with a social account (Facebook)](media/add-identity-provider/external-idp.png)
 
-You can add identity providers that are supported by Azure Active Directory B2C (Azure AD B2C) to your [user flows](user-flow-overview.md) using the Azure portal. You can also add identity providers to your [custom policies](custom-policy-get-started.md).
+You can add identity providers that are supported by Azure Active Directory B2C (Azure AD B2C) to your [user flows](user-flow-overview.md) using the Azure portal. You can also add identity providers to your [custom policies](user-flow-overview.md).
 
 ## Select an identity provider
 

articles/active-directory-b2c/add-password-change-policy.md

@@ -39,7 +39,7 @@ In Azure Active Directory B2C (Azure AD B2C), you can enable users who are signe
 
 ## Prerequisites
 
-* Complete the steps in [Get started with custom policies in Active Directory B2C](custom-policy-get-started.md).
+* Complete the steps in [Get started with custom policies in Active Directory B2C](tutorial-create-user-flows.md?pivots=b2c-custom-policy).
 * If you haven't already done so, [register a web application in Azure Active Directory B2C](tutorial-register-applications.md).
 
 ## Add the elements

articles/active-directory-b2c/add-password-reset-policy.md

@@ -67,7 +67,7 @@ To enable self-service password reset for the sign-up or sign-in user flow:
 
 ::: zone pivot="b2c-custom-policy"
 
-The following sections describe how to add a self-service password experience to a custom policy. The sample is based on the policy files included in the [custom policy starter pack](./custom-policy-get-started.md). 
+The following sections describe how to add a self-service password experience to a custom policy. The sample is based on the policy files included in the [custom policy starter pack](./tutorial-create-user-flows.md?pivots=b2c-custom-policy#custom-policy-starter-pack). 
 
 > [!TIP]
 > You can find a complete sample of the "sign-up or sign-in with password reset" policy on [GitHub](https://github.com/azure-ad-b2c/samples/tree/master/policies/embedded-password-reset).
@@ -312,7 +312,7 @@ To let users of your application reset their password, you create a password res
 
 ### Create a password reset policy
 
-Custom policies are a set of XML files you upload to your Azure AD B2C tenant to define user journeys. We provide starter packs with several pre-built policies including: sign-up and sign-in, password reset, and profile editing policy. For more information, see [Get started with custom policies in Azure AD B2C](custom-policy-get-started.md).
+Custom policies are a set of XML files you upload to your Azure AD B2C tenant to define user journeys. We provide starter packs with several pre-built policies including: sign-up and sign-in, password reset, and profile editing policy. For more information, see [Get started with custom policies in Azure AD B2C](tutorial-create-user-flows.md?pivots=b2c-custom-policy).
 
 ::: zone-end
 

articles/active-directory-b2c/add-profile-editing-policy.md

@@ -61,7 +61,7 @@ If you want to enable users to edit their profile in your application, you use a
 
 ## Create a profile editing policy
 
-Custom policies are a set of XML files you upload to your Azure AD B2C tenant to define user journeys. We provide starter packs with several pre-built policies including: sign-up and sign-in, password reset, and profile editing policy. For more information, see [Get started with custom policies in Azure AD B2C](custom-policy-get-started.md).
+Custom policies are a set of XML files you upload to your Azure AD B2C tenant to define user journeys. We provide starter packs with several pre-built policies including: sign-up and sign-in, password reset, and profile editing policy. For more information, see [Get started with custom policies in Azure AD B2C](tutorial-create-user-flows.md?pivots=b2c-custom-policy).
 
 ::: zone-end
 

articles/active-directory-b2c/add-sign-up-and-sign-in-policy.md

@@ -87,7 +87,7 @@ The sign-up and sign-in user flow handles both sign-up and sign-in experiences w
 
 ## Create a sign-up and sign-in policy
 
-Custom policies are a set of XML files you upload to your Azure AD B2C tenant to define user journeys. We provide starter packs with several pre-built policies including: sign-up and sign-in, password reset, and profile editing policy. For more information, see [Get started with custom policies in Azure AD B2C](custom-policy-get-started.md).
+Custom policies are a set of XML files you upload to your Azure AD B2C tenant to define user journeys. We provide starter packs with several pre-built policies including: sign-up and sign-in, password reset, and profile editing policy. For more information, see [Get started with custom policies in Azure AD B2C](tutorial-create-user-flows.md?pivots=b2c-custom-policy).
 
 ::: zone-end