Merge pull request #148968 from MicrosoftDocs/master

3/03 PM Publish

Author: huypub

.openpublishing.publish.config.json

@@ -583,6 +583,11 @@
       "path_to_root": "digital-twins-docs-samples",
       "url": "https://github.com/azure-samples/digital-twins-docs-code",
       "branch": "main"
+    },
+    {
+      "path_to_root": "digital-twins-docs-samples-dps",
+      "url": "https://github.com/Azure-Samples/digital-twins-iothub-integration",
+      "branch": "main"
     }
   ],
   "branch_target_mapping": {

.openpublishing.redirection.json

@@ -17,7 +17,7 @@
     },
     {
       "source_path": "articles/azure-arc/kubernetes/use-gitops-connected-cluster.md",
-      "redirect_url": "/azure/azure-arc/kubernetes/tutorial-use-gitops-connect-cluster",
+      "redirect_url": "/azure/azure-arc/kubernetes/tutorial-use-gitops-connected-cluster",
       "redirect_document_id": false
     },
     {
@@ -915,6 +915,16 @@
       "redirect_url": "/azure/active-directory-b2c/identity-provider-google",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/active-directory-b2c/conditional-access-identity-protection-setup.md",
+      "redirect_url": "/azure/active-directory-b2c/identity-protection-investigate-risk",
+      "redirect_document_id": true
+    },
+    {
+      "source_path_from_root": "/articles/active-directory-b2c/conditional-access-technical-profile.md",
+      "redirect_url": "/azure/active-directory-b2c/conditional-access-user-flow",
+      "redirect_document_id": true
+    },
     {
       "source_path_from_root": "/articles/active-directory-b2c/identity-provider-google-custom.md",
       "redirect_url": "/azure/active-directory-b2c/identity-provider-google",
@@ -63349,6 +63359,11 @@
       "redirect_url": "/azure/azure-monitor/agents/diagnostics-extension-logs",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-monitor/essentials/diagnostics-extension-logs.md",
+      "redirect_url": "/azure/azure-monitor/agents/diagnostics-extension-logs",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-monitor/platform/powerbi.md",
       "redirect_url": "/azure/azure-monitor/visualize/powerbi",

articles/active-directory-b2c/TOC.yml

@@ -219,11 +219,11 @@
       href: configure-tokens.md
   - name: Define custom attributes
     href: user-flow-custom-attributes.md
-  - name: Identity Protection and Conditional Access
+  - name: Risk-based authentication
     items:
-    - name: Set up Identity Protection and Conditional Access
-      href: conditional-access-identity-protection-setup.md
-    - name: Add Conditional Access
+    - name: Investigate risk with Identity Protection
+      href: identity-protection-investigate-risk.md
+    - name: Configure Conditional Access
       href: conditional-access-user-flow.md
   - name: Configure age gating
     href: basic-age-gating.md
@@ -329,9 +329,6 @@
             href: aad-sspr-technical-profile.md
           - name: Claims transformation
             href: claims-transformation-technical-profile.md
-          - name: Conditional Access 
-            href: conditional-access-technical-profile.md
-            displayName: ca
           - name: ID token hint
             href: id-token-hint.md
           - name: JWT token issuer

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

@@ -202,7 +202,7 @@ In your user journey, you can represent the Forgot Password sub journey as a **C
 
 ### Set the user journey to be executed
 
-Now that you've modified or created a user journey, in the **Relying Party** section specify the journey that Azure AD B2C will execute for this custom policy. Within the [RelyingParty](../articles/active-directory-b2c/relyingparty.md) element, find the **DefaultUserJourney** element. Update the  **DefaultUserJourney ReferenceId** to match the ID of the user journey in which you added the **ClaimsProviderSelections**.
+Now that you've modified or created a user journey, in the **Relying Party** section specify the journey that Azure AD B2C will execute for this custom policy. Within the [RelyingParty](relyingparty.md) element, find the **DefaultUserJourney** element. Update the  **DefaultUserJourney ReferenceId** to match the ID of the user journey in which you added the **ClaimsProviderSelections**.
 
 ```xml
 <RelyingParty>

articles/active-directory-b2c/conditional-access-identity-protection-overview.md

@@ -6,7 +6,7 @@ services: active-directory
 ms.service: active-directory
 ms.subservice: conditional-access
 ms.topic: overview
-ms.date: 09/01/2020
+ms.date: 03/03/2021
 
 ms.author: mimart
 author: msmimart
@@ -46,21 +46,21 @@ Identity Protection and Conditional Access in Azure AD B2C generally work the sa
 
 - In Azure AD B2C tenants, Identity Protection risk detections are available for local B2C accounts only, and not for social identities like Google or Facebook.
 
-- In Azure AD B2C tenants, a subset of the Identity Protection risk detections is available. See [Set up Identity Protection](conditional-access-identity-protection-setup.md#set-up-identity-protection).
+- In Azure AD B2C tenants, a subset of the Identity Protection risk detections is available. See [Investigate risk with Identity Protection](identity-protection-investigate-risk.md), and [Add Conditional Access to user flows](conditional-access-user-flow.md).
 
 - The Conditional Access device compliance feature isn't available in Azure AD B2C tenants.
 
 
 ## Integrate Conditional Access with user flows and custom policies
 
-In Azure AD B2C, you can trigger Conditional Access conditions from built-in user flows. You can also incorporate Conditional Access into custom policies. As with other aspects of the B2C user flow, end-user experience messaging can be customized according to your organization's voice, brand, and mitigation alternatives. See [Define a Conditional Access technical profile](conditional-access-technical-profile.md).
+In Azure AD B2C, you can trigger Conditional Access conditions from built-in user flows. You can also incorporate Conditional Access into custom policies. As with other aspects of the B2C user flow, end-user experience messaging can be customized according to your organization's voice, brand, and mitigation alternatives. See [Add Conditional Access to user flows](conditional-access-user-flow.md).
 
 ## Microsoft Graph API
 
-You can also manage Conditional Access policies in Azure AD B2C with Microsoft Graph API. For details, see the [Conditional Access documentation](../active-directory/conditional-access/overview.md) and the [Microsoft Graph reference](/graph/api/resources/conditionalaccesspolicy?view=graph-rest-beta).
+You can also manage Conditional Access policies in Azure AD B2C with Microsoft Graph API. For details, see the [Conditional Access documentation](../active-directory/conditional-access/overview.md) and the [Microsoft Graph operations](microsoft-graph-operations.md#conditional-access).
 
 ## Next steps
 
-- [Set up Identity Protection and Conditional Access for Azure AD B2C](conditional-access-identity-protection-setup.md)
+- [Add Conditional Access to user flows](conditional-access-user-flow.md)
 - [Learn about Identity Protection in Azure AD](../active-directory/identity-protection/overview-identity-protection.md)
 - [Learn about Conditional Access](../active-directory/conditional-access/overview.md)