Skip to content

Commit 5832d94

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into davidbel-39607366-aad-fslogix-preview-update
2 parents b4c57cc + f9662e8 commit 5832d94

File tree

10,679 files changed

+199061
-124281
lines changed

Some content is hidden

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

10,679 files changed

+199061
-124281
lines changed

.openpublishing.publish.config.json

Lines changed: 10 additions & 4 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
},
@@ -947,7 +947,7 @@
947947
{
948948
"path_to_root": "azure-cosmos-mongodb-dotnet",
949949
"url": "https://github.com/Azure-Samples/cosmos-db-mongodb-api-dotnet-samples",
950-
"branch": "quickstart-test",
950+
"branch": "main",
951951
"branch_mapping": {}
952952
}
953953
],
@@ -978,6 +978,7 @@
978978
".openpublishing.redirection.app-service.json",
979979
".openpublishing.redirection.key-vault.json",
980980
".openpublishing.redirection.sql-database.json",
981+
".openpublishing.redirection.machine-configuration.json",
981982
".openpublishing.redirection.security-benchmark.json",
982983
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
983984
".openpublishing.redirection.azure-web-pubsub.json",
@@ -1016,9 +1017,14 @@
10161017
"articles/mysql/.openpublishing.redirection.mysql.json",
10171018
"articles/container-apps/.openpublishing.redirection.container-apps.json",
10181019
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
1020+
"articles/spring-apps/.openpublishing.redirection.spring-apps.json",
10191021
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
10201022
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
10211023
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
1022-
"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"
10231029
]
10241030
}

.openpublishing.redirection.active-directory.json

Lines changed: 40 additions & 4 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",
@@ -2028,7 +2043,7 @@
20282043
{
20292044
"source_path_from_root": "/articles/active-directory/conditional-access/conditional-access-for-exo-and-spo.md",
20302045
"redirect_url": "/azure/active-directory/conditional-access/block-legacy-authentication",
2031-
"redirect_document_id": true
2046+
"redirect_document_id": false
20322047
},
20332048
{
20342049
"source_path_from_root": "/articles/active-directory/conditional-access/baseline-protection.md",
@@ -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,7 +2805,7 @@
27902805
"redirect_url": "/azure/active-directory/develop/howto-authenticate-service-principal-powershell",
27912806
"redirect_document_id": false
27922807
},
2793-
2808+
27942809
{
27952810
"source_path_from_root": "/articles/active-directory/develop/active-directory-devhowto-multi-tenant-overview.md",
27962811
"redirect_url": "/azure/active-directory/develop/howto-convert-app-to-be-multi-tenant",
@@ -4243,7 +4258,12 @@
42434258
},
42444259
{
42454260
"source_path_from_root": "/articles/active-directory/conditional-access/concept-conditional-access-block-legacy-authentication.md",
4246-
"redirect_url": "/azure/active-directory/fundamentals/concept-fundamentals-block-legacy-authentication",
4261+
"redirect_url": "/azure/active-directory/conditional-access/block-legacy-authentication",
4262+
"redirect_document_id": false
4263+
},
4264+
{
4265+
"source_path_from_root": "/articles/active-directory/fundamentals/concept-fundamentals-block-legacy-authentication.md",
4266+
"redirect_url": "/azure/active-directory/conditional-access/block-legacy-authentication",
42474267
"redirect_document_id": true
42484268
},
42494269
{
@@ -10801,6 +10821,16 @@
1080110821
"redirect_url": "/azure/active-directory/manage-apps/add-application-portal",
1080210822
"redirect_document_id": false
1080310823
},
10824+
{
10825+
"source_path": "articles/active-directory/saas-apps/iprova-provisioning-tutorial.md",
10826+
"redirect_url": "/azure/active-directory/saas-apps/zenya-provisioning-tutorial",
10827+
"redirect_document_id": false
10828+
},
10829+
{
10830+
"source_path": "articles/active-directory/saas-apps/iprova-tutorial.md",
10831+
"redirect_url": "/azure/active-directory/saas-apps/zenya-tutorial",
10832+
"redirect_document_id": false
10833+
},
1080410834
{
1080510835
"source_path": "articles/active-directory/manage-apps/manage-certificates-for-federated-single-sign-on.md",
1080610836
"redirect_url": "/azure/active-directory/manage-apps/tutorial-manage-certificates-for-federated-single-sign-on",
@@ -10810,7 +10840,13 @@
1081010840
"source_path": "articles/active-directory/manage-apps/howto-enforce-signed-saml-authentication.md",
1081110841
"redirect_url": "/azure/active-directory/manage-apps/howto-saml-token-encryption",
1081210842
"redirect_document_id": true
10843+
},
10844+
{
10845+
"source_path_from_root": "/articles/active-directory/manage-apps/recover-deleted-apps-faq.md",
10846+
"redirect_url": "/azure/active-directory/manage-apps/delete-recover-faq",
10847+
"redirect_document_id": false
1081310848
}
1081410849

10850+
1081510851
]
1081610852
}

0 commit comments

Comments
 (0)