fixing merge conflict

Author: ShawnJackson

.openpublishing.redirection.active-directory.json

@@ -5818,7 +5818,12 @@
     },
     {
       "source_path_from_root": "/articles/active-directory/manage-apps/active-directory-app-proxy-protect-ndes.md",
-      "redirect_url": "/azure/active-directory/app-proxy/active-directory-app-proxy-protect-ndes",
+      "redirect_url": "/azure/active-directory/app-proxy/app-proxy-protect-ndes",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/app-proxy/active-directory-app-proxy-protect-ndes.md",
+      "redirect_url": "/azure/active-directory/app-proxy/app-proxy-protect-ndes",
       "redirect_document_id": false
     },
     {
@@ -11210,6 +11215,11 @@
       "source_path_from_root": "/articles/active-directory-domain-services/create-resource-forest-powershell.md",
       "redirect_url": "/azure/active-directory-domain-services/create-forest-trust-powershell",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/privileged-identity-management/powershell-for-azure-ad-roles.md",
+      "redirect_url": "/powershell/microsoftgraph/tutorial-pim?view=graph-powershell-1.0",
+      "redirect_document_id": false
     }
   ]
 }

.openpublishing.redirection.api-management.json

@@ -149,6 +149,16 @@
         "source_path_from_root": "/articles/api-management/validation-policies.md",
         "redirect_url": "/azure/api-management/api-management-policies#validation-policies",
         "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/authorizations-how-to.md",
+        "redirect_url": "/azure/api-management/authorizations-how-to-github",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/authorizations-reference.md",
+        "redirect_url": "/azure/api-management/authorizations-configure-common-providers",
+        "redirect_document_id": false
     }
   ]
 }

.openpublishing.redirection.azure-monitor.json

@@ -1,6 +1,11 @@
 {
     "redirections": [
-         {
+        {
+            "source_path_from_root": "/articles/azure-monitor/snapshot-debugger/snapshot-collector-release-notes.md",
+            "redirect_url": "/azure/azure-monitor/snapshot-debugger/snapshot-debugger#release-notes-for-microsoftapplicationinsightssnapshotcollector",
+            "redirect_document_id": false
+        },
+        {
             "source_path_from_root": "/articles/azure-monitor/best-practices.md",
             "redirect_url": "/azure/azure-monitor/getting-started",
             "redirect_document_id": false

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

@@ -1,5 +1,44 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-activate-and-set-up-your-on-premises-management-console.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/ot-deploy/activate-deploy-management",
+            "redirect_document_id": false
+        },        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-activate-and-set-up-your-sensor.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/ot-deploy/activate-deploy-sensor",
+            "redirect_document_id": false
+        },        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-deploy-certificates.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/ot-deploy/activate-deploy-sensor#deploy-an-ssltls-certificate",
+            "redirect_document_id": false
+        },        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-enhance-port-and-vlan-name-resolution.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/how-to-control-what-traffic-is-monitored#customize-port-and-vlan-names",
+            "redirect_document_id": false
+        },        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-gain-insight-into-global-regional-and-local-threats.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/monitor-zero-trust",
+            "redirect_document_id": false
+        },        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/traffic-mirroring/configure-mirror-tap.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/best-practices/traffic-mirroring-methods#active-or-passive-aggregation-tap",
+            "redirect_document_id": false
+        },        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/pre-deployment-checklist.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/ot-deploy/ot-deploy-path",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-troubleshoot-the-sensor-and-on-premises-management-console.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/how-to-troubleshoot-sensor",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-set-up-your-network.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/best-practices/plan-prepare-deploy",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-work-with-device-notifications.md",
             "redirect_url": "/azure/defender-for-iot/organizations/how-to-work-with-the-sensor-device-map#manage-device-notifications-from-an-ot-sensor-device-map",
@@ -136,7 +175,7 @@
         },
         {
             "source_path_from_root": "/articles/defender-for-iot/how-to-set-up-your-network.md",
-            "redirect_url": "/azure/defender-for-iot/organizations/how-to-set-up-your-network",
+            "redirect_url": "/azure/defender-for-iot/organizations/best-practices/plan-prepare-deploy",
             "redirect_document_id": false
         },
         {
@@ -151,7 +190,7 @@
         },
         {
             "source_path_from_root": "/articles/defender-for-iot/how-to-activate-and-set-up-your-on-premises-management-console.md",
-            "redirect_url": "/azure/defender-for-iot/organizations/how-to-activate-and-set-up-your-on-premises-management-console",
+            "redirect_url": "/azure/defender-for-iot/organizations/ot-deploy/activate-deploy-management",
             "redirect_document_id": false
         },
         {
@@ -256,7 +295,7 @@
         },
         {
             "source_path_from_root": "/articles/defender-for-iot/how-to-gain-insight-into-global-regional-and-local-threats.md",
-            "redirect_url": "/azure/defender-for-iot/organizations/how-to-gain-insight-into-global-regional-and-local-threats",
+            "redirect_url": "/azure/defender-for-iot/organizations/monitor-zero-trust",
             "redirect_document_id": false
         },
         {
@@ -677,5 +716,3 @@
     ]
 }
 
-
-

.openpublishing.redirection.json

@@ -22508,6 +22508,21 @@
             "redirect_URL": "/azure/private-5g-core/modify-service-plan",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/private-5g-core/monitor-private-5g-core-with-log-analytics.md",
+            "redirect_url": "/azure/private-5g-core/monitor-private-5g-core-with-platform-metrics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/private-5g-core/enable-log-analytics-for-private-5g-core.md",
+            "redirect_url": "/azure/private-5g-core/monitor-private-5g-core-with-platform-metrics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/private-5g-core/create-overview-dashboard.md",
+            "redirect_url": "/azure/private-5g-core/monitor-private-5g-core-with-platform-metrics",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/communications-gateway/rotate-secrets.md",
             "redirect_URL": "/azure/communications-gateway/whats-new",

.openpublishing.redirection.machine-configuration.json

@@ -7,63 +7,128 @@
         },
         {
           "source_path_from_root": "/articles/governance/policy/concepts/guest-configuration-policy-effects.md",
-          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-policy-effects",
+          "redirect_url": "/azure/governance/machine-configuration/remediation-options",
           "redirect_document_id": false
         },
         {
           "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-desired-state-configuration-extension-migration.md",
-          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-dsc-extension-migration",
+          "redirect_url": "/azure/governance/machine-configuration/migrate-from-dsc-extension",
           "redirect_document_id": false
         },
         {
           "source_path_from_root": "/articles/governance/policy/concepts/guest-configuration-custom.md",
-          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-custom",
+          "redirect_url": "/azure/governance/machine-configuration/dsc-in-machine-configuration",
           "redirect_document_id": false
         },
         {
           "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create.md",
-          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-create",
+          "redirect_url": "/azure/governance/machine-configuration/how-to-create-package",
           "redirect_document_id": false
         },
         {
           "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-test.md",
-          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-test",
+          "redirect_url": "/azure/governance/machine-configuration/how-to-test-package",
           "redirect_document_id": false
         },
         {
           "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-signing.md",
-          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-signing",
+          "redirect_url": "/azure/governance/machine-configuration/how-to-sign-package",
           "redirect_document_id": false
         },
         {
           "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-setup.md",
-          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-setup",
+          "redirect_url": "/azure/governance/machine-configuration/how-to-set-up-authoring-environment",
           "redirect_document_id": false
         },
         {
           "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-publish.md",
-          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-publish",
+          "redirect_url": "/azure/governance/machine-configuration/how-to-publish-package",
           "redirect_document_id": false
         },
         {
           "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-definition.md",
-          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-definition",
+          "redirect_url": "/azure/governance/machine-configuration/how-to-create-policy-definition",
           "redirect_document_id": false
         },
         {
           "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-assignment.md",
-          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-create-assignment",
+          "redirect_url": "/azure/governance/machine-configuration/how-to-create-assignment",
           "redirect_document_id": false
         },
         {
           "source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-azure-automation-migration.md",
-          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-azure-automation-migration",
+          "redirect_url": "/azure/governance/machine-configuration/migrate-from-azure-automation",
           "redirect_document_id": false
         },
         {
           "source_path_from_root": "/articles/governance/policy/concepts/guest-configuration-assignments.md",
-          "redirect_url": "/azure/governance/machine-configuration/machine-configuration-assignments",
+          "redirect_url": "/azure/governance/machine-configuration/assignments",
           "redirect_document_id": false
         },
+        {
+          "source_path_from_root": "/articles/governance/machine-configuration/agent-notes.md",
+          "redirect_url": "/azure/governance/machine-configuration/agent-release-notes",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/machine-configuration/machine-configuration-assignments.md",
+          "redirect_url": "/azure/governance/machine-configuration/assignments",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/machine-configuration/machine-configuration-azure-automation-migration.md",
+          "redirect_url": "/azure/governance/machine-configuration/migrate-from-azure-automation",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/machine-configuration/machine-configuration-create-assignment.md",
+          "redirect_url": "/azure/governance/machine-configuration/how-to-create-assignment",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/machine-configuration/machine-configuration-create-definition.md",
+          "redirect_url": "/azure/governance/machine-configuration/how-to-create-policy-definition",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/machine-configuration/machine-configuration-create-publish.md",
+          "redirect_url": "/azure/governance/machine-configuration/how-to-publish-package",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/machine-configuration/machine-configuration-create-setup.md",
+          "redirect_url": "/azure/governance/machine-configuration/how-to-set-up-authoring-environment",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/machine-configuration/machine-configuration-create-signing.md",
+          "redirect_url": "/azure/governance/machine-configuration/how-to-sign-package",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/machine-configuration/machine-configuration-create-test.md",
+          "redirect_url": "/azure/governance/machine-configuration/how-to-test-package",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/machine-configuration/machine-configuration-create.md",
+          "redirect_url": "/azure/governance/machine-configuration/how-to-create-package",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/machine-configuration/machine-configuration-custom.md",
+          "redirect_url": "/azure/governance/machine-configuration/dsc-in-machine-configuration",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/machine-configuration/machine-configuration-dsc-extension-migration.md",
+          "redirect_url": "/azure/governance/machine-configuration/migrate-from-dsc-extension",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/governance/machine-configuration/machine-configuration-policy-effects.md",
+          "redirect_url": "/azure/governance/machine-configuration/remediation-options",
+          "redirect_document_id": false
+        }
       ]
 }

articles/active-directory-b2c/whats-new-docs.md

@@ -15,6 +15,29 @@ manager: CelesteDG
 
 Welcome to what's new in Azure Active Directory B2C documentation. This article lists new docs that have been added and those that have had significant updates in the last three months. To learn what's new with the B2C service, see [What's new in Azure Active Directory](../active-directory/fundamentals/whats-new.md) and [Azure AD B2C developer release notes](custom-policy-developer-notes.md)
 
+## March 2023
+
+### Updated articles
+
+- [Configure SAML identity provider options with Azure Active Directory B2C](identity-provider-generic-saml-options.md)
+- [Tutorial: Configure BioCatch with Azure Active Directory B2C](partner-biocatch.md)
+- [Tutorial: Configure Nok Nok Passport with Azure Active Directory B2C for passwordless FIDO2 authentication](partner-nok-nok.md)
+- [Pass an identity provider access token to your application in Azure Active Directory B2C](idp-pass-through-user-flow.md)
+- [Tutorial: Configure Haventec Authenticate with Azure Active Directory B2C for single-step, multi-factor passwordless authentication](partner-haventec.md)
+- [Configure Trusona Authentication Cloud with Azure Active Directory B2C](partner-trusona.md)
+- [Tutorial: Configure IDEMIA Mobile ID with Azure Active Directory B2C](partner-idemia.md)
+- [Configure Azure Active Directory B2C with Bluink eID-Me for identity verification](partner-eid-me.md)
+- [Tutorial: Configure Azure Active Directory B2C with BlokSec for passwordless authentication](partner-bloksec.md)
+- [Tutorial: Configure Azure Active Directory B2C with Azure Web Application Firewall](partner-azure-web-application-firewall.md)
+- [Tutorial to configure Saviynt with Azure Active Directory B2C](partner-saviynt.md)
+- [Tutorial: Configure Keyless with Azure Active Directory B2C](partner-keyless.md)
+- [Tutorial: Configure security analytics for Azure Active Directory B2C data with Microsoft Sentinel](azure-sentinel.md)
+- [Configure authentication in a sample Python web app by using Azure AD B2C](configure-authentication-sample-python-web-app.md)
+- [Billing model for Azure Active Directory B2C](billing.md)
+- [Azure Active Directory B2C: Region availability & data residency](data-residency.md)
+- ['Azure AD B2C: Frequently asked questions (FAQ)'](faq.yml)
+- [Tutorial: Create an Azure Active Directory B2C tenant](tutorial-create-tenant.md)
+ 
 ## February 2023
 
 ### Updated articles