Skip to content

Commit 0ad4e5a

Browse files
author
gitName
committed
Fix merge conflicts
2 parents 9cfea66 + 71e15ba commit 0ad4e5a

File tree

106 files changed

+585
-3396
lines changed

Some content is hidden

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

106 files changed

+585
-3396
lines changed

.openpublishing.redirection.json

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,36 @@
4141
"redirect_document_id": false
4242
},
4343
{
44+
"source_path_from_root": "/learn-pr/azure/intro-to-arc-enabled-data-services/1-introduction.yml",
45+
"redirect_url": "https://learn.microsoft.com/training/modules/upload-download-and-manage-data-with-azure-storage-explorer",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path_from_root": "/learn-pr/azure/intro-to-arc-enabled-data-services/2-hybrid-computing.yml",
50+
"redirect_url": "https://learn.microsoft.com/training/modules/upload-download-and-manage-data-with-azure-storage-explorer",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/learn-pr/azure/intro-to-arc-enabled-data-services/3-fundamentals.yml",
55+
"redirect_url": "https://learn.microsoft.com/training/modules/upload-download-and-manage-data-with-azure-storage-explorer",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path_from_root": "/learn-pr/azure/intro-to-arc-enabled-data-services/4-sql-managed-instance.yml",
60+
"redirect_url": "https://learn.microsoft.com/training/modules/upload-download-and-manage-data-with-azure-storage-explorer",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path_from_root": "/learn-pr/azure/intro-to-arc-enabled-data-services/6-summary.yml",
65+
"redirect_url": "https://learn.microsoft.com/training/modules/upload-download-and-manage-data-with-azure-storage-explorer",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path_from_root": "/learn-pr/azure/intro-to-arc-enabled-data-services/index.yml",
70+
"redirect_url": "https://learn.microsoft.com/training/modules/upload-download-and-manage-data-with-azure-storage-explorer",
71+
"redirect_document_id": false
72+
},
73+
{
4474
"source_path_from_root": "/learn-pr/azure/intro-to-azure-monitor/1-introduction.yml",
4575
"redirect_url": "https://learn.microsoft.com/training/modules/monitor-azure-vm-using-diagnostic-data",
4676
"redirect_document_id": false
@@ -75,6 +105,43 @@
75105
"redirect_url": "https://learn.microsoft.com/training/modules/monitor-azure-vm-using-diagnostic-data",
76106
"redirect_document_id": false
77107
},
108+
{
109+
"source_path_from_root": "/learn-pr/azure/intro-to-azure-data-explorer/1-introduction.yml",
110+
"redirect_url": "https://learn.microsoft.com/training/modules/upload-download-and-manage-data-with-azure-storage-explorer",
111+
"redirect_document_id": false
112+
},
113+
{
114+
"source_path_from_root": "/learn-pr/azure/intro-to-azure-data-explorer/2-what-is-azure-data-explorer.yml",
115+
"redirect_url": "https://learn.microsoft.com/training/modules/upload-download-and-manage-data-with-azure-storage-explorer",
116+
"redirect_document_id": false
117+
},
118+
{
119+
"source_path_from_root": "/learn-pr/azure/intro-to-azure-data-explorer/3-how-azure-data-explorer-works.yml",
120+
"redirect_url": "https://learn.microsoft.com/training/modules/upload-download-and-manage-data-with-azure-storage-explorer",
121+
"redirect_document_id": false
122+
},
123+
{
124+
"source_path_from_root": "/learn-pr/azure/intro-to-azure-data-explorer/4-when-to-use-azure-data-explorer.yml",
125+
"redirect_url": "https://learn.microsoft.com/training/modules/upload-download-and-manage-data-with-azure-storage-explorer",
126+
"redirect_document_id": false
127+
},
128+
{
129+
"source_path_from_root": "/learn-pr/azure/intro-to-azure-data-explorer/5-knowledge-check.yml",
130+
"redirect_url": "https://learn.microsoft.com/training/modules/upload-download-and-manage-data-with-azure-storage-explorer",
131+
"redirect_document_id": false
132+
},
133+
{
134+
"source_path_from_root": "/learn-pr/azure/intro-to-azure-data-explorer/6-summary.yml",
135+
"redirect_url": "https://learn.microsoft.com/training/modules/upload-download-and-manage-data-with-azure-storage-explorer",
136+
"redirect_document_id": false
137+
},
138+
{
139+
"source_path_from_root": "/learn-pr/azure/intro-to-azure-data-explorer/index.yml",
140+
"redirect_url": "https://learn.microsoft.com/training/modules/upload-download-and-manage-data-with-azure-storage-explorer",
141+
"redirect_document_id": false
142+
},
143+
144+
78145
{
79146
"source_path_from_root": "/learn-pr/achievements/learn.azure.deploy-java-spring-boot-app-service-mysql.badge.yml",
80147
"redirect_url": "https://learn.microsoft.com/azure/app-service/tutorial-java-spring-cosmosdb",
@@ -51402,6 +51469,11 @@
5140251469
"redirect_url": "/training/paths/transform-your-business-with-microsoft-ai/",
5140351470
"redirect_document_id": false
5140451471
},
51472+
{
51473+
"source_path": "learn-pr/paths/evolve-your-devops-practices/index.yml",
51474+
"redirect_url": "https://learn.microsoft.com/azure/devops/get-started/?view=azure-devops",
51475+
"redirect_document_id": false
51476+
},
5140551477
{
5140651478
"source_path": "learn-pr/wwl-sci/investigate-threats-with-content-search-in-microsoft-purview/index.md",
5140751479
"redirect_url": "/training/modules/purview-ediscovery-search/",
@@ -51556,6 +51628,66 @@
5155651628
"source_path": "learn-pr/azure-devops/manage-delivery-plans/index.yml",
5155751629
"redirect_url": "https://learn.microsoft.com/azure/devops/boards/plans/add-edit-delivery-plan?view=azure-devops",
5155851630
"redirect_document_id": false
51631+
},
51632+
{
51633+
"source_path": "learn-pr/azure-devops/get-started-with-devops/1-introduction.yml",
51634+
"redirect_url": "https://learn.microsoft.com/azure/devops/user-guide/what-is-azure-devops?view=azure-devops",
51635+
"redirect_document_id": false
51636+
},
51637+
{
51638+
"source_path": "learn-pr/azure-devops/get-started-with-devops/2-what-is-devops.yml",
51639+
"redirect_url": "https://learn.microsoft.com/azure/devops/user-guide/what-is-azure-devops?view=azure-devops",
51640+
"redirect_document_id": false
51641+
},
51642+
{
51643+
"source_path": "learn-pr/azure-devops/get-started-with-devops/3-what-is-azure-devops.yml",
51644+
"redirect_url": "https://learn.microsoft.com/azure/devops/user-guide/what-is-azure-devops?view=azure-devops",
51645+
"redirect_document_id": false
51646+
},
51647+
{
51648+
"source_path": "learn-pr/azure-devops/get-started-with-devops/4-create-an-azure-devops-account.yml",
51649+
"redirect_url": "https://learn.microsoft.com/azure/devops/user-guide/what-is-azure-devops?view=azure-devops",
51650+
"redirect_document_id": false
51651+
},
51652+
{
51653+
"source_path": "learn-pr/azure-devops/get-started-with-devops/5-summary.yml",
51654+
"redirect_url": "https://learn.microsoft.com/azure/devops/user-guide/what-is-azure-devops?view=azure-devops",
51655+
"redirect_document_id": false
51656+
},
51657+
{
51658+
"source_path": "learn-pr/azure-devops/get-started-with-devops/index.yml",
51659+
"redirect_url": "https://learn.microsoft.com/azure/devops/user-guide/what-is-azure-devops?view=azure-devops",
51660+
"redirect_document_id": false
51661+
},
51662+
{
51663+
"source_path": "learn-pr/azure-devops/assess-your-development-process/1-introduction.yml",
51664+
"redirect_url": "https://learn.microsoft.com/azure/devops/user-guide/plan-your-azure-devops-org-structure?view=azure-devops",
51665+
"redirect_document_id": false
51666+
},
51667+
{
51668+
"source_path": "learn-pr/azure-devops/assess-your-development-process/2-meet-the-team.yml",
51669+
"redirect_url": "https://learn.microsoft.com/azure/devops/user-guide/plan-your-azure-devops-org-structure?view=azure-devops",
51670+
"redirect_document_id": false
51671+
},
51672+
{
51673+
"source_path": "learn-pr/azure-devops/assess-your-development-process/3-release-process.yml",
51674+
"redirect_url": "https://learn.microsoft.com/azure/devops/user-guide/plan-your-azure-devops-org-structure?view=azure-devops",
51675+
"redirect_document_id": false
51676+
},
51677+
{
51678+
"source_path": "learn-pr/azure-devops/assess-your-development-process/4-assess-process-efficiency.yml",
51679+
"redirect_url": "https://learn.microsoft.com/azure/devops/user-guide/plan-your-azure-devops-org-structure?view=azure-devops",
51680+
"redirect_document_id": false
51681+
},
51682+
{
51683+
"source_path": "learn-pr/azure-devops/assess-your-development-process/5-summary.yml",
51684+
"redirect_url": "https://learn.microsoft.com/azure/devops/user-guide/plan-your-azure-devops-org-structure?view=azure-devops",
51685+
"redirect_document_id": false
51686+
},
51687+
{
51688+
"source_path": "learn-pr/azure-devops/assess-your-development-process/index.yml",
51689+
"redirect_url": "https://learn.microsoft.com/azure/devops/user-guide/plan-your-azure-devops-org-structure?view=azure-devops",
51690+
"redirect_document_id": false
5155951691
}
5156051692
]
5156151693
}

learn-pr/achievements.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,16 @@ achievements:
1515
title: Characterize an unfamiliar dataset with Azure Data Explorer
1616
summary: Learn how to characterize an unfamiliar dataset using Azure Data Explorer.
1717
iconUrl: /training/achievements/azure-data-explore-web.svg
18+
- uid: learn.azure.intro-to-arc-enabled-data-services.badge
19+
type: badge
20+
title: Introduction to Azure Arc-enabled data services
21+
summary: In this module, you learn the fundamentals of hybrid computing and Azure Arc.
22+
iconUrl: /training/achievements/intro-to-arc-enabled-data-services.svg
23+
- uid: learn.intro-to-azure-data-explorer.badge
24+
type: badge
25+
title: Introduction to Azure Data Explorer
26+
summary: Learn to describe the ingestion, query, visualization, and data management features that Azure Data Explorer provides to help you make sense of the data flowing into your business.
27+
iconUrl: /training/achievements/intro-to-azure-data-explorer.svg
1828
- uid: learn.azure.intro-to-azure-monitor.badge
1929
type: badge
2030
title: Introduction to Azure Monitor
@@ -6120,6 +6130,11 @@ achievements:
61206130
title: Investigate threats with Content search in Microsoft Purview
61216131
summary: This module examines how to search for content in the Microsoft Purview portal using Content Search functionality, including how to view and export the search results, and configure search permissions filtering.
61226132
iconUrl: /training/achievements/m365-content-compliance.svg
6133+
- uid: learn.azdo.evolve-your-devops-practices.trophy
6134+
type: trophy
6135+
title: Get started with Azure DevOps
6136+
summary: DevOps is the union of people, process, and products to enable continuous delivery of value to your end users. Azure DevOps is a set of services that gives you the tools you need to do just that. With Azure DevOps, you can build, test, and deploy any application, either to the cloud or on premises. DevOps practices that enable transparency, cooperation, continuous delivery and continuous deployment become embedded in your software development lifecycle.
6137+
iconUrl: /training/achievements/azure-devops/evolve-your-devops-practices.svg
61236138
- uid: learn.wwl.create-implement-application-allowlists-with-adaptive-application-control.badge
61246139
type: badge
61256140
title: Create and implement application allowlists with adaptive application control
@@ -6135,3 +6150,13 @@ achievements:
61356150
title: Manage Agile software delivery plans across teams
61366151
summary: Learn how to optimize delivery efficiency by improving work plan visibility across teams.
61376152
iconUrl: /training/achievements/azure-devops/manage-agile-software-delivery-plans-across-teams.svg
6153+
- uid: learn.get-started-with-devops.badge
6154+
type: badge
6155+
title: Introduction to Azure DevOps
6156+
summary: Explore what DevOps is (and isn't) and learn how to get started with Azure DevOps.
6157+
iconUrl: /training/achievements/azure-devops/get-started-with-devops.svg
6158+
- uid: learn.azdo.assess-your-development-process.badge
6159+
type: badge
6160+
title: Assess your existing software development process
6161+
summary: Use a value stream map to help you examine your existing processes and technologies.
6162+
iconUrl: /training/achievements/azure-devops/assess-your-software-development-process.svg

learn-pr/azure-devops/assess-your-development-process/1-introduction.yml

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

learn-pr/azure-devops/assess-your-development-process/2-meet-the-team.yml

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

learn-pr/azure-devops/assess-your-development-process/3-release-process.yml

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

learn-pr/azure-devops/assess-your-development-process/4-assess-process-efficiency.yml

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

learn-pr/azure-devops/assess-your-development-process/5-summary.yml

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

learn-pr/azure-devops/assess-your-development-process/includes/1-introduction.md

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

0 commit comments

Comments
 (0)