Skip to content

Commit 7e7e1af

Browse files
rthorn17rthorn17
authored
Merge branch 'MicrosoftDocs:main' into tagsPageUpdate
2 parents b57700d + 0f427e0 commit 7e7e1af

File tree

8,232 files changed

+127805
-100481
lines changed

Some content is hidden

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

8,232 files changed

+127805
-100481
lines changed

‎.openpublishing.publish.config.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,12 @@
254254
"branch": "main",
255255
"branch_mapping": {}
256256
},
257+
{
258+
"path_to_root": "function-flex-consumption",
259+
"url": "https://github.com/Azure-Samples/azure-functions-flex-consumption-samples",
260+
"branch": "main",
261+
"branch_mapping": {}
262+
},
257263
{
258264
"path_to_root": "functions-azure-product",
259265
"url": "https://github.com/Azure/Azure-Functions",
@@ -506,6 +512,12 @@
506512
"branch": "sdk-codetest",
507513
"branch_mapping": {}
508514
},
515+
{
516+
"path_to_root": "rag-data-openai-python-promptflow-main",
517+
"url": "https://github.com/Azure-Samples/rag-data-openai-python-promptflow",
518+
"branch": "main",
519+
"branch_mapping": {}
520+
},
509521
{
510522
"path_to_root": "azureml-examples-main",
511523
"url": "https://github.com/azure/azureml-examples",
@@ -986,6 +998,12 @@
986998
"branch": "main",
987999
"branch_mapping": {}
9881000
},
1001+
{
1002+
"path_to_root": "msdocs-app-service-sqldb-dotnetcore",
1003+
"url": "https://github.com/Azure-Samples/msdocs-app-service-sqldb-dotnetcore",
1004+
"branch": "main",
1005+
"branch_mapping": {}
1006+
},
9891007
{
9901008
"path_to_root": "azuresignalr-samples",
9911009
"url": "https://github.com/aspnet/AzureSignalR-samples",
@@ -1219,6 +1237,12 @@
12191237
"url": "https://github.com/MicrosoftDocs/SupportArticles-docs",
12201238
"branch": "main",
12211239
"branch_mapping": {}
1240+
},
1241+
{
1242+
"path_to_root": "msdocs-python-fastapi-webapp-quickstart",
1243+
"url": "https://github.com/Azure-Samples/msdocs-python-fastapi-webapp-quickstart",
1244+
"branch": "main",
1245+
"branch_mapping": {}
12221246
}
12231247
],
12241248
"branch_target_mapping": {

‎.openpublishing.redirection.app-service.json

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,12 @@
552552
},
553553
{
554554
"source_path_from_root": "/articles/app-service/containers/configure-language-java.md",
555-
"redirect_url": "/azure/app-service/configure-language-java?pivots=platform-linux",
555+
"redirect_url": "/azure/app-service/configure-language-java-deploy-run?pivots=platform-linux",
556+
"redirect_document_id": false
557+
},
558+
{
559+
"source_path_from_root": "/articles/app-service/configure-language-java.md",
560+
"redirect_url": "/azure/app-service/configure-language-java-deploy-run",
556561
"redirect_document_id": false
557562
},
558563
{
@@ -1850,6 +1855,16 @@
18501855
"redirect_url": "/azure/app-service/scripts/powershell-scale-manual",
18511856
"redirect_document_id": false
18521857
},
1858+
{
1859+
"source_path_from_root": "/articles/app-service/get-resource-events.md",
1860+
"redirect_url": "/azure/app-service/monitor-app-service",
1861+
"redirect_document_id": false
1862+
},
1863+
{
1864+
"source_path_from_root": "/articles/app-service/overview-monitoring.md",
1865+
"redirect_url": "/azure/app-service/monitor-app-service",
1866+
"redirect_document_id": false
1867+
},
18531868
{
18541869
"source_path_from_root": "/articles/app-service/app-service-security-attributes.md",
18551870
"redirect_url": "/azure/app-service/security-baseline",

‎.openpublishing.redirection.applied-ai-services.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,11 @@
249249
"source_path_from_root": "/articles/ai-services/content-safety/how-to/incident-response.md",
250250
"redirect_url": "/azure/ai-services/content-safety/how-to/custom-categories-rapid",
251251
"redirect_document_id": true
252+
},
253+
{
254+
"source_path_from_root": "/articles/ai-services/content-safety/concepts/custom-categories-rapid.md",
255+
"redirect_url": "/azure/ai-services/content-safety/concepts/custom-categories",
256+
"redirect_document_id": true
252257
}
253258
]
254259
}

‎.openpublishing.redirection.azure-app-configuration.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@
2424
"source_path_from_root": "/articles/azure-app-configuration/quickstart-azure-function-csharp.md",
2525
"redirect_url": "/azure/azure-app-configuration/quickstart-azure-functions-csharp",
2626
"redirect_document_id": false
27+
},
28+
{
29+
"source_path_from_root": "/articles/azure-app-configuration/concept-github-action.md",
30+
"redirect_url": "/azure/azure-app-configuration/push-kv-github-action.md",
31+
"redirect_document_id": false
2732
}
2833
]
2934
}

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 78 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@
1010
"redirect_url": "/azure/azure-monitor/vm/scom-managed-instance-overview",
1111
"redirect_document_id": false
1212
},
13+
{
14+
"source_path_from_root": "/articles/azure-monitor/scom-manage-instance/monitor-arc-enabled-vm-with-scom-managed-instance.md",
15+
"redirect_url": "/azure/azure-monitor/scom-manage-instance/monitor-azure-off-azure-vm-with-scom-managed-instance",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/azure-monitor/scom-manage-instance/common-questions.md",
20+
"redirect_url": "/azure/azure-monitor/scom-manage-instance/scom-managed-instance-faq",
21+
"redirect_document_id": false
22+
},
1323
{
1424
"source_path_from_root": "/articles/azure-monitor/vm/scom-managed-instance-overview.md",
1525
"redirect_url": "/azure/azure-monitor/scom-manage-instance/overview",
@@ -1200,21 +1210,11 @@
12001210
"redirect_url": "/azure/azure-monitor/app/overview-dashboard",
12011211
"redirect_document_id": false
12021212
},
1203-
{
1204-
"source_path_from_root": "/articles/azure-monitor/agents/azure-monitor-agent-overview.md",
1205-
"redirect_url": "/azure/azure-monitor/agents/agents-overview",
1206-
"redirect_document_id": false
1207-
},
12081213
{
12091214
"source_path_from_root": "/articles/azure-monitor/agents/use-azure-monitor-agent-troubleshooter.md",
12101215
"redirect_url": "/azure/azure-monitor/agents/troubleshooter-ama-windows",
12111216
"redirect_document_id": false
12121217
},
1213-
{
1214-
"source_path_from_root": "/azure/azure-monitor/agents/agents-overview.md#log-analytics-agent",
1215-
"redirect_url": "/azure/azure-monitor/agents/log-analytics-agent",
1216-
"redirect_document_id": false
1217-
},
12181218
{
12191219
"source_path_from_root": "/articles/application-insights/app-insights-platforms.md",
12201220
"redirect_url": "/azure/azure-monitor/app/platforms",
@@ -2525,11 +2525,6 @@
25252525
"redirect_url": "/azure/azure-monitor/agents/agent-manage",
25262526
"redirect_document_id": false
25272527
},
2528-
{
2529-
"source_path_from_root": "/articles/monitoring/monitoring-overview-azure-agents.md",
2530-
"redirect_url": "/azure/azure-monitor/platform/agents-overview",
2531-
"redirect_document_id": false
2532-
},
25332528
{
25342529
"source_path_from_root": "/articles/log-analytics/log-analytics-agent-windows.md",
25352530
"redirect_url": "/azure/azure-monitor/agents/agent-windows",
@@ -3831,7 +3826,7 @@
38313826
},
38323827
{
38333828
"source_path_from_root": "/articles/azure-monitor/platform/agents-overview.md",
3834-
"redirect_url": "/azure/azure-monitor/agents/agents-overview",
3829+
"redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-overview",
38353830
"redirect_document_id": false
38363831
},
38373832
{
@@ -5504,6 +5499,11 @@
55045499
"redirect_url": "/azure/azure-monitor/logs/resource-manager-workspace",
55055500
"redirect_document_id": false
55065501
},
5502+
{
5503+
"source_path_from_root": "/articles/azure-monitor/logs/resource-manager-cluster.md",
5504+
"redirect_url": "/azure/azure-monitor/logs/logs-dedicated-clusters",
5505+
"redirect_document_id": false
5506+
},
55075507
{
55085508
"source_path_from_root": "/articles/azure-monitor/visualize/powerbi.md",
55095509
"redirect_url": "/azure/azure-monitor/logs/log-powerbi",
@@ -5549,6 +5549,41 @@
55495549
"redirect_url": "/azure/azure-monitor/essentials/resource-manager-diagnostic-settings#diagnostic-setting-for-activity-log",
55505550
"redirect_document_id": false
55515551
},
5552+
{
5553+
"source_path_from_root": "/articles/azure-monitor/app/availability-overview.md",
5554+
"redirect_url": "/azure/azure-monitor/app/availability",
5555+
"redirect_document_id": false
5556+
},
5557+
{
5558+
"source_path_from_root": "/articles/azure-monitor/app/availability-standard-tests.md",
5559+
"redirect_url": "/azure/azure-monitor/app/availability",
5560+
"redirect_document_id": false
5561+
},
5562+
{
5563+
"source_path_from_root": "/articles/azure-monitor/app/availability-azure-functions.md",
5564+
"redirect_url": "/azure/azure-monitor/app/availability",
5565+
"redirect_document_id": false
5566+
},
5567+
{
5568+
"source_path_from_root": "/articles/azure-monitor/app/availability-private-test.md",
5569+
"redirect_url": "/azure/azure-monitor/app/availability",
5570+
"redirect_document_id": false
5571+
},
5572+
{
5573+
"source_path_from_root": "/articles/azure-monitor/app/availability-alerts.md",
5574+
"redirect_url": "/azure/azure-monitor/app/availability",
5575+
"redirect_document_id": false
5576+
},
5577+
{
5578+
"source_path_from_root": "/articles/azure-monitor/app/availability-test-migration.md",
5579+
"redirect_url": "/azure/azure-monitor/app/availability",
5580+
"redirect_document_id": false
5581+
},
5582+
{
5583+
"source_path_from_root": "/articles/azure-monitor/app/sla-report.md",
5584+
"redirect_url": "/azure/azure-monitor/app/availability",
5585+
"redirect_document_id": false
5586+
},
55525587
{
55535588
"source_path_from_root": "/articles/azure-monitor/app/tutorial-alert.md",
55545589
"redirect_url": "/azure/azure-monitor/app/availability-standard-tests",
@@ -6743,6 +6778,32 @@
67436778
"source_path_from_root": "/articles/azure-monitor/agents/azure-monitor-agent-migration-tools.md",
67446779
"redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-migration",
67456780
"redirect_document_id": false
6746-
}
6781+
},
6782+
{
6783+
"source_path_from_root": "/articles/azure-monitor/agents/agents-overview.md",
6784+
"redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-overview",
6785+
"redirect_document_id": false
6786+
},
6787+
{
6788+
"source_path_from_root": "/articles/azure-monitor/agents/azure-monitor-agent-data-collection-endpoint.md",
6789+
"redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-network-configuration",
6790+
"redirect_document_id": false
6791+
},
6792+
{
6793+
"source_path_from_root": "/articles/azure-monitor/agents/data-collection-text-log.md",
6794+
"redirect_url": "/azure/azure-monitor/agents/data-collection-log-text",
6795+
"redirect_document_id": false
6796+
},
6797+
{
6798+
"source_path_from_root": "/articles/monitoring/monitoring-overview-azure-agents.md",
6799+
"redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-overview",
6800+
"redirect_document_id": false
6801+
},
6802+
{
6803+
"source_path_from_root": "/articles/azure-monitor/agents/data-collection-rule-azure-monitor-agent.md",
6804+
"redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-data-collection",
6805+
"redirect_document_id": false
6806+
}
67476807
]
67486808
}
6809+

‎.openpublishing.redirection.baremetal-infrastructure.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,41 @@
134134
"source_path_from_root": "/articles/baremetal-infrastructure/workloads/sap/baremetal-overview-architecture.md",
135135
"redirect_url": "/azure/baremetal-infrastructure/concepts-baremetal-infrastructure-overview",
136136
"redirect_document_id": false
137+
},
138+
{
139+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/solution-design.md",
140+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
141+
"redirect_document_id": false
142+
},
143+
{
144+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/nc2-baremetal-overview.md",
145+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure",
146+
"redirect_document_id": false
147+
},
148+
{
149+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/skus.md",
150+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure",
151+
"redirect_document_id": false
152+
},
153+
{
154+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/nc2-on-azure-responsibility-matrix.md",
155+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/about-nc2-on-azure",
156+
"redirect_document_id": false
157+
},
158+
{
159+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/requirements.md",
160+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
161+
"redirect_document_id": false
162+
},
163+
{
164+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/use-cases-and-supported-scenarios.md",
165+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
166+
"redirect_document_id": false
167+
},
168+
{
169+
"source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/supported-instances-and-regions.md",
170+
"redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
171+
"redirect_document_id": false
137172
}
138173
]
139174
}

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

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/defender-for-cloud/multicloud.yml",
5+
"redirect_url": "/azure/defender-for-cloud/security-policy-concept",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/defender-for-cloud/recommendations-reference.md",
10+
"redirect_url": "/azure/defender-for-cloud/plan-multicloud-security-get-started",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/defender-for-cloud/recommendations-reference-gcp.md",
15+
"redirect_url": "/azure/defender-for-cloud/security-policy-concept",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/defender-for-cloud/recommendations-reference-aws.md",
20+
"redirect_url": "/azure/defender-for-cloud/security-policy-concept",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/defender-for-cloud/upcoming-changes.md",
25+
"redirect_url": "/azure/defender-for-cloud/release-notes",
26+
"redirect_document_id": false
27+
},
328
{
429
"source_path_from_root": "/articles/defender-for-cloud/secret-scanning.md",
530
"redirect_url": "/azure/defender-for-cloud/secrets-scanning-servers",
@@ -960,6 +985,11 @@
960985
"redirect_url": "/azure/defender-for-cloud/view-and-remediate-vulnerability-registry-images",
961986
"redirect_document_id": false
962987
},
988+
{
989+
"source_path_from_root": "/articles/defender-for-cloud/management-groups-roles.md",
990+
"redirect_url": "/azure/governance/management-groups/overview",
991+
"redirect_document_id": false
992+
},
963993
{
964994
"source_path_from_root": "/articles/defender-for-cloud/how-to-migrate-to-built-in.md",
965995
"redirect_url": "/azure/defender-for-cloud/how-to-transition-to-built-in",

‎.openpublishing.redirection.education.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/education-hub/custom-tenant-set-up-classroom.md",
5+
"redirect_url": "/articles/education-hub/about-education-hub.md",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

0 commit comments

Comments
 (0)