Skip to content

Commit 757d8d6

Browse files
johndownsjohndowns
committed
Merge branch 'main' into waf-front-door-pivot
2 parents 8e6aca3 + cda5104 commit 757d8d6

File tree

6,996 files changed

+120661
-84422
lines changed

Some content is hidden

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

6,996 files changed

+120661
-84422
lines changed

‎.openpublishing.publish.config.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -990,6 +990,7 @@
990990
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
991991
"articles/azure-relay/.openpublishing.redirection.relay.json",
992992
"articles/communication-services/.openpublishing.redirection.communication-services.json",
993+
"articles/confidential-computing/.openpublishing.redirection.json",
993994
"articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",
994995
"articles/cost-management-billing/.openpublishing.redirection.cost-management-billing.json",
995996
"articles/data-catalog/.openpublishing.redirection.data-catalog.json",
@@ -1022,6 +1023,9 @@
10221023
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
10231024
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
10241025
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
1025-
".openpublishing.redirection.virtual-desktop.json"
1026+
".openpublishing.redirection.virtual-desktop.json",
1027+
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
1028+
"articles/applied-ai-services/.openpublishing.archived.json",
1029+
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json"
10261030
]
10271031
}

‎.openpublishing.redirection.active-directory.json‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
},
5858
{
5959
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-create-trust-github.md",
60-
"redirect_url":"/azure/active-directory/develop/workload-identity-federation-create-trust",
60+
"redirect_url": "/azure/active-directory/develop/workload-identity-federation-create-trust",
6161
"redirect_document_id": false
6262
},
6363
{
@@ -2038,7 +2038,7 @@
20382038
{
20392039
"source_path_from_root": "/articles/active-directory/conditional-access/conditional-access-for-exo-and-spo.md",
20402040
"redirect_url": "/azure/active-directory/conditional-access/block-legacy-authentication",
2041-
"redirect_document_id": true
2041+
"redirect_document_id": false
20422042
},
20432043
{
20442044
"source_path_from_root": "/articles/active-directory/conditional-access/baseline-protection.md",
@@ -2427,7 +2427,7 @@
24272427
},
24282428
{
24292429
"source_path_from_root": "/articles/active-directory/develop/active-directory-graph-api.md",
2430-
"redirect_url": "https://docs.microsoft.com/graph/migrate-azure-ad-graph-planning-checklist",
2430+
"redirect_url": "/graph/migrate-azure-ad-graph-planning-checklist",
24312431
"redirect_document_id": false
24322432
},
24332433
{
@@ -2800,7 +2800,7 @@
28002800
"redirect_url": "/azure/active-directory/develop/howto-authenticate-service-principal-powershell",
28012801
"redirect_document_id": false
28022802
},
2803-
2803+
28042804
{
28052805
"source_path_from_root": "/articles/active-directory/develop/active-directory-devhowto-multi-tenant-overview.md",
28062806
"redirect_url": "/azure/active-directory/develop/howto-convert-app-to-be-multi-tenant",
@@ -4253,7 +4253,12 @@
42534253
},
42544254
{
42554255
"source_path_from_root": "/articles/active-directory/conditional-access/concept-conditional-access-block-legacy-authentication.md",
4256-
"redirect_url": "/azure/active-directory/fundamentals/concept-fundamentals-block-legacy-authentication",
4256+
"redirect_url": "/azure/active-directory/conditional-access/block-legacy-authentication",
4257+
"redirect_document_id": false
4258+
},
4259+
{
4260+
"source_path_from_root": "/articles/active-directory/fundamentals/concept-fundamentals-block-legacy-authentication.md",
4261+
"redirect_url": "/azure/active-directory/conditional-access/block-legacy-authentication",
42574262
"redirect_document_id": true
42584263
},
42594264
{
@@ -10832,9 +10837,14 @@
1083210837
"redirect_document_id": true
1083310838
},
1083410839
{
10835-
"source_path_from_root": "/articles/active-directory/manage-apps/recover-deleted-apps-faq.md",
10840+
"source_path": "articles/active-directory/manage-apps/recover-deleted-apps-faq.md",
1083610841
"redirect_url": "/azure/active-directory/manage-apps/delete-recover-faq",
1083710842
"redirect_document_id": false
10843+
},
10844+
{
10845+
"source_path": "articles/azure-percept/voice-control-your-inventory-then-visualize-with-power-bi-dashboard.md",
10846+
"redirect_url": "/azure/azure-percept/index",
10847+
"redirect_document_id": false
1083810848
}
1083910849

1084010850

‎.openpublishing.redirection.azure-monitor.json‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,27 +148,27 @@
148148
},
149149
{
150150
"source_path_from_root": "/articles/azure-monitor/app/java-2x-troubleshoot.md",
151-
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/java-2x-troubleshoot",
151+
"redirect_url": "/troubleshoot/azure/azure-monitor/app-insights/java-2x-troubleshoot",
152152
"redirect_document_id": false
153153
},
154154
{
155155
"source_path_from_root": "/articles/azure-monitor/app/status-monitor-v2-troubleshoot.md",
156-
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/status-monitor-v2-troubleshoot",
156+
"redirect_url": "/troubleshoot/azure/azure-monitor/app-insights/status-monitor-v2-troubleshoot",
157157
"redirect_document_id": false
158158
},
159159
{
160160
"source_path_from_root": "/articles/azure-monitor/app/asp-net-troubleshoot-no-data.md",
161-
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/asp-net-troubleshoot-no-data",
161+
"redirect_url": "/troubleshoot/azure/azure-monitor/app-insights/asp-net-troubleshoot-no-data",
162162
"redirect_document_id": false
163163
},
164164
{
165165
"source_path_from_root": "/articles/azure-monitor/app/java-standalone-troubleshoot.md",
166-
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/java-standalone-troubleshoot",
166+
"redirect_url": "/troubleshoot/azure/azure-monitor/app-insights/java-standalone-troubleshoot",
167167
"redirect_document_id": false
168168
},
169169
{
170170
"source_path_from_root": "/articles/azure-monitor/app/troubleshoot-availability.md",
171-
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/troubleshoot-availability",
171+
"redirect_url": "/troubleshoot/azure/azure-monitor/app-insights/troubleshoot-availability",
172172
"redirect_document_id": false
173173
},
174174
{
@@ -178,7 +178,7 @@
178178
},
179179
{
180180
"source_path_from_root": "/articles/azure-monitor/app/usage-troubleshoot.md",
181-
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/usage-troubleshoot",
181+
"redirect_url": "/troubleshoot/azure/azure-monitor/app-insights/usage-troubleshoot",
182182
"redirect_document_id": false
183183
},
184184
{
@@ -373,7 +373,7 @@
373373
},
374374
{
375375
"source_path_from_root": "/articles/azure-monitor/app/proactive-cloud-services.md" ,
376-
"redirect_url": "https://docs.microsoft.com/azure/azure-monitor/alerts/alerts-overview",
376+
"redirect_url": "/azure/azure-monitor/alerts/alerts-overview",
377377
"redirect_document_id": false
378378
},
379379
{
@@ -505,6 +505,16 @@
505505
"source_path_from_root": "/articles/azure-monitor/app/cloudservices.md" ,
506506
"redirect_url": "/azure/azure-monitor/app/azure-web-apps-net-core",
507507
"redirect_document_id": false
508+
},
509+
{
510+
"source_path_from_root": "/articles/azure-monitor/logs/workspace-design-service-providers.md" ,
511+
"redirect_url": "/azure/azure-monitor/logs/workspace-design",
512+
"redirect_document_id": false
513+
},
514+
{
515+
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-transition-hybrid.md" ,
516+
"redirect_url": "/azure/azure-monitor/containers/container-insights-onboard",
517+
"redirect_document_id": false
508518
}
509519
]
510520
}

‎.openpublishing.redirection.azure-percept.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,28 @@
44
"source_path_from_root": "/articles/azure-percept/how-to-select-update-package.md",
55
"redirect_url": "/azure/azure-percept/how-to-determine-your-update-strategy",
66
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/azure-percept/deepstream/azure-percept-for-deepstream-overview.md",
10+
"redirect_url": "/azure/azure-percept/index",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/azure-percept/hci/azure-percept-on-azure-stack-hci-overview.md",
15+
"redirect_url": "/azure/azure-percept/index",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/azure-percept/studio/azure-percept-studio-overview.md",
20+
"redirect_url": "/azure/azure-percept/index",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/azure-percept/open-source/azure-percept-open-source-project-overview.md",
25+
"redirect_url": "/azure/azure-percept/index",
26+
"redirect_document_id": false
727
}
28+
829
]
930
}
31+

‎.openpublishing.redirection.defender-for-iot.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/defender-for-iot/organizations/resources-frequently-asked-questions.md",
5+
"redirect_url": "/azure/defender-for-iot/organizations/faqs-general",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/defender-for-iot/organizations/appliance-catalog/appliance-catalog-overview.md",
510
"redirect_url": "/azure/defender-for-iot/organizations/appliance-catalog/index",

0 commit comments

Comments
 (0)