Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into tsk261306-dks-8

Author: dksimpson

.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.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

@@ -1944,8 +1944,13 @@
             "redirect_document_id": false
         },
         {
-            "source_path_from_root": "/articles/dms/tutorial-sql-server-azure-sql-online.md",
-            "redirect_url": "/azure/dms/tutorial-sql-server-to-azure-sql",
+            "source_path_from_root": "/articles/dms/howto-sql-server-to-azure-sql-mi-powershell.md",
+            "redirect_url": "/azure/dms/howto-sql-server-to-azure-sql-managed-instance-powershell-offline",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/dms/known-issues-azure-mysql-online.md",
+            "redirect_url": "/azure/dms/",
             "redirect_document_id": false
         },
         {
@@ -1954,15 +1959,70 @@
             "redirect_document_id": false
         },
         {
-            "source_path_from_root": "/articles/dms/howto-sql-server-to-azure-sql-mi-powershell.md",
-            "redirect_url": "/azure/dms/howto-sql-server-to-azure-sql-managed-instance-powershell-offline",
-            "redirect_document_id": true
+            "source_path_from_root": "/articles/dms/resource-custom-roles-sql-database-ads.md",
+            "redirect_url": "/data-migration/sql-server/database/custom-roles",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/dms/resource-custom-roles-sql-db-managed-instance-ads.md",
+            "redirect_url": "/data-migration/sql-server/managed-instance/custom-roles",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/dms/resource-custom-roles-sql-db-virtual-machine-ads.md",
+            "redirect_url": "/data-migration/sql-server/virtual-machines/custom-roles",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/dms/tutorial-mysql-azure-mysql-online.md",
+            "redirect_url": "/azure/dms/tutorial-mysql-azure-mysql-offline-portal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/dms/tutorial-rds-mysql-server-azure-db-for-mysql-online.md",
+            "redirect_url": "/azure/dms/tutorial-mysql-azure-mysql-offline-portal",
+            "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/dms/tutorial-rds-sql-server-azure-sql-and-managed-instance-online.md",
             "redirect_url": "/azure/dms/",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/dms/tutorial-sql-server-azure-sql-database-offline.md",
+            "redirect_url": "/data-migration/sql-server/database/database-migration-service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/dms/tutorial-sql-server-azure-sql-database-offline-ads.md",
+            "redirect_url": "/data-migration/sql-server/database/database-migration-service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/dms/tutorial-sql-server-azure-sql-online.md",
+            "redirect_url": "/azure/dms/tutorial-sql-server-to-azure-sql",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/dms/tutorial-sql-server-managed-instance-offline-ads.md",
+            "redirect_url": "/data-migration/sql-server/managed-instance/database-migration-service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/dms/tutorial-sql-server-managed-instance-online-ads.md",
+            "redirect_url": "/data-migration/sql-server/managed-instance/database-migration-service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/dms/tutorial-sql-server-to-virtual-machine-offline-ads.md",
+            "redirect_url": "/data-migration/sql-server/virtual-machines/database-migration-service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/dms/tutorial-sql-server-to-virtual-machine-online-ads.md",
+            "redirect_url": "/data-migration/sql-server/virtual-machines/database-migration-service",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/notebooks/use-machine-learning-services-jupyter-notebooks.md",
             "redirect_url": "/azure/machine-learning/samples-notebooks",
@@ -3548,21 +3608,6 @@
             "redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/dms/known-issues-azure-mysql-online.md",
-            "redirect_url": "/azure/dms/",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/dms/tutorial-mysql-azure-mysql-online.md",
-            "redirect_url": "/azure/dms/tutorial-mysql-azure-mysql-offline-portal",
-            "redirect_document_id": false
-        },
-        {
-            "source_path_from_root": "/articles/dms/tutorial-rds-mysql-server-azure-db-for-mysql-online.md",
-            "redirect_url": "/azure/dms/tutorial-mysql-azure-mysql-offline-portal",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/sentinel/tutorial-investigate-cases.md",
             "redirect_url": "/azure/sentinel/investigate-cases",
@@ -3903,11 +3948,6 @@
             "redirect_url": "/azure/cosmos-db/how-to-configure-private-endpoints",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/dms/tutorial-sql-server-azure-sql-database-offline-ads.md",
-            "redirect_url": "/azure/dms/tutorial-sql-server-azure-sql-database-offline",
-            "redirect_document_id": true
-        },
         {
             "source_path_from_root": "/articles/orbital/space-partner-program-overview.md",
             "redirect_url": "/azure/orbital/overview",
@@ -4152,7 +4192,18 @@
            "source_path_from_root": "/articles/data-factory/continuous-integration-delivery-automate-github-actions.md",
             "redirect_url": "/azure",
             "redirect_document_id": false
+        },
+        {
+
+           "source_path_from_root": "/articles/site-recovery/move-vaults-across-regions.md",
+            "redirect_url": "/azure/operational-excellence/relocation-site-recovery",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/tutorial-clearpass.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/integrate-overview",
+            "redirect_document_id": false
         }
-       
+
     ]
 }

.openpublishing.redirection.sentinel.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.virtual-desktop.json

@@ -434,6 +434,11 @@
             "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
         }
     ]
 }

articles/active-directory-b2c/manage-user-data.md

@@ -22,7 +22,7 @@ ms.custom: fasttrack-edit
 
  This article discusses how you can manage the user data in Azure Active Directory B2C (Azure AD B2C) by using the operations that are provided by the [Microsoft Graph API](/graph/use-the-api). Managing user data includes deleting or exporting data from audit logs.
 
-[!INCLUDE [gdpr-intro-sentence.md](../../includes/gdpr-intro-sentence.md)]
+[!INCLUDE [gdpr-intro-sentence.md](~/reusable-content/ce-skilling/azure/includes/gdpr-intro-sentence.md)]
 
 ## Delete user data
 

articles/active-directory-b2c/quickstart-native-app-desktop.md

@@ -21,7 +21,7 @@ ms.subservice: B2C
 
 Azure Active Directory B2C (Azure AD B2C) provides cloud identity management to keep your application, business, and customers protected. Azure AD B2C enables your applications to authenticate to social accounts and enterprise accounts using open standard protocols. In this quickstart, you use a Windows Presentation Foundation (WPF) desktop application to sign in using a social identity provider and call an Azure AD B2C protected web API.
 
-[!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
+[!INCLUDE [quickstarts-free-trial-note](~/reusable-content/ce-skilling/azure/includes/quickstarts-free-trial-note.md)]
 
 ## Prerequisites
 

articles/active-directory-b2c/whats-new-docs.md

@@ -1,7 +1,7 @@
 ---
 title: "What's new in Azure Active Directory business-to-customer (B2C)"
 description: "New and updated documentation for the Azure Active Directory business-to-customer (B2C)."
-ms.date: 06/05/2024
+ms.date: 07/01/2024
 ms.service: active-directory
 ms.subservice: B2C
 ms.topic: whats-new
@@ -19,6 +19,14 @@ manager: CelesteDG
 
 Welcome to what's new in Azure Active Directory B2C documentation. This article lists new docs that have been added and those that have had significant updates in the last three months. To learn what's new with the B2C service, see [What's new in Microsoft Entra ID](../active-directory/fundamentals/whats-new.md), [Azure AD B2C developer release notes](custom-policy-developer-notes.md) and [What's new in Microsoft Entra External ID](/entra/external-id/whats-new-docs).
 
+## June 2024
+
+### Updated articles
+
+- [Define an OAuth2 custom error technical profile in an Azure Active Directory B2C custom policy](oauth2-error-technical-profile.md) - Error code updates
+- [Configure authentication in a sample Python web app by using Azure AD B2C](configure-authentication-sample-python-web-app.md) - Python version update
+
+
 ## May 2024
 
 ### New articles
@@ -45,10 +53,3 @@ Welcome to what's new in Azure Active Directory B2C documentation. This article
 - [Localization string IDs](localization-string-ids.md) - CAPTCHA updates
 - [Page layout versions](page-layout.md) - CAPTCHA updates
 
-## January 2024
-
-### Updated articles
-
-- [Tutorial: Configure Nok Nok Passport with Azure Active Directory B2C for passwordless FIDO2 authentication](partner-nok-nok.md) - Updated Nok Nok instructions 
-- [Configure Transmit Security with Azure Active Directory B2C for passwordless authentication](partner-bindid.md) - Updated Transmit Security instructions
-- [About claim resolvers in Azure Active Directory B2C custom policies](claim-resolver-overview.md) - Updated claim resolvers and user journey

articles/advisor/advisor-alerts-arm.md

@@ -10,7 +10,7 @@ ms.date: 06/29/2020
 
 This article shows you how to set up an alert for new recommendations from Azure Advisor using an Azure Resource Manager template (ARM template).
 
-[!INCLUDE [About Azure Resource Manager](../../includes/resource-manager-quickstart-introduction.md)]
+[!INCLUDE [About Azure Resource Manager](~/reusable-content/ce-skilling/azure/includes/resource-manager-quickstart-introduction.md)]
 
 Whenever Azure Advisor detects a new recommendation for one of your resources, an event is stored in [Azure Activity log](../azure-monitor/essentials/platform-logs-overview.md). You can set up alerts for these events from Azure Advisor using a recommendation-specific alerts creation experience. You can select a subscription and optionally a resource group to specify the resources that you want to receive alerts on.