Skip to content

Commit 77e415a

Browse files
jamesongithubjamesongithub
committed
Merge remote-tracking branch 'upstream/main' into jy/ahbsles
2 parents 4188e67 + 0317b7e commit 77e415a

File tree

9,058 files changed

+110267
-166103
lines changed

Some content is hidden

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

9,058 files changed

+110267
-166103
lines changed

‎.openpublishing.publish.config.json

Lines changed: 30 additions & 25 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,12 +23,8 @@
2623
"version": 0
2724
}
2825
],
29-
"notification_subscribers": [
30-
"[email protected]"
31-
],
32-
"sync_notification_subscribers": [
33-
"[email protected]"
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",
@@ -801,24 +794,36 @@
801794
"branch": "main",
802795
"branch_mapping": {}
803796
},
804-
{
797+
{
805798
"path_to_root": "active-directory-b2c-msal-node-sign-in-sign-out-webapp",
806799
"url": "https://github.com/Azure-Samples/active-directory-b2c-msal-node-sign-in-sign-out-webapp",
807800
"branch": "main",
808801
"branch_mapping": {}
809802
},
810-
{
803+
{
811804
"path_to_root": "active-directory-b2c-javascript-nodejs-webapi",
812805
"url": "https://github.com/Azure-Samples/active-directory-b2c-javascript-nodejs-webapi",
813806
"branch": "master",
814807
"branch_mapping": {}
815808
},
816-
{
809+
{
810+
"path_to_root": "ms-identity-b2c-javascript-spa",
811+
"url": "https://github.com/Azure-Samples/ms-identity-b2c-javascript-spa",
812+
"branch": "main",
813+
"branch_mapping": {}
814+
},
815+
{
817816
"path_to_root": "ms-identity-dotnetcore-b2c-account-management",
818817
"url": "https://github.com/Azure-Samples/ms-identity-dotnetcore-b2c-account-management",
819818
"branch": "master",
820819
"branch_mapping": {}
821820
},
821+
{
822+
"path_to_root": "ms-identity-javascript-v2",
823+
"url": "https://github.com/Azure-Samples/ms-identity-javascript-v2",
824+
"branch": "master",
825+
"branch_mapping": {}
826+
},
822827
{
823828
"path_to_root": "msdocs-python-flask-webapp-quickstart",
824829
"url": "https://github.com/Azure-Samples/msdocs-python-flask-webapp-quickstart",
@@ -860,18 +865,18 @@
860865
"url": "https://github.com/Azure/azure-webpubsub",
861866
"branch": "main",
862867
"branch_mapping": {}
868+
},
869+
{
870+
"path_to_root": "functions-sql-todo-sample",
871+
"url": "https://github.com/Azure-Samples/azure-sql-binding-func-dotnet-todo",
872+
"branch": "docs-snippets",
873+
"branch_mapping": {}
863874
}
864875

865876
],
866877
"branch_target_mapping": {
867-
"live": [
868-
"Publish",
869-
"PDF"
870-
],
871-
"main": [
872-
"Publish",
873-
"PDF"
874-
]
878+
"live": ["Publish", "PDF"],
879+
"main": ["Publish", "PDF"]
875880
},
876881
"need_generate_pdf_url_template": true,
877882
"targets": {
@@ -885,16 +890,15 @@
885890
"redirection_files": [
886891
".openpublishing.redirection.json",
887892
".openpublishing.redirection.active-directory.json",
888-
".openpublishing.redirection.azure-sql.json",
893+
".openpublishing.redirection.azure-blob.json",
889894
"articles/data-factory/.openpublishing.redirection.data-factory.json",
890895
".openpublishing.redirection.defender-for-cloud.json",
891896
".openpublishing.redirection.defender-for-iot.json",
892897
".openpublishing.redirection.healthcare-apis.json",
893898
".openpublishing.redirection.iot-hub.json",
894899
".openpublishing.redirection.key-vault.json",
895-
".openpublishing.redirection.media-services.json",
896-
".openpublishing.redirection.security-benchmark.json",
897900
".openpublishing.redirection.sql-database.json",
901+
".openpublishing.redirection.security-benchmark.json",
898902
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
899903
".openpublishing.redirection.azure-web-pubsub.json",
900904
".openpublishing.redirection.azure-monitor.json",
@@ -931,6 +935,7 @@
931935
"articles/mysql/.openpublishing.redirection.mysql.json",
932936
"articles/container-apps/.openpublishing.redirection.container-apps.json",
933937
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
934-
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json"
938+
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
939+
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json"
935940
]
936941
}

‎.openpublishing.redirection.active-directory.json

Lines changed: 5 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",

‎.openpublishing.redirection.azure-blob.json

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/storage/blobs/storage-upload-process-images.md",
5+
"redirect_url": "/azure/storage/blobs/blob-upload-function-trigger",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/storage/blobs/storage-secure-access-application.md",
10+
"redirect_url": "/azure/storage/blobs/blob-upload-function-trigger",
11+
"redirect_document_id": true
12+
},
13+
{
14+
"source_path_from_root": "/articles/storage/blobs/storage-monitor-troubleshoot-storage-application.md",
15+
"redirect_url": "/azure/storage/blobs/blob-upload-function-trigger",
16+
"redirect_document_id": false
17+
}
18+
]
19+
}

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
"redirect_url": "/azure/azure-monitor/app/overview-dashboard",
66
"redirect_document_id": false
77
},
8+
{
9+
"source_path_from_root": "/articles/azure-monitor/essentials/activity-logs-insights.md",
10+
"redirect_url": "/azure/azure-monitor/essentials/activity-log",
11+
"redirect_document_id": false
12+
},
813
{
914
"source_path_from_root": "/articles/application-insights/app-insights-performance-counters.md",
1015
"redirect_url": "/azure/azure-monitor/app/performance-counters",
1116
"redirect_document_id": true
1217
},
13-
{
14-
"source_path_from_root": "/articles/application-insights/cloudservices.md",
15-
"redirect_url": "/azure/azure-monitor/app/azure-web-apps-net",
16-
"redirect_document_id": false
17-
},
1818
{
1919
"source_path_from_root": "/articles/azure-monitor/insights/service-bus-insights.md",
2020
"redirect_url": "/azure/service-bus-messaging/service-bus-insights",
@@ -35,6 +35,16 @@
3535
"redirect_url": "/azure/azure-monitor/change/change-analysis-visualizations",
3636
"redirect_document_id": false
3737
},
38+
{
39+
"source_path_from_root": "/articles/azure-monitor/app/troubleshoot-portal-connectivity.md",
40+
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/troubleshoot-portal-connectivity",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path_from_root": "/articles/azure-monitor/app/auto-instrumentation-troubleshoot.md",
45+
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/auto-instrumentation-troubleshoot",
46+
"redirect_document_id": false
47+
},
3848
{
3949
"source_path_from_root": "/articles/azure-monitor/app/change-analysis-troubleshoot.md",
4050
"redirect_url": "/azure/azure-monitor/change/change-analysis-troubleshoot",
@@ -50,10 +60,25 @@
5060
"redirect_url": "/azure/azure-monitor/logs/cost-logs",
5161
"redirect_document_id": false
5262
},
63+
{
64+
"source_path_from_root": "/articles/azure-monitor/app/apm-tables.md",
65+
"redirect_url": "/azure/azure-monitor/app/convert-classic-resource#workspace-based-resource-changes",
66+
"redirect_document_id": false
67+
},
5368
{
5469
"source_path_from_root": "/articles/azure-monitor/logs/data-ingestion-from-file.md",
5570
"redirect_url": "/azure/azure-monitor/agents/data-sources-custom-logs",
5671
"redirect_document_id": false
72+
},
73+
{
74+
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-service-manager-script.md",
75+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections.md",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path_from_root": "/articles/azure-monitor/alerts/itsmc-connections-scsm.md" ,
80+
"redirect_url": "/azure/azure-monitor/alerts/itsmc-connections.md",
81+
"redirect_document_id": false
5782
}
5883
]
5984
}

‎.openpublishing.redirection.azure-productivity.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"redirections": [
33
{
44
"source_path_from_root": "/articles/lab-services/classroom-labs-overview.md",
5-
"redirect_url": "/azure/lab-services/get-started-manage-labs",
5+
"redirect_url": "/azure/lab-services/lab-services-overview",
66
"redirect_document_id": false
77
},
88
{

0 commit comments

Comments
 (0)