Skip to content

Commit d802b02

Browse files
author
gitName
committed
Fix merge conflicts
2 parents 381fb01 + 8584c55 commit d802b02

File tree

742 files changed

+7232
-5713
lines changed

Some content is hidden

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

742 files changed

+7232
-5713
lines changed

.openpublishing.redirection.json

Lines changed: 226 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26903,6 +26903,16 @@
2690326903
"redirect_url": "/training/modules/manage-system-health-azure-stack-hub/12-summary",
2690426904
"redirect_document_id": true
2690526905
},
26906+
{
26907+
"source_path_from_root": "/learn-pr/github/github-introduction-products/5-knowledge-check.yml",
26908+
"redirect_url": "/training/modules/github-introduction-products/8-knowledge-check",
26909+
"redirect_document_id": true
26910+
},
26911+
{
26912+
"source_path_from_root": "/learn-pr/github/github-introduction-products/6-summary.yml",
26913+
"redirect_url": "/training/modules/github-introduction-products/9-summary",
26914+
"redirect_document_id": true
26915+
},
2690626916
{
2690726917
"source_path_from_root": "/learn-pr/wwl-azure/manage-system-health-azure-stack-hub/4-monitor-system-health-syslog-server.md",
2690826918
"redirect_url": "/training/modules/manage-system-health-azure-stack-hub/5-monitor-system-health-syslog-server",
@@ -46459,6 +46469,86 @@
4645946469
"redirect_url": "/training/browse/",
4646046470
"redirect_document_id": false
4646146471
},
46472+
{
46473+
"source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/1-introduction.yml",
46474+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46475+
"redirect_document_id": false
46476+
},
46477+
{
46478+
"source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/2-comprehensive-experience-for-all-cloud-environments.yml",
46479+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46480+
"redirect_document_id": false
46481+
},
46482+
{
46483+
"source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/3-get-high-level-insights-permissions-management-dashboard.yml",
46484+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46485+
"redirect_document_id": false
46486+
},
46487+
{
46488+
"source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/4-knowledge-check-insights.yml",
46489+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46490+
"redirect_document_id": false
46491+
},
46492+
{
46493+
"source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/5-dive-deeper-with-analytics-tab.yml",
46494+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46495+
"redirect_document_id": false
46496+
},
46497+
{
46498+
"source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/6-knowledge-check-analytics.yml",
46499+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46500+
"redirect_document_id": false
46501+
},
46502+
{
46503+
"source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/7-develop-better-understanding-of-your-environment-with-reports.yml",
46504+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46505+
"redirect_document_id": false
46506+
},
46507+
{
46508+
"source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/8-analyze-historical-data-with-audit-tab.yml",
46509+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46510+
"redirect_document_id": false
46511+
},
46512+
{
46513+
"source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/9-act-on-your-findings-with-remediation-tab.yml",
46514+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46515+
"redirect_document_id": false
46516+
},
46517+
{
46518+
"source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/10-knowledge-check-remediation.yml",
46519+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46520+
"redirect_document_id": false
46521+
},
46522+
{
46523+
"source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/11-stay-informed-with-continuous-monitoring.yml",
46524+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46525+
"redirect_document_id": false
46526+
},
46527+
{
46528+
"source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/12-knowledge-check-monitoring.yml",
46529+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46530+
"redirect_document_id": false
46531+
},
46532+
{
46533+
"source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/13-manage-access-to-microsoft-entra-permissions-management.yml",
46534+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46535+
"redirect_document_id": false
46536+
},
46537+
{
46538+
"source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/14-put-it-all-together.yml",
46539+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46540+
"redirect_document_id": false
46541+
},
46542+
{
46543+
"source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/15-summary.yml",
46544+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46545+
"redirect_document_id": false
46546+
},
46547+
{
46548+
"source_path": "learn-pr/permissions-managements/explore-features-of-permissions-management/index.yml",
46549+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46550+
"redirect_document_id": false
46551+
},
4646246552
{
4646346553
"source_path": "learn-pr/azure/build-cosmos-db-java-app/1-introduction.yml",
4646446554
"redirect_url": "https://learn.microsoft.com/azure/cosmos-db/nosql/quickstart-java",
@@ -46548,6 +46638,141 @@
4654846638
"source_path": "learn-pr/azure/azure-sql-performance/index.yml",
4654946639
"redirect_url": "https://learn.microsoft.com/training/paths/monitor-optimize-operational-resources-sql-server/",
4655046640
"redirect_document_id": false
46641+
},
46642+
{
46643+
"source_path": "learn-pr/azure/azure-sql-secure-data/1-introduction.yml",
46644+
"redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
46645+
"redirect_document_id": false
46646+
},
46647+
{
46648+
"source_path": "learn-pr/azure/azure-sql-secure-data/2-security-capabilities.yml",
46649+
"redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
46650+
"redirect_document_id": false
46651+
},
46652+
{
46653+
"source_path": "learn-pr/azure/azure-sql-secure-data/3-exercise-configure-sql-database.yml",
46654+
"redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
46655+
"redirect_document_id": false
46656+
},
46657+
{
46658+
"source_path": "learn-pr/azure/azure-sql-secure-data/4-exercise-network-security.yml",
46659+
"redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
46660+
"redirect_document_id": false
46661+
},
46662+
{
46663+
"source_path": "learn-pr/azure/azure-sql-secure-data/5-exercise-configure-authentication.yml",
46664+
"redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
46665+
"redirect_document_id": false
46666+
},
46667+
{
46668+
"source_path": "learn-pr/azure/azure-sql-secure-data/6-data-protection.yml",
46669+
"redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
46670+
"redirect_document_id": false
46671+
},
46672+
{
46673+
"source_path": "learn-pr/azure/azure-sql-secure-data/7-security-management.yml",
46674+
"redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
46675+
"redirect_document_id": false
46676+
},
46677+
{
46678+
"source_path": "learn-pr/azure/azure-sql-secure-data/8-exercise-advanced-data-security.yml",
46679+
"redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
46680+
"redirect_document_id": false
46681+
},
46682+
{
46683+
"source_path": "learn-pr/azure/azure-sql-secure-data/9-exercise-data-classification-masking-audit.yml",
46684+
"redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
46685+
"redirect_document_id": false
46686+
},
46687+
{
46688+
"source_path": "learn-pr/azure/azure-sql-secure-data/10-summary.yml",
46689+
"redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
46690+
"redirect_document_id": false
46691+
},
46692+
{
46693+
"source_path": "learn-pr/azure/azure-sql-secure-data/index.yml",
46694+
"redirect_url": "https://learn.microsoft.com/training/paths/implement-secure-environment-database-service/",
46695+
"redirect_document_id": false
46696+
},
46697+
{
46698+
"source_path": "learn-pr/wwl-data-ai/custom-model-ai-vision-image-classification/index.md",
46699+
"redirect_url": "/training/modules/classify-images/",
46700+
"redirect_document_id": false
46701+
},
46702+
{
46703+
"source_path": "learn-pr/wwl-data-ai/custom-model-ai-vision-image-classification/3-create-custom-project.md",
46704+
"redirect_url": "/training/modules/classify-images/",
46705+
"redirect_document_id": false
46706+
},
46707+
{
46708+
"source_path": "learn-pr/wwl-data-ai/custom-model-ai-vision-image-classification/5-exercise.md",
46709+
"redirect_url": "/training/modules/classify-images/",
46710+
"redirect_document_id": false
46711+
},
46712+
{
46713+
"source_path": "learn-pr/wwl-data-ai/custom-model-ai-vision-image-classification/1-introduction.md",
46714+
"redirect_url": "/training/modules/classify-images/",
46715+
"redirect_document_id": false
46716+
},
46717+
{
46718+
"source_path": "learn-pr/wwl-data-ai/custom-model-ai-vision-image-classification/6-knowledge-check.md",
46719+
"redirect_url": "/training/modules/classify-images/",
46720+
"redirect_document_id": false
46721+
},
46722+
{
46723+
"source_path": "learn-pr/wwl-data-ai/custom-model-ai-vision-image-classification/4-label-train-custom-model.md",
46724+
"redirect_url": "/training/modules/classify-images/",
46725+
"redirect_document_id": false
46726+
},
46727+
{
46728+
"source_path": "learn-pr/wwl-data-ai/custom-model-ai-vision-image-classification/7-summary.md",
46729+
"redirect_url": "/training/modules/classify-images/",
46730+
"redirect_document_id": false
46731+
},
46732+
{
46733+
"source_path": "learn-pr/wwl-data-ai/custom-model-ai-vision-image-classification/2-understand-custom-model-types.md",
46734+
"redirect_url": "/training/modules/classify-images/",
46735+
"redirect_document_id": false
46736+
},
46737+
{
46738+
"source_path": "learn-pr/permissions-managements/intro-to-entra-permissions-management/1-introduction.yml",
46739+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46740+
"redirect_document_id": false
46741+
},
46742+
{
46743+
"source_path": "learn-pr/permissions-managements/intro-to-entra-permissions-management/2-what-is-ciem.yml",
46744+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46745+
"redirect_document_id": false
46746+
},
46747+
{
46748+
"source_path": "learn-pr/permissions-managements/intro-to-entra-permissions-management/3-what-is-entra-permissions-management.yml",
46749+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46750+
"redirect_document_id": false
46751+
},
46752+
{
46753+
"source_path": "learn-pr/permissions-managements/intro-to-entra-permissions-management/4-how-entra-permissions-management-works.yml",
46754+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46755+
"redirect_document_id": false
46756+
},
46757+
{
46758+
"source_path": "learn-pr/permissions-managements/intro-to-entra-permissions-management/5-when-to-use-permissions-management.yml",
46759+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46760+
"redirect_document_id": false
46761+
},
46762+
{
46763+
"source_path": "learn-pr/permissions-managements/intro-to-entra-permissions-management/6-knowledge-check.yml",
46764+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46765+
"redirect_document_id": false
46766+
},
46767+
{
46768+
"source_path": "learn-pr/permissions-managements/intro-to-entra-permissions-management/7-summary.yml",
46769+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46770+
"redirect_document_id": false
46771+
},
46772+
{
46773+
"source_path": "learn-pr/permissions-managements/intro-to-entra-permissions-management/index.yml",
46774+
"redirect_url": "https://learn.microsoft.com/entra/permissions-management/",
46775+
"redirect_document_id": false
4655146776
}
46552-
]
46777+
]
4655346778
}

learn-pr/achievements.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5625,6 +5625,16 @@ achievements:
56255625
title: Guided project langstons ant
56265626
summary: This module will guide you through the steps required to develop your own Langston's Ant project. Your code will use interfaces to represent the functions the ants can perform.
56275627
iconUrl: /training/achievements/guided-project-langstons-ant.svg
5628+
- uid: learn.permissions-management.intro-to-entra-permissions-management.badge
5629+
type: badge
5630+
title: Introduction to Microsoft Entra Permissions Management
5631+
summary: Microsoft Entra Permissions Management gives security operation administrators insight into over-privileged workload and user identities, actions, and resources across multicloud infrastructures.
5632+
iconUrl: /training/achievements/1-intro-to-entra-permissions-management.svg
5633+
- uid: learn.permissions-management.explore-features-of-permissions-management.badge
5634+
type: badge
5635+
title: Explore the many features of Microsoft Entra Permissions Management
5636+
summary: While diving deeper into the features of Microsoft Entra Permissions Management, we use the framework of discover, remediate, monitor as a guide to help walkthrough how the Permissions Management features set can benefit your organization.
5637+
iconUrl: /training/achievements/2-explore-features-of-permissions-management.svg
56285638
- uid: learn.cosmos-db-java-app.badge
56295639
type: badge
56305640
title: Build a Java app with cloud-scale NoSQL Cosmos DB
@@ -5635,3 +5645,13 @@ achievements:
56355645
title: Deliver consistent performance with Azure SQL
56365646
summary: Azure SQL has the capabilities and tools to allow you to deliver consistent performance for your application. In this module, you will learn key aspects of configuration, monitoring, and intelligent performance for Azure SQL.
56375647
iconUrl: /training/achievements/azure-sql-performance.svg
5648+
- uid: learn.azure-sql-secure-data.badge
5649+
type: badge
5650+
title: Secure your data with Azure SQL
5651+
summary: Ensuring the security and compliance of data is always a top priority. In this module, you learn how to use Azure SQL to secure your data, configure logins and users, use tools and techniques for monitoring security, ensure that your data meets industry and regulatory compliance standards, and take advantage of the extra benefits and intelligence that Azure provides. We also cover some of the networking considerations for securing SQL.
5652+
iconUrl: /training/achievements/azure-sql-secure-data.svg
5653+
- uid: learn.wwl.custom-model-ai-vision-image-classification.badge
5654+
type: badge
5655+
title: Image classification with custom Azure AI Vision models
5656+
summary: Classify images by training a custom model with Azure AI Vision.
5657+
iconUrl: /learn/achievements/generic-badge.svg
456 KB
Loading

0 commit comments

Comments
 (0)