Skip to content

Commit 7d54816

Browse files
authored
Merge branch 'main' into patch-19
2 parents 5f951d4 + 07b8139 commit 7d54816

File tree

19,092 files changed

+355867
-304476
lines changed

Some content is hidden

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

19,092 files changed

+355867
-304476
lines changed

.openpublishing.publish.config.json

Lines changed: 76 additions & 6 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",
@@ -74,6 +86,12 @@
7486
"branch": "master",
7587
"branch_mapping": {}
7688
},
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+
},
7795
{
7896
"path_to_root": "azure_cli_scripts",
7997
"url": "https://github.com/Azure-Samples/azure-cli-samples",
@@ -242,6 +260,12 @@
242260
"branch": "main",
243261
"branch_mapping": {}
244262
},
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+
},
245269
{
246270
"path_to_root": "azure-functions-python-worker-extension",
247271
"url": "https://github.com/Azure-Samples/python-worker-extension-timer",
@@ -410,6 +434,12 @@
410434
"branch": "main",
411435
"branch_mapping": {}
412436
},
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+
},
413443
{
414444
"path_to_root": "remote-monitoring-webui",
415445
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
@@ -435,9 +465,15 @@
435465
"branch_mapping": {}
436466
},
437467
{
438-
"path_to_root": "azureml-examples-march-cli-preview",
468+
"path_to_root": "azureml-examples-sdk-preview",
439469
"url": "https://github.com/azure/azureml-examples",
440-
"branch": "march-cli-preview",
470+
"branch": "sdk-preview",
471+
"branch_mapping": {}
472+
},
473+
{
474+
"path_to_root": "azureml-examples-online-endpoint-vnet",
475+
"url": "https://github.com/azure/azureml-examples",
476+
"branch": "main",
441477
"branch_mapping": {}
442478
},
443479
{
@@ -596,6 +632,12 @@
596632
"branch": "master",
597633
"branch_mapping": {}
598634
},
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+
},
599641
{
600642
"path_to_root": "samples-cosmosdb-java-v4-web-app",
601643
"url": "https://github.com/Azure-Samples/azure-cosmos-java-sql-api-todo-app",
@@ -806,6 +848,12 @@
806848
"branch": "master",
807849
"branch_mapping": {}
808850
},
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+
},
809857
{
810858
"path_to_root": "ms-identity-dotnetcore-b2c-account-management",
811859
"url": "https://github.com/Azure-Samples/ms-identity-dotnetcore-b2c-account-management",
@@ -865,8 +913,25 @@
865913
"url": "https://github.com/Azure-Samples/azure-sql-binding-func-dotnet-todo",
866914
"branch": "docs-snippets",
867915
"branch_mapping": {}
916+
},
917+
{
918+
"path_to_root": "ms-identity-node",
919+
"url": "https://github.com/Azure-Samples/ms-identity-node",
920+
"branch": "main",
921+
"branch_mapping": {}
922+
},
923+
{
924+
"path_to_root": "ms-identity-javascript-nodejs-desktop",
925+
"url": "https://github.com/Azure-Samples/ms-identity-javascript-nodejs-desktop",
926+
"branch": "main",
927+
"branch_mapping": {}
928+
},
929+
{
930+
"path_to_root": "azure-cosmos-dotnet-v3",
931+
"url": "https://github.com/Azure-Samples/cosmos-db-sql-api-dotnet-samples",
932+
"branch": "v3",
933+
"branch_mapping": {}
868934
}
869-
870935
],
871936
"branch_target_mapping": {
872937
"live": ["Publish", "PDF"],
@@ -883,22 +948,24 @@
883948
},
884949
"redirection_files": [
885950
".openpublishing.redirection.json",
951+
".openpublishing.redirection.azure-arc-data.json",
886952
".openpublishing.redirection.active-directory.json",
887953
".openpublishing.redirection.azure-blob.json",
888-
".openpublishing.redirection.azure-sql.json",
889954
"articles/data-factory/.openpublishing.redirection.data-factory.json",
890955
".openpublishing.redirection.defender-for-cloud.json",
891956
".openpublishing.redirection.defender-for-iot.json",
892957
".openpublishing.redirection.healthcare-apis.json",
893958
".openpublishing.redirection.iot-hub.json",
959+
".openpublishing.redirection.app-service.json",
894960
".openpublishing.redirection.key-vault.json",
895-
".openpublishing.redirection.security-benchmark.json",
896961
".openpublishing.redirection.sql-database.json",
962+
".openpublishing.redirection.security-benchmark.json",
897963
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
898964
".openpublishing.redirection.azure-web-pubsub.json",
899965
".openpublishing.redirection.azure-monitor.json",
900966
".openpublishing.redirection.azure-percept.json",
901967
".openpublishing.redirection.azure-productivity.json",
968+
".openpublishing.redirection.azure-australia.json",
902969
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
903970
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
904971
"articles/azure-relay/.openpublishing.redirection.relay.json",
@@ -930,6 +997,9 @@
930997
"articles/mysql/.openpublishing.redirection.mysql.json",
931998
"articles/container-apps/.openpublishing.redirection.container-apps.json",
932999
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
933-
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json"
1000+
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
1001+
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
1002+
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
1003+
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json"
9341004
]
9351005
}

.openpublishing.redirection.active-directory.json

Lines changed: 17 additions & 7 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,11 @@
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+
},
2333
{
2434
"source_path_from_root": "/articles/active-directory/manage-apps/common-scenarios.md",
2535
"redirect_url": "/azure/active-directory/manage-apps/what-is-application-management",
@@ -345,6 +355,11 @@
345355
"redirect_url": "/azure/active-directory/saas-apps/mimecast-personal-portal-tutorial",
346356
"redirect_document_id": false
347357
},
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+
},
348363
{
349364
"source_path_from_root": "/articles/active-directory/active-directory-saas-fax.plus-tutorial.md",
350365
"redirect_url": "/articles/active-directory/saas-apps/fax-plus-tutorial",
@@ -8777,8 +8792,8 @@
87778792
},
87788793
{
87798794
"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
8795+
"redirect_url": "/azure",
8796+
"redirect_document_id": false
87828797
},
87838798
{
87848799
"source_path_from_root": "/articles/active-directory/active-directory-saas-linkedinlearning-tutorial.md",
@@ -10700,11 +10715,6 @@
1070010715
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-create-azure-ad-roles-and-resource-roles-review",
1070110716
"redirect_document_id": false
1070210717
},
10703-
{
10704-
"source_path_from_root": "/articles/active-directory-b2c/partner-azure-web-application-firewall.md",
10705-
"redirect_url": "/azure/active-directory-b2c/partner-gallery",
10706-
"redirect_document_id": false
10707-
},
1070810718
{
1070910719
"source_path_from_root": "/articles/active-directory-b2c/troubleshoot-custom-policies.md",
1071010720
"redirect_url": "/azure/active-directory-b2c/troubleshoot",
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)