Fix merge conflicts

Author: ShawnKupfer

.openpublishing.redirection.json

@@ -3263,6 +3263,11 @@ achievements:
   title: Configure Azure Kubernetes Service
   summary: Learn how to configure Azure Kubernetes Service including networking, storage, and scaling.
   iconUrl: /training/achievements/azure-kubernetes-configure.svg
+- uid: learn.azure.cloud-adoption-framework-getting-started.badge
+  type: badge
+  title: Getting started with the Microsoft Cloud Adoption Framework for Azure
+  summary: The Microsoft Cloud Adoption Framework for Azure is a guide to the full lifecycle of cloud adoption. Along your organization's journey to the cloud, you encounter roadblocks that can be easily removed through common approaches that thousands of customers share.
+  iconUrl: /training/achievements/cloud-adoption-framework-getting-started.svg
 - uid: learn.data-ai.azure-for-the-data-engineer.trophy
   type: trophy
   title: Azure for the Data Engineer
@@ -5125,3 +5130,58 @@ achievements:
   title: Define generics in TypeScript
   summary: Generics are code templates that you can define and reuse throughout your codebase. They provide a way to tell functions, classes, or interfaces what type you want to use when you call it.
   iconUrl: /training/achievements/typescript/typescript-generics.svg
+- uid: learn.language.build-javascript-applications-typescript.trophy
+  type: trophy
+  title: Build JavaScript applications using TypeScript
+  summary: TypeScript offers all the features of JavaScript, plus an additional layer on top of these - the TypeScript type system. In this learning path, you’ll learn how using TypeScript for JavaScript development can help you build more robust code, reduce runtime type errors, take advantage of modern features before they are available in JavaScript, and work better with development teams.
+  iconUrl: /training/achievements/typescript/build-javascript-applications-typescript.svg
+- uid: learn.language.typescript-declare-variable-types.badge
+  type: badge
+  title: Declare variable types in TypeScript
+  summary: JavaScript is a dynamically typed language. While this makes declaring variables easy, it can in some cases lead to unexpected results. The static type system in TypeScript enables you to describe the shape of an object, providing better documentation, and allowing TypeScript to validate that your code is working correctly. In TypeScript, declarations of namespaces, classes, properties, functions, variables, and other language entities associate types with those entities. The way that a type is formed and associated with a language entity depends on the kind of entity. This module introduces some of the available types and shows how to associate them with variables. Later modules examine how interfaces, functions, and classes use static typing.
+  iconUrl: /training/achievements/typescript/typescript-declare-variable-types.svg
+- uid: learn.language.typescript-declare-instantiate-classes.badge
+  type: badge
+  title: Declare and instantiate classes in TypeScript
+  summary: Classes in TypeScript extend the ES6 functionality by adding TypeScript-specific features like type annotations for class members, access modifiers, and the ability to specify required or optional parameters. Another benefit of using TypeScript is that you can use it to develop with classes and then compile them down to JavaScript that works across all major browsers and platforms, as needed.
+  iconUrl: /training/achievements/typescript/typescript-declare-instantiate-classes.svg
+- uid: learn.intro-to-azure-sql-edge.badge
+  type: badge
+  title: Introduction to Azure SQL Edge
+  summary: Describe how Azure SQL Edge enables developers to use the same Transact-SQL (T-SQL) API to develop apps for the edge. Evaluate whether Azure SQL Edge provides the same security and performance as Microsoft SQL Server.
+  iconUrl: /training/achievements/generic-badge.svg
+- uid: learn-sqlserver.deploying-sql-server-linux.badge
+  type: badge
+  title: Deploy SQL Server on Linux
+  summary: Learn about the software and hardware prerequisites to run SQL Server on Linux and then discover the straightforward steps to install SQL Server on Linux. You will also learn additional tasks, such as installing command-line tools.
+  iconUrl: /training/achievements/sqlserver/deploying-on-sql-server-on-linux.svg
+- uid: learn.language.vue-dynamic-rendering.badge
+  type: badge
+  title: Dynamic page displays with Vue.js
+  summary: One of the goals of any web framework is to update the display based on data values. This module explores how to make your page dynamic based on those values and how to display lists of information.
+  iconUrl: /training/achievements/vue-dynamic-rendering.svg
+- uid: learn.language.vue-get-started.badge
+  type: badge
+  title: Get started with Vue
+  summary: Vue.js is a progressive web framework that allows developers to get up and running quickly, with just the addition of a script tag. But Vue.js can also grow with you. You can use it to create large scalable applications. In this module, you'll explore the core concepts of Vue.js and how to get started.
+  iconUrl: /training/achievements/vue-get-started.svg
+- uid: learn.languages.vue-first-steps.trophy
+  type: trophy
+  title: Take your first steps with Vue.js
+  summary: Vue.js is a progressive web framework allowing developers to get up and running quickly, with the addition of a `script` tag. However, Vue.js can also grow with you, and can be used to create large scalable applications.
+  iconUrl: /training/achievements/vue-first-steps.svg
+- uid: learn.language.vue-cli-components.badge
+  type: badge
+  title: Getting started with Vue CLI and single-file components in Vue.js.
+  summary: Although it's possible to create Vue.js applications by using purely JavaScript, most developers need more power and flexibility. By using Vue CLI and single-file components, you can use more robust tooling to enhance the development experience. We'll see how to use Vue CLI to bootstrap an application, and how to create reusable components in Vue.
+  iconUrl: /training/achievements/vue-cli-components.svg
+- uid: learn.language.vue-data-events.badge
+  type: badge
+  title: Work with data and events in Vue.js
+  summary: Dynamic web applications typically allow users to interact with the page and data. In this module, you'll see how to add forms to a Vue.js page and respond to user events. You'll also see how to add computed values that can be calculated based on updates to the data.
+  iconUrl: /training/achievements/vue-data-events.svg
+- uid: learn.introduction-to-visual-studio-code.badge
+  type: badge
+  title: Introduction to Visual Studio Code
+  summary: In this module, you learn how to assess whether Visual Studio Code is the right source code editor for you. We explore how Visual Studio Code can be used in different development situations, for example, web, C++, and data science. We also examine Visual Studio Code's features such as the editor, debugger, and source control. Finally, we walk you through decision criteria you can use to choose a code editor.
+  iconUrl: /learn/achievements/introduction-to-visual-studio-code.svg

learn-pr/achievements.yml

@@ -1,12 +1,12 @@
 ### YamlMime:ModuleUnit
 uid: learn.aks-deploy-container-app.1-introduction
-metadata:
-  adobe-target: true
+metadata:
+  adobe-target: true
   prefetch-feature-rollout: true
   title: Introduction
   description: Introduction
   ms.published: 07/31/2020
-  ms.date: 04/04/2023
+  ms.date: 01/31/2025
   author: nickomang
   ms.author: nickoman
   ms.topic: unit

learn-pr/azure/aks-deploy-container-app/1-introduction.yml

@@ -1,12 +1,12 @@
 ### YamlMime:ModuleUnit
 uid: learn.aks-deploy-container-app.2-create-aks-cluster
-metadata:
-  adobe-target: true
+metadata:
+  adobe-target: true
   prefetch-feature-rollout: true
   title: Create an Azure Kubernetes Service cluster
   description: Explore some of the architectural concepts you need to consider when you configure your first Azure Kubernetes Service cluster. You'll review concepts such as common cluster architecture and application routing.
   ms.published: 07/31/2020
-  ms.date: 04/04/2023
+  ms.date: 01/31/2025
   author: nickomang
   ms.author: nickoman
   ms.topic: unit

learn-pr/azure/aks-deploy-container-app/2-create-aks-cluster.yml

@@ -1,12 +1,12 @@
 ### YamlMime:ModuleUnit
 uid: learn.aks-deploy-container-app.3-exercise-create-aks-cluster
-metadata:
-  adobe-target: true
+metadata:
+  adobe-target: true
   prefetch-feature-rollout: true
   title: Exercise - Create an Azure Kubernetes Service cluster
   description: In this exercise, you'll create an Azure Kubernetes Service cluster using Azure CLI and configure access from the Cloud Shell to your new cluster using Kubectl.
   ms.published: 07/31/2020
-  ms.date: 04/04/2023
+  ms.date: 01/31/2025
   author: nickomang
   ms.author: nickoman
   ms.topic: unit

learn-pr/azure/aks-deploy-container-app/3-exercise-create-aks-cluster.yml

@@ -1,12 +1,12 @@
 ### YamlMime:ModuleUnit
 uid: learn.aks-deploy-container-app.4-deploy-app
-metadata:
-  adobe-target: true
+metadata:
+  adobe-target: true
   prefetch-feature-rollout: true
   title: Deploy an application on your Azure Kubernetes Service cluster
   description: Explore the concepts needed to create and deploy an application to your Azure Kubernetes Service cluster. You'll see how to deploy an application as a container from a container registry by using a declarative manifest file.
   ms.published: 07/31/2020
-  ms.date: 04/04/2023
+  ms.date: 01/31/2025
   author: nickomang
   ms.author: nickoman
   ms.topic: unit

learn-pr/azure/aks-deploy-container-app/4-deploy-app.yml

@@ -1,12 +1,12 @@
 ### YamlMime:ModuleUnit
 uid: learn.aks-deploy-container-app.5-exercise-deploy-app
-metadata:
-  adobe-target: true
+metadata:
+  adobe-target: true
   prefetch-feature-rollout: true
   title: Exercise - Deploy an application on your Azure Kubernetes Service cluster
   description: In this exercise, you'll create and push a Kubernetes workload to an Azure Container Registry instance. You'll then deploy the workload from the container registry to an Azure Kubernetes Service cluster by creating a deployment manifest file.
   ms.published: 07/31/2020
-  ms.date: 04/04/2023
+  ms.date: 01/31/2025
   author: nickomang
   ms.author: nickoman
   ms.topic: unit

learn-pr/azure/aks-deploy-container-app/5-exercise-deploy-app.yml

@@ -6,7 +6,7 @@ metadata:
   title: Summary
   description: Summary
   ms.published: 07/31/2020
-  ms.date: 04/04/2023
+  ms.date: 01/31/2025
   author: nickomang
   ms.author: nickoman
   ms.topic: unit

learn-pr/azure/aks-deploy-container-app/6-summary.yml

@@ -16,7 +16,7 @@ By the end of this module, you can:
 - Familiarity with Kubernetes concepts. If you're new to Kubernetes, start with the [basics of Kubernetes](https://azure.microsoft.com/topic/what-is-kubernetes/?azure-portal=true).
 - Familiarity with [Git](/contribute/git-github-fundamentals) and [GitHub](https://github.com).
 - Familiarity with [Docker](https://docker.com) and Docker images.
-- An active Azure [subscription](https://azure.microsoft.com/free/services/kubernetes-service/?azure-portal=true).
+- An active Azure [subscription](https://azure.microsoft.com/pricing/purchase-options/azure-account).
 - Ability to use the [Azure CLI](/azure/aks/kubernetes-walkthrough).
 - Ability to create a Docker container. If you're new to Docker, start with the [intro to containers](/training/modules/intro-to-containers/).
 

learn-pr/azure/aks-deploy-container-app/includes/1-introduction.md

@@ -26,7 +26,7 @@ There are two popular cluster architectures for Kubernetes-based deployments.
 
 :::image type="content" source="../media/2-1-diagram.png" alt-text="A diagram that shows a single control plane and multiple nodes in a cluster configuration.":::
 
-The *single control plane to multiple nodes* per cluster architecture is the most common architectural pattern, and is the easiest to deploy, but it doesn't provide high availability to your cluster's core management services.
+The *single control plane to multiple nodes* per cluster architecture is the most common architectural pattern and is the easiest to deploy, but it doesn't provide high availability to your cluster's core management services.
 
 If the control plane node becomes unavailable for any reason, no other interaction can happen with the cluster. This problem occurs even if you're the operator, or by any workloads that use Kubernetes' APIs to communicate until, at least, the API server is back online.
 
@@ -68,4 +68,4 @@ You can change the node count later in the cluster's configuration panel. It's a
 
 ## Node VM size
 
-Select from a wide range of VM specs. For development purposes, you can choose the B series to save on costs. In the exercises, you use series B2, the standard size. For more guidance to select a VM based on your needs, visit the [Azure VM selector tool](https://azure.microsoft.com/pricing/vm-selector/)
+Select from a wide range of VM specs. For development purposes, you can choose the B series to save on costs. In the exercises, you use series B2, the standard size. For more guidance to select a VM based on your needs, [ask Microsoft Copilot in Azure to find the best VM](https://techcommunity.microsoft.com/blog/azurecompute/using-microsoft-copilot-in-azure-to-find-the-best-vm-size-for-you/4356049)