Skip to content

Commit b9ca2e5

Browse files
ShawnKupferShawnKupfer
committed
Fix merge conflicts
2 parents 2c05c66 + 8e63a03 commit b9ca2e5

File tree

253 files changed

+7545
-2596
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

253 files changed

+7545
-2596
lines changed

‎.openpublishing.redirection.json

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16029,6 +16029,61 @@
1602916029
{
1603016030
"source_path_from_root": "/learn-pr/languages/python-if-elif-else/index.md",
1603116031
"redirect_url": "/training/modules/python-boolean-types"
16032+
},
16033+
{
16034+
"source_path_from_root": "/learn-pr/wwl-data-ai/get-started-openai/1-introduction.yml",
16035+
"redirect_url": "https://learn.microsoft.com/training/modules/prepare-azure-ai-development/",
16036+
"redirect_document_id": false
16037+
},
16038+
{
16039+
"source_path_from_root": "/learn-pr/wwl-data-ai/get-started-openai/2-access-azure-openai.yml",
16040+
"redirect_url": "https://learn.microsoft.com/training/modules/prepare-azure-ai-development/",
16041+
"redirect_document_id": false
16042+
},
16043+
{
16044+
"source_path_from_root": "/learn-pr/wwl-data-ai/get-started-openai/3-use-azure-openai-studio.yml",
16045+
"redirect_url": "https://learn.microsoft.com/training/modules/prepare-azure-ai-development/",
16046+
"redirect_document_id": false
16047+
},
16048+
{
16049+
"source_path_from_root": "/learn-pr/wwl-data-ai/get-started-openai/4-types-of-models.yml",
16050+
"redirect_url": "https://learn.microsoft.com/training/modules/prepare-azure-ai-development/",
16051+
"redirect_document_id": false
16052+
},
16053+
{
16054+
"source_path_from_root": "/learn-pr/wwl-data-ai/get-started-openai/5-deploy-models.yml",
16055+
"redirect_url": "https://learn.microsoft.com/training/modules/prepare-azure-ai-development/",
16056+
"redirect_document_id": false
16057+
},
16058+
{
16059+
"source_path_from_root": "/learn-pr/wwl-data-ai/get-started-openai/6-explore-prompts.yml",
16060+
"redirect_url": "https://learn.microsoft.com/training/modules/prepare-azure-ai-development/",
16061+
"redirect_document_id": false
16062+
},
16063+
{
16064+
"source_path_from_root": "/learn-pr/wwl-data-ai/get-started-openai/7-use-azure-openai-playground.yml",
16065+
"redirect_url": "https://learn.microsoft.com/training/modules/prepare-azure-ai-development/",
16066+
"redirect_document_id": false
16067+
},
16068+
{
16069+
"source_path_from_root": "/learn-pr/wwl-data-ai/get-started-openai/8-exercise.yml",
16070+
"redirect_url": "https://learn.microsoft.com/training/modules/prepare-azure-ai-development/",
16071+
"redirect_document_id": false
16072+
},
16073+
{
16074+
"source_path_from_root": "/learn-pr/wwl-data-ai/get-started-openai/9-knowledge-check.yml",
16075+
"redirect_url": "https://learn.microsoft.com/training/modules/prepare-azure-ai-development/",
16076+
"redirect_document_id": false
16077+
},
16078+
{
16079+
"source_path_from_root": "/learn-pr/wwl-data-ai/get-started-openai/10-summary.yml",
16080+
"redirect_url": "https://learn.microsoft.com/training/modules/prepare-azure-ai-development/",
16081+
"redirect_document_id": false
16082+
},
16083+
{
16084+
"source_path_from_root": "/learn-pr/wwl-data-ai/get-started-openai/includes/index.yml",
16085+
"redirect_url": "https://learn.microsoft.com/training/modules/prepare-azure-ai-development/",
16086+
"redirect_document_id": false
1603216087
},
1603316088
{
1603416089
"source_path_from_root": "/learn-pr/languages/python-install-vscode/1-introduction.md",
@@ -27128,6 +27183,34 @@
2712827183
"source_path_from_root": "/learn-pr/wwl-azure/monitor-troubleshoot-adt/8-summary.md",
2712927184
"redirect_url": "/training/browse/?products=azure&terms=iot"
2713027185
},
27186+
{
27187+
"source_path_from_root": "/learn-pr/azure/cloud-adoption-framework-security/4-security-roles-responsibilities.yml",
27188+
"redirect_url": "/training/modules/cloud-adoption-framework-security/1-introduction"
27189+
},
27190+
{
27191+
"source_path_from_root": "/learn-pr/azure/cloud-adoption-framework-security/5-simplify-compliance-security.yml",
27192+
"redirect_url": "/training/modules/cloud-adoption-framework-security/1-introduction"
27193+
},
27194+
{
27195+
"source_path_from_root": "/learn-pr/azure/cloud-adoption-framework-security/6-simplify-security-implementation.yml",
27196+
"redirect_url": "/training/modules/cloud-adoption-framework-security/1-introduction"
27197+
},
27198+
{
27199+
"source_path_from_root": "/learn-pr/azure/cloud-adoption-framework-security/8-security-tools-policies.yml",
27200+
"redirect_url": "/training/modules/cloud-adoption-framework-security/1-introduction"
27201+
},
27202+
{
27203+
"source_path_from_root": "/learn-pr/azure/cloud-adoption-framework-security/9-summary.yml",
27204+
"redirect_url": "/training/modules/cloud-adoption-framework-security/1-introduction"
27205+
},
27206+
{
27207+
"source_path_from_root": "/learn-pr/azure/cloud-adoption-framework-security/2-customer-narrative.yml",
27208+
"redirect_url": "/training/modules/cloud-adoption-framework-security/1-introduction"
27209+
},
27210+
{
27211+
"source_path_from_root": "/learn-pr/azure/cloud-adoption-framework-security/3-methodology.yml",
27212+
"redirect_url": "/training/modules/cloud-adoption-framework-security/1-introduction"
27213+
},
2713127214
{
2713227215
"source_path_from_root": "/learn-pr/wwl-azure/monitor-troubleshoot-adt/index.md",
2713327216
"redirect_url": "/training/browse/?products=azure&terms=iot"
@@ -44198,6 +44281,101 @@
4419844281
"redirect_url": "https://learn.microsoft.com/training/browse/",
4419944282
"redirect_document_id": false
4420044283
},
44284+
{
44285+
"source_path": "learn-pr/reactors/blockchain-ethereum-networks/1-introduction.yml",
44286+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44287+
"redirect_document_id": false
44288+
},
44289+
{
44290+
"source_path": "learn-pr/reactors/blockchain-ethereum-networks/2-public-networks.yml",
44291+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44292+
"redirect_document_id": false
44293+
},
44294+
{
44295+
"source_path": "learn-pr/reactors/blockchain-ethereum-networks/3-private-networks.yml",
44296+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44297+
"redirect_document_id": false
44298+
},
44299+
{
44300+
"source_path": "learn-pr/reactors/blockchain-ethereum-networks/4-prepare-for-mainnet.yml",
44301+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44302+
"redirect_document_id": false
44303+
},
44304+
{
44305+
"source_path": "learn-pr/reactors/blockchain-ethereum-networks/5-develop-deploy-development.yml",
44306+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44307+
"redirect_document_id": false
44308+
},
44309+
{
44310+
"source_path": "learn-pr/reactors/blockchain-ethereum-networks/6-deploy-ropsten-network.yml",
44311+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44312+
"redirect_document_id": false
44313+
},
44314+
{
44315+
"source_path": "learn-pr/reactors/blockchain-ethereum-networks/7-knowledge-check.yml",
44316+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44317+
"redirect_document_id": false
44318+
},
44319+
{
44320+
"source_path": "learn-pr/reactors/blockchain-ethereum-networks/8-summary.yml",
44321+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44322+
"redirect_document_id": false
44323+
},
44324+
{
44325+
"source_path": "learn-pr/reactors/blockchain-ethereum-networks/index.yml",
44326+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44327+
"redirect_document_id": false
44328+
},
44329+
{
44330+
"source_path": "learn-pr/reactors/blockchain-learning-solidity/1-introduction.yml",
44331+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44332+
"redirect_document_id": false
44333+
},
44334+
{
44335+
"source_path": "learn-pr/reactors/blockchain-learning-solidity/2-what-is-solidity.yml",
44336+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44337+
"redirect_document_id": false
44338+
},
44339+
{
44340+
"source_path": "learn-pr/reactors/blockchain-learning-solidity/3-language-basics.yml",
44341+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44342+
"redirect_document_id": false
44343+
},
44344+
{
44345+
"source_path": "learn-pr/reactors/blockchain-learning-solidity/4-value-types.yml",
44346+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44347+
"redirect_document_id": false
44348+
},
44349+
{
44350+
"source_path": "learn-pr/reactors/blockchain-learning-solidity/5-reference-types.yml",
44351+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44352+
"redirect_document_id": false
44353+
},
44354+
{
44355+
"source_path": "learn-pr/reactors/blockchain-learning-solidity/6-exercise-write-first-contract.yml",
44356+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44357+
"redirect_document_id": false
44358+
},
44359+
{
44360+
"source_path": "learn-pr/reactors/blockchain-learning-solidity/7-knowledge-check.yml",
44361+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44362+
"redirect_document_id": false
44363+
},
44364+
{
44365+
"source_path": "learn-pr/reactors/blockchain-learning-solidity/8-summary.yml",
44366+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44367+
"redirect_document_id": false
44368+
},
44369+
{
44370+
"source_path": "learn-pr/reactors/blockchain-learning-solidity/index.yml",
44371+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44372+
"redirect_document_id": false
44373+
},
44374+
{
44375+
"source_path": "learn-pr/paths/ethereum-blockchain-development/index.yml",
44376+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44377+
"redirect_document_id": false
44378+
},
4420144379
{
4420244380
"source_path": "learn-pr/reactors/blockchain-solidity-ethereum-smart-contracts/1-introduction.yml",
4420344381
"redirect_url": "https://learn.microsoft.com/training/browse/",

‎learn-pr/achievements.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,11 @@ achievements:
372372
title: Explore Azure service level agreements (SLAs)
373373
summary: You're placing an application into a cloud-providers hardware versus on-premises. How reliable will your solution be?
374374
iconUrl: /training/achievements/explore-azure-service-level-agreements.svg
375+
- uid: learn.wwl.get-started-openai.badge
376+
type: badge
377+
title: Get started with Azure OpenAI Service
378+
summary: This module provides engineers with the skills to begin building an Azure OpenAI Service solution.
379+
iconUrl: /training/achievements/generic-badge.svg
375380
- uid: learn.wwl.examine-service-lifecycle-azure.badge
376381
type: badge
377382
title: Examine service lifecycle in Azure
@@ -5330,3 +5335,18 @@ achievements:
53305335
title: Write Ethereum smart contracts by using Solidity
53315336
summary: Learn how to install and use tools that you can use to develop smart contracts.
53325337
iconUrl: /training/achievements/reactors/blockchain-solidity-ethereum-smart-contracts.svg
5338+
- uid: learn.reactors.blockchain-learning-solidity.badge
5339+
type: badge
5340+
title: Learn how to use Solidity
5341+
summary: Discover how Solidity can make it easy to program smart contracts for the Ethereum blockchain platform.
5342+
iconUrl: /training/achievements/reactors/blockchain-learning-solidity.svg
5343+
- uid: learn.reactors.blockchain-ethereum-networks.badge
5344+
type: badge
5345+
title: Connect and deploy to Ethereum networks
5346+
summary: Learn about and use Ethereum networks for development, testing, and production.
5347+
iconUrl: /training/achievements/reactors/blockchain-ethereum-networks.svg
5348+
- uid: learn.ethereum-blockchain-development.trophy
5349+
type: trophy
5350+
title: Get started with blockchain development
5351+
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.
5352+
iconUrl: /training/achievements/ethereum-blockchain-development.svg

‎learn-pr/azure/cloud-adoption-framework-security/1-introduction.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ title: Introduction
44
metadata:
55
unitType: introduction
66
title: Introduction
7-
description: Introduction to the Microsoft Cloud Adoption Framework for Azure security module.
8-
ms.date: 11/01/2023
7+
description: Learn how the Secure methodology in the Cloud Adoption Framework provides a structured approach to secure your Azure cloud estate.
8+
ms.date: 02/27/2025
99
author: Zimmergren
1010
ms.author: tozimmergren
1111
ms.topic: unit
1212
durationInMinutes: 2
1313
content: |
14-
[!include[](includes/1-introduction.md)]
14+
[!include[](includes/1-introduction.md)]

‎learn-pr/azure/cloud-adoption-framework-security/10-summary.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
### YamlMime:ModuleUnit
2+
uid: learn.azure.cloud-adoption-framework-security.summary
3+
title: Summary
4+
metadata:
5+
unitType: summary
6+
title: Summary
7+
description: Summary of the Secure methodology module for the Cloud Adoption Framework. This module includes guidance about security recommendations for all methodologies and guidance about teams and roles.
8+
ms.date: 02/27/2025
9+
author: Zimmergren
10+
ms.author: tozimmergren
11+
ms.topic: unit
12+
durationInMinutes: 2
13+
content: |
14+
[!include[](includes/10-summary.md)]

‎learn-pr/azure/cloud-adoption-framework-security/2-customer-narrative.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎learn-pr/azure/cloud-adoption-framework-security/2-methodology.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
### YamlMime:ModuleUnit
2+
uid: learn.azure.cloud-adoption-framework-security.methodology
3+
title: The Secure methodology
4+
metadata:
5+
unitType: learning-content
6+
title: The Secure Methodology
7+
description: Learn about the foundational guidance of the Microsoft Cloud Adoption Framework Secure methodology and how it can improve your Azure cloud estate.
8+
ms.date: 02/27/2025
9+
author: Zimmergren
10+
ms.author: tozimmergren
11+
ms.topic: unit
12+
durationInMinutes: 10
13+
content: |
14+
[!include[](includes/2-methodology.md)]
15+
quiz:
16+
title: Check your knowledge
17+
questions:
18+
- content: What is the primary goal of the Secure methodology?
19+
choices:
20+
- content: To provide financial guidance for cloud adoption
21+
isCorrect: false
22+
explanation: Incorrect. The Secure methodology includes some financial guidance, but it's typically covered by other frameworks or business strategies.
23+
- content: To provide a structured approach that you can use to enhance workload security and compliance
24+
isCorrect: true
25+
explanation: Correct. The primary goal of the Secure methodology is to ensure that workloads are highly secure and compliant.
26+
- content: To provide a cloud-based environment that enables you to build, deploy, and manage applications
27+
isCorrect: false
28+
explanation: Incorrect. Providing a cloud-based environment isn't the primary goal of the Secure methodology.
29+
- content: To standardize the process for requesting, deploying, and governing subscriptions so that you can deploy your workloads faster
30+
isCorrect: false
31+
explanation: Incorrect. Standardizing processes for subscriptions isn't the focus of the Secure methodology.

‎learn-pr/azure/cloud-adoption-framework-security/3-methodology.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎learn-pr/azure/cloud-adoption-framework-security/3-teams-roles-functions.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
### YamlMime:ModuleUnit
2+
uid: learn.azure.cloud-adoption-framework-security.security-roles-responsibilities
3+
title: Teams, roles, and functions
4+
metadata:
5+
unitType: learning-content
6+
title: Teams, Roles, and Functions
7+
description: Learn about the security roles required for cloud security and the functions that they perform related to cloud infrastructure and platforms.
8+
ms.date: 02/27/2025
9+
author: Zimmergren
10+
ms.author: tozimmergren
11+
ms.topic: unit
12+
durationInMinutes: 10
13+
content: |
14+
[!include[](includes/3-teams-roles-functions.md)]
15+
quiz:
16+
title: Check your knowledge
17+
questions:
18+
- content: Which teams are responsible for translating security strategy, policy, and standards into actionable solutions?
19+
choices:
20+
- content: Infrastructure or platform teams
21+
isCorrect: false
22+
explanation: Incorrect. While infrastructure or platform teams implement and integrate security controls, they don't primarily translate security strategy, policy, and standards into actionable solutions.
23+
- content: Security architecture, engineering, and posture management teams
24+
isCorrect: true
25+
explanation: Correct. These teams translate security strategy, policy, and standards into actionable solutions. They ensure that security measures are effectively implemented.
26+
- content: Security governance, risk, and compliance teams
27+
isCorrect: false
28+
explanation: Incorrect. These teams manage security policies, risk assessments, and compliance requirements but don't focus on translating security strategies into actionable solutions.
29+
- content: Security training and awareness teams
30+
isCorrect: false
31+
explanation: Incorrect. These teams provide training and resources to ensure that stakeholders understand their security responsibilities but aren't involved in translating security strategies into actionable solutions.

0 commit comments

Comments
 (0)