Fix merge conflicts

Author: ShawnKupfer

.openpublishing.redirection.json

@@ -34398,6 +34398,56 @@
       "source_path": "learn-pr/azure/introduction-code-to-cloud/index.yml",
       "redirect_url": "https://learn.microsoft.com/azure/static-web-apps/",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/index.md",
+      "redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/5-determine-service-endpoint-services.md",
+      "redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/4-determine-service-endpoint-uses.md",
+      "redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/6-identify-private-link-uses.md",
+      "redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/3-identify-user-defined-routes.md",
+      "redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/7-simulation-routing.md",
+      "redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/1-introduction.md",
+      "redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/8-knowledge-check.md",
+      "redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/2-review-system-routes.md",
+      "redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/wwl-azure/configure-network-routing-endpoints/9-summary-resources.md",
+      "redirect_url": "/training/modules/control-network-traffic-flow-with-routes/",
+      "redirect_document_id": false
     }
   ]
 }

learn-pr/achievements.yml

@@ -4122,3 +4122,8 @@ achievements:
   title: Introduction to Code to Cloud
   summary: This module covers provides an Introduction to Code to Cloud, a service that allows you to seamlessly deploy your complex micro-architecture solutions to Microsoft Azure.
   iconUrl: /learn/achievements/generic-badge.svg
+- uid: learn.wwl.configure-network-routing-endpoints.badge
+  type: badge
+  title: Configure network routing and endpoints
+  summary: Learn how to configure network routes, including endpoints and private links.
+  iconUrl: /training/achievements/network-routing-endpoints-configure.svg

learn-pr/azure/cna-set-up-azure-ad-use-scale/index.yml

@@ -11,15 +11,14 @@ metadata:
   ms.author: robmcm
   ms.topic: module-standard-task-based
   ms.service: azure-active-directory
-### NOTE: Temporarily hiding this module while SFI issues are addressed.
-  hidden: true
+hidden: true
 title: Authenticate and authorize multi-tenant apps using Microsoft Entra ID
 summary: Microsoft Entra ID enables you to improve the functionality of cloud-native apps in multitenant scenarios.
 abstract: |
   In this module, you'll:
   - Describe the characteristics and functionality of Microsoft Entra ID
   - Implement Microsoft Entra authentication for cloud-native applications
-prerequisites: | 
+prerequisites: |
   Before working on this module, it's helpful but not required that you have:
   - A basic understanding of cloud computing
   - Basic familiarity with Azure
@@ -50,4 +49,3 @@ units:
 - learn.azure.cna-set-up-apps-use-scale.9-summary
 badge:
   uid: learn.azure.cna-set-up-apps-use-scale.badge
-

learn-pr/language/powershell-write-first/1-introduction.yml

@@ -4,7 +4,7 @@ title: Introduction
 metadata:
   title: Introduction
   description: Begin your software development journey by learning PowerShell.
-  ms.date: 10/04/2023
+  ms.date: 10/07/2024
   author: michaeltlombardi
   ms.author: mlombardi
   ms.topic: unit

learn-pr/language/powershell-write-first/2-exercise-hello-world.yml

@@ -3,8 +3,8 @@ uid: learn.languages.powershell-write-first.exercise-hello-world
 title: Exercise - "Hello World!"
 metadata:
   title: Exercise - "Hello World!"
-  description: Write your first line of code to output a message to a console window with PowerShell.
-  ms.date: 10/04/2023
+  description: Write your first PowerShell code to output a message to a console window.
+  ms.date: 10/07/2024
   author: michaeltlombardi
   ms.author: mlombardi
   ms.topic: unit

learn-pr/language/powershell-write-first/3-how-it-works.yml

@@ -4,7 +4,7 @@ title: How PowerShell code works
 metadata:
   title: How PowerShell code works
   description: Learn how code works in PowerShell, and what those words and symbols mean.
-  ms.date: 10/04/2023
+  ms.date: 10/07/2024
   author: michaeltlombardi
   ms.author: mlombardi
   ms.topic: unit

learn-pr/language/powershell-write-first/4-challenge.yml

@@ -4,7 +4,7 @@ title: Challenge
 metadata:
   title: Challenge
   description: Use what you just learned about PowerShell to print messages to output.
-  ms.date: 10/04/2023
+  ms.date: 10/07/2024
   author: michaeltlombardi
   ms.author: mlombardi
   ms.topic: unit

learn-pr/language/powershell-write-first/5-solution.yml

@@ -4,7 +4,7 @@ title: Solution
 metadata:
   title: Solution
   description: Study a solution to the challenge issued in the preceding unit.
-  ms.date: 10/04/2023
+  ms.date: 10/07/2024
   author: michaeltlombardi
   ms.author: mlombardi
   ms.topic: unit

learn-pr/language/powershell-write-first/6-knowledge-check.yml

@@ -3,8 +3,8 @@ uid: learn.languages.powershell-write-first.knowledge-check
 title: Knowledge check
 metadata:
   title: Check your knowledge
-  description: Review what you've learned in this module.
-  ms.date: 10/04/2023
+  description: Review what you learned in this module.
+  ms.date: 10/07/2024
   author: michaeltlombardi
   ms.author: mlombardi
   ms.topic: unit
@@ -17,14 +17,14 @@ quiz:
     choices:
     - content: "You run your code through a compiler as a step to outputting an executable program."
       isCorrect: false
-      explanation: "PowerShell code doesn't need to be run through a compiler as a manual step."
-    - content: "PowerShell is an interpreted language and your code will be interpreted to the computer as it runs."
+      explanation: "PowerShell code doesn't need to run through a compiler as a manual step."
+    - content: "PowerShell is an interpreted language and your code is interpreted to the computer as it runs."
       isCorrect: false
       explanation: "PowerShell isn't an interpreted language and doesn't get communicated to the computer as it runs."
     - content: "PowerShell doesn't compile at all, and the computer knows what your code says automatically."
       isCorrect: false
       explanation: "PowerShell code is compiled to something the computer can understand."
-    - content: "PowerShell code is compiled to an AST, checked for issues, and then translated again so the computer can understand it."
+    - content: "PowerShell code is compiled to an abstract syntax tree (AST), checked for issues, and then translated again so the computer can understand it."
       isCorrect: true
       explanation: "Correct!"
   - content: "Which of the following statements is true about PowerShell."
@@ -52,6 +52,6 @@ quiz:
     - content: "The string should be enclosed in single quotation marks."
       isCorrect: false
       explanation: "You can enclose strings in either single or double quotation marks."
-    - content: "Nothing is wrong with this command. It will run normally."
+    - content: "Nothing is wrong with this command. It should run normally."
       isCorrect: true
       explanation: "Correct! PowerShell's relaxed behavior allows this command to run normally."

learn-pr/language/powershell-write-first/7-summary.yml

@@ -4,7 +4,7 @@ title: Summary
 metadata:
   title: Summary
   description: Review what you learned in this module and what you should learn next.
-  ms.date: 10/04/2023
+  ms.date: 10/07/2024
   author: michaeltlombardi
   ms.author: mlombardi
   ms.topic: unit