Fix merge conflict

Author: kgremban

.openpublishing.publish.config.json

@@ -986,6 +986,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "msdocs-app-service-sqldb-dotnetcore",
+      "url": "https://github.com/Azure-Samples/msdocs-app-service-sqldb-dotnetcore",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azuresignalr-samples",
       "url": "https://github.com/aspnet/AzureSignalR-samples",

.openpublishing.redirection.azure-monitor.json

@@ -5509,6 +5509,11 @@
             "redirect_url": "/azure/azure-monitor/logs/resource-manager-workspace",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/logs/resource-manager-cluster.md",
+            "redirect_url": "/azure/azure-monitor/logs/logs-dedicated-clusters",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/visualize/powerbi.md",
             "redirect_url": "/azure/azure-monitor/logs/log-powerbi",

.openpublishing.redirection.defender-for-cloud.json

@@ -1,5 +1,25 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/recommendations-reference.md",
+            "redirect_url": "/azure/defender-for-cloud/security-policy-concept",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/recommendations-reference-gcp.md",
+            "redirect_url": "/azure/defender-for-cloud/security-policy-concept",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/recommendations-reference-aws.md",
+            "redirect_url": "/azure/defender-for-cloud/security-policy-concept",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-cloud/upcoming-changes.md",
+            "redirect_url": "/azure/defender-for-cloud/release-notes",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-cloud/secret-scanning.md",
             "redirect_url": "/azure/defender-for-cloud/secrets-scanning-servers",

.openpublishing.redirection.education.json

@@ -0,0 +1,9 @@
+{
+    "redirections": [
+        {
+            "source_path_from_root": "/articles/education-hub/custom-tenant-set-up-classroom.md",
+            "redirect_url": "/articles/education-hub/about-education-hub.md",
+            "redirect_document_id": false
+        }
+    ]
+    }

.openpublishing.redirection.json

@@ -1624,6 +1624,16 @@
             "source_path_from_root": "/articles/sentinel/data-connectors/fortinet.md",
             "redirect_url": "/azure/sentinel/data-connectors/deprecated-fortinet-via-legacy-agent",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/sentinel/data-connectors/cisco-stealthwatch.md",
+            "redirect_url": "/azure/sentinel/data-connectors-reference",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/sentinel/data-connectors/hyas-protect.md",
+            "redirect_url": "/azure/sentinel/data-connectors-reference",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.sentinel.json

@@ -429,6 +429,16 @@
             "source_path_from_root": "/articles/virtual-desktop/host-pool-load-balancing.md",
             "redirect_url": "/azure/virtual-desktop/configure-host-pool-load-balancing",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/configure-rdp-shortpath-limit-ports-public-networks.md",
+            "redirect_url": "/azure/virtual-desktop/configure-rdp-shortpath",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/disaster-recovery.md",
+            "redirect_url": "/azure/virtual-desktop/disaster-recovery-concepts",
+            "redirect_document_id": true
         }
     ]
 }

.openpublishing.redirection.virtual-desktop.json

@@ -1,19 +1,19 @@
 ---
-title: Configure authentication in a sample Python web application by using Azure Active Directory B2C
+title: Configure authentication in a sample Python web app by using Azure AD B2C
 description:  This article discusses how to use Azure Active Directory B2C to sign in and sign up users in a Python web application.
 
 author: kengaderdus
-manager: CelesteDG
+manager: mwongerapk
 ms.service: active-directory
 
 ms.topic: reference
-ms.date: 01/11/2024
+ms.date: 06/04/2024
 ms.author: kengaderdus
 ms.subservice: B2C
 ms.custom: b2c-support, devx-track-python
 
 
-#Customer intent: As a Python web app developer, I want to configure Azure AD B2C authentication in my web application, so that I can securely sign users in and add authentication and authorization support to my app.
+#Customer intent: As a Python web app developer, I want to configure Azure AD B2C authentication in a sample web app by using my own tenant, so that I can securely sign customer users.
 
 ---
 
@@ -37,7 +37,7 @@ The sign-in flow involves the following steps:
 
 - An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
 - If you don't have one already, [create an Azure AD B2C tenant](tutorial-create-tenant.md) that is linked to your Azure subscription.
-- [Python 3.7+](https://www.python.org/downloads/)
+- [Python 3.8+](https://www.python.org/downloads/)
 
 ## Step 1: Configure your user flow
 
@@ -222,4 +222,4 @@ You can add and modify redirect URIs in your registered applications at any time
 * The redirect URL is case-sensitive. Its case must match the case of the URL path of your running application. 
 
 ## Next steps
-* Learn how to [Configure authentication options in a Python web app by using Azure AD B2C](enable-authentication-python-web-app-options.md).
+* Learn how to [Configure authentication options in a Python web app by using Azure AD B2C](enable-authentication-python-web-app-options.md).

articles/active-directory-b2c/configure-authentication-sample-python-web-app.md

@@ -10,7 +10,7 @@ ms.service: active-directory
 
 ms.topic: how-to
 ms.custom: b2c-docs-improvements
-ms.date: 05/11/2024
+ms.date: 06/21/2024
 ms.author: kengaderdus
 ms.reviewer: yoelh
 ms.subservice: B2C
@@ -263,7 +263,7 @@ Follow the steps in [Test the custom policy](custom-policies-series-validate-use
 
 After the policy finishes execution, and you receive your ID token, check that the user record has been created: 
 
-1. Sign in to the [Azure portal](https://portal.azure.com/) with Global Administrator or Privileged Role Administrator permissions.
+1. Sign in to the [Azure portal](https://portal.azure.com/) as at least Privileged Role Administrator.
 
 1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Azure AD B2C tenant from the **Directories + subscriptions** menu.
 

articles/active-directory-b2c/custom-policies-series-store-user.md

@@ -105,12 +105,6 @@ The resources referenced by the *index.html* file are detailed in the following
 |---|---|
 |MSAL.js library| MSAL.js authentication JavaScript library [CDN path](https://github.com/AzureAD/microsoft-authentication-library-for-js/blob/dev/lib/msal-browser/docs/cdn-usage.md).|
 |[Bootstrap stylesheet](https://getbootstrap.com/) | A free front-end framework for faster and easier web development. The framework includes HTML-based and CSS-based design templates. |
-|[`policies.js`](https://github.com/Azure-Samples/ms-identity-b2c-javascript-spa/blob/main/App/policies.js) | Contains the Azure AD B2C custom policies and user flows. |
-|[`authConfig.js`](https://github.com/Azure-Samples/ms-identity-b2c-javascript-spa/blob/main/App/authConfig.js) | Contains authentication configuration parameters.|
-|[`authRedirect.js`](https://github.com/Azure-Samples/ms-identity-b2c-javascript-spa/blob/main/App/authRedirect.js) | Contains the authentication logic. |
-|[`apiConfig.js`](https://github.com/Azure-Samples/ms-identity-b2c-javascript-spa/blob/main/App/apiConfig.js) | Contains web API scopes and the API endpoint location. |
-|[`api.js`](https://github.com/Azure-Samples/ms-identity-b2c-javascript-spa/blob/main/App/api.js) | Defines the method to use to call your API and handle its response.|
-|[`ui.js`](https://github.com/Azure-Samples/ms-identity-b2c-javascript-spa/blob/main/App/ui.js) | Controls the UI elements. |
 | | |
 
 To render the SPA index file, in the *myApp* folder, create a file named *index.html*, which contains the following HTML snippet: