resolve conflicts

Author: mumian

.openpublishing.publish.config.json

@@ -135,9 +135,9 @@
       "branch_mapping": {}
     },
     {
-      "path_to_root": "ms-identity-dotnetcore-b2c-account-management",
+      "path_to_root": "ms-identity-dotnetcore-b2c-account-management-archive",
       "url": "https://github.com/Azure-Samples/ms-identity-dotnetcore-b2c-account-management",
-      "branch": "master",
+      "branch": "archive",
       "branch_mapping": {}
     },
     {

.openpublishing.redirection.azure-monitor.json

@@ -6679,6 +6679,11 @@
             "redirect_url": "/azure/azure-monitor/monitor-azure-monitor-reference",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/azure-monitor-monitoring-reference.md",
+            "redirect_url": "/azure/azure-monitor/monitor-azure-monitor-reference",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/ai-ops/responsible-ai-faq.md",
             "redirect_url": "/azure/copilot/overview",
@@ -6694,11 +6699,6 @@
             "redirect_url": "/azure/copilot/overview",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/azure-monitor/azure-monitor-monitoring-reference.md",
-            "redirect_url": "/azure/azure-monitor/monitor-azure-monitor-reference",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/azure-monitor/insights/resource-group-insights.md",
             "redirect_url": "/azure/azure-resource-manager/management/resource-group-insights",

.openpublishing.redirection.json

@@ -4072,6 +4072,11 @@
             "source_path_from_root":"/articles/migrate/prepare-isv-movere.md",
             "redirect_url":"/azure/migrate/whats-new#update-april-2024",
             "redirect_document_id":false 
+        },
+        {
+            "source_path_from_root":"/articles/aks/troubleshoot-udp-packet-drops.md",
+            "redirect_url":"/troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes",
+            "redirect_document_id":false
         }
     ]
 }

articles/active-directory-b2c/access-tokens.md

@@ -23,7 +23,7 @@ An *access token* contains claims that you can use in Azure Active Directory B2C
 This article shows you how to request an access token for a web application and web API. For more information about tokens in Azure AD B2C, see the [overview of tokens in Azure Active Directory B2C](tokens-overview.md).
 
 > [!NOTE]
-> **Web API chains (On-Behalf-Of) is not supported by Azure AD B2C** - Many architectures include a web API that needs to call another downstream web API, both secured by Azure AD B2C. This scenario is common in clients that have a web API back end, which in turn calls a another service. This chained web API scenario can be supported by using the OAuth 2.0 JWT Bearer Credential grant, otherwise known as the On-Behalf-Of flow. However, the On-Behalf-Of flow is not currently implemented in Azure AD B2C. Although On-Behalf-Of works for applications registered in Microsoft Entra ID, it does not work for applications registered in Azure AD B2C, regardless of the tenant (Microsoft Entra ID or Azure AD B2C) that is issuing the tokens.
+> **Web API chains (On-Behalf-Of) is not supported by Azure AD B2C** - Many architectures include a web API that needs to call another downstream web API, both secured by Azure AD B2C. This scenario is common in clients that have a web API back end, which in turn calls another service. This chained web API scenario can be supported by using the OAuth 2.0 JWT Bearer Credential grant, otherwise known as the On-Behalf-Of flow. However, the On-Behalf-Of flow is not currently implemented in Azure AD B2C. Although On-Behalf-Of works for applications registered in Microsoft Entra ID, it does not work for applications registered in Azure AD B2C, regardless of the tenant (Microsoft Entra ID or Azure AD B2C) that is issuing the tokens.
 
 ## Prerequisites
 

articles/active-directory-b2c/azure-monitor.md

@@ -316,7 +316,7 @@ Use the following instructions to create a new Azure Alert, which will send an [
    - Alert logic: Set **Number of results** **Greater than** **0**.
    - Evaluation based on: Select **120** for Period (in minutes) and **5** for Frequency (in minutes)
 
-   ![Create a alert rule condition](./media/azure-monitor/alert-create-rule-condition.png)
+   ![Create an alert rule condition](./media/azure-monitor/alert-create-rule-condition.png)
 
 After the alert is created, go to **Log Analytics workspace** and select **Alerts**. This page displays all the alerts that have been triggered in the duration set by **Time range** option.
 

articles/active-directory-b2c/custom-policies-series-sign-up-or-sign-in.md

@@ -31,7 +31,7 @@ In this article, you learn how  to write an Azure Active Directory B2C (Azure AD
 
 Azure AD B2C uses OpenID Connect authentication protocol to verify user credentials. In Azure AD B2C, you send the user credentials alongside other information to a secure endpoint, which then determines if the credentials are valid or not. In a nutshell, when you use Azure AD B2C's implementation of OpenID Connect, you can outsource sign-up, sign in, and other identity management experiences in your web applications to Microsoft Entra ID. 
 
-Azure AD B2C custom policy provides a OpenID Connect technical profile, which you use to make a call to a secure Microsoft endpoint. Learn more about [OpenID Connect technical profile](openid-connect-technical-profile.md).
+Azure AD B2C custom policy provides an OpenID Connect technical profile, which you use to make a call to a secure Microsoft endpoint. Learn more about [OpenID Connect technical profile](openid-connect-technical-profile.md).
 
 ## Prerequisites
 
@@ -331,4 +331,4 @@ You can sign in by entering the **Email Address** and **Password** of an existin
 
 - Learn how to [Remove the sign-up link](add-sign-in-policy.md), so users can just sign in.  
 
-- Learn more about [OpenID Connect technical profile](openid-connect-technical-profile.md).
+- Learn more about [OpenID Connect technical profile](openid-connect-technical-profile.md).

articles/active-directory-b2c/enable-authentication-in-node-web-app-with-api.md

@@ -21,7 +21,7 @@ ms.subservice: B2C
 
 # Enable authentication in your own Node.js web API by using Azure Active Directory B2C
 
-In this article, you learn how to create your web app that calls your web API. The web API needs to be protected by Azure Active Directory B2C (Azure AD B2C). To authorize access to a the web API, you serve requests that include a valid access token that's issued by Azure AD B2C. 
+In this article, you learn how to create your web app that calls your web API. The web API needs to be protected by Azure Active Directory B2C (Azure AD B2C). To authorize access to the web API, you serve requests that include a valid access token that's issued by Azure AD B2C. 
 
 ## Prerequisites
 

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

@@ -19,7 +19,7 @@ ms.custom: "b2c-support"
 
 # Configure authentication options in a React application by using Azure Active Directory B2C
 
-This article describes ways you can customize and enhance the Azure Active Directory B2C (Azure AD B2C) authentication experience for your React single-page application (SPA). Before you start, familiarize yourself with the article [Configure authentication in an React SPA](configure-authentication-sample-react-spa-app.md) or [Enable authentication in your own React SPA](enable-authentication-react-spa-app.md).
+This article describes ways you can customize and enhance the Azure Active Directory B2C (Azure AD B2C) authentication experience for your React single-page application (SPA). Before you start, familiarize yourself with the article [Configure authentication in a React SPA](configure-authentication-sample-react-spa-app.md) or [Enable authentication in your own React SPA](enable-authentication-react-spa-app.md).
 
 
 ## Sign-in and sign-out behavior
@@ -260,4 +260,3 @@ export const msalConfig = {
 ## Next steps
 
 - Learn more: [MSAL.js configuration options](https://github.com/AzureAD/microsoft-authentication-library-for-js/tree/dev/lib/msal-react/docs).
-

articles/active-directory-b2c/error-codes.md

@@ -156,5 +156,5 @@ The following errors can be returned by the Azure Active Directory B2C service.
 | `AADB2C99013` | The supplied grant_type [{0}] and token_type [{1}] combination is not supported. |
 | `AADB2C99015` | Profile '{0}' in policy '{1}' in tenant '{2}' is missing all InputClaims required for resource owner password credential flow. | [Create a resource owner policy](add-ropc-policy.md#create-a-resource-owner-policy) |
 |`AADB2C99002`| User doesn't exist. Please sign up before you can sign in. |
-| `AADB2C99027` | Policy '{0}' does not contain a AuthorizationTechnicalProfile with a corresponding ClientAssertionType. | [Client credentials flow](client-credentials-grant-flow.md) |
+| `AADB2C99027` | Policy '{0}' does not contain an AuthorizationTechnicalProfile with a corresponding ClientAssertionType. | [Client credentials flow](client-credentials-grant-flow.md) |
 |`AADB2C90229`|Azure AD B2C throttled traffic if too many requests are sent from the same source in a short period of time| [Best practices for Azure Active Directory B2C](best-practices.md#testing) |

articles/active-directory-b2c/index-spa.yml

@@ -52,4 +52,3 @@ landingContent:
         links:
           - text: Single-page application (SPA) samples
             url: integrate-with-app-code-samples.md#single-page-apps
-