Skip to content

Commit d1e68e3

Browse files
authored
Merge branch 'main' into patch-4
2 parents 09d017f + f5aa2bd commit d1e68e3

File tree

24,636 files changed

+495054
-406171
lines changed

Some content is hidden

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

24,636 files changed

+495054
-406171
lines changed

.openpublishing.publish.config.json

Lines changed: 106 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
"locale": "en-us",
99
"monikers": [],
1010
"moniker_ranges": [],
11-
"xref_query_tags": [
12-
"/dotnet",
13-
"/python"
14-
],
11+
"xref_query_tags": ["/dotnet", "/python"],
1512
"open_to_public_contributors": true,
1613
"type_mapping": {
1714
"ZonePivotGroups": "Toc",
@@ -26,19 +23,27 @@
2623
"version": 0
2724
}
2825
],
29-
"notification_subscribers": [
30-
31-
],
32-
"sync_notification_subscribers": [
33-
34-
],
26+
"notification_subscribers": ["[email protected]"],
27+
"sync_notification_subscribers": ["[email protected]"],
3528
"branches_to_filter": [],
3629
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/azure-docs",
3730
"git_repository_branch_open_to_public_contributors": "main",
3831
"skip_source_output_uploading": false,
3932
"need_preview_pull_request": true,
4033
"contribution_branch_mappings": {},
4134
"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+
},
4247
{
4348
"path_to_root": "quickstart-templates",
4449
"url": "https://github.com/Azure/azure-quickstart-templates",
@@ -81,6 +86,12 @@
8186
"branch": "master",
8287
"branch_mapping": {}
8388
},
89+
{
90+
"path_to_root": "msdocs-storage-bind-function-service",
91+
"url": "https://github.com/Azure-Samples/msdocs-storage-bind-function-service",
92+
"branch": "main",
93+
"branch_mapping": {}
94+
},
8495
{
8596
"path_to_root": "azure_cli_scripts",
8697
"url": "https://github.com/Azure-Samples/azure-cli-samples",
@@ -249,6 +260,12 @@
249260
"branch": "main",
250261
"branch_mapping": {}
251262
},
263+
{
264+
"path_to_root": "azure-functions-kafka-extension",
265+
"url": "https://github.com/Azure/azure-functions-kafka-extension",
266+
"branch": "dev",
267+
"branch_mapping": {}
268+
},
252269
{
253270
"path_to_root": "azure-functions-python-worker-extension",
254271
"url": "https://github.com/Azure-Samples/python-worker-extension-timer",
@@ -417,6 +434,12 @@
417434
"branch": "main",
418435
"branch_mapping": {}
419436
},
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+
},
420443
{
421444
"path_to_root": "remote-monitoring-webui",
422445
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
@@ -442,9 +465,15 @@
442465
"branch_mapping": {}
443466
},
444467
{
445-
"path_to_root": "azureml-examples-march-cli-preview",
468+
"path_to_root": "azureml-examples-sdk-preview",
469+
"url": "https://github.com/azure/azureml-examples",
470+
"branch": "sdk-preview",
471+
"branch_mapping": {}
472+
},
473+
{
474+
"path_to_root": "azureml-examples-online-endpoint-vnet",
446475
"url": "https://github.com/azure/azureml-examples",
447-
"branch": "march-cli-preview",
476+
"branch": "main",
448477
"branch_mapping": {}
449478
},
450479
{
@@ -603,6 +632,12 @@
603632
"branch": "master",
604633
"branch_mapping": {}
605634
},
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+
},
606641
{
607642
"path_to_root": "samples-cosmosdb-java-v4-web-app",
608643
"url": "https://github.com/Azure-Samples/azure-cosmos-java-sql-api-todo-app",
@@ -813,12 +848,24 @@
813848
"branch": "master",
814849
"branch_mapping": {}
815850
},
851+
{
852+
"path_to_root": "ms-identity-b2c-javascript-spa",
853+
"url": "https://github.com/Azure-Samples/ms-identity-b2c-javascript-spa",
854+
"branch": "main",
855+
"branch_mapping": {}
856+
},
816857
{
817858
"path_to_root": "ms-identity-dotnetcore-b2c-account-management",
818859
"url": "https://github.com/Azure-Samples/ms-identity-dotnetcore-b2c-account-management",
819860
"branch": "master",
820861
"branch_mapping": {}
821862
},
863+
{
864+
"path_to_root": "ms-identity-javascript-v2",
865+
"url": "https://github.com/Azure-Samples/ms-identity-javascript-v2",
866+
"branch": "master",
867+
"branch_mapping": {}
868+
},
822869
{
823870
"path_to_root": "msdocs-python-flask-webapp-quickstart",
824871
"url": "https://github.com/Azure-Samples/msdocs-python-flask-webapp-quickstart",
@@ -837,6 +884,12 @@
837884
"branch": "main",
838885
"branch_mapping": {}
839886
},
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+
},
840893
{
841894
"path_to_root": "msdocs-django-postgresql-sample-app",
842895
"url": "https://github.com/Azure-Samples/msdocs-django-postgresql-sample-app",
@@ -866,18 +919,41 @@
866919
"url": "https://github.com/Azure-Samples/azure-sql-binding-func-dotnet-todo",
867920
"branch": "docs-snippets",
868921
"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": "main",
951+
"branch_mapping": {}
869952
}
870-
871953
],
872954
"branch_target_mapping": {
873-
"live": [
874-
"Publish",
875-
"PDF"
876-
],
877-
"main": [
878-
"Publish",
879-
"PDF"
880-
]
955+
"live": ["Publish", "PDF"],
956+
"main": ["Publish", "PDF"]
881957
},
882958
"need_generate_pdf_url_template": true,
883959
"targets": {
@@ -890,22 +966,25 @@
890966
},
891967
"redirection_files": [
892968
".openpublishing.redirection.json",
969+
".openpublishing.redirection.azure-arc-data.json",
893970
".openpublishing.redirection.active-directory.json",
971+
".openpublishing.redirection.azure-attestation.json",
894972
".openpublishing.redirection.azure-blob.json",
895-
".openpublishing.redirection.azure-sql.json",
896973
"articles/data-factory/.openpublishing.redirection.data-factory.json",
897974
".openpublishing.redirection.defender-for-cloud.json",
898975
".openpublishing.redirection.defender-for-iot.json",
899976
".openpublishing.redirection.healthcare-apis.json",
900977
".openpublishing.redirection.iot-hub.json",
978+
".openpublishing.redirection.app-service.json",
901979
".openpublishing.redirection.key-vault.json",
902-
".openpublishing.redirection.security-benchmark.json",
903980
".openpublishing.redirection.sql-database.json",
981+
".openpublishing.redirection.security-benchmark.json",
904982
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
905983
".openpublishing.redirection.azure-web-pubsub.json",
906984
".openpublishing.redirection.azure-monitor.json",
907985
".openpublishing.redirection.azure-percept.json",
908986
".openpublishing.redirection.azure-productivity.json",
987+
".openpublishing.redirection.azure-australia.json",
909988
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
910989
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
911990
"articles/azure-relay/.openpublishing.redirection.relay.json",
@@ -937,6 +1016,9 @@
9371016
"articles/mysql/.openpublishing.redirection.mysql.json",
9381017
"articles/container-apps/.openpublishing.redirection.container-apps.json",
9391018
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
940-
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json"
1019+
"articles/load-testing/.openpublishing.redirection.azure-load-testing.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"
9411023
]
9421024
}

.openpublishing.redirection.active-directory.json

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/active-directory/manage-apps/my-apps-deployment-plan.md",
5+
"redirect_url": "/azure/active-directory/manage-apps/myapps-overview",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/active-directory/authentication/cloud-native-certificate-based-authentication-faq.yml",
510
"redirect_url": "/azure/active-directory/authentication/certificate-based-authentication-faq",
@@ -20,6 +25,16 @@
2025
"redirect_url": "/azure/active-directory/authentication/concept-certificate-based-authentication",
2126
"redirect_document_id": false
2227
},
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+
},
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+
},
2338
{
2439
"source_path_from_root": "/articles/active-directory/manage-apps/common-scenarios.md",
2540
"redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
@@ -345,6 +360,11 @@
345360
"redirect_url": "/azure/active-directory/saas-apps/mimecast-personal-portal-tutorial",
346361
"redirect_document_id": false
347362
},
363+
{
364+
"source_path_from_root": "/articles/active-directory/saas-apps/carlsonwagonlit-tutorial.md",
365+
"redirect_url": "/azure/active-directory/saas-apps/cwt-tutorial",
366+
"redirect_document_id": false
367+
},
348368
{
349369
"source_path_from_root": "/articles/active-directory/active-directory-saas-fax.plus-tutorial.md",
350370
"redirect_url": "/articles/active-directory/saas-apps/fax-plus-tutorial",
@@ -2775,6 +2795,7 @@
27752795
"redirect_url": "/azure/active-directory/develop/howto-authenticate-service-principal-powershell",
27762796
"redirect_document_id": false
27772797
},
2798+
27782799
{
27792800
"source_path_from_root": "/articles/active-directory/develop/active-directory-devhowto-multi-tenant-overview.md",
27802801
"redirect_url": "/azure/active-directory/develop/howto-convert-app-to-be-multi-tenant",
@@ -4500,6 +4521,11 @@
45004521
"redirect_url": "azure/active-directory/hybrid/what-is-inter-directory-provisioning",
45014522
"redirect_document_id": false
45024523
},
4524+
{
4525+
"source_path_from_root": "/articles/active-directory/hybrid/how-to-connect-group-writeback.md",
4526+
"redirect_url": "/azure/active-directory/hybrid/how-to-connect-group-writeback-v2",
4527+
"redirect_document_id": false
4528+
},
45034529
{
45044530
"source_path_from_root": "/articles/active-directory/cloud-provisioning/tutorial-single-forest.md",
45054531
"redirect_url": "/azure/active-directory/cloud-sync/tutorial-single-forest",
@@ -8772,13 +8798,13 @@
87728798
},
87738799
{
87748800
"source_path_from_root": "/articles/active-directory/active-directory-saas-linkedinlearning-provisioning-tutorial.md",
8775-
"redirect_url": "/azure/active-directory/saas-apps/linkedinlearning-provisioning-tutorial",
8801+
"redirect_url": "/azure/active-directory/saas-apps/linkedin-learning-provisioning-tutorial",
87768802
"redirect_document_id": false
87778803
},
87788804
{
87798805
"source_path_from_root": "/articles/active-directory/active-directory-saas-linkedin-learning-provisioning-tutorial.md",
8780-
"redirect_url": "/azure/active-directory/saas-apps/linkedin-learning-provisioning-tutorial",
8781-
"redirect_document_id": true
8806+
"redirect_url": "/azure",
8807+
"redirect_document_id": false
87828808
},
87838809
{
87848810
"source_path_from_root": "/articles/active-directory/active-directory-saas-linkedinlearning-tutorial.md",
@@ -10780,10 +10806,25 @@
1078010806
"redirect_url": "/azure/active-directory/manage-apps/add-application-portal",
1078110807
"redirect_document_id": false
1078210808
},
10809+
{
10810+
"source_path": "articles/active-directory/saas-apps/iprova-provisioning-tutorial.md",
10811+
"redirect_url": "/azure/active-directory/saas-apps/zenya-provisioning-tutorial",
10812+
"redirect_document_id": false
10813+
},
10814+
{
10815+
"source_path": "articles/active-directory/saas-apps/iprova-tutorial.md",
10816+
"redirect_url": "/azure/active-directory/saas-apps/zenya-tutorial",
10817+
"redirect_document_id": false
10818+
},
1078310819
{
1078410820
"source_path": "articles/active-directory/manage-apps/manage-certificates-for-federated-single-sign-on.md",
1078510821
"redirect_url": "/azure/active-directory/manage-apps/tutorial-manage-certificates-for-federated-single-sign-on",
1078610822
"redirect_document_id": false
10823+
},
10824+
{
10825+
"source_path": "articles/active-directory/manage-apps/howto-enforce-signed-saml-authentication.md",
10826+
"redirect_url": "/azure/active-directory/manage-apps/howto-saml-token-encryption",
10827+
"redirect_document_id": true
1078710828
}
1078810829

1078910830
]
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)