Skip to content

Commit bcb32e4

Browse files
authored
Merge pull request #272402 from mattbriggs/mdb_20240416-sync-main
Sync with Main
2 parents 4a9979e + 24a5603 commit bcb32e4

File tree

3,023 files changed

+47764
-36917
lines changed

Some content is hidden

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

3,023 files changed

+47764
-36917
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: 13 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",
@@ -1183,6 +1189,12 @@
11831189
"url": "https://github.com/Azure-Samples/explore-iot-operations",
11841190
"branch": "main",
11851191
"branch_mapping": {}
1192+
},
1193+
{
1194+
"path_to_root": "SupportArticles-docs",
1195+
"url": "https://github.com/MicrosoftDocs/SupportArticles-docs",
1196+
"branch": "main",
1197+
"branch_mapping": {}
11861198
}
11871199
],
11881200
"branch_target_mapping": {
@@ -1232,6 +1244,7 @@
12321244
".openpublishing.redirection.government.json",
12331245
".openpublishing.redirection.guidance.json",
12341246
".openpublishing.redirection.industry.json",
1247+
".openpublishing.redirection.iot-accelerators.json",
12351248
".openpublishing.redirection.iot-develop.json",
12361249
".openpublishing.redirection.iot-hub-device-update.json",
12371250
".openpublishing.redirection.json",
@@ -1297,7 +1310,6 @@
12971310
"articles/hdinsight/.openpublishing.redirection.hdinsight.json",
12981311
"articles/healthcare-apis/.openpublishing.redirection.healthcare-apis.json",
12991312
"articles/internet-peering/.openpublishing.redirection.internet-peering.json",
1300-
"articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
13011313
"articles/iot-central/.openpublishing.redirection.iot-central.json",
13021314
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
13031315
"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.azure-monitor.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6664,6 +6664,21 @@
66646664
"redirect_url": "/azure/azure-monitor/monitor-azure-monitor-reference",
66656665
"redirect_document_id": false
66666666
},
6667+
{
6668+
"source_path_from_root": "/articles/azure-monitor/ai-ops/responsible-ai-faq.md",
6669+
"redirect_url": "/azure/copilot/overview",
6670+
"redirect_document_id": false
6671+
},
6672+
{
6673+
"source_path_from_root": "/articles/azure-monitor/ai-ops/investigator-overview.md",
6674+
"redirect_url": "/azure/copilot/overview",
6675+
"redirect_document_id": false
6676+
},
6677+
{
6678+
"source_path_from_root": "/articles/azure-monitor/ai-ops/investigate-alert-instance.md",
6679+
"redirect_url": "/azure/copilot/overview",
6680+
"redirect_document_id": false
6681+
},
66676682
{
66686683
"source_path_from_root": "/articles/azure-monitor/azure-monitor-monitoring-reference.md",
66696684
"redirect_url": "/azure/azure-monitor/monitor-azure-monitor-reference",
@@ -6688,7 +6703,18 @@
66886703
"source_path_from_root": "/articles/azure-monitor/agents/resource-manager-data-collection-rules.md",
66896704
"redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-create-edit?tabs=arm#manually-create-a-dcr",
66906705
"redirect_document_id": false
6706+
},
6707+
{
6708+
"source_path_from_root": "/articles/azure-monitor/essentials/remote-write-prometheus.md",
6709+
"redirect_url": "/azure/azure-monitor/essentials/prometheus-remote-write-virtual-machines",
6710+
"redirect_document_id": false
6711+
},
6712+
{
6713+
"source_path_from_root": "/articles/azure-monitor/essentials/prometheus-get-started.md",
6714+
"redirect_url": "/azure/azure-monitor/essentials/prometheus-metrics-overview",
6715+
"redirect_document_id": false
66916716
}
6717+
66926718

66936719
]
66946720
}

.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

0 commit comments

Comments
 (0)