Skip to content

Commit 5c44b71

Browse files
committed
Merge branch 'main' into szuber/configure-customer-managed-key-encryption-at-rest
2 parents bd5d5f8 + afb6569 commit 5c44b71

File tree

13,786 files changed

+273981
-194181
lines changed

Some content is hidden

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

13,786 files changed

+273981
-194181
lines changed

.openpublishing.publish.config.json

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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",
@@ -997,9 +1017,14 @@
9971017
"articles/mysql/.openpublishing.redirection.mysql.json",
9981018
"articles/container-apps/.openpublishing.redirection.container-apps.json",
9991019
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
1020+
"articles/spring-apps/.openpublishing.redirection.spring-apps.json",
10001021
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
10011022
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
10021023
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
1003-
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json"
1024+
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
1025+
".openpublishing.redirection.virtual-desktop.json",
1026+
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
1027+
"articles/applied-ai-services/.openpublishing.archived.json",
1028+
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json"
10041029
]
10051030
}

.openpublishing.redirection.active-directory.json

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,16 @@
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/saas-apps/netmotion-mobility-tutorial.md",
35+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/active-directory/fundamentals/whats-new-microsoft-365-government.md",
40+
"redirect_url": "/azure/active-directory/fundamentals/whats-new",
41+
"redirect_document_id": true
42+
},
3343
{
3444
"source_path_from_root": "/articles/active-directory/manage-apps/common-scenarios.md",
3545
"redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
@@ -50,6 +60,11 @@
5060
"redirect_url": "/azure/active-directory/authentication/how-to-mfa-registration-campaign",
5161
"redirect_document_id": false
5262
},
63+
{
64+
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-create-trust-github.md",
65+
"redirect_url": "/azure/active-directory/develop/workload-identity-federation-create-trust",
66+
"redirect_document_id": false
67+
},
5368
{
5469
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-limitations.md",
5570
"redirect_url": "/azure/active-directory/azuread-dev/azure-ad-endpoint-comparison",
@@ -2417,7 +2432,7 @@
24172432
},
24182433
{
24192434
"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",
2435+
"redirect_url": "/graph/migrate-azure-ad-graph-planning-checklist",
24212436
"redirect_document_id": false
24222437
},
24232438
{
@@ -2790,6 +2805,7 @@
27902805
"redirect_url": "/azure/active-directory/develop/howto-authenticate-service-principal-powershell",
27912806
"redirect_document_id": false
27922807
},
2808+
27932809
{
27942810
"source_path_from_root": "/articles/active-directory/develop/active-directory-devhowto-multi-tenant-overview.md",
27952811
"redirect_url": "/azure/active-directory/develop/howto-convert-app-to-be-multi-tenant",
@@ -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,7 +8808,7 @@
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
{
@@ -10795,11 +10816,32 @@
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/howto-enforce-signed-saml-authentication.md",
10836+
"redirect_url": "/azure/active-directory/manage-apps/howto-saml-token-encryption",
10837+
"redirect_document_id": true
10838+
},
10839+
{
10840+
"source_path_from_root": "/articles/active-directory/manage-apps/recover-deleted-apps-faq.md",
10841+
"redirect_url": "/azure/active-directory/manage-apps/delete-recover-faq",
10842+
"redirect_document_id": false
1080210843
}
1080310844

10845+
1080410846
]
1080510847
}
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/attestation/audit-logs.md",
5+
"redirect_url": "/azure/attestation/view-logs",
6+
"redirect_document_id": true
7+
}
8+
]
9+
}

0 commit comments

Comments
 (0)