Skip to content

Commit a0c2a86

Browse files
Merge branch 'main' into vpn_client_2
2 parents d1e0816 + 36298c2 commit a0c2a86

File tree

13,281 files changed

+204622
-233675
lines changed

Some content is hidden

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

13,281 files changed

+204622
-233675
lines changed

.openpublishing.publish.config.json

Lines changed: 50 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
],
3535
"branches_to_filter": [],
3636
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/azure-docs",
37-
"git_repository_branch_open_to_public_contributors": "master",
37+
"git_repository_branch_open_to_public_contributors": "main",
3838
"skip_source_output_uploading": false,
3939
"need_preview_pull_request": true,
4040
"contribution_branch_mappings": {},
@@ -75,6 +75,12 @@
7575
"branch": "master",
7676
"branch_mapping": {}
7777
},
78+
{
79+
"path_to_root": "azure_storage-snippets",
80+
"url": "https://github.com/Azure-Samples/AzureStorageSnippets",
81+
"branch": "master",
82+
"branch_mapping": {}
83+
},
7884
{
7985
"path_to_root": "azure_cli_scripts",
8086
"url": "https://github.com/Azure-Samples/azure-cli-samples",
@@ -375,6 +381,12 @@
375381
"branch": "main",
376382
"branch_mapping": {}
377383
},
384+
{
385+
"path_to_root": "media-services-v3-python",
386+
"url": "https://github.com/Azure-Samples/media-services-v3-python",
387+
"branch": "main",
388+
"branch_mapping": {}
389+
},
378390
{
379391
"path_to_root": "samples-javascript",
380392
"url": "https://github.com/Microsoft/tsiclient",
@@ -405,12 +417,6 @@
405417
"branch": "main",
406418
"branch_mapping": {}
407419
},
408-
{
409-
"path_to_root": "media-services-v3-python",
410-
"url": "https://github.com/Azure-Samples/media-services-v3-python",
411-
"branch": "main",
412-
"branch_mapping": {}
413-
},
414420
{
415421
"path_to_root": "remote-monitoring-webui",
416422
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
@@ -522,7 +528,7 @@
522528
{
523529
"path_to_root": "azure-sdk-for-go-samples",
524530
"url": "https://github.com/Azure-Samples/azure-sdk-for-go-samples",
525-
"branch": "master",
531+
"branch": "main",
526532
"branch_mapping": {}
527533
},
528534
{
@@ -801,6 +807,12 @@
801807
"branch": "master",
802808
"branch_mapping": {}
803809
},
810+
{
811+
"path_to_root": "ms-identity-dotnetcore-b2c-account-management",
812+
"url": "https://github.com/Azure-Samples/ms-identity-dotnetcore-b2c-account-management",
813+
"branch": "master",
814+
"branch_mapping": {}
815+
},
804816
{
805817
"path_to_root": "msdocs-python-flask-webapp-quickstart",
806818
"url": "https://github.com/Azure-Samples/msdocs-python-flask-webapp-quickstart",
@@ -818,6 +830,30 @@
818830
"url": "https://github.com/Azure-Samples/msdocs-nodejs-mongodb-azure-sample-app",
819831
"branch": "main",
820832
"branch_mapping": {}
833+
},
834+
{
835+
"path_to_root": "msdocs-django-postgresql-sample-app",
836+
"url": "https://github.com/Azure-Samples/msdocs-django-postgresql-sample-app",
837+
"branch": "main",
838+
"branch_mapping": {}
839+
},
840+
{
841+
"path_to_root": "msdocs-flask-postgresql-sample-app",
842+
"url": "https://github.com/Azure-Samples/msdocs-flask-postgresql-sample-app",
843+
"branch": "main",
844+
"branch_mapping": {}
845+
},
846+
{
847+
"path_to_root": "azuresignalr-samples",
848+
"url": "https://github.com/aspnet/AzureSignalR-samples",
849+
"branch": "main",
850+
"branch_mapping": {}
851+
},
852+
{
853+
"path_to_root": "azure-webpubsub",
854+
"url": "https://github.com/Azure/azure-webpubsub",
855+
"branch": "main",
856+
"branch_mapping": {}
821857
}
822858
],
823859
"branch_target_mapping": {
@@ -881,9 +917,13 @@
881917
"articles/purview/.openpublishing.redirection.purview.json",
882918
"articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
883919
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
920+
"articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
884921
"articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
885922
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
886923
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
887-
"articles/mysql/.openpublishing.redirection.mysql.json"
924+
"articles/mysql/.openpublishing.redirection.mysql.json",
925+
"articles/container-apps/.openpublishing.redirection.container-apps.json",
926+
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
927+
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json"
888928
]
889-
}
929+
}

.openpublishing.redirection.active-directory.json

Lines changed: 10788 additions & 10760 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.azure-monitor.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,27 @@
1919
"source_path_from_root": "/articles/azure-monitor/insights/service-bus-insights.md",
2020
"redirect_url": "/azure/service-bus-messaging/service-bus-insights",
2121
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/azure-monitor/agents/data-collection-rule-overview.md",
25+
"redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-overview",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/azure-monitor/app/change-analysis.md",
30+
"redirect_url": "/azure/azure-monitor/change/change-analysis",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path_from_root": "/articles/azure-monitor/app/change-analysis-visualizations.md",
35+
"redirect_url": "/azure/azure-monitor/change/change-analysis-visualizations",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/azure-monitor/app/change-analysis-troubleshoot.md",
40+
"redirect_url": "/azure/azure-monitor/change/change-analysis-troubleshoot",
41+
"redirect_document_id": false
2242
}
43+
2344
]
2445
}

.openpublishing.redirection.azure-sql.json

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,13 +175,33 @@
175175
"redirect_url": "/sql/machine-learning/tutorials/r-predictive-model-train?context=/azure/azure-sql/managed-instance/context/ml-context&view=azuresqldb-mi-current",
176176
"redirect_document_id": false
177177
},
178+
{
179+
"source_path_from_root": "/articles/azure-sql/database/auto-failover-group-overview.md",
180+
"redirect_url": "/azure/azure-sql/database/auto-failover-group-sql-db",
181+
"redirect_document_id": true
182+
},
183+
{
184+
"source_path_from_root": "/articles/azure-sql/database/auto-failover-group-configure.md",
185+
"redirect_url": "/azure/azure-sql/database/auto-failover-group-configure-sql-db",
186+
"redirect_document_id": true
187+
},
178188
{
179189
"source_path_from_root": "/articles/azure-sql/database/job-automation-managed-instances.md",
180190
"redirect_url": "/azure/azure-sql/managed-instance/job-automation-managed-instance",
181191
"redirect_document_id": true
182192
},
183193
{
184-
"source_path": "articles/azure-sql/database/service-tiers-general-purpose-business-critical.md",
194+
"source_path_from_root": "/articles/azure-sql/managed-instance/link-feature.md",
195+
"redirect_url": "/azure/azure-sql/managed-instance/managed-instance-link-feature-overview",
196+
"redirect_document_id": true
197+
},
198+
{
199+
"source_path_from_root": "/articles/azure-sql/managed-instance/link-feature-best-practices.md",
200+
"redirect_url": "/azure/azure-sql/managed-instance/managed-instance-link-best-practices",
201+
"redirect_document_id": true
202+
},
203+
{
204+
"source_path_from_root": "/articles/azure-sql/database/service-tiers-general-purpose-business-critical.md",
185205
"redirect_url": "/azure/azure-sql/database/service-tiers-vcore",
186206
"redirect_document_id": false
187207
}

.openpublishing.redirection.defender-for-cloud.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@
6060
"redirect_url": "/azure/defender-for-cloud/os-coverage",
6161
"redirect_document_id": false
6262
},
63+
{
64+
"source_path_from_root": "/articles/defender-for-cloud/supported-machines-endpoint-solutions-clouds.md",
65+
"redirect_url": "/azure/defender-for-cloud/supported-machines-endpoint-solutions-clouds-containers",
66+
"redirect_document_id": false
67+
},
6368
{
6469
"source_path_from_root": "/articles/security-center/security-center-just-in-time.md",
6570
"redirect_url": "/azure/defender-for-cloud/just-in-time-access-usage",
@@ -632,7 +637,7 @@
632637
},
633638
{
634639
"source_path_from_root": "/articles/security-center/supported-machines-endpoint-solutions-clouds.md",
635-
"redirect_url": "/azure/defender-for-cloud/supported-machines-endpoint-solutions-clouds",
640+
"redirect_url": "/azure/defender-for-cloud/supported-machines-endpoint-solutions-clouds-containers",
636641
"redirect_document_id": true
637642
},
638643
{

.openpublishing.redirection.defender-for-iot.json

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
{
22
"redirections": [
3-
{
4-
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-configure-with-sentinel.md",
5-
"redirect_url": "/azure/sentinel/iot-solution",
6-
"redirect_document_id": false
7-
},
83
{
94
"source_path_from_root": "/articles/defender-for-iot/device-builders/quickstart-building-the-defender-micro-agent-from-source.md",
105
"redirect_url": "/azure/defender-for-iot/device-builders/overview",
@@ -30,7 +25,17 @@
3025
"redirect_url": "/azure/defender-for-iot/organizations/getting-started",
3126
"redirect_document_id": false
3227
},
33-
{
28+
{
29+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-view-information-provided-in-alerts.md",
30+
"redirect_url": "/azure/defender-for-iot/organizations/how-to-view-alerts",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-work-with-alerts-on-your-sensor.md",
35+
"redirect_url": "/azure/defender-for-iot/organizations/concept-key-concepts#analytics-and-self-learning-engines",
36+
"redirect_document_id": false
37+
},
38+
{
3439
"source_path_from_root": "/azure/defender-for-iot/organizations/quickstart-system-prerequisites.md",
3540
"redirect_url": "/azure/defender-for-iot/organizations/getting-started",
3641
"redirect_document_id": false
@@ -230,11 +235,6 @@
230235
"redirect_url": "/azure/defender-for-iot/organizations/how-to-track-sensor-activity",
231236
"redirect_document_id": false
232237
},
233-
{
234-
"source_path_from_root": "/articles/defender-for-iot/how-to-configure-with-sentinel.md",
235-
"redirect_url": "/azure/defender-for-iot/organizations/how-to-configure-with-sentinel",
236-
"redirect_document_id": false
237-
},
238238
{
239239
"source_path_from_root": "/articles/defender-for-iot/how-to-troubleshoot-the-sensor-and-on-premises-management-console.md",
240240
"redirect_url": "/azure/defender-for-iot/organizations/how-to-troubleshoot-the-sensor-and-on-premises-management-console",
@@ -564,6 +564,29 @@
564564
"source_path_from_root": "/articles/defender-for-iot/organizations/references-horizon-sdk.md",
565565
"redirect_url": "/azure/defender-for-iot/organizations",
566566
"redirect_document_id": false
567+
},
568+
{
569+
"source_path_from_root": "/articles/device-builders/how-to-configure-with-sentinel.md",
570+
"redirect_url": "/azure/sentinel/iot-solution?toc=%2Fazure%2Fdefender-for-iot%2Forganizations%2Ftoc.json&bc=%2Fazure%2Fdefender-for-iot%2Fbreadcrumb%2Ftoc.json&tabs=use-out-of-the-box-analytics-rules-recommended",
571+
"redirect_document_id": false
572+
},
573+
{
574+
"source_path_from_root": "/articles/defender-for-iot/organizations/how-to-configure-with-sentinel.md",
575+
"redirect_url": "/azure/sentinel/iot-solution?toc=%2Fazure%2Fdefender-for-iot%2Forganizations%2Ftoc.json&bc=%2Fazure%2Fdefender-for-iot%2Fbreadcrumb%2Ftoc.json&tabs=use-out-of-the-box-analytics-rules-recommended",
576+
"redirect_document_id": false
577+
},
578+
{
579+
"source_path_from_root": "/articles/defender-for-iot/how-to-configure-with-sentinel.md",
580+
"redirect_url": "/azure/sentinel/iot-solution?toc=%2Fazure%2Fdefender-for-iot%2Forganizations%2Ftoc.json&bc=%2Fazure%2Fdefender-for-iot%2Fbreadcrumb%2Ftoc.json&tabs=use-out-of-the-box-analytics-rules-recommended",
581+
"redirect_document_id": false
582+
},
583+
{
584+
"source_path_from_root": "/articles/defender-for-iot/device-builders/concept-security-agent-authentication.md",
585+
"redirect_url": "/azure/defender-for-iot/device-builders/tutorial-standalone-agent-binary-installation",
586+
"redirect_document_id": false
567587
}
568588
]
569-
}
589+
}
590+
591+
592+

.openpublishing.redirection.iot-hub.json

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1008,7 +1008,16 @@
10081008
"source_path_from_root": "/articles/iot-hub/tutorial-firmware-update.md",
10091009
"redirect_url": "/azure/iot-hub-device-update/device-update-raspberry-pi",
10101010
"redirect_document_id": false
1011+
},
1012+
{
1013+
"source_path_from_root": "/articles/iot-hub/iot-hub-device-management-visual-studio.md",
1014+
"redirect_url": "/azure/iot-hub/iot-hub-device-management-iot-toolkit",
1015+
"redirect_document_id": false
1016+
},
1017+
{
1018+
"source_path_from_root": "/articles/iot-hub/iot-hub-visual-studio-cloud-device-messaging.md",
1019+
"redirect_url": "/azure/iot-hub/iot-hub-vscode-iot-toolkit-cloud-device-messaging",
1020+
"redirect_document_id": false
10111021
}
1012-
10131022
]
10141023
}

0 commit comments

Comments
 (0)