Skip to content

Commit b277fd9

Browse files
committed
fix merge conflict
2 parents 2da930b + 8e9075a commit b277fd9

File tree

464 files changed

+44238
-42210
lines changed

Some content is hidden

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

464 files changed

+44238
-42210
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.redirection.applied-ai-services-renamed.json",
1028+
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json"
10261029
]
10271030
}

.openpublishing.redirection.active-directory.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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
{

.openpublishing.redirection.azure-monitor.json

Lines changed: 7 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
{

0 commit comments

Comments
 (0)