Merge branch 'main' into nr-100222-phpwebapp-1906169

Author: v-niranjan

.openpublishing.publish.config.json

@@ -34,7 +34,7 @@
   ],
   "branches_to_filter": [],
   "git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/azure-docs",
-  "git_repository_branch_open_to_public_contributors": "master",
+  "git_repository_branch_open_to_public_contributors": "main",
   "skip_source_output_uploading": false,
   "need_preview_pull_request": true,
   "contribution_branch_mappings": {},
@@ -75,6 +75,12 @@
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azure_storage-snippets",
+      "url": "https://github.com/Azure-Samples/AzureStorageSnippets",
+      "branch": "master",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azure_cli_scripts",
       "url": "https://github.com/Azure-Samples/azure-cli-samples",
@@ -789,6 +795,24 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {  
+      "path_to_root": "active-directory-b2c-msal-node-sign-in-sign-out-webapp",
+      "url": "https://github.com/Azure-Samples/active-directory-b2c-msal-node-sign-in-sign-out-webapp",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {  
+      "path_to_root": "active-directory-b2c-javascript-nodejs-webapi",
+      "url": "https://github.com/Azure-Samples/active-directory-b2c-javascript-nodejs-webapi",
+      "branch": "master",
+      "branch_mapping": {}
+    },
+    {  
+      "path_to_root": "ms-identity-dotnetcore-b2c-account-management",
+      "url": "https://github.com/Azure-Samples/ms-identity-dotnetcore-b2c-account-management",
+      "branch": "master",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "msdocs-python-flask-webapp-quickstart",
       "url": "https://github.com/Azure-Samples/msdocs-python-flask-webapp-quickstart",
@@ -840,7 +864,7 @@
     ".openpublishing.redirection.media-services.json",
     ".openpublishing.redirection.security-benchmark.json",
     ".openpublishing.redirection.sql-database.json",
-    ".openpublishing.redirection.synapse-analytics.json",
+    "articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
     ".openpublishing.redirection.azure-web-pubsub.json",
     ".openpublishing.redirection.azure-monitor.json",
     ".openpublishing.redirection.azure-percept.json",
@@ -869,8 +893,12 @@
     "articles/purview/.openpublishing.redirection.purview.json",
     "articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
     "articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
+    "articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
     "articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
     "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
-    "articles/mysql/.openpublishing.redirection.mysql.json"
+    "articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
+    "articles/mysql/.openpublishing.redirection.mysql.json",
+    "articles/container-apps/.openpublishing.redirection.container-apps.json",
+    "articles/spring-cloud/.openpublishing.redirection.spring-cloud.json"
   ]
-}
+}

.openpublishing.redirection.active-directory.json

@@ -1,5 +1,25 @@
 {
     "redirections": [
+        {
+          "source_path_from_root": "/articles/active-directory/authentication/cloud-native-certificate-based-authentication-faq.yml",
+          "redirect_url": "/azure/active-directory/authentication/certificate-based-authentication-faq",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/active-directory/authentication/concept-cloud-native-certificate-based-authentication-limitations.md",
+          "redirect_url": "/azure/active-directory/authentication/concept-certificate-based-authentication-limitations",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/active-directory/authentication/concept-cloud-native-certificate-based-authentication-technical-deep-dive.md",
+          "redirect_url": "/azure/active-directory/authentication/concept-certificate-based-authentication-technical-deep-dive",
+          "redirect_document_id": false
+        },
+        {
+          "source_path_from_root": "/articles/active-directory/authentication/concept-cloud-native-certificate-based-authentication.md",
+          "redirect_url": "/azure/active-directory/authentication/concept-certificate-based-authentication",
+          "redirect_document_id": false
+        },
         {
           "source_path_from_root": "/articles/active-directory/manage-apps/common-scenarios.md",
           "redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
@@ -780,6 +800,11 @@
             "redirect_url": "/azure/active-directory/external-identities/external-identities-overview",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/active-directory/external-identities/o365-external-user.md",
+            "redirect_url": "/azure/active-directory/external-identities/what-is-b2b",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-b2b-current-preview-limitations.md",
             "redirect_url": "/azure/active-directory/active-directory-b2b-current-limitations",
@@ -837,12 +862,12 @@
         },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-conditional-access.md",
-            "redirect_url": "/azure/active-directory/active-directory-conditional-access-azure-portal",
+            "redirect_url": "/azure/active-directory/conditional-access/overview",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-conditional-access-azuread-connected-apps.md",
-            "redirect_url": "/azure/active-directory/active-directory-conditional-access-azure-portal-get-started",
+            "redirect_url": "/azure/active-directory/concept-conditional-access-cloud-apps",
             "redirect_document_id": false
         },
         {
@@ -1972,7 +1997,7 @@
         },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-conditional-access-azure-portal-get-started.md",
-            "redirect_url": "/azure/active-directory/conditional-access/app-based-mfa",
+            "redirect_url": "/azure/active-directory/conditional-access/howto-conditional-access-policy-azure-management",
             "redirect_document_id": true
         },
         {
@@ -2067,7 +2092,7 @@
         },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-conditional-access-device-policies.md",
-            "redirect_url": "/azure/active-directory/conditional-access/overview",
+            "redirect_url": "/azure/active-directory/conditional-access/concept-condition-filters-for-devices",
             "redirect_document_id": false
         },
         {
@@ -2077,7 +2102,7 @@
         },
         {
             "source_path_from_root": "/articles/active-directory/conditional-access/howto-conditional-access-adoption-kit.md",
-            "redirect_url": "/azure/active-directory/conditional-access/overview",
+            "redirect_url": "/azure/active-directory/conditional-access/plan-conditional-access",
             "redirect_document_id": false
         },
         {
@@ -3458,7 +3483,7 @@
         {
             "source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-enable.md",
             "redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-enable",
-            "redirect_document_id": true
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-faqs.md",
@@ -3473,7 +3498,7 @@
         {
             "source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-overview.md",
             "redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-overview",
-            "redirect_document_id": true
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-troubleshooting.md",
@@ -3485,6 +3510,11 @@
             "redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-windows-settings-reference",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/active-directory/devices/enterprise-state-roaming-overview.md",
+            "redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-enable",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/active-directory/device-management-faq.md",
             "redirect_url": "/azure/active-directory/devices/faq",
@@ -7890,6 +7920,11 @@
             "redirect_url": "/azure/active-directory/saas-apps/cisco-webex-provisioning-tutorial",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/active-directory/saas-apps/active-and-thriving-perth-airport-tutorial.md",
+            "redirect_url": "/azure/active-directory/saas-apps/active-and-thriving-tutorial",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-saas-cisco-webex-tutorial.md",
             "redirect_url": "/azure/active-directory/saas-apps/cisco-webex-tutorial",
@@ -10664,7 +10699,22 @@
             "source_path_from_root": "/articles/active-directory-b2c/troubleshoot-custom-policies.md",
             "redirect_url": "/azure/active-directory-b2c/troubleshoot",
             "redirect_document_id": false
-          },
+        },
+        {
+            "source_path_from_root": "/articles/active-directory-b2c/tutorial-authenticate-nodejs-web-app-msal.md",
+            "redirect_url": "/azure/active-directory-b2c/enable-authentication-in-node-web-app",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/active-directory-b2c/tutorial-acquire-access-token.md",
+            "redirect_url": "/azure/active-directory-b2c/enable-authentication-in-node-web-app-with-api",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/active-directory-b2c/tutorial-call-api-with-access-token.md",
+            "redirect_url": "/azure/active-directory-b2c/enable-authentication-in-node-web-app-with-api",
+            "redirect_document_id": false
+        },
         {
             "source_path": "articles/active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-arm.md",
             "redirect_url": "/azure/active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities?pivots=identity-mi-methods-arm",

.openpublishing.redirection.azure-monitor.json

@@ -9,6 +9,21 @@
             "source_path_from_root": "/articles/application-insights/app-insights-performance-counters.md",
             "redirect_url": "/azure/azure-monitor/app/performance-counters",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/application-insights/cloudservices.md",
+            "redirect_url": "/azure/azure-monitor/app/azure-web-apps-net",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/insights/service-bus-insights.md",
+            "redirect_url": "/azure/service-bus-messaging/service-bus-insights",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/agents/data-collection-rule-overview.md",
+            "redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-overview",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.azure-sql.json

@@ -175,13 +175,23 @@
             "redirect_url": "/sql/machine-learning/tutorials/r-predictive-model-train?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-sql/database/auto-failover-group-overview.md",
+            "redirect_url": "/azure/azure-sql/database/auto-failover-group-sql-db",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/azure-sql/database/auto-failover-group-configure.md",
+            "redirect_url": "/azure/azure-sql/database/auto-failover-group-configure-sql-db",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/azure-sql/database/job-automation-managed-instances.md",
             "redirect_url": "/azure/azure-sql/managed-instance/job-automation-managed-instance",
             "redirect_document_id": true
         },   
         {
-            "source_path": "articles/azure-sql/database/service-tiers-general-purpose-business-critical.md",
+            "source_path_from_root": "/articles/azure-sql/database/service-tiers-general-purpose-business-critical.md",
             "redirect_url": "/azure/azure-sql/database/service-tiers-vcore",
             "redirect_document_id": false
         }                                                                                                                  

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

@@ -1,10 +1,5 @@
 {
     "redirections": [
-        {
-            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-configure-with-sentinel.md",
-            "redirect_url": "/azure/sentinel/iot-solution",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-building-the-defender-micro-agent-from-source.md",
             "redirect_url": "/azure/defender-for-iot/device-builders/overview",
@@ -30,7 +25,17 @@
             "redirect_url": "/azure/defender-for-iot/organizations/getting-started",
             "redirect_document_id": false
         },
-	{
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-view-information-provided-in-alerts.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/how-to-view-alerts",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-work-with-alerts-on-your-sensor.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/concept-key-concepts#analytics-and-self-learning-engines",
+            "redirect_document_id": false
+        },
+	    {
             "source_path_from_root": "/azure/defender-for-iot/organizations/quickstart-system-prerequisites.md",
             "redirect_url": "/azure/defender-for-iot/organizations/getting-started",
             "redirect_document_id": false
@@ -230,11 +235,6 @@
             "redirect_url": "/azure/defender-for-iot/organizations/how-to-track-sensor-activity",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/defender-for-iot/how-to-configure-with-sentinel.md",
-            "redirect_url": "/azure/defender-for-iot/organizations/how-to-configure-with-sentinel",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/defender-for-iot/how-to-troubleshoot-the-sensor-and-on-premises-management-console.md",
             "redirect_url": "/azure/defender-for-iot/organizations/how-to-troubleshoot-the-sensor-and-on-premises-management-console",
@@ -564,6 +564,29 @@
             "source_path_from_root": "/articles/defender-for-iot/organizations/references-horizon-sdk.md",
             "redirect_url": "/azure/defender-for-iot/organizations",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/device-builders/how-to-configure-with-sentinel.md",
+            "redirect_url": "/azure/sentinel/iot-solution?toc=%2Fazure%2Fdefender-for-iot%2Forganizations%2Ftoc.json&bc=%2Fazure%2Fdefender-for-iot%2Fbreadcrumb%2Ftoc.json&tabs=use-out-of-the-box-analytics-rules-recommended",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-configure-with-sentinel.md",
+            "redirect_url": "/azure/sentinel/iot-solution?toc=%2Fazure%2Fdefender-for-iot%2Forganizations%2Ftoc.json&bc=%2Fazure%2Fdefender-for-iot%2Fbreadcrumb%2Ftoc.json&tabs=use-out-of-the-box-analytics-rules-recommended",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/how-to-configure-with-sentinel.md",
+            "redirect_url": "/azure/sentinel/iot-solution?toc=%2Fazure%2Fdefender-for-iot%2Forganizations%2Ftoc.json&bc=%2Fazure%2Fdefender-for-iot%2Fbreadcrumb%2Ftoc.json&tabs=use-out-of-the-box-analytics-rules-recommended",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/device-builders/concept-security-agent-authentication.md",
+            "redirect_url": "/azure/defender-for-iot/device-builders/tutorial-standalone-agent-binary-installation",
+            "redirect_document_id": false
         }
     ]
-}
+}
+
+
+