Skip to content

Commit 79d954d

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents 10b6c89 + 04844b5 commit 79d954d

File tree

12,946 files changed

+269396
-145074
lines changed

Some content is hidden

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

12,946 files changed

+269396
-145074
lines changed

.openpublishing.publish.config.json

Lines changed: 54 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",
@@ -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",
@@ -435,9 +459,15 @@
435459
"branch_mapping": {}
436460
},
437461
{
438-
"path_to_root": "azureml-examples-march-cli-preview",
462+
"path_to_root": "azureml-examples-sdk-preview",
463+
"url": "https://github.com/azure/azureml-examples",
464+
"branch": "sdk-preview",
465+
"branch_mapping": {}
466+
},
467+
{
468+
"path_to_root": "azureml-examples-online-endpoint-vnet",
439469
"url": "https://github.com/azure/azureml-examples",
440-
"branch": "march-cli-preview",
470+
"branch": "rsethur/mvnet",
441471
"branch_mapping": {}
442472
},
443473
{
@@ -871,8 +901,25 @@
871901
"url": "https://github.com/Azure-Samples/azure-sql-binding-func-dotnet-todo",
872902
"branch": "docs-snippets",
873903
"branch_mapping": {}
904+
},
905+
{
906+
"path_to_root": "ms-identity-node",
907+
"url": "https://github.com/Azure-Samples/ms-identity-node",
908+
"branch": "main",
909+
"branch_mapping": {}
910+
},
911+
{
912+
"path_to_root": "ms-identity-javascript-nodejs-desktop",
913+
"url": "https://github.com/Azure-Samples/ms-identity-javascript-nodejs-desktop",
914+
"branch": "main",
915+
"branch_mapping": {}
916+
},
917+
{
918+
"path_to_root": "azure-cosmos-dotnet-v3",
919+
"url": "https://github.com/Azure-Samples/cosmos-db-sql-api-dotnet-samples",
920+
"branch": "v3",
921+
"branch_mapping": {}
874922
}
875-
876923
],
877924
"branch_target_mapping": {
878925
"live": ["Publish", "PDF"],
@@ -897,12 +944,14 @@
897944
".openpublishing.redirection.healthcare-apis.json",
898945
".openpublishing.redirection.iot-hub.json",
899946
".openpublishing.redirection.key-vault.json",
947+
".openpublishing.redirection.sql-database.json",
900948
".openpublishing.redirection.security-benchmark.json",
901949
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
902950
".openpublishing.redirection.azure-web-pubsub.json",
903951
".openpublishing.redirection.azure-monitor.json",
904952
".openpublishing.redirection.azure-percept.json",
905953
".openpublishing.redirection.azure-productivity.json",
954+
".openpublishing.redirection.azure-australia.json",
906955
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
907956
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
908957
"articles/azure-relay/.openpublishing.redirection.relay.json",
@@ -935,6 +984,7 @@
935984
"articles/container-apps/.openpublishing.redirection.container-apps.json",
936985
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
937986
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
938-
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json"
987+
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
988+
"articles/machine-learning/.openpublishing.redirection.machine-learning.json"
939989
]
940990
}

.openpublishing.redirection.active-directory.json

Lines changed: 10 additions & 0 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",
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/azure-australia/australia-overview.md",
5+
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/azure-australia/azure-key-vault.md",
10+
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/azure-australia/azure-policy.md",
15+
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/azure-australia/gateway-egress-traffic.md",
20+
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/azure-australia/gateway-ingress-traffic.md",
25+
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/azure-australia/gateway-log-audit-visibility.md",
30+
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path_from_root": "/articles/azure-australia/gateway-secure-remote-administration.md",
35+
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/azure-australia/identity-federation.md",
40+
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path_from_root": "/articles/azure-australia/index.yml",
45+
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path_from_root": "/articles/azure-australia/recovery-backup.md",
50+
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/azure-australia/reference-library.md",
55+
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path_from_root": "/articles/azure-australia/role-privileged.md",
60+
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path_from_root": "/articles/azure-australia/secure-your-data.md",
65+
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path_from_root": "/articles/azure-australia/security-explained.md",
70+
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path_from_root": "/articles/azure-australia/system-monitor.md",
75+
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path_from_root": "/articles/azure-australia/vpn-gateway.md",
80+
"redirect_url": "https://azure.microsoft.com/en-us/global-infrastructure/geographies/",
81+
"redirect_document_id": false
82+
}
83+
]
84+
}

0 commit comments

Comments
 (0)