Skip to content

Commit d27c444

Browse files
andykrohgandykrohg
committed
Fix merge conflict on CRLF
2 parents 1bc21e6 + 6eadf5a commit d27c444

File tree

3,573 files changed

+76306
-56031
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,573 files changed

+76306
-56031
lines changed

‎.openpublishing.publish.config.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1022,6 +1022,9 @@
10221022
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
10231023
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
10241024
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
1025-
".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"
10261029
]
10271030
}

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

Lines changed: 8 additions & 3 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",
@@ -57,7 +62,7 @@
5762
},
5863
{
5964
"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",
65+
"redirect_url": "/azure/active-directory/develop/workload-identity-federation-create-trust",
6166
"redirect_document_id": false
6267
},
6368
{
@@ -2427,7 +2432,7 @@
24272432
},
24282433
{
24292434
"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",
2435+
"redirect_url": "/graph/migrate-azure-ad-graph-planning-checklist",
24312436
"redirect_document_id": false
24322437
},
24332438
{
@@ -2800,7 +2805,7 @@
28002805
"redirect_url": "/azure/active-directory/develop/howto-authenticate-service-principal-powershell",
28012806
"redirect_document_id": false
28022807
},
2803-
2808+
28042809
{
28052810
"source_path_from_root": "/articles/active-directory/develop/active-directory-devhowto-multi-tenant-overview.md",
28062811
"redirect_url": "/azure/active-directory/develop/howto-convert-app-to-be-multi-tenant",

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

Lines changed: 12 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,11 @@
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
508513
}
509514
]
510515
}

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