Skip to content

Commit 36011fe

Browse files
author
RoseHJM
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ade-azdo-cicd
2 parents af560f5 + 659561a commit 36011fe

File tree

6,252 files changed

+84449
-75713
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,252 files changed

+84449
-75713
lines changed

.openpublishing.publish.config.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -962,6 +962,12 @@
962962
"branch": "main",
963963
"branch_mapping": {}
964964
},
965+
{
966+
"path_to_root": "msdocs-tomcat-mysql-sample-app",
967+
"url": "https://github.com/Azure-Samples/msdocs-tomcat-mysql-sample-app",
968+
"branch": "main",
969+
"branch_mapping": {}
970+
},
965971
{
966972
"path_to_root": "azuresignalr-samples",
967973
"url": "https://github.com/aspnet/AzureSignalR-samples",
@@ -1113,7 +1119,7 @@
11131119
"branch_mapping": {}
11141120
},
11151121
{
1116-
"path_to_root": "articles/reusable-content",
1122+
"path_to_root": "reusable-content",
11171123
"url": "https://github.com/MicrosoftDocs/reusable-content",
11181124
"branch": "main",
11191125
"branch_mapping": {}
@@ -1214,10 +1220,12 @@
12141220
".openpublishing.redirection.azure-web-pubsub.json",
12151221
".openpublishing.redirection.baremetal-infrastructure.json",
12161222
".openpublishing.redirection.container-service.json",
1223+
".openpublishing.redirection.data-lake-analytics.json",
12171224
".openpublishing.redirection.defender-for-cloud.json",
12181225
".openpublishing.redirection.defender-for-iot.json",
12191226
".openpublishing.redirection.devops-project.json",
12201227
".openpublishing.redirection.guidance.json",
1228+
".openpublishing.redirection.industry.json",
12211229
".openpublishing.redirection.iot-hub-device-update.json",
12221230
".openpublishing.redirection.key-vault.json",
12231231
".openpublishing.redirection.machine-configuration.json",
@@ -1250,7 +1258,6 @@
12501258
"articles/cost-management-billing/.openpublishing.redirection.cost-management-billing.json",
12511259
"articles/data-catalog/.openpublishing.redirection.data-catalog.json",
12521260
"articles/data-factory/.openpublishing.redirection.data-factory.json",
1253-
"articles/data-lake-analytics/.openpublishing.redirection.data-lake-analytics.json",
12541261
"articles/deployment-environments/.openpublishing.redirection.deployment-environments.json",
12551262
"articles/dev-box/.openpublishing.redirection.dev-box.json",
12561263
"articles/digital-twins/.openpublishing.redirection.digital-twins.json",

.openpublishing.redirection.active-directory.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33690,6 +33690,6 @@
3369033690
"source_path_from_root": "/articles/active-directory-domain-services/contact-us.md",
3369133691
"redirect_url": "/azure/active-directory/fundamentals/support-help-options",
3369233692
"redirect_document_id": false
33693-
},
33693+
}
3369433694
]
33695-
}
33695+
}

.openpublishing.redirection.app-service.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2659,6 +2659,21 @@
26592659
"source_path": "articles/app-service/quickstart-dotnet-framework.md",
26602660
"redirect_url": "/azure/app-service/quickstart-dotnetcore?tabs=netframework48",
26612661
"redirect_document_id": false
2662+
},
2663+
{
2664+
"source_path": "articles/app-service/quickstart-arm-template-uiex.md",
2665+
"redirect_url": "/azure/app-service/quickstart-arm-template",
2666+
"redirect_document_id": true
2667+
},
2668+
{
2669+
"source_path": "articles/app-service/quickstart-dotnetcore-uiex.md",
2670+
"redirect_url": "/azure/app-service/quickstart-dotnetcore",
2671+
"redirect_document_id": true
2672+
},
2673+
{
2674+
"source_path": "articles/app-service/quickstart-java-uiex.md",
2675+
"redirect_url": "/azure/app-service/quickstart-java",
2676+
"redirect_document_id": true
26622677
}
26632678
]
26642679
}

.openpublishing.redirection.azure-datalake-storage-gen1.json

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -289,16 +289,6 @@
289289
"source_path": "articles/data-lake-store/security-controls-policy.md",
290290
"redirect_url": "/previous-versions/azure/data-lake-store/security-controls-policy",
291291
"redirect_document_id": false
292-
},
293-
{
294-
"source_path": "articles/storage/blobs/data-lake-storage-migrate-gen1-to-gen2.md",
295-
"redirect_url": "/previous-versions/azure/storage/blobs/data-lake-storage-migrate-gen1-to-gen2",
296-
"redirect_document_id": false
297-
},
298-
{
299-
"source_path": "articles/storage/blobs/data-lake-storage-migrate-gen1-to-gen2-azure-portal.md",
300-
"redirect_url": "/previous-versions/azure/storage/blobs/data-lake-storage-migrate-gen1-to-gen2-azure-portal",
301-
"redirect_document_id": false
302292
}
303293

304294
]

.openpublishing.redirection.azure-kubernetes-service.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,11 @@
461461
"source_path_from_root": "/articles/aks/command-invoke.md",
462462
"redirect_url": "/azure/aks/access-private-cluster",
463463
"redirect_document_id": false
464+
},
465+
{
466+
"source_path_from_root": "/articles/aks/operator-best-practices-run-at-scale.md",
467+
"redirect_url": "/azure/aks/best-practices-performance-scale-large",
468+
"redirect_document_id": false
464469
}
465470
]
466471
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4916,12 +4916,12 @@
49164916
},
49174917
{
49184918
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-enable-aks-policy.md",
4919-
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable&tabs=policy#enable-container-insights",
4919+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable?tabs=policy#enable-container-insights",
49204920
"redirect_document_id": false
49214921
},
49224922
{
49234923
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-enable-provisioned-clusters.md",
4924-
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable.md&tabs=cli#aks-hybrid-cluster",
4924+
"redirect_url": "/azure/azure-monitor/containers/kubernetes-monitoring-enable?tabs=cli#aks-hybrid-cluster",
49254925
"redirect_document_id": false
49264926
},
49274927
{
@@ -6604,6 +6604,11 @@
66046604
"redirect_url": "/azure/azure-monitor/app/java-get-started-supplemental",
66056605
"redirect_document_id": false
66066606
},
6607+
{
6608+
"source_path_from_root": "/articles/azure-monitor/app/resource-manager-app-resource.md",
6609+
"redirect_url": "/azure/azure-monitor/app/create-workspace-resource",
6610+
"redirect_document_id": false
6611+
},
66076612
{
66086613
"source_path_from_root": "/articles/azure-monitor/partners.md",
66096614
"redirect_url": "/azure/azure-monitor/overview#integrate",

.openpublishing.redirection.azure-vmware.json

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,66 @@
179179
"source_path_from_root": "/articles/azure-vmware/vrealize-operations-for-avs.md",
180180
"redirect_url": "/azure/azure-vmware/vrealize-operations-for-azure-vmware-solution",
181181
"redirect_document_id": false
182+
},
183+
{
184+
"source_path_from_root": "/articles/azure-vmware/concepts-api-management.md",
185+
"redirect_url": "/azure/azure-vmware/architecture-api-management",
186+
"redirect_document_id": false
187+
},
188+
{
189+
"source_path_from_root": "/articles/azure-vmware/concepts-design-public-internet-access.md",
190+
"redirect_url": "/azure/azure-vmware/architecture-design-public-internet-access",
191+
"redirect_document_id": false
192+
},
193+
{
194+
"source_path_from_root": "/articles/azure-vmware/concepts-hub-and-spoke.md",
195+
"redirect_url": "/azure/azure-vmware/architecture-hub-and-spoke",
196+
"redirect_document_id": false
197+
},
198+
{
199+
"source_path_from_root": "/articles/azure-vmware/concepts-identity.md",
200+
"redirect_url": "/azure/azure-vmware/architecture-identity",
201+
"redirect_document_id": false
202+
},
203+
{
204+
"source_path_from_root": "/articles/azure-vmware/concepts-migrate.md",
205+
"redirect_url": "/azure/azure-vmware/architecture-migrate",
206+
"redirect_document_id": false
207+
},
208+
{
209+
"source_path_from_root": "/articles/azure-vmware/concepts-network-design-considerations.md",
210+
"redirect_url": "/azure/azure-vmware/architecture-network-design-considerations",
211+
"redirect_document_id": false
212+
},
213+
{
214+
"source_path_from_root": "/articles/azure-vmware/concepts-networking.md",
215+
"redirect_url": "/azure/azure-vmware/architecture-networking",
216+
"redirect_document_id": false
217+
},
218+
{
219+
"source_path_from_root": "/articles/azure-vmware/concepts-private-clouds-clusters.md",
220+
"redirect_url": "/azure/azure-vmware/architecture-private-clouds",
221+
"redirect_document_id": false
222+
},
223+
{
224+
"source_path_from_root": "/articles/azure-vmware/concepts-run-command.md",
225+
"redirect_url": "/azure/azure-vmware/using-run-command",
226+
"redirect_document_id": false
227+
},
228+
{
229+
"source_path_from_root": "/articles/azure-vmware/concepts-security-recommendations.md",
230+
"redirect_url": "/azure/azure-vmware/security-recommendations",
231+
"redirect_document_id": false
232+
},
233+
{
234+
"source_path_from_root": "/articles/azure-vmware/concepts-storage.md",
235+
"redirect_url": "/azure/azure-vmware/architecture-storage",
236+
"redirect_document_id": false
237+
},
238+
{
239+
"source_path_from_root": "/articles/azure-vmware/concepts-vulnerability-management.md",
240+
"redirect_url": "/azure/azure-vmware/vulnerability-management",
241+
"redirect_document_id": false
182242
}
183243
]
184244
}

0 commit comments

Comments
 (0)