Skip to content

Commit 0a134db

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into model-update
2 parents c8432bc + 90e5da0 commit 0a134db

File tree

2,362 files changed

+31398
-27333
lines changed

Some content is hidden

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

2,362 files changed

+31398
-27333
lines changed

.acrolinx-config.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
{:allowed-branchname-matches ["main" "release-.*"]
2-
:allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md|.*policy/samples/|.*resource-graph/samples/))" "(?i)includes/(?:(?!policy/reference/|policy/standards/))"]}
2+
:allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md|.*policy/samples/|.*resource-graph/samples/))" "(?i)includes/(?:(?!policy/reference/|policy/standards/|resource-graph/samples/))"]}

.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.

0 commit comments

Comments
 (0)