Skip to content

Commit a5b65a8

Browse files
ShawnKupferShawnKupfer
committed
Fix merge conflicts
2 parents bb96364 + e74e500 commit a5b65a8

File tree

322 files changed

+820
-6035
lines changed

Some content is hidden

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

322 files changed

+820
-6035
lines changed

‎.openpublishing.redirection.json

Lines changed: 345 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35738,6 +35738,271 @@
3573835738
"redirect_url": "/fabric/real-time-intelligence/data-activator/activator-introduction",
3573935739
"redirect_document_id": false
3574035740
},
35741+
{
35742+
"source_path": "learn-pr/iot/create-manage-device-templates/index.yml",
35743+
"redirect_url": "/training/",
35744+
"redirect_document_id": false
35745+
},
35746+
{
35747+
"source_path": "learn-pr/iot/create-manage-device-templates/1-introduction.yml",
35748+
"redirect_url": "/training/",
35749+
"redirect_document_id": false
35750+
},
35751+
{
35752+
"source_path": "learn-pr/iot/create-manage-device-templates/2-introduction-to-device-templates.yml",
35753+
"redirect_url": "/training/",
35754+
"redirect_document_id": false
35755+
},
35756+
{
35757+
"source_path": "learn-pr/iot/create-manage-device-templates/3-create-device-capability-model.yml",
35758+
"redirect_url": "/training/",
35759+
"redirect_document_id": false
35760+
},
35761+
{
35762+
"source_path": "learn-pr/iot/create-manage-device-templates/4-add-cloud-properties-to-device-template.yml",
35763+
"redirect_url": "/training/",
35764+
"redirect_document_id": false
35765+
},
35766+
{
35767+
"source_path": "learn-pr/iot/create-manage-device-templates/5-add-customizations-to-device-template.yml",
35768+
"redirect_url": "/training/",
35769+
"redirect_document_id": false
35770+
},
35771+
{
35772+
"source_path": "learn-pr/iot/create-manage-device-templates/6-add-dashboards-to-device-template.yml",
35773+
"redirect_url": "/training/",
35774+
"redirect_document_id": false
35775+
},
35776+
{
35777+
"source_path": "learn-pr/iot/create-manage-device-templates/7-version-device-template.yml",
35778+
"redirect_url": "/training/",
35779+
"redirect_document_id": false
35780+
},
35781+
{
35782+
"source_path": "learn-pr/iot/create-manage-device-templates/8-knowledge-check.yml",
35783+
"redirect_url": "/training/",
35784+
"redirect_document_id": false
35785+
},
35786+
{
35787+
"source_path": "learn-pr/iot/create-manage-device-templates/9-summary.yml",
35788+
"redirect_url": "/training/",
35789+
"redirect_document_id": false
35790+
},
35791+
{
35792+
"source_path": "learn-pr/iot/manage-devices-azure-iot-central/index.yml",
35793+
"redirect_url": "/training/",
35794+
"redirect_document_id": false
35795+
},
35796+
{
35797+
"source_path": "learn-pr/iot/manage-devices-azure-iot-central/1-introduction.yml",
35798+
"redirect_url": "/training/",
35799+
"redirect_document_id": false
35800+
},
35801+
{
35802+
"source_path": "learn-pr/iot/manage-devices-azure-iot-central/2-manage-your-devices.yml",
35803+
"redirect_url": "/training/",
35804+
"redirect_document_id": false
35805+
},
35806+
{
35807+
"source_path": "learn-pr/iot/manage-devices-azure-iot-central/3-introduction-to-device-groups.yml",
35808+
"redirect_url": "/training/",
35809+
"redirect_document_id": false
35810+
},
35811+
{
35812+
"source_path": "learn-pr/iot/manage-devices-azure-iot-central/4-manage-devices-at-scale-using-jobs.yml",
35813+
"redirect_url": "/training/",
35814+
"redirect_document_id": false
35815+
},
35816+
{
35817+
"source_path": "learn-pr/iot/manage-devices-azure-iot-central/5-knowledge-check.yml",
35818+
"redirect_url": "/training/",
35819+
"redirect_document_id": false
35820+
},
35821+
{
35822+
"source_path": "learn-pr/iot/manage-devices-azure-iot-central/6-summary.yml",
35823+
"redirect_url": "/training/",
35824+
"redirect_document_id": false
35825+
},
35826+
{
35827+
"source_path": "learn-pr/iot/connect-iot-edge-device-to-iot-central/index.yml",
35828+
"redirect_url": "/training/",
35829+
"redirect_document_id": false
35830+
},
35831+
{
35832+
"source_path": "learn-pr/iot/connect-iot-edge-device-to-iot-central/1-introduction.yml",
35833+
"redirect_url": "/training/",
35834+
"redirect_document_id": false
35835+
},
35836+
{
35837+
"source_path": "learn-pr/iot/connect-iot-edge-device-to-iot-central/2-implement-iot-application-with-edge-pattern.yml",
35838+
"redirect_url": "/training/",
35839+
"redirect_document_id": false
35840+
},
35841+
{
35842+
"source_path": "learn-pr/iot/connect-iot-edge-device-to-iot-central/3-exercise-create-iot-central-application.yml",
35843+
"redirect_url": "/training/",
35844+
"redirect_document_id": false
35845+
},
35846+
{
35847+
"source_path": "learn-pr/iot/connect-iot-edge-device-to-iot-central/4-deploy-iot-edge-to-virtual-machine.yml",
35848+
"redirect_url": "/training/",
35849+
"redirect_document_id": false
35850+
},
35851+
{
35852+
"source_path": "learn-pr/iot/connect-iot-edge-device-to-iot-central/5-exercise-deploy-and-manage-an-iot-edge-device.yml",
35853+
"redirect_url": "/training/",
35854+
"redirect_document_id": false
35855+
},
35856+
{
35857+
"source_path": "learn-pr/iot/connect-iot-edge-device-to-iot-central/6-deploy-azure-function-to-iot-edge.yml",
35858+
"redirect_url": "/training/",
35859+
"redirect_document_id": false
35860+
},
35861+
{
35862+
"source_path": "learn-pr/iot/connect-iot-edge-device-to-iot-central/7-exercise-deploy-azure-function-to-filter-telemetry.yml",
35863+
"redirect_url": "/training/",
35864+
"redirect_document_id": false
35865+
},
35866+
{
35867+
"source_path": "learn-pr/iot/connect-iot-edge-device-to-iot-central/8-summary.yml",
35868+
"redirect_url": "/training/",
35869+
"redirect_document_id": false
35870+
},
35871+
{
35872+
"source_path": "learn-pr/iot/configure-business-integration/index.yml",
35873+
"redirect_url": "/training/",
35874+
"redirect_document_id": false
35875+
},
35876+
{
35877+
"source_path": "learn-pr/iot/configure-business-integration/1-introduction.yml",
35878+
"redirect_url": "/training/",
35879+
"redirect_document_id": false
35880+
},
35881+
{
35882+
"source_path": "learn-pr/iot/configure-business-integration/2-introduction-to-rules.yml",
35883+
"redirect_url": "/training/",
35884+
"redirect_document_id": false
35885+
},
35886+
{
35887+
"source_path": "learn-pr/iot/configure-business-integration/3-create-rule-set-up-notification.yml",
35888+
"redirect_url": "/training/",
35889+
"redirect_document_id": false
35890+
},
35891+
{
35892+
"source_path": "learn-pr/iot/configure-business-integration/4-configure-dashboard.yml",
35893+
"redirect_url": "/training/",
35894+
"redirect_document_id": false
35895+
},
35896+
{
35897+
"source_path": "learn-pr/iot/configure-business-integration/5-analyze-your-device-data.yml",
35898+
"redirect_url": "/training/",
35899+
"redirect_document_id": false
35900+
},
35901+
{
35902+
"source_path": "learn-pr/iot/configure-business-integration/6-knowledge-check.yml",
35903+
"redirect_url": "/training/",
35904+
"redirect_document_id": false
35905+
},
35906+
{
35907+
"source_path": "learn-pr/iot/configure-business-integration/7-summary.yml",
35908+
"redirect_url": "/training/",
35909+
"redirect_document_id": false
35910+
},
35911+
{
35912+
"source_path": "learn-pr/iot/introduction-to-azure-iot-central/index.yml",
35913+
"redirect_url": "/training/",
35914+
"redirect_document_id": false
35915+
},
35916+
{
35917+
"source_path": "learn-pr/iot/introduction-to-azure-iot-central/1-introduction.yml",
35918+
"redirect_url": "/training/",
35919+
"redirect_document_id": false
35920+
},
35921+
{
35922+
"source_path": "learn-pr/iot/introduction-to-azure-iot-central/2-what-is-azure-iot-central.yml",
35923+
"redirect_url": "/training/",
35924+
"redirect_document_id": false
35925+
},
35926+
{
35927+
"source_path": "learn-pr/iot/introduction-to-azure-iot-central/3-how-azure-iot-central-works.yml",
35928+
"redirect_url": "/training/",
35929+
"redirect_document_id": false
35930+
},
35931+
{
35932+
"source_path": "learn-pr/iot/introduction-to-azure-iot-central/4-when-to-use-azure-iot-central.yml",
35933+
"redirect_url": "/training/",
35934+
"redirect_document_id": false
35935+
},
35936+
{
35937+
"source_path": "learn-pr/iot/introduction-to-azure-iot-central/5-knowledge-check.yml",
35938+
"redirect_url": "/training/",
35939+
"redirect_document_id": false
35940+
},
35941+
{
35942+
"source_path": "learn-pr/iot/introduction-to-azure-iot-central/6-summary.yml",
35943+
"redirect_url": "/training/",
35944+
"redirect_document_id": false
35945+
},
35946+
{
35947+
"source_path": "learn-pr/iot/monitor-and-manage-device-with-iot-central/index.yml",
35948+
"redirect_url": "/training/",
35949+
"redirect_document_id": false
35950+
},
35951+
{
35952+
"source_path": "learn-pr/iot/monitor-and-manage-device-with-iot-central/1-introduction.yml",
35953+
"redirect_url": "/training/",
35954+
"redirect_document_id": false
35955+
},
35956+
{
35957+
"source_path": "learn-pr/iot/monitor-and-manage-device-with-iot-central/2-create-azure-iot-central-application.yml",
35958+
"redirect_url": "/training/",
35959+
"redirect_document_id": false
35960+
},
35961+
{
35962+
"source_path": "learn-pr/iot/monitor-and-manage-device-with-iot-central/3-define-coffee-machine-device-template.yml",
35963+
"redirect_url": "/training/",
35964+
"redirect_document_id": false
35965+
},
35966+
{
35967+
"source_path": "learn-pr/iot/monitor-and-manage-device-with-iot-central/4-create-coffee-machine-device-template.yml",
35968+
"redirect_url": "/training/",
35969+
"redirect_document_id": false
35970+
},
35971+
{
35972+
"source_path": "learn-pr/iot/monitor-and-manage-device-with-iot-central/5-define-coffee-machine-device-simulator.yml",
35973+
"redirect_url": "/training/",
35974+
"redirect_document_id": false
35975+
},
35976+
{
35977+
"source_path": "learn-pr/iot/monitor-and-manage-device-with-iot-central/6-connect-coffee-machine-device-simulator.yml",
35978+
"redirect_url": "/training/",
35979+
"redirect_document_id": false
35980+
},
35981+
{
35982+
"source_path": "learn-pr/iot/monitor-and-manage-device-with-iot-central/7-monitor-manage-coffee-machines.yml",
35983+
"redirect_url": "/training/",
35984+
"redirect_document_id": false
35985+
},
35986+
{
35987+
"source_path": "learn-pr/iot/monitor-and-manage-device-with-iot-central/8-configure-rules-actions.yml",
35988+
"redirect_url": "/training/",
35989+
"redirect_document_id": false
35990+
},
35991+
{
35992+
"source_path": "learn-pr/iot/monitor-and-manage-device-with-iot-central/9-knowledge-check.yml",
35993+
"redirect_url": "/training/",
35994+
"redirect_document_id": false
35995+
},
35996+
{
35997+
"source_path": "learn-pr/iot/monitor-and-manage-device-with-iot-central/10-summary.yml",
35998+
"redirect_url": "/training/",
35999+
"redirect_document_id": false
36000+
},
36001+
{
36002+
"source_path": "learn-pr/paths/evaluate-iot-scenario-with-iot-central/index.yml",
36003+
"redirect_url": "/training/",
36004+
"redirect_document_id": false
36005+
},
3574136006
{
3574236007
"source_path": "learn-pr/wwl-data-ai/catalog-data-artifacts-use-microsoft-purview/index.md",
3574336008
"redirect_url": "/purview/",
@@ -36678,6 +36943,56 @@
3667836943
"redirect_url": "/training/modules/create-azure-ai-custom-skill/",
3667936944
"redirect_document_id": false
3668036945
},
36946+
{
36947+
"source_path": "learn-pr/azure/intro-to-azure-government/1-introduction.yml",
36948+
"redirect_url": "/training/",
36949+
"redirect_document_id": false
36950+
},
36951+
{
36952+
"source_path": "learn-pr/azure/intro-to-azure-government/2-what-is-azure-government.yml",
36953+
"redirect_url": "/training/",
36954+
"redirect_document_id": false
36955+
},
36956+
{
36957+
"source_path": "learn-pr/azure/intro-to-azure-government/3-security-on-azure-government.yml",
36958+
"redirect_url": "/training/",
36959+
"redirect_document_id": false
36960+
},
36961+
{
36962+
"source_path": "learn-pr/azure/intro-to-azure-government/4-compliance-on-azure-government.yml",
36963+
"redirect_url": "/training/",
36964+
"redirect_document_id": false
36965+
},
36966+
{
36967+
"source_path": "learn-pr/azure/intro-to-azure-government/5-connect-to-azure-government.yml",
36968+
"redirect_url": "/training/",
36969+
"redirect_document_id": false
36970+
},
36971+
{
36972+
"source_path": "learn-pr/azure/intro-to-azure-government/6-marketplace.yml",
36973+
"redirect_url": "/training/",
36974+
"redirect_document_id": false
36975+
},
36976+
{
36977+
"source_path": "learn-pr/azure/intro-to-azure-government/7-purchase-azure-government.yml",
36978+
"redirect_url": "/training/",
36979+
"redirect_document_id": false
36980+
},
36981+
{
36982+
"source_path": "learn-pr/azure/intro-to-azure-government/8-knowledge-check.yml",
36983+
"redirect_url": "/training/",
36984+
"redirect_document_id": false
36985+
},
36986+
{
36987+
"source_path": "learn-pr/azure/intro-to-azure-government/9-summary.yml",
36988+
"redirect_url": "/training/",
36989+
"redirect_document_id": false
36990+
},
36991+
{
36992+
"source_path": "learn-pr/azure/intro-to-azure-government/index.yml",
36993+
"redirect_url": "/training/",
36994+
"redirect_document_id": false
36995+
},
3668136996
{
3668236997
"source_path": "learn-pr/wwl-azure/configure-azure-resources-tools/index.md",
3668336998
"redirect_url": "/training/modules/describe-features-tools-manage-deploy-azure-resources/",
@@ -40462,6 +40777,36 @@
4046240777
"source_path": "learn-pr/paths/explore-azure-devops-with-github/index.yml",
4046340778
"redirect_url": "https://learn.microsoft.com/training/paths/az-400-implement-ci-azure-pipelines-github-actions/",
4046440779
"redirect_document_id": false
40780+
},
40781+
{
40782+
"source_path": "learn-pr/azure/manage-device-identity-ad-join/1-introduction.yml",
40783+
"redirect_url": "https://learn.microsoft.com/en-us/entra/identity/devices/overview",
40784+
"redirect_document_id": false
40785+
},
40786+
{
40787+
"source_path": "learn-pr/azure/manage-device-identity-ad-join/2-what-is-device-identity.yml",
40788+
"redirect_url": "https://learn.microsoft.com/en-us/entra/identity/devices/overview",
40789+
"redirect_document_id": false
40790+
},
40791+
{
40792+
"source_path": "learn-pr/azure/manage-device-identity-ad-join/3-what-is-ad-join.yml",
40793+
"redirect_url": "https://learn.microsoft.com/en-us/entra/identity/devices/overview",
40794+
"redirect_document_id": false
40795+
},
40796+
{
40797+
"source_path": "learn-pr/azure/manage-device-identity-ad-join/4-what-is-enterprise-state-roaming.yml",
40798+
"redirect_url": "https://learn.microsoft.com/en-us/entra/identity/devices/overview",
40799+
"redirect_document_id": false
40800+
},
40801+
{
40802+
"source_path": "learn-pr/azure/manage-device-identity-ad-join/5-summary.yml",
40803+
"redirect_url": "https://learn.microsoft.com/en-us/entra/identity/devices/overview",
40804+
"redirect_document_id": false
40805+
},
40806+
{
40807+
"source_path": "learn-pr/azure/manage-device-identity-ad-join/index.yml",
40808+
"redirect_url": "https://learn.microsoft.com/en-us/entra/identity/devices/overview",
40809+
"redirect_document_id": false
4046540810
}
4046640811
]
4046740812
}

0 commit comments

Comments
 (0)