Skip to content

Commit a728205

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into faq
2 parents 0572cb7 + 6c37e59 commit a728205

File tree

2,668 files changed

+52514
-26786
lines changed

Some content is hidden

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

2,668 files changed

+52514
-26786
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,6 @@ AzureMigration.ps1
2424
.gitignore
2525
**/.vscode/settings.json
2626
*.pdn
27+
28+
# Pycharm
29+
.idea/*

.openpublishing.publish.config.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -867,7 +867,7 @@
867867
"branch_mapping": {}
868868
},
869869
{
870-
"path_to_root": "reusable-content",
870+
"path_to_root": "articles/reusable-content",
871871
"url": "https://github.com/MicrosoftDocs/reusable-content",
872872
"branch": "main",
873873
"branch_mapping": {}
@@ -908,6 +908,7 @@
908908
".openpublishing.redirection.azure-percept.json",
909909
".openpublishing.redirection.azure-productivity.json",
910910
".openpublishing.redirection.azure-australia.json",
911+
".openpublishing.redirection.iot-hub-device-update.json",
911912
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
912913
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
913914
"articles/azure-relay/.openpublishing.redirection.relay.json",
@@ -948,7 +949,7 @@
948949
".openpublishing.redirection.virtual-desktop.json",
949950
".openpublishing.redirection.deployment-environments.json",
950951
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
951-
"articles/applied-ai-services/.openpublishing.archived.json",
952+
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
952953
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
953954
".openpublishing.redirection.baremetal-infrastructure.json",
954955
"articles/iot-dps/.openpublishing.redirection.iot-dps.json"

.openpublishing.redirection.azure-monitor.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -846,6 +846,11 @@
846846
"redirect_url": "/azure/azure-monitor/app/java-in-process-agent",
847847
"redirect_document_id": false
848848
},
849+
{
850+
"source_path_from_root": "/articles/azure-monitor/app/export-power-bi.md",
851+
"redirect_url": "/azure/azure-monitor/logs/log-powerbi",
852+
"redirect_document_id": false
853+
},
849854
{
850855
"source_path_from_root": "/articles/azure-monitor/app/java-trace-logs.md",
851856
"redirect_url": "/azure/azure-monitor/app/java-in-process-agent",
@@ -5271,6 +5276,11 @@
52715276
"redirect_url": "/azure/azure-monitor/essentials/resource-manager-diagnostic-settings#diagnostic-setting-for-activity-log",
52725277
"redirect_document_id": false
52735278
},
5279+
{
5280+
"source_path_from_root": "/articles/azure-monitor/app/tutorial-alert.md",
5281+
"redirect_url": "/azure/azure-monitor/app/availability-standard-tests",
5282+
"redirect_document_id": false
5283+
},
52745284
{
52755285
"source_path_from_root": "/articles/azure-monitor/app/dotnet-quickstart.md",
52765286
"redirect_url": "/azure/azure-monitor/app/asp-net-core",
@@ -5457,10 +5467,28 @@
54575467
"redirect_document_id": false
54585468
}
54595469
,
5470+
{
5471+
"source_path_from_root": "/articles/automation/migrate-oms-update-deployments.md",
5472+
"redirect_url": "/azure/azure-monitor/terminology#april-2018---retirement-of-operations-management-suite-brand",
5473+
"redirect_document_id": false
5474+
}
5475+
,
54605476
{
54615477
"source_path_from_root": "/articles/azure-monitor/autoscale/autoscale-virtual-machine-scale-sets.md",
54625478
"redirect_url": "/azure/virtual-machine-scale-sets/tutorial-autoscale-template",
54635479
"redirect_document_id": false
54645480
}
5481+
,
5482+
{
5483+
"source_path_from_root": "/articles/azure-monitor/alerts/alerts-common-schema-integrations.md",
5484+
"redirect_url": "/azure/azure-monitor/alerts/alerts-logic-apps",
5485+
"redirect_document_id": false
5486+
}
5487+
,
5488+
{
5489+
"source_path_from_root": "/articles/azure-monitor/alerts/action-groups-logic-app.md",
5490+
"redirect_url": "/azure/azure-monitor/alerts/alerts-logic-apps",
5491+
"redirect_document_id": false
5492+
}
54655493
]
54665494
}

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -734,6 +734,26 @@
734734
"source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-cicd.md",
735735
"redirect_url": "/azure/defender-for-cloud/defender-for-devops-introduction",
736736
"redirect_document_id": true
737+
},
738+
{
739+
"source_path_from_root": "/articles/defender-for-cloud/tutorial-enable-pull-request-annotations.md",
740+
"redirect_url": "/azure/defender-for-cloud/enable-pull-request-annotations",
741+
"redirect_document_id": true
742+
},
743+
{
744+
"source_path_from_root": "/articles/defender-for-cloud/detect-credential-leaks.md",
745+
"redirect_url": "/azure/defender-for-cloud/detect-exposed-secrets",
746+
"redirect_document_id": true
747+
},
748+
{
749+
"source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-va-ecr.md",
750+
"redirect_url": "/azure/defender-for-cloud/defender-for-containers-vulnerability-assessment-elastic",
751+
"redirect_document_id": true
752+
},
753+
{
754+
"source_path_from_root": "/articles/defender-for-cloud/defender-for-containers-va-acr.md",
755+
"redirect_url": "/azure/defender-for-cloud/defender-for-containers-vulnerability-assessment-azure",
756+
"redirect_document_id": true
737757
}
738758

739759
]

.openpublishing.redirection.healthcare-apis.json

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,13 +542,25 @@
542542
"redirect_url": "/azure/healthcare-apis/iot/how-to-enable-diagnostic-settings",
543543
"redirect_document_id": false
544544
},
545+
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-collection-content-mappings.md",
546+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-device-mappings",
547+
"redirect_document_id": false
548+
},
549+
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-jsonpath-content-mappings.md",
550+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-device-mappings",
551+
"redirect_document_id": false
552+
},
553+
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-iot-central-json-content-mappings.md",
554+
"redirect_url": "/azure/healthcare-apis/iot/how-to-use-iot-jsonpath-content-mappings",
555+
"redirect_document_id": false
556+
},
545557
{ "source_path_from_root": "/articles/healthcare-apis/events/events-display-metrics.md",
546558
"redirect_url": "/azure/healthcare-apis/events/events-use-metrics",
547559
"redirect_document_id": false
548560
},
549561
{ "source_path_from_root": "/articles/healthcare-apis/events/events-export-logs-metrics.md",
550562
"redirect_url": "/azure/healthcare-apis/events/events-enable-diagnostic-settings",
551563
"redirect_document_id": false
552-
}
564+
}
553565
]
554566
}
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/iot-hub-device-update/migration-pp-to-ppr.md",
5+
"redirect_url": "/azure/iot-hub-device-update/migration-public-preview-refresh-to-ga",
6+
"redirect_document_id": true
7+
}
8+
]
9+
}

.openpublishing.redirection.json

Lines changed: 115 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
"redirect_url": "/azure/backup/sap-hana-database-about",
2626
"redirect_document_id": false
2727
},
28+
{
29+
"source_path_from_root": "/articles/storage/elastic-san/elastic-san-connect.md",
30+
"redirect_url": "/azure/storage/elastic-san/elastic-san-connect-windows",
31+
"redirect_document_id": false
32+
},
2833
{
2934
"source_path_from_root": "/articles/storage/blobs/storage-quickstart-blobs-dotnet-legacy.md",
3035
"redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-dotnet",
@@ -5938,11 +5943,6 @@
59385943
"redirect_url": "/azure/availability-zones/az-overview",
59395944
"redirect_document_id": false
59405945
},
5941-
{
5942-
"source_path_from_root": "/articles/partner-solutions/index.md",
5943-
"redirect_url": "/azure/partner-solutions/overview",
5944-
"redirect_document_id": false
5945-
},
59465946
{
59475947
"source_path_from_root": "/articles/fxt-edge-filer/fxt-add-nodes.md",
59485948
"redirect_url": "/azure/fxt-edge-filer/add-nodes",
@@ -10183,6 +10183,101 @@
1018310183
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
1018410184
"redirect_document_id": false
1018510185
},
10186+
{
10187+
"source_path_from_root": "/articles/blockchain/workbench/architecture.md",
10188+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10189+
"redirect_document_id": false
10190+
},
10191+
{
10192+
"source_path_from_root": "/articles/blockchain/workbench/configuration.md",
10193+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10194+
"redirect_document_id": false
10195+
},
10196+
{
10197+
"source_path_from_root": "/articles/blockchain/workbench/create-app.md",
10198+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10199+
"redirect_document_id": false
10200+
},
10201+
{
10202+
"source_path_from_root": "/articles/blockchain/workbench/data-excel.md",
10203+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10204+
"redirect_document_id": false
10205+
},
10206+
{
10207+
"source_path_from_root": "/articles/blockchain/workbench/data-powerbi.md",
10208+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10209+
"redirect_document_id": false
10210+
},
10211+
{
10212+
"source_path_from_root": "/articles/blockchain/workbench/data-sql-management-studio.md",
10213+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10214+
"redirect_document_id": false
10215+
},
10216+
{
10217+
"source_path_from_root": "/articles/blockchain/workbench/database-firewall.md",
10218+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10219+
"redirect_document_id": false
10220+
},
10221+
{
10222+
"source_path_from_root": "/articles/blockchain/workbench/database-views.md",
10223+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10224+
"redirect_document_id": false
10225+
},
10226+
{
10227+
"source_path_from_root": "/articles/blockchain/workbench/deploy.md",
10228+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10229+
"redirect_document_id": false
10230+
},
10231+
{
10232+
"source_path_from_root": "/articles/blockchain/workbench/getdb-details.md",
10233+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10234+
"redirect_document_id": false
10235+
},
10236+
{
10237+
"source_path_from_root": "/articles/blockchain/workbench/index.yml",
10238+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10239+
"redirect_document_id": false
10240+
},
10241+
{
10242+
"source_path_from_root": "/articles/blockchain/workbench/integration-patterns.md",
10243+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10244+
"redirect_document_id": false
10245+
},
10246+
{
10247+
"source_path_from_root": "/articles/blockchain/workbench/manage-users.md",
10248+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10249+
"redirect_document_id": false
10250+
},
10251+
{
10252+
"source_path_from_root": "/articles/blockchain/workbench/messages-overview.md",
10253+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10254+
"redirect_document_id": false
10255+
},
10256+
{
10257+
"source_path_from_root": "/articles/blockchain/workbench/overview.md",
10258+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10259+
"redirect_document_id": false
10260+
},
10261+
{
10262+
"source_path_from_root": "/articles/blockchain/workbench/troubleshooting.md",
10263+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10264+
"redirect_document_id": false
10265+
},
10266+
{
10267+
"source_path_from_root": "/articles/blockchain/workbench/use-api.md",
10268+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10269+
"redirect_document_id": false
10270+
},
10271+
{
10272+
"source_path_from_root": "/articles/blockchain/workbench/use.md",
10273+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10274+
"redirect_document_id": false
10275+
},
10276+
{
10277+
"source_path_from_root": "/articles/blockchain/workbench/version-app.md",
10278+
"redirect_url": "https://azure.microsoft.com/solutions/blockchain",
10279+
"redirect_document_id": false
10280+
},
1018610281
{
1018710282
"source_path_from_root": "/articles/app-service/app-service-web-tutorial-content-delivery-network.md",
1018810283
"redirect_url": "/azure/cdn/cdn-add-to-web-app",
@@ -11113,6 +11208,11 @@
1111311208
"redirect_url": "/azure/databox-online/azure-stack-edge-mini-r-overview",
1111411209
"redirect_document_id": false
1111511210
},
11211+
{
11212+
"source_path_from_root": "/articles/databox-online/azure-stack-edge-gpu-deploy-arc-data-controller.md",
11213+
"redirect_url": "/azure/azure-arc/data/create-data-controller-direct-azure-portal",
11214+
"redirect_document_id": false
11215+
},
1111611216
{
1111711217
"source_path_from_root": "/articles/databox-online/data-box-edge-manage-access-power-connectivity-mode.md",
1111811218
"redirect_url": "/azure/databox-online/azure-stack-edge-manage-access-power-connectivity-mode",
@@ -29234,6 +29334,11 @@
2923429334
"redirect_url": "/azure/developer/java/ee/jboss-on-azure",
2923529335
"redirect_document_id": false
2923629336
},
29337+
{
29338+
"source_path": "articles/pytorch-enterprise/index.yml",
29339+
"redirect_url": "/azure/databricks/machine-learning/train-model/pytorch",
29340+
"redirect_document_id": false
29341+
},
2923729342
{
2923829343
"source_path": "articles/aks/keda-troubleshoot.md",
2923929344
"redirect_url": "/troubleshoot/azure/azure-kubernetes/troubleshoot-kubernetes-event-driven-autoscaling-add-on?context=/azure/aks/context/aks-context",
@@ -29248,8 +29353,11 @@
2924829353
"source_path_from_root": "/articles/application-gateway/configuration-front-end-ip.md",
2924929354
"redirect_url": "/azure/application-gateway/configuration-frontend-ip",
2925029355
"redirect_document_id": false
29356+
},
29357+
{
29358+
"source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6.md",
29359+
"redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6-powershell",
29360+
"redirect_document_id": false
2925129361
}
29252-
2925329362
]
2925429363
}
29255-

.openpublishing.redirection.virtual-desktop.json

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,46 @@
3434
"source_path": "articles/virtual-desktop/azure-stack-hci-faq.yml",
3535
"redirect_url": "/azure/virtual-desktop/azure-stack-hci",
3636
"redirect_document_id": false
37+
},
38+
{
39+
"source_path_from_root": "/articles/virtual-desktop/user-documentation/connect-android.md",
40+
"redirect_url": "/azure/virtual-desktop/users/connect-android-chrome-os",
41+
"redirect_document_id": true
42+
},
43+
{
44+
"source_path_from_root": "/articles/virtual-desktop/user-documentation/connect-ios.md",
45+
"redirect_url": "/azure/virtual-desktop/users/connect-ios-ipados",
46+
"redirect_document_id": true
47+
},
48+
{
49+
"source_path_from_root": "/articles/virtual-desktop/user-documentation/connect-macos.md",
50+
"redirect_url": "/azure/virtual-desktop/users/connect-macos",
51+
"redirect_document_id": true
52+
},
53+
{
54+
"source_path_from_root": "/articles/virtual-desktop/user-documentation/connect-microsoft-store.md",
55+
"redirect_url": "/azure/virtual-desktop/users/connect-microsoft-store",
56+
"redirect_document_id": true
57+
},
58+
{
59+
"source_path_from_root": "/articles/virtual-desktop/user-documentation/connect-web.md",
60+
"redirect_url": "/azure/virtual-desktop/users/connect-web",
61+
"redirect_document_id": true
62+
},
63+
{
64+
"source_path_from_root": "/articles/virtual-desktop/user-documentation/connect-windows-7-10.md",
65+
"redirect_url": "/azure/virtual-desktop/users/connect-windows",
66+
"redirect_document_id": true
67+
},
68+
{
69+
"source_path_from_root": "/articles/virtual-desktop/user-documentation/index.yml",
70+
"redirect_url": "/azure/virtual-desktop/users/",
71+
"redirect_document_id": true
72+
},
73+
{
74+
"source_path_from_root": "/articles/virtual-desktop/user-documentation/linux-overview.md",
75+
"redirect_url": "/azure/virtual-desktop/users/connect-thin-clients",
76+
"redirect_document_id": true
3777
}
3878
]
3979
}

0 commit comments

Comments
 (0)