Skip to content

Commit 3a364e0

Browse files
authored
Merge branch 'main' into runsToJobsPart11
2 parents cdd8caa + ad08ea8 commit 3a364e0

File tree

14,061 files changed

+235950
-179619
lines changed

Some content is hidden

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

14,061 files changed

+235950
-179619
lines changed

.openpublishing.publish.config.json

Lines changed: 69 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,18 @@
3232
"need_preview_pull_request": true,
3333
"contribution_branch_mappings": {},
3434
"dependent_repositories": [
35+
{
36+
"path_to_root": "azure-dev-docs-pr",
37+
"url": "https://github.com/MicrosoftDocs/azure-dev-docs-pr",
38+
"branch": "main",
39+
"branch_mapping": {}
40+
},
41+
{
42+
"path_to_root": "terraform_samples",
43+
"url": "https://github.com/Azure/terraform",
44+
"branch": "master",
45+
"branch_mapping": {}
46+
},
3547
{
3648
"path_to_root": "quickstart-templates",
3749
"url": "https://github.com/Azure/azure-quickstart-templates",
@@ -79,7 +91,7 @@
7991
"url": "https://github.com/Azure-Samples/msdocs-storage-bind-function-service",
8092
"branch": "main",
8193
"branch_mapping": {}
82-
},
94+
},
8395
{
8496
"path_to_root": "azure_cli_scripts",
8597
"url": "https://github.com/Azure-Samples/azure-cli-samples",
@@ -422,6 +434,12 @@
422434
"branch": "main",
423435
"branch_mapping": {}
424436
},
437+
{
438+
"path_to_root": "media-services-video-indexer",
439+
"url": "https://github.com/Azure-Samples/media-services-video-indexer",
440+
"branch": "master",
441+
"branch_mapping": {}
442+
},
425443
{
426444
"path_to_root": "remote-monitoring-webui",
427445
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
@@ -455,7 +473,7 @@
455473
{
456474
"path_to_root": "azureml-examples-online-endpoint-vnet",
457475
"url": "https://github.com/azure/azureml-examples",
458-
"branch": "rsethur/mvnet",
476+
"branch": "main",
459477
"branch_mapping": {}
460478
},
461479
{
@@ -614,6 +632,12 @@
614632
"branch": "master",
615633
"branch_mapping": {}
616634
},
635+
{
636+
"path_to_root": "samples-cosmosdb-mongodb-javascript",
637+
"url": "https://github.com/Azure-Samples/cosmos-db-mongodb-api-javascript-samples",
638+
"branch": "main",
639+
"branch_mapping": {}
640+
},
617641
{
618642
"path_to_root": "samples-cosmosdb-java-v4-web-app",
619643
"url": "https://github.com/Azure-Samples/azure-cosmos-java-sql-api-todo-app",
@@ -860,6 +884,12 @@
860884
"branch": "main",
861885
"branch_mapping": {}
862886
},
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+
},
863893
{
864894
"path_to_root": "msdocs-django-postgresql-sample-app",
865895
"url": "https://github.com/Azure-Samples/msdocs-django-postgresql-sample-app",
@@ -889,8 +919,37 @@
889919
"url": "https://github.com/Azure-Samples/azure-sql-binding-func-dotnet-todo",
890920
"branch": "docs-snippets",
891921
"branch_mapping": {}
922+
},
923+
{
924+
"path_to_root": "ms-identity-node",
925+
"url": "https://github.com/Azure-Samples/ms-identity-node",
926+
"branch": "main",
927+
"branch_mapping": {}
928+
},
929+
{
930+
"path_to_root": "ms-identity-javascript-nodejs-desktop",
931+
"url": "https://github.com/Azure-Samples/ms-identity-javascript-nodejs-desktop",
932+
"branch": "main",
933+
"branch_mapping": {}
934+
},
935+
{
936+
"path_to_root": "azure-cosmos-dotnet-v3",
937+
"url": "https://github.com/Azure-Samples/cosmos-db-sql-api-dotnet-samples",
938+
"branch": "v3",
939+
"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": "quickstart-test",
951+
"branch_mapping": {}
892952
}
893-
894953
],
895954
"branch_target_mapping": {
896955
"live": ["Publish", "PDF"],
@@ -907,13 +966,16 @@
907966
},
908967
"redirection_files": [
909968
".openpublishing.redirection.json",
969+
".openpublishing.redirection.azure-arc-data.json",
910970
".openpublishing.redirection.active-directory.json",
971+
".openpublishing.redirection.azure-attestation.json",
911972
".openpublishing.redirection.azure-blob.json",
912973
"articles/data-factory/.openpublishing.redirection.data-factory.json",
913974
".openpublishing.redirection.defender-for-cloud.json",
914975
".openpublishing.redirection.defender-for-iot.json",
915976
".openpublishing.redirection.healthcare-apis.json",
916977
".openpublishing.redirection.iot-hub.json",
978+
".openpublishing.redirection.app-service.json",
917979
".openpublishing.redirection.key-vault.json",
918980
".openpublishing.redirection.sql-database.json",
919981
".openpublishing.redirection.security-benchmark.json",
@@ -922,6 +984,7 @@
922984
".openpublishing.redirection.azure-monitor.json",
923985
".openpublishing.redirection.azure-percept.json",
924986
".openpublishing.redirection.azure-productivity.json",
987+
".openpublishing.redirection.azure-australia.json",
925988
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
926989
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
927990
"articles/azure-relay/.openpublishing.redirection.relay.json",
@@ -954,6 +1017,8 @@
9541017
"articles/container-apps/.openpublishing.redirection.container-apps.json",
9551018
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
9561019
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
957-
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json"
1020+
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
1021+
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
1022+
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json"
9581023
]
9591024
}

.openpublishing.redirection.active-directory.json

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
"redirect_url": "/azure/active-directory/authentication/concept-certificate-based-authentication",
2626
"redirect_document_id": false
2727
},
28+
{
29+
"source_path_from_root": "/articles/active-directory/saas-apps/bridgelineunbound-tutorial.md",
30+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
31+
"redirect_document_id": false
32+
},
2833
{
2934
"source_path_from_root": "/articles/active-directory/manage-apps/common-scenarios.md",
3035
"redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
@@ -350,6 +355,11 @@
350355
"redirect_url": "/azure/active-directory/saas-apps/mimecast-personal-portal-tutorial",
351356
"redirect_document_id": false
352357
},
358+
{
359+
"source_path_from_root": "/articles/active-directory/saas-apps/carlsonwagonlit-tutorial.md",
360+
"redirect_url": "/azure/active-directory/saas-apps/cwt-tutorial",
361+
"redirect_document_id": false
362+
},
353363
{
354364
"source_path_from_root": "/articles/active-directory/active-directory-saas-fax.plus-tutorial.md",
355365
"redirect_url": "/articles/active-directory/saas-apps/fax-plus-tutorial",
@@ -2780,6 +2790,7 @@
27802790
"redirect_url": "/azure/active-directory/develop/howto-authenticate-service-principal-powershell",
27812791
"redirect_document_id": false
27822792
},
2793+
27832794
{
27842795
"source_path_from_root": "/articles/active-directory/develop/active-directory-devhowto-multi-tenant-overview.md",
27852796
"redirect_url": "/azure/active-directory/develop/howto-convert-app-to-be-multi-tenant",
@@ -4505,6 +4516,11 @@
45054516
"redirect_url": "azure/active-directory/hybrid/what-is-inter-directory-provisioning",
45064517
"redirect_document_id": false
45074518
},
4519+
{
4520+
"source_path_from_root": "/articles/active-directory/hybrid/how-to-connect-group-writeback.md",
4521+
"redirect_url": "/azure/active-directory/hybrid/how-to-connect-group-writeback-v2",
4522+
"redirect_document_id": false
4523+
},
45084524
{
45094525
"source_path_from_root": "/articles/active-directory/cloud-provisioning/tutorial-single-forest.md",
45104526
"redirect_url": "/azure/active-directory/cloud-sync/tutorial-single-forest",
@@ -8777,13 +8793,13 @@
87778793
},
87788794
{
87798795
"source_path_from_root": "/articles/active-directory/active-directory-saas-linkedinlearning-provisioning-tutorial.md",
8780-
"redirect_url": "/azure/active-directory/saas-apps/linkedinlearning-provisioning-tutorial",
8796+
"redirect_url": "/azure/active-directory/saas-apps/linkedin-learning-provisioning-tutorial",
87818797
"redirect_document_id": false
87828798
},
87838799
{
87848800
"source_path_from_root": "/articles/active-directory/active-directory-saas-linkedin-learning-provisioning-tutorial.md",
8785-
"redirect_url": "/azure/active-directory/saas-apps/linkedin-learning-provisioning-tutorial",
8786-
"redirect_document_id": true
8801+
"redirect_url": "/azure",
8802+
"redirect_document_id": false
87878803
},
87888804
{
87898805
"source_path_from_root": "/articles/active-directory/active-directory-saas-linkedinlearning-tutorial.md",
@@ -10789,6 +10805,11 @@
1078910805
"source_path": "articles/active-directory/manage-apps/manage-certificates-for-federated-single-sign-on.md",
1079010806
"redirect_url": "/azure/active-directory/manage-apps/tutorial-manage-certificates-for-federated-single-sign-on",
1079110807
"redirect_document_id": false
10808+
},
10809+
{
10810+
"source_path": "articles/active-directory/manage-apps/howto-enforce-signed-saml-authentication.md",
10811+
"redirect_url": "/azure/active-directory/manage-apps/howto-saml-token-encryption",
10812+
"redirect_document_id": true
1079210813
}
1079310814

1079410815
]
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/app-service-web/web-sites-restore.md",
5+
"redirect_url": "/azure/app-service/manage-backup",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/app-service/web-sites-restore.md",
10+
"redirect_url": "/azure/app-service/manage-backup",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/app-service/app-service-web-restore-snapshots.md",
15+
"redirect_url": "/azure/app-service/manage-backup",
16+
"redirect_document_id": false
17+
}
18+
]
19+
}

0 commit comments

Comments
 (0)