Skip to content

Commit bfaabf6

Browse files
authored
Merge branch 'main' into qingyliu/java21
2 parents d1304bb + fc3806d commit bfaabf6

File tree

15,934 files changed

+344798
-181623
lines changed

Some content is hidden

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

15,934 files changed

+344798
-181623
lines changed

.openpublishing.publish.config.json

Lines changed: 52 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@
135135
"branch_mapping": {}
136136
},
137137
{
138-
"path_to_root": "ms-identity-dotnetcore-b2c-account-management",
138+
"path_to_root": "ms-identity-dotnetcore-b2c-account-management-archive",
139139
"url": "https://github.com/Azure-Samples/ms-identity-dotnetcore-b2c-account-management",
140-
"branch": "master",
140+
"branch": "archive",
141141
"branch_mapping": {}
142142
},
143143
{
@@ -236,6 +236,12 @@
236236
"branch": "main",
237237
"branch_mapping": {}
238238
},
239+
{
240+
"path_to_root": "functions-python-extensions",
241+
"url": "https://github.com/Azure/azure-functions-python-extensions",
242+
"branch": "dev",
243+
"branch_mapping": {}
244+
},
239245
{
240246
"path_to_root": "functions-python-tensorflow-tutorial",
241247
"url": "https://github.com/Azure-Samples/functions-python-tensorflow-tutorial",
@@ -247,7 +253,7 @@
247253
"url": "https://github.com/Azure-Samples/function-app-arm-templates",
248254
"branch": "main",
249255
"branch_mapping": {}
250-
},
256+
},
251257
{
252258
"path_to_root": "functions-azure-product",
253259
"url": "https://github.com/Azure/Azure-Functions",
@@ -356,6 +362,12 @@
356362
"branch": "main",
357363
"branch_mapping": {}
358364
},
365+
{
366+
"path_to_root": "azure-functions-python-worker",
367+
"url": "https://github.com/Azure/azure-functions-python-worker",
368+
"branch": "dev",
369+
"branch_mapping": {}
370+
},
359371
{
360372
"path_to_root": "functions-openapi-turbine-repair",
361373
"url": "https://github.com/Azure-Samples/functions-openapi-turbine-repair",
@@ -866,6 +878,12 @@
866878
"branch": "master",
867879
"branch_mapping": {}
868880
},
881+
{
882+
"path_to_root": "blob-devguide-go",
883+
"url": "https://github.com/Azure-Samples/blob-storage-devguide-go",
884+
"branch": "main",
885+
"branch_mapping": {}
886+
},
869887
{
870888
"path_to_root": "azure-sdk-for-net",
871889
"url": "https://github.com/Azure/azure-sdk-for-net/",
@@ -974,6 +992,12 @@
974992
"branch": "main",
975993
"branch_mapping": {}
976994
},
995+
{
996+
"path_to_root": "azure-typescript-e2e-apps",
997+
"url": "https://github.com/Azure-Samples/azure-typescript-e2e-apps",
998+
"branch": "main",
999+
"branch_mapping": {}
1000+
},
9771001
{
9781002
"path_to_root": "azure-webpubsub",
9791003
"url": "https://github.com/Azure/azure-webpubsub",
@@ -986,6 +1010,12 @@
9861010
"branch": "docs-snippets",
9871011
"branch_mapping": {}
9881012
},
1013+
{
1014+
"path_to_root": "functions-openai-extension",
1015+
"url": "https://github.com/Azure/azure-functions-openai-extension",
1016+
"branch": "main",
1017+
"branch_mapping": {}
1018+
},
9891019
{
9901020
"path_to_root": "cosmos-db-nosql-dotnet-samples",
9911021
"url": "https://github.com/azure-samples/cosmos-db-nosql-dotnet-samples",
@@ -1183,6 +1213,12 @@
11831213
"url": "https://github.com/Azure-Samples/explore-iot-operations",
11841214
"branch": "main",
11851215
"branch_mapping": {}
1216+
},
1217+
{
1218+
"path_to_root": "SupportArticles-docs",
1219+
"url": "https://github.com/MicrosoftDocs/SupportArticles-docs",
1220+
"branch": "main",
1221+
"branch_mapping": {}
11861222
}
11871223
],
11881224
"branch_target_mapping": {
@@ -1200,7 +1236,12 @@
12001236
},
12011237
"redirection_files": [
12021238
".openpublishing.redirection.active-directory.json",
1239+
".openpublishing.redirection.ai-services-from-applied.json",
1240+
".openpublishing.redirection.ai-services-from-cog.json",
1241+
".openpublishing.redirection.applied-ai-old.json",
1242+
".openpublishing.redirection.applied-ai-services.json",
12031243
".openpublishing.redirection.ansible.json",
1244+
".openpublishing.redirection.api-center.json",
12041245
".openpublishing.redirection.api-management.json",
12051246
".openpublishing.redirection.app-service.json",
12061247
".openpublishing.redirection.asc-for-iot.json",
@@ -1222,23 +1263,27 @@
12221263
".openpublishing.redirection.azure-web-pubsub.json",
12231264
".openpublishing.redirection.baremetal-infrastructure.json",
12241265
".openpublishing.redirection.blockchain.json",
1266+
".openpublishing.redirection.cognitive-services.json",
12251267
".openpublishing.redirection.container-service.json",
12261268
".openpublishing.redirection.data-lake-analytics.json",
12271269
".openpublishing.redirection.defender-for-cloud.json",
12281270
".openpublishing.redirection.defender-for-iot.json",
12291271
".openpublishing.redirection.dev-spaces.json",
12301272
".openpublishing.redirection.devops-project.json",
1273+
".openpublishing.redirection.document-db.json",
12311274
".openpublishing.redirection.germany.json",
12321275
".openpublishing.redirection.government.json",
12331276
".openpublishing.redirection.guidance.json",
12341277
".openpublishing.redirection.industry.json",
1278+
".openpublishing.redirection.iot-accelerators.json",
12351279
".openpublishing.redirection.iot-develop.json",
12361280
".openpublishing.redirection.iot-hub-device-update.json",
12371281
".openpublishing.redirection.json",
12381282
".openpublishing.redirection.key-vault.json",
12391283
".openpublishing.redirection.machine-configuration.json",
12401284
".openpublishing.redirection.marketplace.json",
12411285
".openpublishing.redirection.openshift.json",
1286+
".openpublishing.redirection.private-multi-access-edge-compute-mec.json",
12421287
".openpublishing.redirection.purview.json",
12431288
".openpublishing.redirection.remoteapp.json",
12441289
".openpublishing.redirection.security-benchmark.json",
@@ -1253,12 +1298,9 @@
12531298
".openpublishing.redirection.virtual-desktop.json",
12541299
".openpublishing.redirection.vmware-cloudsimple.json",
12551300
"articles/active-directory-b2c/.openpublishing.redirection.active-directory-b2c.json",
1256-
"articles/ai-services/.openpublishing.redirection.ai-services-from-applied.json",
1257-
"articles/ai-services/.openpublishing.redirection.ai-services-from-cog.json",
1258-
"articles/ai-services/.openpublishing.redirection.applied-ai-old.json",
1259-
"articles/ai-services/.openpublishing.redirection.applied-ai-services.json",
1260-
"articles/ai-services/.openpublishing.redirection.cognitive-services.json",
1301+
"articles/ai-services.openpublishing.redirection.ai-services.json",
12611302
"articles/ai-studio/.openpublishing.redirection.ai-studio.json",
1303+
"articles/aks/.openpublishing.redirection.aks.json",
12621304
"articles/analysis-services/.openpublishing.redirection.analysis-services.json",
12631305
"articles/application-gateway/.openpublishing.redirection.application-gateway.json",
12641306
"articles/automation/.openpublishing.redirection.automation.json",
@@ -1297,7 +1339,6 @@
12971339
"articles/hdinsight/.openpublishing.redirection.hdinsight.json",
12981340
"articles/healthcare-apis/.openpublishing.redirection.healthcare-apis.json",
12991341
"articles/internet-peering/.openpublishing.redirection.internet-peering.json",
1300-
"articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
13011342
"articles/iot-central/.openpublishing.redirection.iot-central.json",
13021343
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
13031344
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",
@@ -1310,6 +1351,7 @@
13101351
"articles/logic-apps/.openpublishing.redirection.logic-apps.json",
13111352
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
13121353
"articles/machine-learning/v1/.openpublishing.redirection.machine-learning-v1.json",
1354+
"articles/managed-instance-apache-cassandra/.openpublishing.redirection.managed-instance-apache-cassandra.json",
13131355
"articles/mariadb/.openpublishing.redirection.mariadb.json",
13141356
"articles/migrate/.openpublishing.redirection.migrate.json",
13151357
"articles/mysql/.openpublishing.redirection.mysql.json",
@@ -1318,6 +1360,7 @@
13181360
"articles/object-anchors/.openpublishing.redirection.object-anchors.json",
13191361
"articles/operator-insights/.openpublishing.redirection.operator-insights.json",
13201362
"articles/operator-nexus/.openpublishing.redirection.operator-nexus.json",
1363+
"articles/operator-service-manager/.openpublishing.redirection.operator-service-manager.json",
13211364
"articles/peering-service/.openpublishing.redirection.peering-service.json",
13221365
"articles/postgresql/.openpublishing.redirection.postgresql.json",
13231366
"articles/route-server/.openpublishing.redirection.route-server.json",

articles/ai-services/.openpublishing.redirection.ai-services-from-applied.json renamed to .openpublishing.redirection.ai-services-from-applied.json

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -660,6 +660,39 @@
660660
"source_path_from_root": "/articles/ai-services/document-intelligence/concept-retrieval-augumented-generation.md",
661661
"redirect_url": "/azure/ai-services/document-intelligence/concept-retrieval-augmented-generation",
662662
"redirect_document_id": true
663+
},
664+
{
665+
"source_path_from_root": "/articles/ai-services/translator/document-translation/quickstarts/asynchronous-rest-api.md",
666+
"redirect_url": "/azure/ai-services/translator/document-translation/how-to-guides/use-rest-api-programmatically",
667+
"redirect_document_id": true
668+
},
669+
{
670+
"source_path_from_root": "/articles/ai-services/translator/document-translation/quickstarts/synchronous-rest-api.md",
671+
"redirect_url": "/azure/ai-services/translator/document-translation/how-to-guides/use-rest-api-programmatically",
672+
"redirect_document_id": false
673+
},
674+
{
675+
"source_path_from_root": "/articles/ai-services/translator/document-translation/quickstarts/asynchronous-sdk.md",
676+
"redirect_url": "/azure/ai-services/translator/document-translation/quickstarts/client-library-sdks",
677+
"redirect_document_id": true
678+
},
679+
{
680+
"source_path_from_root": "/articles/ai-services/translator/document-translation/reference/synchronous-rest-api-guide.md",
681+
"redirect_url": "/azure/ai-services/translator/document-translation/reference/translate-document",
682+
"redirect_document_id": true
683+
684+
},
685+
{
686+
"source_path_from_root": "/articles/ai-services/translator/document-translation/reference/start-translation.md",
687+
"redirect_url": "/azure/ai-services/translator/document-translation/reference/start-batch-translation",
688+
"redirect_document_id": true
689+
690+
},
691+
{
692+
"source_path_from_root": "/articles/ai-services/translator/document-translation/reference/get-supported-storage-sources.md",
693+
"redirect_url": "/azure/ai-services/translator/document-translation/reference/rest-api-guide",
694+
"redirect_document_id": false
695+
663696
}
664697

665698
]

articles/ai-services/.openpublishing.redirection.ai-services-from-cog.json renamed to .openpublishing.redirection.ai-services-from-cog.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2042,9 +2042,14 @@
20422042
},
20432043
{
20442044
"source_path_from_root": "/articles/cognitive-services/speech-service/migrate-v2-to-v3.md",
2045-
"redirect_url": "/azure/ai-services/speech-service/migrate-v2-to-v3",
2045+
"redirect_url": "/azure/ai-services/speech-service/migrate-v3-1-to-v3-2",
20462046
"redirect_document_id": true
20472047
},
2048+
{
2049+
"source_path_from_root": "/articles/ai-services/speech-service/migrate-v2-to-v3.md",
2050+
"redirect_url": "/azure/ai-services/speech-service/migrate-v3-1-to-v3-2",
2051+
"redirect_document_id": false
2052+
},
20482053
{
20492054
"source_path_from_root": "/articles/cognitive-services/speech-service/migrate-v3-0-to-v3-1.md",
20502055
"redirect_url": "/azure/ai-services/speech-service/migrate-v3-0-to-v3-1",
@@ -2341,7 +2346,7 @@
23412346
"redirect_document_id": true
23422347
},
23432348
{
2344-
"source_path_from_root": "/articles/cognitive-services/translator/create-translator-resource.md",
2349+
"source_path_from_root": "/articles/cognitive-services/translator/create-translator-resource.yml",
23452350
"redirect_url": "/azure/ai-services/translator/create-translator-resource",
23462351
"redirect_document_id": true
23472352
},
@@ -3296,7 +3301,7 @@
32963301
"redirect_document_id": true
32973302
},
32983303
{
3299-
"source_path_from_root": "/articles/cognitive-services/openai/how-to/switching-endpoints.md",
3304+
"source_path_from_root": "/articles/cognitive-services/openai/how-to/switching-endpoints.yml",
33003305
"redirect_url": "/azure/ai-services/openai/how-to/switching-endpoints",
33013306
"redirect_document_id": true
33023307
},
@@ -3588,7 +3593,7 @@
35883593
{
35893594
"source_path_from_root": "/articles/cognitive-services/translator/reference/rest-api-guide.md",
35903595
"redirect_url": "/azure/ai-services/translator/reference/rest-api-guide",
3591-
"redirect_document_id": true
3596+
"redirect_document_id": false
35923597
},
35933598
{
35943599
"source_path_from_root": "/articles/cognitive-services/translator/reference/v3-0-break-sentence.md",
@@ -4338,7 +4343,7 @@
43384343
{
43394344
"source_path_from_root": "/articles/cognitive-services/translator/document-translation/how-to-guides/use-rest-api-programmatically.md",
43404345
"redirect_url": "/azure/ai-services/translator/document-translation/how-to-guides/use-rest-api-programmatically",
4341-
"redirect_document_id": true
4346+
"redirect_document_id": false
43424347
},
43434348
{
43444349
"source_path_from_root": "/articles/cognitive-services/translator/document-translation/quickstarts/document-translation-rest-api.md",
@@ -4393,7 +4398,7 @@
43934398
{
43944399
"source_path_from_root": "/articles/cognitive-services/translator/document-translation/reference/rest-api-guide.md",
43954400
"redirect_url": "/azure/ai-services/translator/document-translation/reference/rest-api-guide",
4396-
"redirect_document_id": true
4401+
"redirect_document_id": false
43974402
},
43984403
{
43994404
"source_path_from_root": "/articles/cognitive-services/translator/document-translation/reference/start-translation.md",
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/api-center/use-vscode-extension-copilot.md",
5+
"redirect_url": "/azure/api-center/use-vscode-extension",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

articles/ai-services/.openpublishing.redirection.applied-ai-services.json renamed to .openpublishing.redirection.applied-ai-services.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,36 @@
219219
"source_path_from_root": "/articles/ai-services/openai/how-to/prepare-dataset.md",
220220
"redirect_url": "/azure/ai-services/openai/concepts/fine-tuning-considerations",
221221
"redirect_document_id": true
222+
},
223+
{
224+
"source_path_from_root": "/articles/ai-services/content-moderator/try-image-api.md",
225+
"redirect_url": "/azure/ai-services/content-moderator/client-libraries",
226+
"redirect_document_id": false
227+
},
228+
{
229+
"source_path_from_root": "/articles/ai-services/content-moderator/try-text-api.md",
230+
"redirect_url": "/azure/ai-services/content-moderator/client-libraries",
231+
"redirect_document_id": false
232+
},
233+
{
234+
"source_path_from_root": "/articles/ai-services/content-moderator/try-image-list-api.md",
235+
"redirect_url": "/azure/ai-services/content-moderator/image-lists-quickstart-dotnet",
236+
"redirect_document_id": false
237+
},
238+
{
239+
"source_path_from_root": "/articles/ai-services/content-moderator/try-terms-list-api.md",
240+
"redirect_url": "/azure/ai-services/content-moderator/term-lists-quickstart-dotnet",
241+
"redirect_document_id": false
242+
},
243+
{
244+
"source_path_from_root": "/articles/ai-services/content-safety/concepts/incident-response.md",
245+
"redirect_url": "/azure/ai-services/content-safety/concepts/custom-categories-rapid",
246+
"redirect_document_id": true
247+
},
248+
{
249+
"source_path_from_root": "/articles/ai-services/content-safety/how-to/incident-response.md",
250+
"redirect_url": "/azure/ai-services/content-safety/how-to/custom-categories-rapid",
251+
"redirect_document_id": true
222252
}
223253
]
224254
}

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@
8080
"redirect_url": "/azure/aks/azure-csi-files-storage-provision",
8181
"redirect_document_id": false
8282
},
83+
{
84+
"source_path_from_root": "/articles/aks/learn/tutorial-kubernetes-workload-identity.md",
85+
"redirect_url": "/azure/aks/workload-identity-deploy-cluster",
86+
"redirect_document_id": false
87+
},
8388
{
8489
"source_path_from_root": "/articles/aks/workload-identity-migration-sidecar.md",
8590
"redirect_url": "/azure/aks/workload-identity-migrate-from-pod-identity",
@@ -351,12 +356,6 @@
351356
"redirect_url": "/cli/azure/aks#az_aks_create",
352357
"redirect_document_id": false
353358
},
354-
{
355-
"source_path_from_root": "/articles/aks/delete-cluster.md",
356-
"redirect_url": "/cli/azure/aks#az_aks_delete",
357-
"redirect_document_id": false
358-
},
359-
360359
{
361360
"source_path": "articles/aks/view-master-logs.md",
362361
"redirect_url": "/azure/aks/view-control-plane-logs",

0 commit comments

Comments
 (0)