Merge branch 'main' into avd-extended-zones-update

Author: dknappettmsft

.openpublishing.build.ps1

@@ -590,6 +590,12 @@
             "branch": "main",
             "branch_mapping": {}
         },
+        {
+            "path_to_root": "msdocs-jboss-mysql-sample-app",
+            "url": "https://github.com/Azure-Samples/msdocs-jboss-mysql-sample-app",
+            "branch": "main",
+            "branch_mapping": {}
+        },
         {
             "path_to_root": "playwright-testing-service",
             "url": "https://github.com/microsoft/playwright-testing-service",

.openpublishing.publish.config.json

@@ -1,5 +1,115 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/lab-services/class-type-adobe-creative-cloud.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-adobe-creative-cloud",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-arcgis.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-arcgis",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-autodesk.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-autodesk",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-big-data-analytics.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-big-data-analytics",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-database-management.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-database-management",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-deep-learning-natural-language-processing.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-deep-learning-natural-language-processing",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-ethical-hacking.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-ethical-hacking",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-matlab.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-matlab",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-jupyter-notebook.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-jupyter-notebook",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-networking-gns3.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-networking-gns3",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-pltw.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-pltw",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-react-linux.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-react-linux",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-react-windows.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-react-windows",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-rstudio-linux.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-rstudio-linux",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-rstudio-windows.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-rstudio-windows",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-shell-scripting-linux.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-shell-scripting-linux",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-solidworks.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-solidworks",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-type-sql-server.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-type-sql-server",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/class-types.md",
+      "redirect_url": "/previous-versions/azure/lab-services/class-types",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/lab-services/how-to-create-lab-accounts.md",
+      "redirect_url": "/previous-versions/azure/lab-services/how-to-create-lab-accounts",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/devtest-labs/devtest-lab-integrate-ci-cd.md",
+      "redirect_url": "/previous-versions/azure/devtest-labs/devtest-lab-integrate-ci-cd",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/devtest-labs/integrate-environments-devops-pipeline.md",
+      "redirect_url": "/previous-versions/azure/devtest-labs/integrate-environments-devops-pipeline",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/confidential-computing/virtual-machine-solutions.md",
       "redirect_url": "/azure/virtual-machines/",
@@ -98,7 +208,7 @@
     {
       "source_path_from_root": "/articles/application-insights/app-insights-analytics-diagnostics.md",
       "redirect_url": "/azure/application-insights/app-insights-analytics",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/application-insights/app-insights-analytics-reference.md",
@@ -108,7 +218,7 @@
     {
       "source_path_from_root": "/articles/application-insights/app-insights-azure.md",
       "redirect_url": "/azure/application-insights/app-insights-overview",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/application-insights/app-insights-developer-analytics.md",
@@ -123,7 +233,7 @@
     {
       "source_path_from_root": "/articles/application-insights/app-insights-java-eclipse.md",
       "redirect_url": "/azure/application-insights/app-insights-java-quick-start",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/application-insights/app-insights-pricing-enterprise-details.md",
@@ -2010,21 +2120,6 @@
       "redirect_url": "/azure/migrate/migrate-services-overview",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/monitoring/management-overview-monitoring.md",
-      "redirect_url": "/azure/monitoring/",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/monitoring/monitoring-container-health.md",
-      "redirect_url": "/azure/monitoring/monitoring-container-insights-overview",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/monitoring/monitoring-walkthrough-servicemap.md",
-      "redirect_url": "/azure/monitoring/monitoring-service-map",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/multi-factor-authentication/end-user/index.md",
       "redirect_url": "/azure/multi-factor-authentication/end-user/multi-factor-authentication-end-user",
@@ -2210,101 +2305,6 @@
       "redirect_url": "/azure/openshift/delete-cluster",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/index.md",
-      "redirect_url": "/azure/monitoring",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/oms-solution-agenthealth.md",
-      "redirect_url": "/azure/monitoring/monitoring-solution-agenthealth",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/oms-solution-office-365.md",
-      "redirect_url": "/azure/monitoring/monitoring-solution-office-365",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-architecture.md",
-      "redirect_url": "/azure/monitoring",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-integration.md",
-      "redirect_url": "/azure/monitoring",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-overview.md",
-      "redirect_url": "/azure/monitoring",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-runbook-datacollect.md",
-      "redirect_url": "/azure/monitoring/monitoring-runbook-datacollect",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-sdk.md",
-      "redirect_url": "/azure/monitoring",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-service-map-scom.md",
-      "redirect_url": "/azure/monitoring/monitoring-service-map-scom",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-service-map.md",
-      "redirect_url": "/azure/monitoring/monitoring-service-map",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solution-targeting.md",
-      "redirect_url": "/azure/monitoring/monitoring-solution-targeting",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solutions-best-practices.md",
-      "redirect_url": "/azure/monitoring/monitoring-solutions-best-practices",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solutions-creating.md",
-      "redirect_url": "/azure/monitoring/monitoring-solutions-creating",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solutions-resources-automation.md",
-      "redirect_url": "/azure/monitoring/monitoring-solutions-resources-automation",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solutions-resources-searches-alerts.md",
-      "redirect_url": "/azure/monitoring/monitoring-solutions-resources-searches-alerts",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solutions-resources-views.md",
-      "redirect_url": "/azure/monitoring/monitoring-solutions-resources-views",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solutions-solution-file.md",
-      "redirect_url": "/azure/monitoring/monitoring-solutions-solution-file",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-solutions.md",
-      "redirect_url": "/azure/monitoring/monitoring-solutions",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/operations-management-suite/operations-management-suite-walkthrough-servicemap.md",
-      "redirect_url": "/azure/monitoring/monitoring-service-map",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/operator-service-manager/overview.md",
       "redirect_url": "azure/operator-service-manager/azure-operator-service-manager-overview",
@@ -3100,6 +3100,16 @@
       "redirect_url": "https://docs.sendgrid.com/for-developers/partners/microsoft-azure-2021#create-a-twilio-sendgrid-account",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/synapse-analytics/whats-new.md",
+      "redirect_url": "/fabric/get-started/whats-new",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/synapse-analytics/whats-new-archive.md",
+      "redirect_url": "/fabric/get-started/whats-new",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/terraform/terrafom-quickstart.md",
       "redirect_url": "/azure/terraform/terraform-create-configuration",
@@ -3420,6 +3430,11 @@
       "redirect_url": "/azure/vpn-gateway/add-remove-site-to-site-connections",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/vpn-gateway/vpn-gateway-howto-point-to-site-resource-manager-portal.md",
+      "redirect_url": "/azure/vpn-gateway/point-to-site-certificate-gateway",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/vpn-gateway/vpn-gateway-howto-openvpn-clients.md",
       "redirect_url": "/azure/vpn-gateway/point-to-site-vpn-client-cert-windows",
@@ -3689,6 +3704,16 @@
       "source_path_from_root": "/articles/third-party-notices.md",
       "redirect_url": "https://github.com/MicrosoftDocs/azure-docs/blob/main/ThirdPartyNotices.md",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/reliability/glossary.md",
+      "redirect_url": "/azure/reliability/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/reliability/resiliency-recommendations/recommend-cosmos-db-nosql.md",
+      "redirect_url": "/azure/reliability/reliability-cosmos-db-nosql",
+      "redirect_document_id": false
     }
   ]
-}
+}

.openpublishing.redirection.json

@@ -22,15 +22,11 @@ sections:
       - question: |
           What is Microsoft Entra External ID?
         answer: |
-          We announced an early preview of our next-generation Microsoft Entra External ID solution. This early preview represents an evolutionary step in unifying secure and engaging experiences across all external identities including partners, customers, citizens, patients, and others within a single, integrated platform. For more information about the preview, see [What is Microsoft Entra External ID for customers?](../active-directory/external-identities/customers/overview-customers-ciam.md). 
+          We have released our next generation Microsoft Entra External ID product which combines powerful solutions for working with people outside of your organization. With External ID capabilities, you can allow external identities to securely access your apps and resources. Whether you’re working with external partners, consumers, or business customers, users can bring their own identities. These identities can range from corporate or government-issued accounts to social identity providers like Google or Facebook. For more information, see [Introduction to Microsoft Entra External ID](/entra/external-id/external-identities-overview)
       - question: |
           How does this preview affect me?
         answer: |
-          No action is required on your part at this time. The next-generation platform is currently in early preview only. We remain fully committed to supporting your current Azure AD B2C solution. There are no requirements for Azure AD B2C customers to migrate at this time and no plans to discontinue the current Azure AD B2C service. As the next generation platform approaches GA, details will be made available to all our valued B2C customers on available options including migration to the new platform.
-      - question: |
-          How do I participate in the preview?
-        answer: |
-          As the next-generation platform represents our future for customer identity and access management (CIAM), we welcome and encourage your participation and feedback during early preview. If you're interested in joining the early preview, contact your sales team for details. 
+          No action is required on your part at this time. We remain fully committed to supporting your current Azure AD B2C solution. There are no requirements for Azure AD B2C customers to migrate at this time and no plans to discontinue the current Azure AD B2C service. 
   - name: General
     questions:
       - question: |
@@ -119,7 +115,7 @@ sections:
           Currently, you can’t change the "From:" field on the email.
           
           > [!TIP]
-          > With Azure AD B2C [custom policy](custom-policy-overview.md), you can customize the email Azure AD B2C sends to users, including the "From:" field on the email. The custom email verification requires the use of a third-party email provider like [Mailjet](custom-email-mailjet.md), [SendGrid](custom-email-sendgrid.md), or [SparkPost](https://messagebird.com/email/cloud-sending?sp=true).
+          > With Azure AD B2C [custom policy](custom-policy-overview.md), you can customize the email Azure AD B2C sends to users, including the "From:" field on the email. The custom email verification requires the use of a third-party email provider like [Mailjet](custom-email-mailjet.md) or [SendGrid](custom-email-sendgrid.md).
           
       - question: |
           How can I migrate my existing user names, passwords, and profiles from my database to Azure AD B2C?

articles/active-directory-b2c/faq.yml

@@ -46,7 +46,7 @@ To enable sign-in for users with Mobile ID in Azure AD B2C, you need to create a
 
     |Key  |Note  |
     |---------|---------|
-    | Client ID | The Mobile ID client ID. For example, 11111111-2222-3333-4444-555555555555. |
+    | Client ID | The Mobile ID client ID. For example, 00001111-aaaa-2222-bbbb-3333cccc4444. |
     | Client Secret| The Mobile ID client secret.|