Skip to content

Commit 2647090

Browse files
chuckheinzelmanchuckheinzelman
authored
Merge branch 'main' into patch-44
2 parents 85fdf03 + 7b03219 commit 2647090

File tree

1,097 files changed

+25845
-9705
lines changed

Some content is hidden

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

1,097 files changed

+25845
-9705
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: 2 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": {}
@@ -948,7 +948,7 @@
948948
".openpublishing.redirection.virtual-desktop.json",
949949
".openpublishing.redirection.deployment-environments.json",
950950
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
951-
"articles/applied-ai-services/.openpublishing.archived.json",
951+
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
952952
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
953953
".openpublishing.redirection.baremetal-infrastructure.json",
954954
"articles/iot-dps/.openpublishing.redirection.iot-dps.json"

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 16 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,6 +5467,12 @@
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",

‎.openpublishing.redirection.json

Lines changed: 15 additions & 2 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",
@@ -11113,6 +11118,11 @@
1111311118
"redirect_url": "/azure/databox-online/azure-stack-edge-mini-r-overview",
1111411119
"redirect_document_id": false
1111511120
},
11121+
{
11122+
"source_path_from_root": "/articles/databox-online/azure-stack-edge-gpu-deploy-arc-data-controller.md",
11123+
"redirect_url": "/azure/azure-arc/data/create-data-controller-direct-azure-portal",
11124+
"redirect_document_id": false
11125+
},
1111611126
{
1111711127
"source_path_from_root": "/articles/databox-online/data-box-edge-manage-access-power-connectivity-mode.md",
1111811128
"redirect_url": "/azure/databox-online/azure-stack-edge-manage-access-power-connectivity-mode",
@@ -29234,6 +29244,11 @@
2923429244
"redirect_url": "/azure/developer/java/ee/jboss-on-azure",
2923529245
"redirect_document_id": false
2923629246
},
29247+
{
29248+
"source_path": "articles/pytorch-enterprise/index.yml",
29249+
"redirect_url": "/azure/databricks/machine-learning/train-model/pytorch",
29250+
"redirect_document_id": false
29251+
},
2923729252
{
2923829253
"source_path": "articles/aks/keda-troubleshoot.md",
2923929254
"redirect_url": "/troubleshoot/azure/azure-kubernetes/troubleshoot-kubernetes-event-driven-autoscaling-add-on?context=/azure/aks/context/aks-context",
@@ -29249,7 +29264,5 @@
2924929264
"redirect_url": "/azure/application-gateway/configuration-frontend-ip",
2925029265
"redirect_document_id": false
2925129266
}
29252-
2925329267
]
2925429268
}
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)