Resolve merge conflict (date only)

Author: v-dalc

.acrolinx-config.edn

@@ -1,2 +1,2 @@
-{:allowed-branchname-matches ["main" "master" "release-.*"]
+{:allowed-branchname-matches ["main" "release-.*"]
  :allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md))" "includes/"]}

.openpublishing.publish.config.json

@@ -60,13 +60,13 @@
     {
       "path_to_root": "_themes",
       "url": "https://github.com/Microsoft/templates.docs.msft",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
       "path_to_root": "_themes.pdf",
       "url": "https://github.com/Microsoft/templates.docs.msft.pdf",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
@@ -772,10 +772,10 @@
       "branch_mapping": {}
     },
     {
-    "path_to_root": "digital-twins-docs-samples-getting-started",
-    "url": "https://github.com/Azure-Samples/azure-digital-twins-getting-started",
-    "branch": "main",
-    "branch_mapping": {}
+      "path_to_root": "digital-twins-docs-samples-getting-started",
+      "url": "https://github.com/Azure-Samples/azure-digital-twins-getting-started",
+      "branch": "main",
+      "branch_mapping": {}
     },
     {
       "path_to_root": "dotnet-samples",
@@ -789,6 +789,18 @@
       "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": "msdocs-python-flask-webapp-quickstart",
       "url": "https://github.com/Azure-Samples/msdocs-python-flask-webapp-quickstart",
@@ -806,14 +818,14 @@
       "url": "https://github.com/Azure-Samples/msdocs-nodejs-mongodb-azure-sample-app",
       "branch": "main",
       "branch_mapping": {}
-    }     
+    }
   ],
   "branch_target_mapping": {
     "live": [
       "Publish",
       "PDF"
     ],
-    "master": [
+    "main": [
       "Publish",
       "PDF"
     ]
@@ -840,13 +852,13 @@
     ".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",
     ".openpublishing.redirection.azure-productivity.json",
     "articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
-    "articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",   
+    "articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
     "articles/azure-relay/.openpublishing.redirection.relay.json",
     "articles/communication-services/.openpublishing.redirection.communication-services.json",
     "articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",
@@ -871,6 +883,7 @@
     "articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
     "articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
     "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
+    "articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
     "articles/mysql/.openpublishing.redirection.mysql.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",
@@ -357,8 +377,8 @@
         },
         {
             "source_path_from_root": "/articles/active-directory/conditional-access-azure-management.md",
-            "redirect_url": "/azure/role-based-access-control/conditional-access-azure-management",
-            "redirect_document_id": true
+            "redirect_url": "/azure/active-directory/conditional-access/concept-conditional-access-cloud-apps",
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/active-directory/role-based-access-control-custom-roles.md",
@@ -755,14 +775,34 @@
             "redirect_url": "/azure/active-directory/active-directory-b2b-admin-add-users",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/active-directory/external-identities/delegate-invitations.md",
+            "redirect_url": "/azure/active-directory/external-identities/external-collaboration-settings-configure",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/external-identities/conditional-access.md",
+            "redirect_url": "/azure/active-directory/external-identities/authentication-conditional-access",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/active-directory/external-identities/compare-with-b2c.md",
+            "redirect_url": "/azure/active-directory/external-identities/external-identities-overview",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/active-directory/external-identities/add-guest-to-role.md",
             "redirect_url": "/azure/active-directory/external-identities/add-users-administrator",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-b2b-compare-external-identities.md",
-            "redirect_url": "/azure/active-directory/active-directory-b2b-compare-b2c",
+            "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
         },
         {
@@ -822,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
         },
         {
@@ -1827,13 +1867,13 @@
         },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-b2b-compare-b2c.md",
-            "redirect_url": "/azure/active-directory/b2b/compare-with-b2c",
-            "redirect_document_id": true
+            "redirect_url": "/azure/active-directory/external-identities/external-identities-overview",
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-b2b-mfa-instructions.md",
             "redirect_url": "/azure/active-directory/b2b/conditional-access",
-            "redirect_document_id": true
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-b2b-configure-saas-apps.md",
@@ -1852,8 +1892,8 @@
         },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-b2b-delegate-invitations.md",
-            "redirect_url": "/azure/active-directory/b2b/delegate-invitations",
-            "redirect_document_id": true
+            "redirect_url": "/azure/active-directory/external-identities/external-collaboration-settings-configure",
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/active-directory/active-directory-b2b-faq.md",
@@ -1957,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
         },
         {
@@ -2052,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
         },
         {
@@ -2062,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
         },
         {
@@ -3822,13 +3862,13 @@
         },
         {
             "source_path_from_root": "/articles/active-directory/b2b/compare-with-b2c.md",
-            "redirect_url": "/azure/active-directory/external-identities/compare-with-b2c",
-            "redirect_document_id": true
+            "redirect_url": "/azure/active-directory/external-identities/external-identities-overview",
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/active-directory/b2b/conditional-access.md",
-            "redirect_url": "/azure/active-directory/external-identities/conditional-access",
-            "redirect_document_id": true
+            "redirect_url": "/azure/active-directory/external-identities/authentication-conditional-access",
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/active-directory/b2b/configure-saas-apps.md",
@@ -3847,8 +3887,8 @@
         },
         {
             "source_path_from_root": "/articles/active-directory/b2b/delegate-invitations.md",
-            "redirect_url": "/azure/active-directory/external-identities/delegate-invitations",
-            "redirect_document_id": true
+            "redirect_url": "/azure/active-directory/external-identities/external-collaboration-settings-configure",
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/active-directory/b2b/direct-federation.md",
@@ -7875,6 +7915,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",
@@ -10649,7 +10694,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

@@ -179,6 +179,11 @@
             "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",
+            "redirect_url": "/azure/azure-sql/database/service-tiers-vcore",
+            "redirect_document_id": false
+        }                                                                                                                  
     ]
 }