Fix merge conflicts

Author: ShawnKupfer

.openpublishing.redirection.json

@@ -2373,6 +2373,11 @@ achievements:
   title: Extract data from forms by using Azure AI Document Intelligence
   summary: In this learning path, you'll see how Azure Forms Analyzer solutions can enable you to capture data from typed or hand-written forms. You'll also learn how to build a solution for your custom form types and integrate that solution into an Azure Cognitive Search pipeline.
   iconUrl: /training/achievements/extract-data-from-forms-use-form-recognizer.svg
+- uid: learn.wwl.create-enrichment-pipeline-with-azure-cognitive-search.badge   
+  type: badge   
+  title: Create a custom skill for Azure AI Search   
+  summary: Use the power of artificial intelligence to enrich your data and find new insights.   
+  iconUrl: /training/achievements/create-an-enrichment-pipeline.svg  
 - uid: learn.wwl.extract-text-from-images-documents.trophy
   type: trophy
   title: Extract text from images and documents
@@ -4036,4 +4041,74 @@ achievements:
   type: badge
   title: Plan for and deploy SDN infrastructure on Azure Stack HCI
   summary: This module explores the architecture and core capabilities of Software Defined Networking (SDN) on Azure Stack HCI. It also includes a couple of demonstrations illustrating a sample deployment of SDN on Azure Stack HCI.
-  iconUrl: /training/achievements/generic-trophy.svg
+  iconUrl: /training/achievements/generic-trophy.svg
+- uid: learn.wwl.manage-azure-stack-hci-clusters.badge
+  type: badge
+  title: Manage Azure Stack HCI clusters
+  summary: This module covers the most common Microsoft Azure Stack HCI management and maintenance tasks that will help you improve the resiliency, stability, and performance of your existing IT infrastructure.
+  iconUrl: /training/achievements/manage-azure-stack-hci-clusters.svg
+- uid: learn-pr.azure.manage-azure-stack-hci-volumes.badge
+  type: badge
+  title: Manage Azure Stack HCI volumes
+  summary: Manage Azure Stack HCI (Hyperconverged infrastructure) volumes.
+  iconUrl: /training/achievements/generic-badge.svg
+- uid: learn.wwl.integrate-azure-services-with-azure-stack-hci.badge
+  type: badge
+  title: Integrate Azure services with Azure Stack HCI
+  summary: This module describes the benefits, considerations, and implementation process of integrating Microsoft Azure services with Azure Stack HCI and its workloads.
+  iconUrl: /training/achievements/integrate-azure-services-with-azure-stack-hci.svg
+- uid: learn.wwl.manage-azure-stack-hci-virtual-machine-workloads.badge
+  type: badge
+  title: Manage Azure Stack HCI virtual machine workloads
+  summary: This module describes how to manage and maintain Microsoft Azure Stack HCI virtual machine (VM) workloads.
+  iconUrl: /training/achievements/manage-azure-stack-hci-virtual-machine-workloads.svg
+- uid: learn.azure.stack-hci-arc-integration.badge
+  type: badge
+  title: Integrate Azure Arc and Azure Stack HCI
+  summary: In this module, you'll learn the fundamentals of Azure Arc and how it's used to bring new capabilities to the management and monitoring of your Azure Stack HCI clusters at scale.
+  iconUrl: /training/achievements/stack-hci-arc-integration.svg
+- uid: learn.azure.azure-stack-hci-plan-deploy.badge
+  type: badge
+  title: Plan and deploy Azure Stack HCI
+  summary: This module introduces you to planning for and deploying Azure Stack HCI. Content includes identifying suitable workloads, determining the optimal configuration to host these workloads, stepping through the deployment process, validating post-deployment operational status, and evaluating Azure integration options.
+  iconUrl: /training/achievements/azure-stack-hci-plan-deploy.svg
+- uid: learn.azure.azure-stack-hci-technologies.badge
+  type: badge
+  title: Introduction to Azure Stack HCI core technologies
+  summary: This module introduces Azure Stack HCI technologies. You'll learn about the core Azure Stack HCI technologies, including Hyper-V, software-defined storage, and software-defined networking. 
+  iconUrl: /training/achievements/azure-stack-hci-technologies.svg
+- uid: learn.azure.intro-to-azure-stack.badge
+  type: badge
+  title: Introduction to Azure Stack
+  summary: This module introduces you to the Azure Stack portfolio and describes basic architecture, core capabilities, and primary use cases of its products. You'll also learn about differences and similarities between Azure Stack HCI, Azure Stack Hub, Azure Stack Edge, and Azure. 
+  iconUrl: /training/achievements/intro-to-azure-stack.svg
+- uid: learn.wwl.operate-maintain-azure-stack-hci.trophy
+  type: trophy
+  title: Operate and maintain Azure Stack HCI
+  summary: This learning path explains how to manage Azure Stack HCI clusters, integrate Microsoft Azure services with Azure Stack HCI, manage Azure Stack HCI VM workloads, and manage Azure Kubernetes Service on Azure Stack HCI.
+  iconUrl: /training/achievements/operate-and-maintain-azure-stack-hci.svg
+- uid: learn.azure-stack-hci-foundations.trophy
+  type: trophy
+  title: Azure Stack HCI foundations
+  summary: This learning path introduces you to the Azure Stack portfolio and describes basic architecture, core capabilities, and primary use cases of its products. You'll also learn about differences and similarities between Azure Stack HCI, Azure Stack Hub, Azure Stack Edge, and Azure.
+  iconUrl: /training/achievements/azure-stack-hci.svg
+- uid: learn.azure.add-custom-domain-name-azure-active-directory.badge
+  type: badge
+  title: Add custom domain name to Microsoft Entra ID
+  summary: In this module, you'll learn to add your custom domain to Microsoft Entra ID. You'll also learn to add DNS information to the domain registrar, verify your custom domain name in the Azure portal, and set it as the primary.
+  iconUrl: /training/achievements/add-custom-domain-name-azure-active-directory.svg
+- uid: learn.azure.create-users-and-groups-in-azure-active-directory.badge
+  type: badge
+  title: Create Azure users and groups in Microsoft Entra ID
+  summary: Create users in Microsoft Entra ID. Understand different types of groups. Create a group and add members. Manage business-to-business guest accounts.
+  iconUrl: /training/achievements/create-users-and-groups-in-azure-active-directory.svg
+- uid: learn.wwl.configure-virtual-machine-backups.badge
+  type: badge
+  title: Configure virtual machine backups
+  summary: Learn how to configure virtual machine backups including restore operations.
+  iconUrl: /training/achievements/virtual-machines-configure-backup.svg
+- uid: learn.manage-data-assets-in-microsoft-purview-data-catalog.badge
+  type: badge
+  title: Manage data assets in the classic Microsoft Purview Data Catalog
+  summary: This module teaches you how to use the classic Microsoft Purview Data Catalog to manage your scanned data assets. How to curate a business glossary, and how to browse assets across your entire data estate.
+  iconUrl: /learn/achievements/manage-data-assets-in-microsoft-purview-data-catalog.svg

learn-pr/achievements.yml

@@ -0,0 +1,5 @@
+### YamlMime:AchievementDetail
+achievementUid: learn.azure-linux-postgres.trophy
+metadata:
+  title: 'Microsoft Trophy: Migrate Linux and PostgreSQL to Azure was issued by Microsoft'
+socialImageUrl: /training/achievements/azure-linux-social.png

learn-pr/achievements/learn.azure-linux-postgres.trophy.yml

@@ -2,6 +2,6 @@
 achievementUid: learn.azure.intro-to-azure-cosmos-db-core-api.badge
 metadata:
   title: >-
-    Microsoft Badge: Introduction to Azure Cosmos DB SQL API was issued by
+    Microsoft Badge: Introduction to Azure Cosmos DB for NoSQL was issued by
     Microsoft
 socialImageUrl: /training/achievements/intro-to-azure-cosmos-db-core-api-social.png

learn-pr/achievements/learn.azure.intro-to-azure-cosmos-db-core-api.badge.yml

@@ -3,5 +3,5 @@ achievementUid: learn.build-dotnet-app-cosmos-db-sql-api.badge
 metadata:
   title: >-
     Microsoft Badge: Guided project - Build an app that queries and adds data to
-    Azure Cosmos DB SQL API was issued by Microsoft
+    Azure Cosmos DB for NoSQL was issued by Microsoft
 socialImageUrl: /training/achievements/build-dotnet-app-cosmos-db-sql-api-social.png

learn-pr/achievements/learn.build-dotnet-app-cosmos-db-sql-api.badge.yml

@@ -39,7 +39,7 @@ Complete the following steps to create the GitHub Actions build action:
       RESOURCE_GROUP: 'rg-eshop'
       CLUSTER_NAME: 'aks-eshop'
       DEPLOYMENT_MANIFEST_PATH: './product.yml'
-      DOCKER_PATH: './DockerfileProducts'
+      DOCKER_PATH: './DockerfileProducts.acr'
 
     jobs:
       buildImage:

learn-pr/aspnetcore/microservices-devops-aspnet-core/includes/3-exercise-create-github-action-build-container-images.md

@@ -12,7 +12,7 @@ dotnet new aspire-xunit
 
 ## Explore the test project 
 
-The following example test project was created as part of the **.NET Aspire Starter Application** template. If you're unfamiliar with it, see [Quickstart: Build your first .NET Aspire project](/dotnet/aspire/get-started/build-your-first-aspire-app.md). The .NET Aspire test project takes a project reference dependency on the target app host. Consider the template project:
+The following example test project was created as part of the **.NET Aspire Starter Application** template. If you're unfamiliar with it, see [Quickstart: Build your first .NET Aspire project](/dotnet/aspire/get-started/build-your-first-aspire-app). The .NET Aspire test project takes a project reference dependency on the target app host. Consider the template project:
 
 ```xml
 <Project Sdk="Microsoft.NET.Sdk">

learn-pr/aspnetcore/use-databases-dotnet-aspire-app/includes/test-aspire-projects.md

@@ -4,7 +4,7 @@ title: Introduction
 metadata:
   title: Introduction
   description: Take your first DevOps steps by using an Agile approach and Azure Boards.
-  ms.date: 10/11/2023
+  ms.date: 10/23/2024
   ms.custom: devdivchpfy22
   author: chcomley
   ms.author: chcomley

learn-pr/azure-devops/choose-an-agile-approach/1-introduction.yml

@@ -4,7 +4,7 @@ title: What is Agile?
 metadata:
   title: What is Agile?
   description: Learn how Agile can offer a better approach to software development through some of its guiding principles.
-  ms.date: 10/11/2023
+  ms.date: 10/23/2024
   ms.custom: devdivchpfy22
   author: chcomley
   ms.author: chcomley

learn-pr/azure-devops/choose-an-agile-approach/2-what-is-agile.yml

@@ -4,7 +4,7 @@ title: What is Azure Boards?
 metadata:
   title: What is Azure Boards?
   description: Discover how Azure Boards can help you plan the work that needs to be done, and learn about the four processes you can choose from.
-  ms.date: 10/11/2023
+  ms.date: 10/23/2024
   ms.custom: devdivchpfy22
   author: chcomley
   ms.author: chcomley