Skip to content

Commit eaca704

Browse files
ericasp16ericasp16
committed
merge from main
2 parents f98445f + 34f16ac commit eaca704

File tree

7,605 files changed

+122872
-70587
lines changed

Some content is hidden

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

7,605 files changed

+122872
-70587
lines changed

‎.openpublishing.publish.config.json

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,12 @@
230230
"branch": "master",
231231
"branch_mapping": {}
232232
},
233+
{
234+
"path_to_root": "functions-docs-python-v2",
235+
"url": "https://github.com/Azure-Samples/functions-docs-python-v2",
236+
"branch": "main",
237+
"branch_mapping": {}
238+
},
233239
{
234240
"path_to_root": "functions-docs-powershell",
235241
"url": "https://github.com/Azure-Samples/functions-docs-powershell",
@@ -416,6 +422,12 @@
416422
"branch": "main",
417423
"branch_mapping": {}
418424
},
425+
{
426+
"path_to_root": "azureml-examples-archive",
427+
"url": "https://github.com/azure/azureml-examples",
428+
"branch": "v1-archive",
429+
"branch_mapping": {}
430+
},
419431
{
420432
"path_to_root": "azureml-examples-batch-pup",
421433
"url": "https://github.com/azure/azureml-examples",
@@ -1006,7 +1018,7 @@
10061018
},
10071019
{
10081020
"path_to_root": "microsoft-graph",
1009-
"url": "https://github.com/MicrosoftGraph/microsoft-graph-docs",
1021+
"url": "https://github.com/MicrosoftGraph/microsoft-graph-docs-contrib",
10101022
"branch": "main",
10111023
"branch_mapping": {}
10121024
},
@@ -1079,6 +1091,7 @@
10791091
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
10801092
"articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
10811093
"articles/communication-services/.openpublishing.redirection.communication-services.json",
1094+
"articles/communications-gateway/.openpublishing.redirection.communications-gateway.json",
10821095
"articles/confidential-computing/.openpublishing.redirection.json",
10831096
"articles/container-apps/.openpublishing.redirection.container-apps.json",
10841097
"articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",

‎.openpublishing.redirection.active-directory.json

Lines changed: 194 additions & 15 deletions
Large diffs are not rendered by default.

‎.openpublishing.redirection.azure-kubernetes-service.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414
"source_path_from_root": "/articles/aks/web-app-routing.md",
1515
"redirect_url": "/azure/aks/app-routing",
1616
"redirect_document_id": false
17+
},
18+
{
19+
"source_path_from_root": "/articles/aks/aks-planned-maintenance-weekly-releases.md",
20+
"redirect_url": "/azure/aks/planned-maintenance",
21+
"redirect_document_id": false
1722
}
1823
]
1924
}

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6310,11 +6310,6 @@
63106310
"redirect_url": "/azure/azure-monitor/agents/solution-agenthealth",
63116311
"redirect_document_id": false
63126312
},
6313-
{
6314-
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-hybrid-setup.md",
6315-
"redirect_url": "/azure/azure-monitor/containers/container-insights-enable-arc-enabled-clusters",
6316-
"redirect_document_id": false
6317-
},
63186313
{
63196314
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-openshift-v3.md",
63206315
"redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
@@ -6324,11 +6319,6 @@
63246319
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-openshift-v4.md",
63256320
"redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
63266321
"redirect_document_id": false
6327-
},
6328-
{
6329-
"source_path_from_root": "/articles/azure-monitor/containers/container-insights-optout-hybrid.md",
6330-
"redirect_url": "/azure/azure-monitor/containers/container-insights-optout",
6331-
"redirect_document_id": false
63326322
}
63336323
]
63346324
}

‎.openpublishing.redirection.azure-productivity.json

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,26 @@
184184
"source_path": "articles/lab-services/how-to-access-vm-for-students-within-teams.md",
185185
"redirect_url": "/azure/lab-services/tutorial-access-lab-virtual-machine-teams-canvas",
186186
"redirect_document_id": false
187+
},
188+
{
189+
"source_path": "articles/lab-services/lab-creator-support-information.md",
190+
"redirect_url": "/azure/lab-services/how-to-manage-labs",
191+
"redirect_document_id": false
192+
},
193+
{
194+
"source_path": "articles/lab-services/lab-user-support-information.md",
195+
"redirect_url": "/azure/lab-services/how-to-access-lab-virtual-machine",
196+
"redirect_document_id": false
197+
},
198+
{
199+
"source_path": "articles/lab-services/how-to-create-lab-plan-template.md",
200+
"redirect_url": "/azure/lab-services/how-to-create-lab-plan-bicep",
201+
"redirect_document_id": false
202+
},
203+
{
204+
"source_path": "articles/lab-services/how-to-create-lab-template.md",
205+
"redirect_url": "/azure/lab-services/how-to-create-lab-bicep",
206+
"redirect_document_id": false
187207
}
188208
]
189-
}
209+
}

‎.openpublishing.redirection.azure-vmware.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,11 @@
99
"source_path_from_root": "/articles/azure-vmware/attach-disk-pools-to-azure-vmware-solution-hosts.md",
1010
"redirect_url": "/azure/storage/elastic-san/elastic-san-introduction",
1111
"redirect_document_id": false
12+
},
13+
{
14+
"source_path_from_root": "/articles/azure-vmware/migrate-sql-server-always-on-cluster.md",
15+
"redirect_url": "/azure/azure-vmware/migrate-sql-server-always-on-availability-group",
16+
"redirect_document_id": false
1217
}
1318
]
1419
}

0 commit comments

Comments
 (0)