20221207 resolve merge conflict

Author: WilliamDAssafMSFT

.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",
@@ -970,6 +976,7 @@
     "articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
     "articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
     ".openpublishing.redirection.baremetal-infrastructure.json",
-    "articles/iot-dps/.openpublishing.redirection.iot-dps.json"
+    "articles/iot-dps/.openpublishing.redirection.iot-dps.json",
+    "articles/cloud-shell/.openpublishing.redirection.cloud-shell.json"
   ]
 }

.openpublishing.redirection.active-directory.json

@@ -45,11 +45,26 @@
       "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/iauditor-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/safety-culture-tutorial",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/icertisicm-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/governance/tutorial-onboard-custom-workflow-graph.md",
       "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",
@@ -112,7 +127,7 @@
     },
     {
       "source_path_from_root": "/articles/active-directory/develop/active-directory-v2-limitations.md",
-      "redirect_url": "/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
+      "redirect_url": "/azure/active-directory/develop/v2-overview",
       "redirect_document_id": false
     },
     {
@@ -1897,7 +1912,7 @@
     },
     {
       "source_path_from_root": "/articles/active-directory/develop/azure-ad-endpoint-comparison.md",
-      "redirect_url": "/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
+      "redirect_url": "/azure/active-directory/develop/v2-overview",
       "redirect_document_id": false
     },
     {
@@ -10911,6 +10926,11 @@
       "redirect_url": "/azure/azure-percept/index",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/reports-monitoring/howto-install-use-log-analytics-views.md",
+      "redirect_url": "/azure/azure-monitor/visualize/workbooks-view-designer-conversion-overview",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-create-azure-portal.md",
       "redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
@@ -10948,7 +10968,7 @@
     },
     {
       "source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
-      "redirect_url": "/azure/active-directory/fundamentals/customize-branding",
+      "redirect_url": "/azure/active-directory/fundamentals/active-directory-users-profile-azure-portal",
       "redirect_document_id": false
     },
     {

.openpublishing.redirection.azure-monitor.json

@@ -5516,6 +5516,31 @@
             "source_path_from_root": "/articles/azure-monitor/containers/container-insights-prometheus-monitoring-addon.md",
             "redirect_url": "/azure/azure-monitor/containers/container-insights-prometheus",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/powershell-azure-diagnostics.md",
+            "redirect_url": "/azure/azure-monitor/agents/diagnostics-extension-to-application-insights",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/platforms.md",
+            "redirect_url": "/azure/azure-monitor/app/app-insights-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/export-data-model.md",
+            "redirect_url": "/azure/azure-monitor/app/export-telemetry",
+            "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
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/logs/api/authentication-authorization.md",
+            "redirect_url": "/azure/azure-monitor/logs/api/access-api",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.azure-productivity.json

@@ -1,39 +1,89 @@
 {
-    "redirections": [
-        {
-            "source_path_from_root": "/articles/lab-services/classroom-labs-overview.md",
-            "redirect_url": "/azure/lab-services/lab-services-overview",
-            "redirect_document_id": false
-        },
-        {
-          "source_path_from_root": "/articles/devtest-labs/scripts/add-external-user-to-lab.md",
-          "redirect_url": "/azure/devtest-labs/samples-powershell",
-          "redirect_document_id": false
-        },
-        {
-          "source_path_from_root": "/articles/devtest-labs/scripts/add-marketplace-images-to-lab.md",
-          "redirect_url": "/azure/devtest-labs/samples-powershell",
-          "redirect_document_id": false
-        },
-        {
-          "source_path_from_root": "/articles/devtest-labs/scripts/create-custom-image-from-vhd.md",
-          "redirect_url": "/azure/devtest-labs/samples-powershell",
-          "redirect_document_id": false
-        },
-        {
-          "source_path_from_root": "/articles/devtest-labs/scripts/create-custom-role-in-lab.md",
-          "redirect_url": "/azure/devtest-labs/samples-powershell",
-          "redirect_document_id": false
-        },
-        {
-          "source_path_from_root": "/articles/devtest-labs/scripts/set-allowed-vm-sizes-in-lab.md",
-          "redirect_url": "/azure/devtest-labs/samples-powershell",
-          "redirect_document_id": false
-        },
-        {
-          "source_path": "articles/dev-box/tutorial-connect-to-dev-box-with-remote-desktop-app.md",
-          "redirect_url": "/azure/dev-box/quickstart-connect-to-dev-box-with-remote-desktop-app",
-          "redirect_document_id": false
-      }
-    ]
-}
+  "redirections": [
+    {
+      "source_path_from_root": "/articles/lab-services/classroom-labs-overview.md",
+      "redirect_url": "/azure/lab-services/lab-services-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/scripts/add-external-user-to-lab.md",
+      "redirect_url": "/azure/devtest-labs/samples-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/scripts/add-marketplace-images-to-lab.md",
+      "redirect_url": "/azure/devtest-labs/samples-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/scripts/create-custom-image-from-vhd.md",
+      "redirect_url": "/azure/devtest-labs/samples-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/scripts/create-custom-role-in-lab.md",
+      "redirect_url": "/azure/devtest-labs/samples-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/devtest-labs/scripts/set-allowed-vm-sizes-in-lab.md",
+      "redirect_url": "/azure/devtest-labs/samples-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/dev-box/tutorial-connect-to-dev-box-with-remote-desktop-app.md",
+      "redirect_url": "/azure/dev-box/quickstart-connect-to-dev-box-with-remote-desktop-app",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-create-schedules-within-teams.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-teams",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-delete-lab-within-teams.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-teams",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-manage-user-lists-within-teams.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-teams",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-manage-vm-pool-within-teams.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-teams",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-get-started-create-lab-within-teams.md",
+      "redirect_url": "/azure/lab-services/how-to-configure-teams-for-lab-plans",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/how-to-get-started-create-lab-within-canvas.md",
+      "redirect_url": "/azure/lab-services/how-to-configure-canvas-for-lab-plans",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "articles/lab-services/how-to-create-schedules-within-canvas.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-canvas",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-delete-lab-within-canvas.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-canvas",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-manage-user-lists-within-canvas.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-canvas",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-manage-vm-pool-within-canvas.md",
+      "redirect_url": "/azure/lab-services/how-to-manage-labs-within-canvas",
+      "redirect_document_id": false
+    }
+  ]
+}

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

@@ -754,7 +754,21 @@
             "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
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/plan-multicloud-security-other-resources.md",
+            "redirect_url": "/azure/defender-for-cloud/multicloud",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/defender-for-servers-introduction.md",
+            "redirect_url": "/azure/defender-for-cloud/plan-defender-for-servers",
+            "redirect_document_id": true
         }
-    
       ]
 }

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

@@ -1,5 +1,25 @@
 {
     "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",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-iot/organizations/resources-frequently-asked-questions.md",
             "redirect_url": "/azure/defender-for-iot/organizations/faqs-general",
@@ -122,12 +142,12 @@
         },
         {
             "source_path_from_root": "/articles/defender-for-iot/how-to-create-and-manage-users.md",
-            "redirect_url": "/azure/defender-for-iot/organizations/how-to-create-and-manage-users",
+            "redirect_url": "/azure/defender-for-iot/organizations/manage-users-overview",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/defender-for-iot/how-to-define-global-user-access-control.md",
-            "redirect_url": "/azure/defender-for-iot/organizations/how-to-define-global-user-access-control",
+            "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
         },
         {

.openpublishing.redirection.healthcare-apis.json

@@ -554,6 +554,34 @@
         "redirect_url": "/azure/healthcare-apis/iot/how-to-use-iot-jsonpath-content-mappings",
         "redirect_document_id": false
     },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/deploy-iot-connector-in-azure.md",
+        "redirect_url": "/azure/healthcare-apis/iot/deploy-new-choose",
+        "redirect_document_id": false
+    },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/deploy-02-new-button.md",
+        "redirect_url": "/azure/healthcare-apis/iot/deploy-new-button",
+        "redirect_document_id": false
+    },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/deploy-03-new-manual.md",
+        "redirect_url": "/azure/healthcare-apis/iot/deploy-new-manual",
+        "redirect_document_id": false
+    },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/deploy-05-new-config.md",
+        "redirect_url": "/azure/healthcare-apis/iot/deploy-new-config",
+        "redirect_document_id": false
+    },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/deploy-06-new-deploy.md",
+        "redirect_url": "/azure/healthcare-apis/iot/deploy-new-deploy",
+        "redirect_document_id": false
+    },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/deploy-08-new-ps-cli.md",
+        "redirect_url": "/azure/healthcare-apis/iot/deploy-new-powershell-cli",
+        "redirect_document_id": false
+    },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-bicep-ps-cli.md",
+        "redirect_url": "/azure/healthcare-apis/iot/deploy-new-bicep-powershell-cli",
+        "redirect_document_id": false
+    }, 
     {   "source_path_from_root": "/articles/healthcare-apis/events/events-display-metrics.md",
         "redirect_url": "/azure/healthcare-apis/events/events-use-metrics",
         "redirect_document_id": false