Fix merge conflicts

Author: ShawnKupfer

.openpublishing.redirection.json

@@ -32454,6 +32454,26 @@
       "redirect_url": "/training/modules/define-microsoft-ai-strategy-healthcare/",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/learn-pr//wwl-azure/create-azure-resources-by-using-azure-cli/2-what-azure-cli.yml",
+      "redirect_url": "/training/modules/create-azure-resources-by-using-azure-cli/2-what-is-azure-cli/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/learn-pr/wwl-azure/create-azure-resources-by-using-azure-cli/3-work-azure-cli.yml",
+      "redirect_url": "/training/modules/create-azure-resources-by-using-azure-cli/4-execute-azure-cli-interactively/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/learn-pr/wwl-azure/create-azure-resources-by-using-azure-cli/4-knowledge-check.yml",
+      "redirect_url": "/training/modules/create-azure-resources-by-using-azure-cli/7-knowledge-check/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/learn-pr/wwl-azure/create-azure-resources-by-using-azure-cli/5-summary.yml",
+      "redirect_url": "/training/modules/create-azure-resources-by-using-azure-cli/8-summary/",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/learn-pr/azure/intro-to-azure-image-builder/2-what-is-azure-image-builder.yml",
       "redirect_url": "/training/modules/intro-to-azure-image-builder/3-how-does-azure-image-builder-work",
@@ -36240,27 +36260,27 @@
     },
     {
       "source_path": "learn-pr/azure/control-azure-services-with-cli/2-what-is-the-azure-cli.yml",
-      "redirect_url": "https://learn.microsoft.com/training/modules/control-azure-services-with-cli/2-decide-if-azure-clil-is-right-for-your-tasks",
+      "redirect_url": "/training/modules/control-azure-services-with-cli/2-decide-if-azure-clil-is-right-for-your-tasks/",
       "redirect_document_id": false
     },
     {
       "source_path": "learn-pr/azure/control-azure-services-with-cli/3-exercise-install-and-run-the-azure-cli.yml",
-      "redirect_url": "https://learn.microsoft.com/training/modules/control-azure-services-with-cli/3-install-azure-cli",
+      "redirect_url": "/training/modules/control-azure-services-with-cli/3-install-azure-cli/",
       "redirect_document_id": false
     },
     {
       "source_path": "learn-pr/azure/control-azure-services-with-cli/4-work-with-the-cli.yml",
-      "redirect_url": "https://learn.microsoft.com/training/modules/control-azure-services-with-cli/5-create-resource-interactively",
+      "redirect_url": "/training/modules/control-azure-services-with-cli/5-create-resource-interactively/",
       "redirect_document_id": false
     },
     {
       "source_path": "learn-pr/azure/control-azure-services-with-cli/5-exercise-create-website-using-the-cli.yml",
-      "redirect_url": "https://learn.microsoft.com/training/modules/control-azure-services-with-cli/7-create-resource-using-script",
+      "redirect_url": "/training/modules/control-azure-services-with-cli/7-create-resource-using-script/",
       "redirect_document_id": false
     },
     {
       "source_path": "learn-pr/azure/control-azure-services-with-cli/6-summary.yml",
-      "redirect_url": "https://learn.microsoft.com/training/modules/control-azure-services-with-cli/9-summary",
+      "redirect_url": "/training/modules/control-azure-services-with-cli/9-summary/",
       "redirect_document_id": false
     },
     {
@@ -46050,6 +46070,181 @@
       "source_path": "learn-pr/azure/improve-api-developer-experience-with-swagger/index.yml",
       "redirect_url": "https://learn.microsoft.com/aspnet/core/fundamentals/openapi/aspnetcore-openapi",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/paths/prepare-data-for-tabular-models-power-bi/index.md",
+      "redirect_url": "/training/paths/prepare-data-power-bi/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/understand-scalability-power-bi/index.md",
+      "redirect_url": "/training/modules/design-scalable-semantic-models/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/understand-scalability-power-bi/1-introduction.md",
+      "redirect_url": "/training/modules/design-scalable-semantic-models/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/understand-scalability-power-bi/2-describe-significance-of-scalable-models.md",
+      "redirect_url": "/training/modules/design-scalable-semantic-models/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/understand-scalability-power-bi/3-implement-data-modeling-best-practices.md",
+      "redirect_url": "/training/modules/design-scalable-semantic-models/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/understand-scalability-power-bi/4-configure-large-datasets.md",
+      "redirect_url": "/training/modules/design-scalable-semantic-models/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/understand-scalability-power-bi/5-knowledge-check.md",
+      "redirect_url": "/training/modules/design-scalable-semantic-models/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/understand-scalability-power-bi/6-summary.md",
+      "redirect_url": "/training/modules/design-scalable-semantic-models/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/create-manage-scalable-power-bi-dataflows/index.md",
+      "redirect_url": "/training/paths/prepare-data-power-bi/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/create-manage-scalable-power-bi-dataflows/1-introduction.md",
+      "redirect_url": "/training/paths/prepare-data-power-bi/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/create-manage-scalable-power-bi-dataflows/2-define-use-cases-for-dataflows.md",
+      "redirect_url": "/training/paths/prepare-data-power-bi/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/create-manage-scalable-power-bi-dataflows/3-create-reusable-assets.md",
+      "redirect_url": "/training/paths/prepare-data-power-bi/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/create-manage-scalable-power-bi-dataflows/4-implement-best-practices.md",
+      "redirect_url": "/training/paths/prepare-data-power-bi/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/create-manage-scalable-power-bi-dataflows/6-knowledge-check.md",
+      "redirect_url": "/training/paths/prepare-data-power-bi/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/create-manage-scalable-power-bi-dataflows/7-summary.md",
+      "redirect_url": "/training/paths/prepare-data-power-bi/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/paths/manage-analytics-development-lifecycle/index.md",
+      "redirect_url": "/training/paths/manage-microsoft-fabric-environment/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/design-power-bi-application-lifecycle-management-strategy/index.md",
+      "redirect_url": "/training/modules/create-manage-power-bi-assets/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/design-power-bi-application-lifecycle-management-strategy/1-introduction.md",
+      "redirect_url": "/training/modules/create-manage-power-bi-assets/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/design-power-bi-application-lifecycle-management-strategy/2-define.md",
+      "redirect_url": "/training/modules/create-manage-power-bi-assets/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/design-power-bi-application-lifecycle-management-strategy/3-recommend-source-control-strategy.md",
+      "redirect_url": "/training/modules/create-manage-power-bi-assets/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/design-power-bi-application-lifecycle-management-strategy/4-design-deployment-strategy.md",
+      "redirect_url": "/training/modules/create-manage-power-bi-assets/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/design-power-bi-application-lifecycle-management-strategy/5-knowledge-check.md",
+      "redirect_url": "/training/modules/create-manage-power-bi-assets/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-data-ai/design-power-bi-application-lifecycle-management-strategy/6-summary.md",
+      "redirect_url": "/training/modules/create-manage-power-bi-assets/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/paths/implement-interfaces/index.md",
+      "redirect_url": "/training/paths/implement-interfaces-new/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/introduce-interfaces/index.md",
+      "redirect_url": "/training/modules/discover-interfaces/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/introduce-interfaces/01-introduction.md",
+      "redirect_url": "/training/modules/discover-interfaces/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/introduce-interfaces/02-what-is-interface.md",
+      "redirect_url": "/training/modules/discover-interfaces/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/introduce-interfaces/03-exercise-create-interface.md",
+      "redirect_url": "/training/modules/discover-interfaces/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/introduce-interfaces/04-exercise-extend-classes-with-interface.md",
+      "redirect_url": "/training/modules/discover-interfaces/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/introduce-interfaces/05-why-use-interfaces.md",
+      "redirect_url": "/training/modules/discover-interfaces/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/introduce-interfaces/06-exercise-use-system-defined-interfaces.md",
+      "redirect_url": "/training/modules/discover-interfaces/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/introduce-interfaces/07-exercise-challenge-create-consumables.md",
+      "redirect_url": "/training/modules/discover-interfaces/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/introduce-interfaces/08-review-solution-create-consumables.md",
+      "redirect_url": "/training/modules/discover-interfaces/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/introduce-interfaces/09-knowledge-check.md",
+      "redirect_url": "/training/modules/discover-interfaces/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/introduce-interfaces/10-summary.md",
+      "redirect_url": "/training/modules/discover-interfaces/",
+      "redirect_document_id": false
     }
  ]
 }

learn-pr/achievements.yml

@@ -5570,3 +5570,38 @@ achievements:
   title: Improve the developer experience of an API with Swagger documentation
   summary: Learn how to document an existing API, written in C#/ASP.NET Core, using Swashbuckle, Swagger/OpenAPI, and Swagger UI.
   iconUrl: /training/achievements/improve-developer-experience-of-an-api-with-swagger-documentation.svg
+- uid: learn.wwl.prepare-data-for-tabular-models-power-bi.trophy
+  type: trophy
+  title: Prepare data for tabular models in Power BI
+  summary: Designing reports for enterprise scale requires more than just connecting to data. Understanding Power BI model frameworks and strategies for scalability and optimization are key to a successful enterprise implementation.This learning path helps you prepare for the [Azure Enterprise Data Analyst Certification](/learn/certifications/exams/dp-500).
+  iconUrl: /training/achievements/prepare-data-for-tabular-models-power-bi.svg
+- uid: learn.wwl.understand-scalability-power-bi.badge
+  type: badge
+  title: Understand scalability in Power BI
+  summary: Scalable data models enable enterprise-scale analytics in Power BI. Implement data modeling best practices, use large dataset storage format, and practice building a star schema to design analytics solutions that can scale.
+  iconUrl: /training/achievements/understand-scalability-power-bi.svg
+- uid: learn.wwl.create-manage-scalable-power-bi-dataflows.badge
+  type: badge
+  title: Create and manage scalable Power BI dataflows
+  summary: Create Power BI transformation logic for reuse across your organization with Power BI dataflows.  Learn how to combine Power BI dataflows with Power BI Premium for scalable ETL, and practice creating and consuming dataflows.
+  iconUrl: /training/achievements/create-manage-scalable-power-bi-dataflows.svg
+- uid: learn.wwl.manage-analytics-development-lifecycle.trophy
+  type: trophy
+  title: Manage the analytics development lifecycle
+  summary: This learning path introduces the foundational components of implementing lifecycle management techniques for Power BI assets.This learning path helps you prepare for the [Azure Enterprise Data Analyst Certification](/certifications/exams/dp-500).
+  iconUrl: /training/achievements/manage-analytics-development-lifecycle.svg
+- uid: learn.wwl.design-power-bi-application-lifecycle-management-strategy.badge
+  type: badge
+  title: Design a Power BI application lifecycle management strategy
+  summary: The use of OneDrive, Git repositories, and Power BI deployment pipelines allows us to follow application lifecycle management techniques. This reduces administrative overhead and provides continuity in the development process.
+  iconUrl: /training/achievements/design-power-bi-application-lifecycle-management-strategy.svg
+- uid: learn.wwl.implement-interfaces.trophy
+  type: trophy
+  title: Implement Interfaces in C#
+  summary: This learning path will introduce you to interfaces in C#. You'll work with a role-playing game inventory project to practice adding behaviors to classes, and use interfaces to craft modular, robust code.
+  iconUrl: /training/achievements/implement-interfaces.svg
+- uid: learn.wwl.introduce-interfaces.badge
+  type: badge
+  title: Introduce interfaces
+  summary: In this module, you'll learn how to use interfaces in C#. You'll practice adding behaviors to classes and using system-defined interfaces to craft modular, robust code.
+  iconUrl: /training/achievements/introduce-interfaces.svg

learn-pr/advocates/deploy-java-ee-app-to-jboss-app-service/1-introduction.yml

@@ -3,18 +3,17 @@ uid: learn.azure.deploy-java-ee-app-to-app-service.1-introduction
 title: Introduction
 metadata:
   title: Introduction
-  description: Introduction
-  author: yoshioterada
-  ms.author: yoterada
-  ms.date: 05/25/2023
+  description: Introduces a training module that shows you how to deploy a Jakarta EE application to Azure App Service.
+  author: KarlErickson
+  ms.author: karler
+  ms.reviewer: yoshioterada
+  ms.date: 03/16/2025
   ms.topic: unit
   ms.custom:
     - team=cloud_advocates
     - devx-track-java
     - devx-track-javaee-jbosseap-appsvc
     - devx-track-javaee
-    - devx-track-extended-java
-  ms.contributors: yoterada-03102021
 durationInMinutes: 2
 content: |
   [!include[](includes/1-introduction.md)]

learn-pr/advocates/deploy-java-ee-app-to-jboss-app-service/2-deploy-azure-database-mysql.yml

@@ -1,20 +1,19 @@
 ### YamlMime:ModuleUnit
 uid: learn.azure.deploy-java-ee-app-to-app-service.2-deploy-azure-database-mysql
-title: Deploy Azure Database for MySQL
+title: Deploy an Azure Database for MySQL instance
 metadata:
-  title: Deploy Azure Database for MySQL
-  description: In this unit, you'll learn how to deploy an Azure Database for MySQL instance
-  author: yoshioterada
-  ms.author: yoterada
-  ms.date: 05/25/2023
+  title: Deploy an Azure Database for MySQL Instance
+  description: Shows you how to deploy an Azure Database for MySQL instance.
+  author: KarlErickson
+  ms.author: karler
+  ms.reviewer: yoshioterada
+  ms.date: 03/16/2025
   ms.topic: unit
   ms.custom:
     - team=cloud_advocates
     - devx-track-java
     - devx-track-javaee-jbosseap-appsvc
     - devx-track-javaee
-    - devx-track-extended-java
-  ms.contributors: yoterada-03082021
 durationInMinutes: 3
 content: |
   [!include[](includes/2-deploy-azure-database-mysql.md)]

learn-pr/advocates/deploy-java-ee-app-to-jboss-app-service/3-exercise-deploy-azure-database-mysql.yml

@@ -1,20 +1,19 @@
 ### YamlMime:ModuleUnit
 uid: learn.azure.deploy-java-ee-app-to-app-service.3-exercise-deploy-azure-database-mysql
-title: Exercise - Deploy Azure Database for MySQL
+title: Exercise - Deploy an Azure Database for MySQL instance
 metadata:
-  title: Exercise - Deploy Azure Database for MySQL
-  description: In this unit, you'll deploy Azure Database for MySQL by using a custom shell script.
-  author: yoshioterada
-  ms.author: yoterada
-  ms.date: 05/25/2023
+  title: Exercise - Deploy an Azure Database for MySQL Instance
+  description: Shows you how to deploy an Azure Database for MySQL instance by using a custom shell script.
+  author: KarlErickson
+  ms.author: karler
+  ms.reviewer: yoshioterada
+  ms.date: 03/16/2025
   ms.topic: unit
   ms.custom:
     - team=cloud_advocates
     - devx-track-java
     - devx-track-javaee-jbosseap-appsvc
     - devx-track-javaee
-    - devx-track-extended-java
-  ms.contributors: yoterada-03082021
 durationInMinutes: 16
 content: |
   [!include[](includes/3-exercise-deploy-azure-database-mysql.md)]

learn-pr/advocates/deploy-java-ee-app-to-jboss-app-service/4-deploy-jakarta-ee-app-to-jboss-eap.yml

@@ -1,20 +1,19 @@
 ### YamlMime:ModuleUnit
 uid: learn.azure.deploy-java-ee-app-to-app-service.4-deploy-jakarta-ee-app-to-jboss-eap
-title: Deploy a Java EE (Jakarta EE) application to JBoss EAP on Azure App Service
+title: Deploy a Jakarta EE application to JBoss EAP on Azure App Service
 metadata:
-  title: Deploy a Java EE (Jakarta EE) application to JBoss EAP on Azure App Service
-  description: Create a Java application that connects to Azure Database for MySQL and deploy it to JBoss EAP on Azure App Service.
-  author: yoshioterada
-  ms.author: yoterada
-  ms.date: 05/25/2023
+  title: Deploy a Jakarta EE Application to JBoss EAP on Azure App Service
+  description: Shows you how to create a Java application that connects to Azure Database for MySQL and deploy it to JBoss EAP on Azure App Service.
+  author: KarlErickson
+  ms.author: karler
+  ms.reviewer: yoshioterada
+  ms.date: 03/16/2025
   ms.topic: unit
   ms.custom:
     - team=cloud_advocates
     - devx-track-java
     - devx-track-javaee-jbosseap-appsvc
     - devx-track-javaee
-    - devx-track-extended-java
-  ms.contributors: yoterada-03082021
 durationInMinutes: 4
 content: |
   [!include[](includes/4-deploy-jakarta-ee-app-to-jboss-eap.md)]