Skip to content

Commit f340cc1

Browse files
ShawnKupferShawnKupfer
committed
Fix merge conflicts
2 parents d829199 + e84b993 commit f340cc1

File tree

349 files changed

+7635
-5083
lines changed

Some content is hidden

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

349 files changed

+7635
-5083
lines changed

‎.openpublishing.redirection.json

Lines changed: 313 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,236 @@
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+
},
44379+
{
44380+
"source_path": "learn-pr/reactors/blockchain-solidity-ethereum-smart-contracts/1-introduction.yml",
44381+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44382+
"redirect_document_id": false
44383+
},
44384+
{
44385+
"source_path": "learn-pr/reactors/blockchain-solidity-ethereum-smart-contracts/2-smart-contracts.yml",
44386+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44387+
"redirect_document_id": false
44388+
},
44389+
{
44390+
"source_path": "learn-pr/reactors/blockchain-solidity-ethereum-smart-contracts/3-truffle.yml",
44391+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44392+
"redirect_document_id": false
44393+
},
44394+
{
44395+
"source_path": "learn-pr/reactors/blockchain-solidity-ethereum-smart-contracts/4-truffle-for-vs-code.yml",
44396+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44397+
"redirect_document_id": false
44398+
},
44399+
{
44400+
"source_path": "learn-pr/reactors/blockchain-solidity-ethereum-smart-contracts/5-write-contract.yml",
44401+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44402+
"redirect_document_id": false
44403+
},
44404+
{
44405+
"source_path": "learn-pr/reactors/blockchain-solidity-ethereum-smart-contracts/6-test-contract.yml",
44406+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44407+
"redirect_document_id": false
44408+
},
44409+
{
44410+
"source_path": "learn-pr/reactors/blockchain-solidity-ethereum-smart-contracts/7-knowledge-check.yml",
44411+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44412+
"redirect_document_id": false
44413+
},
44414+
{
44415+
"source_path": "learn-pr/reactors/blockchain-solidity-ethereum-smart-contracts/8-summary.yml",
44416+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44417+
"redirect_document_id": false
44418+
},
44419+
{
44420+
"source_path": "learn-pr/reactors/blockchain-solidity-ethereum-smart-contracts/index.yml",
44421+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44422+
"redirect_document_id": false
44423+
},
44424+
{
44425+
"source_path": "learn-pr/reactors/blockchain-tokens/1-introduction.yml",
44426+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44427+
"redirect_document_id": false
44428+
},
44429+
{
44430+
"source_path": "learn-pr/reactors/blockchain-tokens/2-what-are-tokens.yml",
44431+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44432+
"redirect_document_id": false
44433+
},
44434+
{
44435+
"source_path": "learn-pr/reactors/blockchain-tokens/3-token-types.yml",
44436+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44437+
"redirect_document_id": false
44438+
},
44439+
{
44440+
"source_path": "learn-pr/reactors/blockchain-tokens/4-learn-open-zeppelin.yml",
44441+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44442+
"redirect_document_id": false
44443+
},
44444+
{
44445+
"source_path": "learn-pr/reactors/blockchain-tokens/5-set-up-project.yml",
44446+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44447+
"redirect_document_id": false
44448+
},
44449+
{
44450+
"source_path": "learn-pr/reactors/blockchain-tokens/6-write-token-contract.yml",
44451+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44452+
"redirect_document_id": false
44453+
},
44454+
{
44455+
"source_path": "learn-pr/reactors/blockchain-tokens/7-knowledge-check.yml",
44456+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44457+
"redirect_document_id": false
44458+
},
44459+
{
44460+
"source_path": "learn-pr/reactors/blockchain-tokens/8-summary.yml",
44461+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44462+
"redirect_document_id": false
44463+
},
44464+
{
44465+
"source_path": "learn-pr/reactors/blockchain-tokens/index.yml",
44466+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44467+
"redirect_document_id": false
44468+
},
44469+
{
44470+
"source_path": "learn-pr/student-evangelism/build-ml-model-with-azure-stream-analytics/1-introduction.yml",
44471+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44472+
"redirect_document_id": false
44473+
},
44474+
{
44475+
"source_path": "learn-pr/student-evangelism/build-ml-model-with-azure-stream-analytics/2-azure-storage.yml",
44476+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44477+
"redirect_document_id": false
44478+
},
44479+
{
44480+
"source_path": "learn-pr/student-evangelism/build-ml-model-with-azure-stream-analytics/3-cognitive-services.yml",
44481+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44482+
"redirect_document_id": false
44483+
},
44484+
{
44485+
"source_path": "learn-pr/student-evangelism/build-ml-model-with-azure-stream-analytics/4-azure-functions.yml",
44486+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44487+
"redirect_document_id": false
44488+
},
44489+
{
44490+
"source_path": "learn-pr/student-evangelism/build-ml-model-with-azure-stream-analytics/5-azure-sql-database.yml",
44491+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44492+
"redirect_document_id": false
44493+
},
44494+
{
44495+
"source_path": "learn-pr/student-evangelism/build-ml-model-with-azure-stream-analytics/6b-knowledge-check.yml",
44496+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44497+
"redirect_document_id": false
44498+
},
44499+
{
44500+
"source_path": "learn-pr/student-evangelism/build-ml-model-with-azure-stream-analytics/6-power-bi.yml",
44501+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44502+
"redirect_document_id": false
44503+
},
44504+
{
44505+
"source_path": "learn-pr/student-evangelism/build-ml-model-with-azure-stream-analytics/7-summary.yml",
44506+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44507+
"redirect_document_id": false
44508+
},
44509+
{
44510+
"source_path": "learn-pr/student-evangelism/build-ml-model-with-azure-stream-analytics/index.yml",
44511+
"redirect_url": "https://learn.microsoft.com/training/browse/",
44512+
"redirect_document_id": false
44513+
},
4420144514
{
4420244515
"source_path": "learn-pr/azure/communication-service-send-sms-console-app/1-introduction.yml",
4420344516
"redirect_url": "https://learn.microsoft.com/training/browse/",

‎learn-pr/achievements.yml

Lines changed: 35 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
@@ -5325,3 +5330,33 @@ achievements:
53255330
title: Send an SMS message from a C# console application with Azure Communication Services
53265331
summary: In this module, you'll create a C# console application that sends SMS messages using a phone number provisioned via Azure Communication Services.
53275332
iconUrl: /training/achievements/communication-service-send-sms-console-app.svg
5333+
- uid: learn.student-evangelism.build-ml-model-with-azure-stream-analytics.badge
5334+
type: badge
5335+
title: Track wild polar bears with AI
5336+
summary: Detect and track polar bears through photos using AI, and then use Power BI to show where cameras spot polar bears.
5337+
iconUrl: /training/achievements/student-evangelism/build-ml-model-with-azure-stream-analytics-badge.svg
5338+
- uid: learn.reactors.blockchain-tokens.badge
5339+
type: badge
5340+
title: Create tokens using OpenZeppelin
5341+
summary: Learn about the significance of tokens and how they are used in blockchain.
5342+
iconUrl: /training/achievements/reactors/blockchain-tokens.svg
5343+
- uid: learn.reactors.blockchain-solidity-ethereum-smart-contracts.badge
5344+
type: badge
5345+
title: Write Ethereum smart contracts by using Solidity
5346+
summary: Learn how to install and use tools that you can use to develop smart contracts.
5347+
iconUrl: /training/achievements/reactors/blockchain-solidity-ethereum-smart-contracts.svg
5348+
- uid: learn.reactors.blockchain-learning-solidity.badge
5349+
type: badge
5350+
title: Learn how to use Solidity
5351+
summary: Discover how Solidity can make it easy to program smart contracts for the Ethereum blockchain platform.
5352+
iconUrl: /training/achievements/reactors/blockchain-learning-solidity.svg
5353+
- uid: learn.reactors.blockchain-ethereum-networks.badge
5354+
type: badge
5355+
title: Connect and deploy to Ethereum networks
5356+
summary: Learn about and use Ethereum networks for development, testing, and production.
5357+
iconUrl: /training/achievements/reactors/blockchain-ethereum-networks.svg
5358+
- uid: learn.ethereum-blockchain-development.trophy
5359+
type: trophy
5360+
title: Get started with blockchain development
5361+
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.
5362+
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)]

0 commit comments

Comments
 (0)