Fixing merge conflict

Author: v-jbasden

.openpublishing.publish.config.json

@@ -218,6 +218,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azure-functions-durable-js",
+      "url": "https://github.com/Azure/azure-functions-durable-js",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azure-functions-kafka-extension",
       "url": "https://github.com/Azure/azure-functions-kafka-extension",

.openpublishing.redirection.active-directory.json

@@ -55,6 +55,11 @@
       "redirect_url": "/graph/tutorial-lifecycle-workflows-onboard-custom-workflow",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/governance/lifecycle-workflows-developer-reference.md",
+      "redirect_url": "/graph/api/resources/identitygovernance-workflow",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/governance/tutorial-offboard-custom-workflow-graph.md",
       "redirect_url": "/graph/tutorial-lifecycle-workflows-offboard-custom-workflow",

.openpublishing.redirection.azure-monitor.json

@@ -5536,6 +5536,11 @@
             "source_path_from_root": "/articles/azure-monitor/app/auto-collect-dependencies.md",
             "redirect_url": "/azure/azure-monitor/app/asp-net-dependencies",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/custom-endpoints.md",
+            "redirect_url": "/azure/azure-monitor/app/create-new-resource",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.defender-for-cloud.json

@@ -754,7 +754,11 @@
             "source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-va-acr.md",
             "redirect_url": "/azure/defender-for-cloud/defender-for-containers-vulnerability-assessment-azure",
             "redirect_document_id": true
-        }
-    
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/deploy-vulnerability-assessment-tvm.md",
+            "redirect_url": "/azure/defender-for-cloud/deploy-vulnerability-assessment-defender-vulnerability-management",
+            "redirect_document_id": true
+        }    
       ]
 }

.openpublishing.redirection.defender-for-iot.json

@@ -1,5 +1,20 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-create-and-manage-users.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/manage-users-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/integrate-with-active-directory.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/manage-users-sensor#integrate-ot-sensor-users-with-active-directory",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-define-global-user-access-control.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/manage-users-on-premises-management-console#define-global-access-permission-for-on-premises-users",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-iot/organizations/tutorial-getting-started-eiot-sensor.md",
             "redirect_url": "/azure/defender-for-iot/organizations/concept-enterprise",

.openpublishing.redirection.json

@@ -1,5 +1,15 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/sentinel/iot-solution.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/iot-solution",
+            "redirect_document_id": false
+        }, 
+        {
+            "source_path_from_root": "/articles/sentinel/iot-advanced-threat-monitoring.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/iot-advanced-threat-monitoring",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/backup/backup-center-community.md",
             "redirect_url": "/azure/backup/backup-center-overview",

articles/active-directory-b2c/TOC.yml

@@ -524,6 +524,8 @@
         href: threat-management.md
       - name: Secure access to legacy and on-premises apps
         items:
+        - name: Akamai
+          href: partner-akamai-secure-hybrid-access.md
         - name: Datawiza
           href: partner-datawiza.md
         - name: F5
@@ -778,4 +780,4 @@
     href: find-help-open-support-ticket.md
     displayName: technical
   - name: Videos
-    href: azure-ad-external-identities-videos.md
+    href: azure-ad-external-identities-videos.md

articles/active-directory-b2c/conditional-access-user-flow.md

@@ -170,7 +170,7 @@ Configure Conditional Access through the Azure portal or Microsoft Graph APIs to
 
 ### Enable template 1 with Conditional Access APIs (optional)
 
-Create a sign-in risk-based Conditional Access policy with MS Graph APIs. For more information, see [Conditional Access APIs](../active-directory/conditional-access/howto-conditional-access-apis.md#graph-api).
+Create a sign-in risk-based Conditional Access policy with MS Graph APIs. For more information, see [Conditional Access APIs](../active-directory/conditional-access/howto-conditional-access-apis.md#microsoft-graph-apis).
 The following template can be used to create a Conditional Access policy with display name "Template 1: Require MFA for medium+ sign-in risk" in report-only mode.
 
 ```json
@@ -232,7 +232,7 @@ To configure your user based conditional access:
 
 ### Enable template 2 with Conditional Access APIs (optional)
 
-To create a user risk-based Conditional Access policy with Conditional Access APIs, refer to the documentation for [Conditional Access APIs](../active-directory/conditional-access/howto-conditional-access-apis.md#graph-api).
+To create a user risk-based Conditional Access policy with Conditional Access APIs, refer to the documentation for [Conditional Access APIs](../active-directory/conditional-access/howto-conditional-access-apis.md#microsoft-graph-apis).
 
 The following template can be used to create a Conditional Access policy with display name "Template 2: Require secure password change for medium+ user risk" in report-only mode.
 
@@ -303,7 +303,7 @@ To enable with condition access policy:
 
 ### Enable template 3 with Conditional Access APIs (optional)
 
-To create a location-based Conditional Access policy with Conditional Access APIs,  refer to the documentation for [Conditional Access APIs](../active-directory/conditional-access/howto-conditional-access-apis.md#graph-api). To set up Named Locations, refer to the documentations for [Named Locations](/graph/api/resources/namedlocation).
+To create a location-based Conditional Access policy with Conditional Access APIs,  refer to the documentation for [Conditional Access APIs](../active-directory/conditional-access/howto-conditional-access-apis.md#microsoft-graph-apis). To set up Named Locations, refer to the documentations for [Named Locations](/graph/api/resources/namedlocation).
 
 The following template can be used to create a Conditional Access policy with display name "Template 3: Block unallowed locations" in report-only mode.
 

articles/active-directory-b2c/faq.yml

@@ -72,6 +72,11 @@ sections:
         answer: |
           Before opening 'Azure AD B2C' in the left side menu of the Azure portal, you must switch into the directory you want to manage. Switch directories by clicking your identity in the upper right of the Azure portal, then choose a directory in the drop down that appears.
 
+      - question: |
+          Why am I unable to create an Azure AD B2C tenant?
+        answer: |
+          You might not be having the permission to create an Azure AD B2C tenant. Only users with **Global administrator** or **Tenant Creator** role can create the tenant. You need to contact your **Global administrator**. 
+
       - question: |
           How do I customize verification emails (the content and the "From:" field) sent by Azure AD B2C?
         answer: |