Skip to content

Commit 2d6c640

Browse files
authored
Merge branch 'main' into TTS_Voice_Container
2 parents a3acada + 32183a2 commit 2d6c640

File tree

5,067 files changed

+61369
-72963
lines changed

Some content is hidden

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

5,067 files changed

+61369
-72963
lines changed

.openpublishing.publish.config.json

Lines changed: 24 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": {},
@@ -381,6 +381,12 @@
381381
"branch": "main",
382382
"branch_mapping": {}
383383
},
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+
},
384390
{
385391
"path_to_root": "samples-javascript",
386392
"url": "https://github.com/Microsoft/tsiclient",
@@ -411,12 +417,6 @@
411417
"branch": "main",
412418
"branch_mapping": {}
413419
},
414-
{
415-
"path_to_root": "media-services-v3-python",
416-
"url": "https://github.com/Azure-Samples/media-services-v3-python",
417-
"branch": "main",
418-
"branch_mapping": {}
419-
},
420420
{
421421
"path_to_root": "remote-monitoring-webui",
422422
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
@@ -528,7 +528,7 @@
528528
{
529529
"path_to_root": "azure-sdk-for-go-samples",
530530
"url": "https://github.com/Azure-Samples/azure-sdk-for-go-samples",
531-
"branch": "master",
531+
"branch": "main",
532532
"branch_mapping": {}
533533
},
534534
{
@@ -830,6 +830,18 @@
830830
"url": "https://github.com/Azure-Samples/msdocs-nodejs-mongodb-azure-sample-app",
831831
"branch": "main",
832832
"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": {}
833845
}
834846
],
835847
"branch_target_mapping": {
@@ -893,11 +905,13 @@
893905
"articles/purview/.openpublishing.redirection.purview.json",
894906
"articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
895907
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
908+
"articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
896909
"articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
897910
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
898911
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
899912
"articles/mysql/.openpublishing.redirection.mysql.json",
900913
"articles/container-apps/.openpublishing.redirection.container-apps.json",
901-
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json"
914+
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
915+
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json"
902916
]
903-
}
917+
}

.openpublishing.redirection.active-directory.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3483,7 +3483,7 @@
34833483
{
34843484
"source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-enable.md",
34853485
"redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-enable",
3486-
"redirect_document_id": true
3486+
"redirect_document_id": false
34873487
},
34883488
{
34893489
"source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-faqs.md",
@@ -3498,7 +3498,7 @@
34983498
{
34993499
"source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-overview.md",
35003500
"redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-overview",
3501-
"redirect_document_id": true
3501+
"redirect_document_id": false
35023502
},
35033503
{
35043504
"source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-troubleshooting.md",
@@ -3510,6 +3510,11 @@
35103510
"redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-windows-settings-reference",
35113511
"redirect_document_id": true
35123512
},
3513+
{
3514+
"source_path_from_root": "/articles/active-directory/devices/enterprise-state-roaming-overview.md",
3515+
"redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-enable",
3516+
"redirect_document_id": true
3517+
},
35133518
{
35143519
"source_path_from_root": "/articles/active-directory/device-management-faq.md",
35153520
"redirect_url": "/azure/active-directory/devices/faq",

.openpublishing.redirection.azure-monitor.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,22 @@
2424
"source_path_from_root": "/articles/azure-monitor/agents/data-collection-rule-overview.md",
2525
"redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-overview",
2626
"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
2742
}
43+
2844
]
2945
}

.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
{

0 commit comments

Comments
 (0)