Fix merge conflicts

Author: ShawnKupfer

.openpublishing.redirection.json

@@ -27183,6 +27183,34 @@
       "source_path_from_root": "/learn-pr/wwl-azure/monitor-troubleshoot-adt/8-summary.md",
       "redirect_url": "/training/browse/?products=azure&terms=iot"
     },
+    {
+      "source_path_from_root": "/learn-pr/azure/cloud-adoption-framework-security/4-security-roles-responsibilities.yml",
+      "redirect_url": "/training/modules/cloud-adoption-framework-security/1-introduction"
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/cloud-adoption-framework-security/5-simplify-compliance-security.yml",
+      "redirect_url": "/training/modules/cloud-adoption-framework-security/1-introduction"
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/cloud-adoption-framework-security/6-simplify-security-implementation.yml",
+      "redirect_url": "/training/modules/cloud-adoption-framework-security/1-introduction"
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/cloud-adoption-framework-security/8-security-tools-policies.yml",
+      "redirect_url": "/training/modules/cloud-adoption-framework-security/1-introduction"
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/cloud-adoption-framework-security/9-summary.yml",
+      "redirect_url": "/training/modules/cloud-adoption-framework-security/1-introduction"
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/cloud-adoption-framework-security/2-customer-narrative.yml",
+      "redirect_url": "/training/modules/cloud-adoption-framework-security/1-introduction"
+    },
+    {
+      "source_path_from_root": "/learn-pr/azure/cloud-adoption-framework-security/3-methodology.yml",
+      "redirect_url": "/training/modules/cloud-adoption-framework-security/1-introduction"
+    },
     {
       "source_path_from_root": "/learn-pr/wwl-azure/monitor-troubleshoot-adt/index.md",
       "redirect_url": "/training/browse/?products=azure&terms=iot"
@@ -44253,6 +44281,266 @@
       "redirect_url": "https://learn.microsoft.com/training/browse/",
       "redirect_document_id": false
     },
+    {
+      "source_path": "learn-pr/reactors/blockchain-ethereum-networks/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-ethereum-networks/2-public-networks.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-ethereum-networks/3-private-networks.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-ethereum-networks/4-prepare-for-mainnet.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-ethereum-networks/5-develop-deploy-development.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-ethereum-networks/6-deploy-ropsten-network.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-ethereum-networks/7-knowledge-check.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-ethereum-networks/8-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-ethereum-networks/index.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-learning-solidity/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-learning-solidity/2-what-is-solidity.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-learning-solidity/3-language-basics.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-learning-solidity/4-value-types.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-learning-solidity/5-reference-types.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-learning-solidity/6-exercise-write-first-contract.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-learning-solidity/7-knowledge-check.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-learning-solidity/8-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-learning-solidity/index.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/paths/ethereum-blockchain-development/index.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-solidity-ethereum-smart-contracts/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-solidity-ethereum-smart-contracts/2-smart-contracts.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-solidity-ethereum-smart-contracts/3-truffle.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-solidity-ethereum-smart-contracts/4-truffle-for-vs-code.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-solidity-ethereum-smart-contracts/5-write-contract.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-solidity-ethereum-smart-contracts/6-test-contract.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-solidity-ethereum-smart-contracts/7-knowledge-check.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-solidity-ethereum-smart-contracts/8-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-solidity-ethereum-smart-contracts/index.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-tokens/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-tokens/2-what-are-tokens.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-tokens/3-token-types.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-tokens/4-learn-open-zeppelin.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-tokens/5-set-up-project.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-tokens/6-write-token-contract.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-tokens/7-knowledge-check.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-tokens/8-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/reactors/blockchain-tokens/index.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/build-ml-model-with-azure-stream-analytics/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/build-ml-model-with-azure-stream-analytics/2-azure-storage.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/build-ml-model-with-azure-stream-analytics/3-cognitive-services.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/build-ml-model-with-azure-stream-analytics/4-azure-functions.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/build-ml-model-with-azure-stream-analytics/5-azure-sql-database.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/build-ml-model-with-azure-stream-analytics/6b-knowledge-check.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/build-ml-model-with-azure-stream-analytics/6-power-bi.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/build-ml-model-with-azure-stream-analytics/7-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/student-evangelism/build-ml-model-with-azure-stream-analytics/index.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/communication-service-send-sms-console-app/1-introduction.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/communication-service-send-sms-console-app/2-exercise-create-account.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/communication-service-send-sms-console-app/3-exercise-send.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/communication-service-send-sms-console-app/4-knowledge-check.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/communication-service-send-sms-console-app/5-summary.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "learn-pr/azure/communication-service-send-sms-console-app/index.yml",
+      "redirect_url": "https://learn.microsoft.com/training/browse/",
+      "redirect_document_id": false
+    },
     {
       "source_path": "learn-pr/paths/develop-custom-object-detection-models-with-nvidia-and-azure-machine-learning/index.yml",
       "redirect_url": "https://learn.microsoft.com/training/browse/",

learn-pr/achievements.yml

@@ -5340,3 +5340,38 @@ achievements:
   title: Create a labeled dataset using Azure Machine Learning data labeling tools
   summary: Learn how to use Azure Machine Learning data labeling to create, manage, and monitor data labeling projects.
   iconUrl: /training/achievements/setup-configure-nvidia-deepstream-development.svg
+- uid: learn.azure.communication-service-send-sms-console-app.badge
+  type: badge
+  title: Send an SMS message from a C# console application with Azure Communication Services
+  summary: In this module, you'll create a C# console application that sends SMS messages using a phone number provisioned via Azure Communication Services.
+  iconUrl: /training/achievements/communication-service-send-sms-console-app.svg
+- uid: learn.student-evangelism.build-ml-model-with-azure-stream-analytics.badge
+  type: badge
+  title: Track wild polar bears with AI
+  summary: Detect and track polar bears through photos using AI, and then use Power BI to show where cameras spot polar bears.
+  iconUrl: /training/achievements/student-evangelism/build-ml-model-with-azure-stream-analytics-badge.svg
+- uid: learn.reactors.blockchain-tokens.badge
+  type: badge
+  title: Create tokens using OpenZeppelin
+  summary: Learn about the significance of tokens and how they are used in blockchain.
+  iconUrl: /training/achievements/reactors/blockchain-tokens.svg
+- uid: learn.reactors.blockchain-solidity-ethereum-smart-contracts.badge
+  type: badge
+  title: Write Ethereum smart contracts by using Solidity
+  summary: Learn how to install and use tools that you can use to develop smart contracts.
+  iconUrl: /training/achievements/reactors/blockchain-solidity-ethereum-smart-contracts.svg
+- uid: learn.reactors.blockchain-learning-solidity.badge
+  type: badge
+  title: Learn how to use Solidity
+  summary: Discover how Solidity can make it easy to program smart contracts for the Ethereum blockchain platform.
+  iconUrl: /training/achievements/reactors/blockchain-learning-solidity.svg
+- uid: learn.reactors.blockchain-ethereum-networks.badge
+  type: badge
+  title: Connect and deploy to Ethereum networks
+  summary: Learn about and use Ethereum networks for development, testing, and production.
+  iconUrl: /training/achievements/reactors/blockchain-ethereum-networks.svg
+- uid: learn.ethereum-blockchain-development.trophy
+  type: trophy
+  title: Get started with blockchain development
+  summary: This learning path introduces you to blockchain and development on the Ethereum platform. Discover what skills are necessary to learn to begin building your own blockchain networks at scale.
+  iconUrl: /training/achievements/ethereum-blockchain-development.svg

learn-pr/advocates/intro-azure-machine-learning-auth/1-introduction.yml

@@ -0,0 +1,13 @@
+### YamlMime:ModuleUnit
+uid: learn.introduction-azure-machine-learning-auth.introduction
+title: Introduction
+metadata:
+  title: Introduction
+  description: Introduction to Azure Machine Learning authentication and authorization.
+  ms.date: 03/06/2025
+  author: Orin-Thomas
+  ms.author: viniap
+  ms.topic: unit
+durationInMinutes: 2
+content: |
+  [!include[](includes/1-introduction.md)]

learn-pr/advocates/intro-azure-machine-learning-auth/2-authentication-azure-machine-learning-workspaces.yml

@@ -0,0 +1,13 @@
+### YamlMime:ModuleUnit
+uid: learn.introduction-azure-machine-learning-auth.authentication-azure-machine-learning-workspaces
+title: Authentication for Azure Machine Learning workspaces
+metadata:
+  title: Authentication for Azure Machine Learning workspaces
+  description: Understand authentication for Azure Machine Learning workspaces.
+  ms.date: 03/06/2025
+  author: Orin-Thomas
+  ms.author: viniap
+  ms.topic: unit
+durationInMinutes: 6
+content: |
+  [!include[](includes/2-authentication-azure-machine-learning-workspaces.md)]

learn-pr/advocates/intro-azure-machine-learning-auth/3-manage-access-azure-machine-learning.yml

@@ -0,0 +1,13 @@
+### YamlMime:ModuleUnit
+uid: learn.introduction-azure-machine-learning-auth.manage-access-azure-machine-learning
+title: Manage access to Azure Machine Learning
+metadata:
+  title: Manage access to Azure Machine Learning
+  description: Control access to Azure Machine Learning resources.
+  ms.date: 03/06/2025
+  author: Orin-Thomas
+  ms.author: viniap
+  ms.topic: unit
+durationInMinutes: 7
+content: |
+  [!include[](includes/3-manage-access-azure-machine-learning.md)]

learn-pr/advocates/intro-azure-machine-learning-auth/4-authentication-between-azure-machine-learning-other-azure-services.yml

@@ -0,0 +1,13 @@
+### YamlMime:ModuleUnit
+uid: learn.introduction-azure-machine-learning-auth.authentication-between-azure-machine-learning-other-azure-services
+title: Authentication between Azure Machine Learning and other Azure services
+metadata:
+  title: Authentication between Azure Machine Learning and other Azure services
+  description: Configure access for workspaces to other Azure services.
+  ms.date: 03/06/2025
+  author: Orin-Thomas
+  ms.author: viniap
+  ms.topic: unit
+durationInMinutes: 10
+content: |
+  [!include[](includes/4-authentication-between-azure-machine-learning-other-azure-services.md)]