Skip to content

Commit 4777f53

Browse files
author
RoseHJM
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ade-arm-terraform-runner
2 parents 22156d2 + 9faae9c commit 4777f53

File tree

1,305 files changed

+15361
-12815
lines changed

Some content is hidden

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

1,305 files changed

+15361
-12815
lines changed

.openpublishing.publish.config.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -974,6 +974,12 @@
974974
"branch": "main",
975975
"branch_mapping": {}
976976
},
977+
{
978+
"path_to_root": "azure-typescript-e2e-apps",
979+
"url": "https://github.com/Azure-Samples/azure-typescript-e2e-apps",
980+
"branch": "main",
981+
"branch_mapping": {}
982+
},
977983
{
978984
"path_to_root": "azure-webpubsub",
979985
"url": "https://github.com/Azure/azure-webpubsub",
@@ -1232,6 +1238,7 @@
12321238
".openpublishing.redirection.government.json",
12331239
".openpublishing.redirection.guidance.json",
12341240
".openpublishing.redirection.industry.json",
1241+
".openpublishing.redirection.iot-accelerators.json",
12351242
".openpublishing.redirection.iot-develop.json",
12361243
".openpublishing.redirection.iot-hub-device-update.json",
12371244
".openpublishing.redirection.json",
@@ -1297,7 +1304,6 @@
12971304
"articles/hdinsight/.openpublishing.redirection.hdinsight.json",
12981305
"articles/healthcare-apis/.openpublishing.redirection.healthcare-apis.json",
12991306
"articles/internet-peering/.openpublishing.redirection.internet-peering.json",
1300-
"articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
13011307
"articles/iot-central/.openpublishing.redirection.iot-central.json",
13021308
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
13031309
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",

.openpublishing.redirection.active-directory.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32725,6 +32725,11 @@
3272532725
"redirect_url": "/azure/active-directory/governance/licensing-fundamentals",
3272632726
"redirect_document_id": false
3272732727
},
32728+
{
32729+
"source_path": "articles/active-directory/azuread-dev/index.yml",
32730+
"redirect_url": "/entra/identity-platform",
32731+
"redirect_document_id": false
32732+
},
3272832733
{
3272932734
"source_path": "articles/active-directory/azuread-dev/about-microsoft-identity-platform.md",
3273032735
"redirect_url": "/previous-versions/azure/active-directory/azuread-dev/about-microsoft-identity-platform",

.openpublishing.redirection.container-service.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"redirect_document_id": false
77
},
88
{
9+
910
"source_path_from_root": "/articles/container-service/dcos-swarm/container-service-application-specific-marathon.md",
1011
"redirect_url": "/previous-versions/azure/container-service/dcos-swarm/container-service-application-specific-marathon",
1112
"redirect_document_id": false
Lines changed: 192 additions & 32 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.iot-develop.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -440,6 +440,26 @@
440440
"redirect_url": "/azure/iot-develop/about-iot-develop",
441441
"redirect_document_id": false
442442
},
443+
{
444+
"source_path_from_root": "/articles/iot-develop/quickstart-devkit-mxchip-az3166-iot-hub.md",
445+
"redirect_url": "/azure/iot/tutorial-devkit-mxchip-az3166-iot-hub",
446+
"redirect_document_id": false
447+
},
448+
{
449+
"source_path_from_root": "/articles/iot-develop/quickstart-devkit-stm-b-l475e-iot-hub.md",
450+
"redirect_url": "/azure/iot/tutorial-devkit-stm-b-l475e-iot-hub",
451+
"redirect_document_id": false
452+
},
453+
{
454+
"source_path_from_root": "/articles/iot-develop/concepts-azure-rtos-security-practices.md",
455+
"redirect_url": "/azure/iot/concepts-eclipse-threadx-security-practices",
456+
"redirect_document_id": false
457+
},
458+
{
459+
"source_path_from_root": "/articles/iot-develop/troubleshoot-embedded-device-quickstarts.md",
460+
"redirect_url": "/azure/iot/troubleshoot-embedded-device-tutorials",
461+
"redirect_document_id": false
462+
},
443463
{
444464
"source_path_from_root": "/articles/iot-develop/how-to-use-reliability-features-in-sdks.md",
445465
"redirect_url": "/azure/iot-develop/concepts-manage-device-reconnections",

.openpublishing.redirection.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3919,11 +3919,6 @@
39193919
"redirect_url": "/azure/batch/monitor-batch",
39203920
"redirect_document_id": false
39213921
},
3922-
{
3923-
"source_path_from_root": "/articles/container-registry/container-registry-auth-aci.md",
3924-
"redirect_url": "/azure/container-registry/container-registry-authentication",
3925-
"redirect_document_id": false
3926-
},
39273922
{
39283923
"source_path_from_root": "/articles/event-hubs/move-cluster-across-regions.md",
39293924
"redirect_url": "/azure/operational-excellence/relocation-event-hub-cluster",
@@ -3974,6 +3969,11 @@
39743969
"source_path_from_root":"/articles/trusted-signing/concept.md",
39753970
"redirect_url":"/azure/trusted-signing/concept-trustedsigning-resources-roles",
39763971
"redirect_document_id":false
3972+
},
3973+
{
3974+
"source_path_from_root":"/articles/container-instances/availability-zones.md",
3975+
"redirect_url":"/azure/reliability/reliability-containers",
3976+
"redirect_document_id":false
39773977
}
39783978
]
39793979
}

articles/active-directory/azuread-dev/TOC.yml

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

articles/active-directory/azuread-dev/breadcrumb/toc.yml

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

articles/active-directory/azuread-dev/context/aaddev-context.yml

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

articles/active-directory/azuread-dev/index.yml

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

0 commit comments

Comments
 (0)