Skip to content

Commit 0470d9d

Browse files
authored
Merge pull request #96911 from MicrosoftDocs/repo_sync_working_branch
Resolve syncing conflicts from repo_sync_working_branch to main
2 parents d63850d + b6df4ca commit 0470d9d

File tree

247 files changed

+2429
-1434
lines changed

Some content is hidden

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

247 files changed

+2429
-1434
lines changed

.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: 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.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,16 @@
434434
"redirect_url": "/azure/azure-arc/kubernetes/conceptual-agent-overview",
435435
"redirect_document_id": false
436436
},
437+
{
438+
"source_path": "articles/cognitive-services/language-service/custom-text-classification/how-to/improve-model.md",
439+
"redirect_url": "/azure/cognitive-services/language-service/custom-text-classification/how-to/view-model-evaluation",
440+
"redirect_document_id": true
441+
},
442+
{
443+
"source_path": "articles/cognitive-services/language-service/custom-named-entity-recognition/how-to/improve-model.md",
444+
"redirect_url": "/azure/cognitive-services/language-service/custom-named-entity-recognition/how-to/view-model-evaluation",
445+
"redirect_document_id": true
446+
},
437447
{
438448
"source_path": "articles/cognitive-services/conversational-language-understanding/how-to/deploy-query-model.md",
439449
"redirect_url": "/azure/cognitive-services/language-service/conversational-language-understanding/how-to/deploy-model",
@@ -7744,7 +7754,7 @@
77447754
{
77457755
"source_path_from_root": "/articles/cognitive-services/language-service/custom-classification/how-to/view-model-evaluation.md",
77467756
"redirect_url": "/azure/cognitive-services/language-service/custom-text-classification/how-to/view-model-evaluation",
7747-
"redirect_document_id": true
7757+
"redirect_document_id": false
77487758
},
77497759
{
77507760
"source_path_from_root": "/articles/cognitive-services/language-service/custom-classification/concepts/data-formats.md",
@@ -40320,7 +40330,7 @@
4032040330
},
4032140331
{
4032240332
"source_path_from_root": "/articles/applied-ai-services/form-recognizer/tutorial-ai-builder.md",
40323-
"redirect_url": "https://docs.microsoft.com/ai-builder/create-form-processing-model",
40333+
"redirect_url": "/ai-builder/create-form-processing-model",
4032440334
"redirect_document_id": false
4032540335
}
4032640336
]

articles/active-directory/conditional-access/concept-conditional-access-cloud-apps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: conditional-access
88
ms.topic: conceptual
9-
ms.date: 07/18/2022
9+
ms.date: 08/09/2022
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
139 KB
Loading
Loading

0 commit comments

Comments
 (0)