resolve merge conflict

Author: b-ahibbard

.github/workflows/stale.yml

@@ -128,12 +128,6 @@
             "branch": "master",
             "branch_mapping": {}
         },
-        {
-            "path_to_root": "azure-docs-snippets-pr",
-            "url": "https://github.com/MicrosoftDocs/azure-docs-snippets-pr",
-            "branch": "main",
-            "branch_mapping": {}
-        },
         {
             "path_to_root": "azure-functions-dapr-extension",
             "url": "https://github.com/Azure/azure-functions-dapr-extension",

.openpublishing.publish.config.json

@@ -1,5 +1,105 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/network-watcher/network-watcher-packet-capture-manage-portal-vmss.md",
+      "redirect_url": "/previous-versions/azure/network-watcher/network-watcher-packet-capture-manage-portal-vmss",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/network-watcher/network-watcher-packet-capture-manage-powershell-vmss.md",
+      "redirect_url": "/previous-versions/azure/network-watcher/network-watcher-packet-capture-manage-powershell-vmss",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-analyze-usage-patterns.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-analyze-usage-patterns",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-http-debug-headers.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-http-debug-headers",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-migrate.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-migrate",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-pop-abbreviations.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-pop-abbreviations",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-query-string-premium.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-query-string-premium",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-query-string.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-query-string",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-real-time-alerts.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-real-time-alerts",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-restrict-access-by-country-region.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-restrict-access-by-country-region",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-verizon-custom-reports.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-verizon-custom-reports",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-verizon-http-headers.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-verizon-http-headers",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-verizon-premium-rules-engine-reference-conditional-expressions.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-verizon-premium-rules-engine-reference-conditional-expressions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-verizon-premium-rules-engine-reference-features.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-verizon-premium-rules-engine-reference-features",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-verizon-premium-rules-engine-reference-match-conditions.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-verizon-premium-rules-engine-reference-match-conditions",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-verizon-premium-rules-engine-reference.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-verizon-premium-rules-engine-reference",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/cdn/cdn-verizon-premium-rules-engine.md",
+      "redirect_url": "/previous-versions/azure/cdn/cdn-verizon-premium-rules-engine",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/network-watcher/network-watcher-nsg-auditing-powershell.md",
+      "redirect_url": "/previous-versions/azure/network-watcher/network-watcher-nsg-auditing-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/network-watcher/view-relative-latencies.md",
+      "redirect_url": "/previous-versions/azure/network-watcher/view-relative-latencies",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-network/migrate-classic-vnet-powershell.md",
+      "redirect_url": "/previous-versions/azure/virtual-network/migrate-classic-vnet-powershell",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/modeling-simulation-workbench/index.yml",
       "redirect_url": "/azure",
@@ -1985,6 +2085,11 @@
       "redirect_url": "/azure/cdn/monitoring-and-access-log",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/cdn/cdn-features.md",
+      "redirect_url": "/azure/frontdoor/front-door-cdn-comparison",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/chef/chef-automation.md",
       "redirect_url": "/azure/developer/chef/windows-vm-configure",
@@ -2244,6 +2349,20 @@
       "source_path_from_root": "/articles/ddos-protection/telemetry-monitoring-alerting.md",
       "redirect_url": "/azure/ddos-protection/telemetry",
       "redirect_document_id": false
+    },    {
+      "source_path_from_root": "/articles/ddos-protection/telemetry.md",
+      "redirect_url": "/azure/ddos-protection/monitor-ddos-protection",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ddos-protection/ddos-configure-log-analytics-workspace.md",
+      "redirect_url": "/azure/azure-monitor/logs/quick-create-workspace",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/ddos-protection/diagnostic-logging.md",
+      "redirect_url": "/azure/azure-monitor/essentials/tutorial-resource-logs",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/defender-for-iot/concept-pricing.md",
@@ -4999,6 +5118,106 @@
       "source_path_from_root": "/articles/reliability/cross-region-replication-azure.md",
       "redirect_url": "/azure/reliability/regions-paired",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/troubleshoot-agent.md",
+      "redirect_url": "/troubleshoot/azure/virtual-desktop/troubleshoot-agent",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/troubleshoot-app-attach.md",
+      "redirect_url": "/troubleshoot/azure/virtual-desktop/troubleshoot-app-attach",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/troubleshoot-authorization.md",
+      "redirect_url": "/troubleshoot/azure/virtual-desktop/troubleshoot-authorization",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/troubleshoot-azure-ad-connections.md",
+      "redirect_url": "/troubleshoot/azure/virtual-desktop/troubleshoot-azure-ad-connections",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/troubleshoot-connection-quality.md",
+      "redirect_url": "/troubleshoot/azure/virtual-desktop/troubleshoot-connection-quality",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/troubleshoot-custom-image-templates.md",
+      "redirect_url": "/troubleshoot/azure/virtual-desktop/troubleshoot-custom-image-templates",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/troubleshoot-device-redirections.md",
+      "redirect_url": "/troubleshoot/azure/virtual-desktop/troubleshoot-device-redirections",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/troubleshoot-insights.md",
+      "redirect_url": "/troubleshoot/azure/virtual-desktop/troubleshoot-insights",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/troubleshoot-management-issues.md",
+      "redirect_url": "/troubleshoot/azure/virtual-desktop/troubleshoot-management-issues",
+      "redirect_document_id": false  
+    },
+    {
+      "source_path": "articles/virtual-desktop/troubleshoot-multimedia-redirection.md",
+      "redirect_url": "/troubleshoot/azure/virtual-desktop/troubleshoot-multimedia-redirection",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/troubleshoot-powershell.md",
+      "redirect_url": "/troubleshoot/azure/virtual-desktop/troubleshoot-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/troubleshoot-rdp-shortpath.md",
+      "redirect_url": "/troubleshoot/azure/virtual-desktop/troubleshoot-rdp-shortpath",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/troubleshoot-service-connection.md",
+      "redirect_url": "/troubleshoot/azure/virtual-desktop/troubleshoot-service-connection",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/troubleshoot-session-host-configuration-update.md",
+      "redirect_url": "/troubleshoot/azure/virtual-desktop/troubleshoot-session-host-configuration-update",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/troubleshoot-set-up-issues.md",
+      "redirect_url": "/troubleshoot/azure/virtual-desktop/troubleshoot-set-up-issues",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/troubleshoot-set-up-overview.md",
+      "redirect_url": "/troubleshoot/azure/virtual-desktop/troubleshoot-set-up-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/virtual-desktop/troubleshoot-vm-configuration.md",
+      "redirect_url": "/troubleshoot/azure/virtual-desktop/troubleshoot-vm-configuration",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/reliability/business-continuity-management-program.md",
+      "redirect_url": "/azure/reliability/concept-business-continuity-high-availability-disaster-recovery",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/reliability/disaster-recovery-overview.md",
+      "redirect_url": "/azure/reliability/concept-business-continuity-high-availability-disaster-recovery",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/reliability/cross-region-replication-azure-no-pair.md",
+      "redirect_url": "/azure/reliability/regions-multi-region-nonpaired",
+      "redirect_document_id": false
     }
   ]
 }

.openpublishing.redirection.json

@@ -411,7 +411,7 @@ if (this.msalGuardConfig.authRequest) {
   authRequestConfig = { ...this.msalGuardConfig.authRequest } as RedirectRequest
 }
 
-authRequestConfig.extraQueryParameters = {"id_token_hint": idToken};;
+authRequestConfig.extraQueryParameters = {"id_token_hint": idToken};
 
 this.authService.loginRedirect(authRequestConfig);
 

articles/active-directory-b2c/enable-authentication-angular-spa-app-options.md

@@ -435,7 +435,7 @@ If you have an Asignio Signature, you're prompted to authenticate with your Asig
 ## Next steps
 
 * [Solutions and Training for Azure Active Directory B2C](solution-articles.md)
-* Ask questions on [Stackoverflow](https://stackoverflow.com/questions/tagged/azure-ad-b2c)
+* Ask questions on [Stack Overflow](https://stackoverflow.com/questions/tagged/azure-ad-b2c)
 * [Azure AD B2C Samples](https://stackoverflow.com/questions/tagged/azure-ad-b2c)
 * YouTube: [Identity Azure AD B2C Series](https://www.youtube.com/playlist?list=PL3ZTgFEc7LyuJ8YRSGXBUVItCPnQz3YX0)
 * [Azure AD B2C custom policy overview](custom-policy-overview.md)

articles/active-directory-b2c/media/technical-overview/audit-log.png

@@ -17,7 +17,7 @@ ms.subservice: b2c
 
 # Configure TheAccessHub Admin Tool with Azure Active Directory B2C
 
-In this tutorial, learn how to integrate Azure Active Directory B2C (Azure AD B2C) with [TheAccessHub Admin Tool](https://n8id.com/products/theaccesshub-admintool/) from N8 Identity [N8ID](https://n8id.com/). The solution addresses customer account migration and customer service request (CSR) administration.  
+In this tutorial, learn how to integrate Azure Active Directory B2C (Azure AD B2C) with [TheAccessHub Admin Tool](https://n8identity.com/products/theaccesshub-admintool/) from N8 Identity [N8ID](https://n8identity.com/). The solution addresses customer account migration and customer service request (CSR) administration.  
 
 Use this solution for the following scenarios:
 
@@ -36,7 +36,7 @@ To get started, you need:
   - If you don't have a one, you can get an [Azure free account](https://azure.microsoft.com/free/)
 - An [Azure AD B2C tenant](./tutorial-create-tenant.md) linked to your Azure subscription
 - TheAccessHub Admin Tool environment
-  - See, [N8 Identity/contact](https://n8id.com/contact/) for a new environment
+  - See, [N8 Identity/contact](https://n8identity.com/contact/) for a new environment
 - Optional: 
   - Connection and credential information for databases or Lightweight Directory Access Protocols (LDAPs), from which you want to migrate customer data
   - A configured Azure AD B2C environment for [custom policies](./tutorial-create-user-flows.md?pivots=b2c-custom-policy) to integrate TheAccessHub Admin Tool into your sign-up policy flow

articles/active-directory-b2c/partner-asignio.md

@@ -444,5 +444,5 @@ Using the directory with your Azure AD B2C tenant, test your custom policy:
 
 ## Next steps
 
-* Ask questions on [Stackoverflow](https://stackoverflow.com/questions/tagged/azure-ad-b2c)
+* Ask questions on [Stack Overflow](https://stackoverflow.com/questions/tagged/azure-ad-b2c)
 * Check out the [Azure AD B2C custom policy overview](custom-policy-overview.md)

articles/active-directory-b2c/partner-n8identity.md

@@ -495,7 +495,7 @@ For additional information, review the following articles:
 
 - [Azure AD B2C docs](solution-articles.md)
 
-- [Ask your question on Stackoverflow](https://stackoverflow.com/questions/tagged/azure-ad-b2c)
+- [Ask your question on Stack Overflow](https://stackoverflow.com/questions/tagged/azure-ad-b2c)
 
 - [Azure AD B2C Samples](https://stackoverflow.com/questions/tagged/azure-ad-b2c)