Skip to content

Commit 98e05f5

Browse files
authored
Merge branch 'main' into main
2 parents 030487a + 2fbc2d3 commit 98e05f5

File tree

20,844 files changed

+428948
-261883
lines changed

Some content is hidden

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

20,844 files changed

+428948
-261883
lines changed

.openpublishing.publish.config.json

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -287,19 +287,19 @@
287287
{
288288
"path_to_root": "azure-search-javascript-samples",
289289
"url": "https://github.com/Azure-Samples/azure-search-javascript-samples",
290-
"branch": "master",
290+
"branch": "main",
291291
"branch_mapping": {}
292292
},
293293
{
294294
"path_to_root": "azure-search-dotnet-samples",
295295
"url": "https://github.com/Azure-Samples/azure-search-dotnet-samples",
296-
"branch": "master",
296+
"branch": "main",
297297
"branch_mapping": {}
298298
},
299299
{
300300
"path_to_root": "azure-search-python-samples",
301301
"url": "https://github.com/Azure-Samples/azure-search-python-samples",
302-
"branch": "master",
302+
"branch": "main",
303303
"branch_mapping": {}
304304
},
305305
{
@@ -374,12 +374,6 @@
374374
"branch": "master",
375375
"branch_mapping": {}
376376
},
377-
{
378-
"path_to_root": "media-services-v3-dotnet-quickstarts",
379-
"url": "https://github.com/Azure-Samples/media-services-v3-dotnet-quickstarts",
380-
"branch": "master",
381-
"branch_mapping": {}
382-
},
383377
{
384378
"path_to_root": "media-services-v3-dotnet-tutorials",
385379
"url": "https://github.com/Azure-Samples/media-services-v3-dotnet-tutorials",
@@ -437,7 +431,7 @@
437431
{
438432
"path_to_root": "media-services-video-indexer",
439433
"url": "https://github.com/Azure-Samples/media-services-video-indexer",
440-
"branch": "main",
434+
"branch": "master",
441435
"branch_mapping": {}
442436
},
443437
{
@@ -680,6 +674,12 @@
680674
"branch": "main",
681675
"branch_mapping": {}
682676
},
677+
{
678+
"path_to_root": "cosmos-db-sql-api-javascript-samples",
679+
"url": "https://github.com/Azure-Samples/cosmos-db-sql-api-javascript-samples",
680+
"branch": "main",
681+
"branch_mapping": {}
682+
},
683683
{
684684
"path_to_root": "azure-cosmos-db-python-getting-started",
685685
"url": "https://github.com/Azure-Samples/azure-cosmos-db-python-getting-started",
@@ -813,8 +813,8 @@
813813
"branch_mapping": {}
814814
},
815815
{
816-
"path_to_root": "azure-spring-cloud-reference-architecture",
817-
"url": "https://github.com/Azure/azure-spring-cloud-reference-architecture",
816+
"path_to_root": "azure-spring-apps-reference-architecture",
817+
"url": "https://github.com/Azure/azure-spring-apps-reference-architecture",
818818
"branch": "main",
819819
"branch_mapping": {}
820820
},
@@ -884,6 +884,12 @@
884884
"branch": "main",
885885
"branch_mapping": {}
886886
},
887+
{
888+
"path_to_root": "azure-cosmos-tableapi-dotnet",
889+
"url": "https://github.com/Azure-Samples/cosmos-db-table-api-dotnet-samples",
890+
"branch": "v12",
891+
"branch_mapping": {}
892+
},
887893
{
888894
"path_to_root": "msdocs-django-postgresql-sample-app",
889895
"url": "https://github.com/Azure-Samples/msdocs-django-postgresql-sample-app",
@@ -931,6 +937,18 @@
931937
"url": "https://github.com/Azure-Samples/cosmos-db-sql-api-dotnet-samples",
932938
"branch": "v3",
933939
"branch_mapping": {}
940+
},
941+
{
942+
"path_to_root": "azure-cosmos-db-table-dotnet-v12",
943+
"url": "https://github.com/Azure-Samples/cosmos-db-table-api-dotnet-samples",
944+
"branch": "v12",
945+
"branch_mapping": {}
946+
},
947+
{
948+
"path_to_root": "azure-cosmos-mongodb-dotnet",
949+
"url": "https://github.com/Azure-Samples/cosmos-db-mongodb-api-dotnet-samples",
950+
"branch": "main",
951+
"branch_mapping": {}
934952
}
935953
],
936954
"branch_target_mapping": {
@@ -950,6 +968,7 @@
950968
".openpublishing.redirection.json",
951969
".openpublishing.redirection.azure-arc-data.json",
952970
".openpublishing.redirection.active-directory.json",
971+
".openpublishing.redirection.azure-attestation.json",
953972
".openpublishing.redirection.azure-blob.json",
954973
"articles/data-factory/.openpublishing.redirection.data-factory.json",
955974
".openpublishing.redirection.defender-for-cloud.json",
@@ -959,6 +978,7 @@
959978
".openpublishing.redirection.app-service.json",
960979
".openpublishing.redirection.key-vault.json",
961980
".openpublishing.redirection.sql-database.json",
981+
".openpublishing.redirection.machine-configuration.json",
962982
".openpublishing.redirection.security-benchmark.json",
963983
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
964984
".openpublishing.redirection.azure-web-pubsub.json",
@@ -970,6 +990,7 @@
970990
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
971991
"articles/azure-relay/.openpublishing.redirection.relay.json",
972992
"articles/communication-services/.openpublishing.redirection.communication-services.json",
993+
"articles/confidential-computing/.openpublishing.redirection.json",
973994
"articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",
974995
"articles/cost-management-billing/.openpublishing.redirection.cost-management-billing.json",
975996
"articles/data-catalog/.openpublishing.redirection.data-catalog.json",
@@ -997,9 +1018,14 @@
9971018
"articles/mysql/.openpublishing.redirection.mysql.json",
9981019
"articles/container-apps/.openpublishing.redirection.container-apps.json",
9991020
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
1021+
"articles/spring-apps/.openpublishing.redirection.spring-apps.json",
10001022
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
10011023
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
10021024
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
1003-
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json"
1025+
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
1026+
".openpublishing.redirection.virtual-desktop.json",
1027+
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
1028+
"articles/applied-ai-services/.openpublishing.archived.json",
1029+
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json"
10041030
]
10051031
}

.openpublishing.redirection.active-directory.json

Lines changed: 92 additions & 6 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/fundamentals/whats-new-microsoft-365-government.md",
35+
"redirect_url": "/azure/active-directory/fundamentals/whats-new",
36+
"redirect_document_id": true
37+
},
3338
{
3439
"source_path_from_root": "/articles/active-directory/manage-apps/common-scenarios.md",
3540
"redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
@@ -50,6 +55,11 @@
5055
"redirect_url": "/azure/active-directory/authentication/how-to-mfa-registration-campaign",
5156
"redirect_document_id": false
5257
},
58+
{
59+
"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",
61+
"redirect_document_id": false
62+
},
5363
{
5464
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-limitations.md",
5565
"redirect_url": "/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
@@ -2028,7 +2038,7 @@
20282038
{
20292039
"source_path_from_root": "/articles/active-directory/conditional-access/conditional-access-for-exo-and-spo.md",
20302040
"redirect_url": "/azure/active-directory/conditional-access/block-legacy-authentication",
2031-
"redirect_document_id": true
2041+
"redirect_document_id": false
20322042
},
20332043
{
20342044
"source_path_from_root": "/articles/active-directory/conditional-access/baseline-protection.md",
@@ -2417,7 +2427,7 @@
24172427
},
24182428
{
24192429
"source_path_from_root": "/articles/active-directory/develop/active-directory-graph-api.md",
2420-
"redirect_url": "https://docs.microsoft.com/graph/migrate-azure-ad-graph-planning-checklist",
2430+
"redirect_url": "/graph/migrate-azure-ad-graph-planning-checklist",
24212431
"redirect_document_id": false
24222432
},
24232433
{
@@ -2790,6 +2800,7 @@
27902800
"redirect_url": "/azure/active-directory/develop/howto-authenticate-service-principal-powershell",
27912801
"redirect_document_id": false
27922802
},
2803+
27932804
{
27942805
"source_path_from_root": "/articles/active-directory/develop/active-directory-devhowto-multi-tenant-overview.md",
27952806
"redirect_url": "/azure/active-directory/develop/howto-convert-app-to-be-multi-tenant",
@@ -4242,7 +4253,12 @@
42424253
},
42434254
{
42444255
"source_path_from_root": "/articles/active-directory/conditional-access/concept-conditional-access-block-legacy-authentication.md",
4245-
"redirect_url": "/azure/active-directory/fundamentals/concept-fundamentals-block-legacy-authentication",
4256+
"redirect_url": "/azure/active-directory/conditional-access/block-legacy-authentication",
4257+
"redirect_document_id": false
4258+
},
4259+
{
4260+
"source_path_from_root": "/articles/active-directory/fundamentals/concept-fundamentals-block-legacy-authentication.md",
4261+
"redirect_url": "/azure/active-directory/conditional-access/block-legacy-authentication",
42464262
"redirect_document_id": true
42474263
},
42484264
{
@@ -4515,6 +4531,11 @@
45154531
"redirect_url": "azure/active-directory/hybrid/what-is-inter-directory-provisioning",
45164532
"redirect_document_id": false
45174533
},
4534+
{
4535+
"source_path_from_root": "/articles/active-directory/hybrid/how-to-connect-group-writeback.md",
4536+
"redirect_url": "/azure/active-directory/hybrid/how-to-connect-group-writeback-v2",
4537+
"redirect_document_id": false
4538+
},
45184539
{
45194540
"source_path_from_root": "/articles/active-directory/cloud-provisioning/tutorial-single-forest.md",
45204541
"redirect_url": "/azure/active-directory/cloud-sync/tutorial-single-forest",
@@ -8787,13 +8808,13 @@
87878808
},
87888809
{
87898810
"source_path_from_root": "/articles/active-directory/active-directory-saas-linkedinlearning-provisioning-tutorial.md",
8790-
"redirect_url": "/azure/active-directory/saas-apps/linkedinlearning-provisioning-tutorial",
8811+
"redirect_url": "/azure/active-directory/saas-apps/linkedin-learning-provisioning-tutorial",
87918812
"redirect_document_id": false
87928813
},
87938814
{
87948815
"source_path_from_root": "/articles/active-directory/active-directory-saas-linkedin-learning-provisioning-tutorial.md",
8795-
"redirect_url": "/azure/active-directory/saas-apps/linkedin-learning-provisioning-tutorial",
8796-
"redirect_document_id": true
8816+
"redirect_url": "/azure",
8817+
"redirect_document_id": false
87978818
},
87988819
{
87998820
"source_path_from_root": "/articles/active-directory/active-directory-saas-linkedinlearning-tutorial.md",
@@ -10795,10 +10816,75 @@
1079510816
"redirect_url": "/azure/active-directory/manage-apps/add-application-portal",
1079610817
"redirect_document_id": false
1079710818
},
10819+
{
10820+
"source_path": "articles/active-directory/saas-apps/iprova-provisioning-tutorial.md",
10821+
"redirect_url": "/azure/active-directory/saas-apps/zenya-provisioning-tutorial",
10822+
"redirect_document_id": false
10823+
},
10824+
{
10825+
"source_path": "articles/active-directory/saas-apps/iprova-tutorial.md",
10826+
"redirect_url": "/azure/active-directory/saas-apps/zenya-tutorial",
10827+
"redirect_document_id": false
10828+
},
1079810829
{
1079910830
"source_path": "articles/active-directory/manage-apps/manage-certificates-for-federated-single-sign-on.md",
1080010831
"redirect_url": "/azure/active-directory/manage-apps/tutorial-manage-certificates-for-federated-single-sign-on",
1080110832
"redirect_document_id": false
10833+
},
10834+
{
10835+
"source_path": "articles/active-directory/manage-apps/recover-deleted-apps-faq.md",
10836+
"redirect_url": "/azure/active-directory/manage-apps/delete-recover-faq",
10837+
"redirect_document_id": false
10838+
},
10839+
{
10840+
"source_path": "articles/azure-percept/voice-control-your-inventory-then-visualize-with-power-bi-dashboard.md",
10841+
"redirect_url": "/azure/azure-percept/index",
10842+
"redirect_document_id": false
10843+
},
10844+
{
10845+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-create-azure-portal.md",
10846+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10847+
"redirect_document_id": false
10848+
},
10849+
{
10850+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-members-azure-portal.md",
10851+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10852+
"redirect_document_id": false
10853+
},
10854+
{
10855+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-delete-group.md",
10856+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10857+
"redirect_document_id": false
10858+
},
10859+
{
10860+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-membership-azure-portal.md",
10861+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10862+
"redirect_document_id": false
10863+
},
10864+
{
10865+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-settings-azure-portal.md",
10866+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10867+
"redirect_document_id": false
10868+
},
10869+
{
10870+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-accessmanagement-managing-group-owners.md",
10871+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10872+
"redirect_document_id": false
10873+
},
10874+
{
10875+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-manage-groups.md",
10876+
"redirect_url": "/azure/active-directory/fundamentals/concept-learn-about-groups",
10877+
"redirect_document_id": false
10878+
},
10879+
{
10880+
"source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
10881+
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
10882+
"redirect_document_id": false
10883+
},
10884+
{
10885+
"source_path_from_root": "/articles/active-directory/cloud-infrastructure-entitlement-management/product-integrations.md",
10886+
"redirect_url": "/azure/active-directory/cloud-infrastructure-entitlement-management",
10887+
"redirect_document_id": false
1080210888
}
1080310889

1080410890
]

0 commit comments

Comments
 (0)