Skip to content

Commit 7650d55

Browse files
b-ahibbardb-ahibbard
committed
resolve merge conflict
2 parents 28b0084 + 1db160d commit 7650d55

File tree

5,297 files changed

+99288
-69042
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,297 files changed

+99288
-69042
lines changed

‎.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
*.c text
77
*.h text
88

9+
# Include Markdown in the GitHub language breakdown statistics
10+
*.md linguist-detectable
11+
912
# Denote all files that are truly binary and should not be modified.
1013
*.gif binary
1114
*.ico binary

‎.openpublishing.publish.config.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -969,6 +969,12 @@
969969
"branch_mapping": {}
970970
},
971971
{
972+
"path_to_root": "azure-load-testing-samples",
973+
"url": "https://github.com/Azure-Samples/azure-load-testing-samples",
974+
"branch": "main",
975+
"branch_mapping": {}
976+
},
977+
{
972978
"path_to_root": "microsoft-graph",
973979
"url": "https://github.com/MicrosoftGraph/microsoft-graph-docs",
974980
"branch": "main",
@@ -994,6 +1000,7 @@
9941000
".openpublishing.redirection.app-service.json",
9951001
".openpublishing.redirection.azure-arc-data.json",
9961002
".openpublishing.redirection.azure-attestation.json",
1003+
".openpublishing.redirection.azure-app-configuration.json",
9971004
".openpublishing.redirection.azure-australia.json",
9981005
".openpublishing.redirection.azure-databricks.json",
9991006
".openpublishing.redirection.azure-hpc.json",

‎.openpublishing.redirection.active-directory.json

Lines changed: 1228 additions & 3 deletions
Large diffs are not rendered by default.

‎.openpublishing.redirection.app-service.json

Lines changed: 25 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/app-service/scenario-secure-app-authentication-app-service-as-user.md",
5+
"redirect_url": "/azure/app-service/scenario-secure-app-authentication-app-service",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/app-service/deploy-resource-manager-template.md",
10+
"redirect_url": "/azure/app-service/quickstart-arm-template",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/app-service/deploy-complex-application-predictably.md",
15+
"redirect_url": "/azure/app-service/quickstart-arm-template",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/app-service/quickstart-html.md",
20+
"redirect_url": "/azure/static-web-apps/get-started-portal",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path_from_root": "/articles/app-service/quickstart-html-uiex.md",
25+
"redirect_url": "/azure/static-web-apps/get-started-portal",
26+
"redirect_document_id": false
27+
},
328
{
429
"source_path_from_root": "/articles/app-service-web/web-sites-restore.md",
530
"redirect_url": "/azure/app-service/manage-backup",

‎.openpublishing.redirection.azure-app-configuration.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/azure-app-configuration/howto-backup-config-store.md",
5+
"redirect_url": "/articles/azure-app-configuration/concept-geo-replication.md",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6026,11 +6026,6 @@
60266026
"redirect_url": "/previous-versions/azure/azure-monitor/alerts/monitoring-classic-retirement",
60276027
"redirect_document_id": false
60286028
},
6029-
{
6030-
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-log-api-switch.md",
6031-
"redirect_url": "/previous-versions/azure/azure-monitor/alerts/alerts-log-api-switch",
6032-
"redirect_document_id": false
6033-
},
60346029
{
60356030
"source_path_from_root": "/articles/azure-monitor/visualize/view-designer.md",
60366031
"redirect_url": "/previous-versions/azure/azure-monitor/visualize/view-designer",
@@ -6136,6 +6131,11 @@
61366131
"redirect_url": "/azure/azure-monitor/app/data-model-complete",
61376132
"redirect_document_id": false
61386133
},
6134+
{
6135+
"source_path_from_root": "/articles/azure-monitor/vm/monitor-virtual-machine-management-packs.md",
6136+
"redirect_url": "/azure/azure-monitor/azure-monitor-operations-manager#migrate-management-pack-logic",
6137+
"redirect_document_id": false
6138+
},
61396139
{
61406140
"source_path_from_root": "/articles/azure-monitor/logs/dashboard-upgrade.md",
61416141
"redirect_url": "/azure/azure-monitor/visualize/tutorial-logs-dashboards",

‎.openpublishing.redirection.azure-productivity.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,11 @@
149149
"source_path": "articles/lab-services/classroom-labs-faq.yml",
150150
"redirect_url": "/azure/lab-services/lab-services-overview",
151151
"redirect_document_id": false
152-
}
152+
},
153+
{
154+
"source_path": "articles/lab-services/how-to-enable-nested-virtualization-template-vm-ui.md",
155+
"redirect_url": "/azure/lab-services/how-to-enable-nested-virtualization-template-vm-using-script",
156+
"redirect_document_id": false
157+
}
153158
]
154159
}

‎.openpublishing.redirection.azure-vmware.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
"source_path_from_root": "/articles/azure-vmware/send-logs-to-log-analytics.md",
55
"redirect_url": "/azure/azure-vmware/configure-vmware-syslogs",
66
"redirect_document_id": false
7+
},
8+
{
9+
"source_path_from_root": "/articles/azure-vmware/attach-disk-pools-to-azure-vmware-solution-hosts.md",
10+
"redirect_url": "/azure/storage/elastic-san/elastic-san-introduction",
11+
"redirect_document_id": false
712
}
813
]
914
}

‎.openpublishing.redirection.healthcare-apis.json

Lines changed: 48 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -550,33 +550,73 @@
550550
"redirect_document_id": false
551551
},
552552
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-iot-connector-in-azure.md",
553-
"redirect_url": "/azure/healthcare-apis/iot/deploy-new-choose",
553+
"redirect_url": "/azure/healthcare-apis/iot/deploy-choose-method",
554554
"redirect_document_id": false
555555
},
556556
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-02-new-button.md",
557-
"redirect_url": "/azure/healthcare-apis/iot/deploy-new-button",
557+
"redirect_url": "/azure/healthcare-apis/iot/deploy-choose-method",
558558
"redirect_document_id": false
559559
},
560560
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-03-new-manual.md",
561-
"redirect_url": "/azure/healthcare-apis/iot/deploy-new-manual",
561+
"redirect_url": "/azure/healthcare-apis/iot/deploy-choose-method",
562562
"redirect_document_id": false
563563
},
564564
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-05-new-config.md",
565-
"redirect_url": "/azure/healthcare-apis/iot/deploy-new-config",
565+
"redirect_url": "/azure/healthcare-apis/iot/deploy-choose-method",
566566
"redirect_document_id": false
567567
},
568568
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-06-new-deploy.md",
569-
"redirect_url": "/azure/healthcare-apis/iot/deploy-new-deploy",
569+
"redirect_url": "/azure/healthcare-apis/iot/deploy-choose-method",
570570
"redirect_document_id": false
571571
},
572572
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-08-new-ps-cli.md",
573-
"redirect_url": "/azure/healthcare-apis/iot/deploy-new-powershell-cli",
573+
"redirect_url": "/azure/healthcare-apis/iot/deploy-json-powershell-cli",
574+
"redirect_document_id": false
575+
},
576+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-arm.md",
577+
"redirect_url": "/azure/healthcare-apis/iot/deploy-arm-template",
574578
"redirect_document_id": false
575579
},
576580
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-bicep-ps-cli.md",
577-
"redirect_url": "/azure/healthcare-apis/iot/deploy-new-bicep-powershell-cli",
581+
"redirect_url": "/azure/healthcare-apis/iot/deploy-bicep-powershell-cli",
578582
"redirect_document_id": false
579-
},
583+
},
584+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-bicep-powershell-cli.md",
585+
"redirect_url": "/azure/healthcare-apis/iot/deploy-bicep-powershell-cli",
586+
"redirect_document_id": false
587+
},
588+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-choose.md",
589+
"redirect_url": "/azure/healthcare-apis/iot/deploy-choose-method",
590+
"redirect_document_id": false
591+
},
592+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-powershell-cli.md",
593+
"redirect_url": "/azure/healthcare-apis/iot/deploy-json-powershell-cli",
594+
"redirect_document_id": false
595+
},
596+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-config.md",
597+
"redirect_url": "/azure/healthcare-apis/iot/deploy-manual-portal",
598+
"redirect_document_id": false
599+
},
600+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-deploy.md",
601+
"redirect_url": "/azure/healthcare-apis/iot/deploy-manual-portal",
602+
"redirect_document_id": false
603+
},
604+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-manual.md",
605+
"redirect_url": "/azure/healthcare-apis/iot/deploy-manual-portal",
606+
"redirect_document_id": false
607+
},
608+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-manual-prerequisites.md",
609+
"redirect_url": "/azure/healthcare-apis/iot/deploy-manual-portal",
610+
"redirect_document_id": false
611+
},
612+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-manual-config.md",
613+
"redirect_url": "/azure/healthcare-apis/iot/deploy-manual-portal",
614+
"redirect_document_id": false
615+
},
616+
{ "source_path_from_root": "/articles/healthcare-apis/iot/deploy-manual-post.md",
617+
"redirect_url": "/azure/healthcare-apis/iot/deploy-manual-portal",
618+
"redirect_document_id": false
619+
},
580620
{ "source_path_from_root": "/articles/healthcare-apis/iot/iot-connector-overview.md",
581621
"redirect_url": "/azure/healthcare-apis/iot/overview",
582622
"redirect_document_id": false

0 commit comments

Comments
 (0)