Skip to content

Commit 6fe0ee6

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into davidbel-37836863-passwordless-preview
2 parents 3054175 + 2cd30be commit 6fe0ee6

File tree

5,758 files changed

+114825
-81885
lines changed

Some content is hidden

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

5,758 files changed

+114825
-81885
lines changed

.openpublishing.publish.config.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -978,6 +978,7 @@
978978
".openpublishing.redirection.app-service.json",
979979
".openpublishing.redirection.key-vault.json",
980980
".openpublishing.redirection.sql-database.json",
981+
".openpublishing.redirection.machine-configuration.json",
981982
".openpublishing.redirection.security-benchmark.json",
982983
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
983984
".openpublishing.redirection.azure-web-pubsub.json",
@@ -1021,6 +1022,9 @@
10211022
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
10221023
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
10231024
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
1024-
".openpublishing.redirection.virtual-desktop.json"
1025+
".openpublishing.redirection.virtual-desktop.json",
1026+
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
1027+
"articles/applied-ai-services/.openpublishing.archived.json",
1028+
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json"
10251029
]
10261030
}

.openpublishing.redirection.active-directory.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@
3030
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
3131
"redirect_document_id": false
3232
},
33+
{
34+
"source_path_from_root": "/articles/active-directory/saas-apps/netmotion-mobility-tutorial.md",
35+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
36+
"redirect_document_id": false
37+
},
3338
{
3439
"source_path_from_root": "/articles/active-directory/fundamentals/whats-new-microsoft-365-government.md",
3540
"redirect_url": "/azure/active-directory/fundamentals/whats-new",
@@ -55,6 +60,11 @@
5560
"redirect_url": "/azure/active-directory/authentication/how-to-mfa-registration-campaign",
5661
"redirect_document_id": false
5762
},
63+
{
64+
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-create-trust-github.md",
65+
"redirect_url": "/azure/active-directory/develop/workload-identity-federation-create-trust",
66+
"redirect_document_id": false
67+
},
5868
{
5969
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-limitations.md",
6070
"redirect_url": "/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
@@ -2422,7 +2432,7 @@
24222432
},
24232433
{
24242434
"source_path_from_root": "/articles/active-directory/develop/active-directory-graph-api.md",
2425-
"redirect_url": "https://docs.microsoft.com/graph/migrate-azure-ad-graph-planning-checklist",
2435+
"redirect_url": "/graph/migrate-azure-ad-graph-planning-checklist",
24262436
"redirect_document_id": false
24272437
},
24282438
{
@@ -2795,7 +2805,7 @@
27952805
"redirect_url": "/azure/active-directory/develop/howto-authenticate-service-principal-powershell",
27962806
"redirect_document_id": false
27972807
},
2798-
2808+
27992809
{
28002810
"source_path_from_root": "/articles/active-directory/develop/active-directory-devhowto-multi-tenant-overview.md",
28012811
"redirect_url": "/azure/active-directory/develop/howto-convert-app-to-be-multi-tenant",

.openpublishing.redirection.azure-monitor.json

Lines changed: 34 additions & 9 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
{
@@ -301,14 +301,34 @@
301301
"redirect_url": "/azure/azure-monitor/alerts/alerts-types",
302302
"redirect_document_id": false
303303
},
304+
{
305+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-page.md" ,
306+
"redirect_url": "/azure/azure-monitor/alerts/alerts-manage-alert-instances",
307+
"redirect_document_id": false
308+
},
304309
{
305310
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-managing-alert-instances.md" ,
306-
"redirect_url": "/azure/azure-monitor/alerts/alerts-page",
311+
"redirect_url": "/azure/azure-monitor/alerts/alerts-manage-alert-instances",
307312
"redirect_document_id": false
308313
},
309314
{
310315
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-managing-alert-states.md" ,
311-
"redirect_url": "/azure/azure-monitor/alerts/alerts-page",
316+
"redirect_url": "/azure/azure-monitor/alerts/alerts-manage-alert-instances",
317+
"redirect_document_id": false
318+
},
319+
{
320+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-metric.md" ,
321+
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-new-alert-rule",
322+
"redirect_document_id": false
323+
},
324+
{
325+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-log.md" ,
326+
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-new-alert-rule",
327+
"redirect_document_id": false
328+
},
329+
{
330+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-activity-log.md" ,
331+
"redirect_url": "/azure/azure-monitor/alerts/alerts-create-new-alert-rule",
312332
"redirect_document_id": false
313333
},
314334
{
@@ -353,7 +373,7 @@
353373
},
354374
{
355375
"source_path_from_root": "/articles/azure-monitor/app/proactive-cloud-services.md" ,
356-
"redirect_url": "https://docs.microsoft.com/azure/azure-monitor/alerts/alerts-overview",
376+
"redirect_url": "/azure/azure-monitor/alerts/alerts-overview",
357377
"redirect_document_id": false
358378
},
359379
{
@@ -485,6 +505,11 @@
485505
"source_path_from_root": "/articles/azure-monitor/app/cloudservices.md" ,
486506
"redirect_url": "/azure/azure-monitor/app/azure-web-apps-net-core",
487507
"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
488513
}
489514
]
490515
}

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