Skip to content

Commit dd777c3

Browse files
authored
Merge branch 'MicrosoftDocs:main' into shannon/remove-deprecated-github-action
2 parents ccde41b + ec0f960 commit dd777c3

File tree

2,131 files changed

+41572
-25874
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,131 files changed

+41572
-25874
lines changed

.openpublishing.publish.config.json

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -878,6 +878,12 @@
878878
"branch": "docs-snippets",
879879
"branch_mapping": {}
880880
},
881+
{
882+
"path_to_root": "ms-identity-python-webapp",
883+
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
884+
"branch": "main",
885+
"branch_mapping": {}
886+
},
881887
{
882888
"path_to_root": "ms-identity-node",
883889
"url": "https://github.com/Azure-Samples/ms-identity-node",
@@ -937,6 +943,12 @@
937943
"url": "https://github.com/Azure-Samples/azure-cache-redis-samples",
938944
"branch": "main",
939945
"branch_mapping": {}
946+
},
947+
{
948+
"path_to_root": "microsoft-graph",
949+
"url": "https://github.com/MicrosoftGraph/microsoft-graph-docs",
950+
"branch": "main",
951+
"branch_mapping": {}
940952
}
941953
],
942954
"branch_target_mapping": {
@@ -961,6 +973,7 @@
961973
".openpublishing.redirection.azure-australia.json",
962974
".openpublishing.redirection.azure-databricks.json",
963975
".openpublishing.redirection.azure-hpc.json",
976+
".openpublishing.redirection.azure-kubernetes-service.json",
964977
".openpublishing.redirection.azure-monitor.json",
965978
".openpublishing.redirection.azure-percept.json",
966979
".openpublishing.redirection.azure-productivity.json",
@@ -971,8 +984,6 @@
971984
".openpublishing.redirection.baremetal-infrastructure.json",
972985
".openpublishing.redirection.defender-for-cloud.json",
973986
".openpublishing.redirection.defender-for-iot.json",
974-
".openpublishing.redirection.deployment-environments.json",
975-
".openpublishing.redirection.dev-box.json",
976987
".openpublishing.redirection.healthcare-apis.json",
977988
".openpublishing.redirection.iot-hub-device-update.json",
978989
".openpublishing.redirection.json",
@@ -1029,6 +1040,8 @@
10291040
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
10301041
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
10311042
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
1032-
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json"
1043+
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
1044+
"articles/dev-box/.openpublishing.redirection.dev-box.json",
1045+
"articles/deployment-environments/.openpublishing.redirection.deployment-environments.json"
10331046
]
10341047
}

.openpublishing.redirection.active-directory.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@
7575
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
7676
"redirect_document_id": false
7777
},
78+
{
79+
"source_path_from_root": "/articles/active-directory/saas-apps/teamzskill-tutorial.md",
80+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
81+
"redirect_document_id": false
82+
},
7883
{
7984
"source_path_from_root": "/articles/active-directory/saas-apps/usertesting-tutorial.md",
8085
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
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/aks/stop-api-upgrade.md",
5+
"redirect_url": "/azure/aks/upgrade-cluster",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,16 @@
4545
"redirect_url": "/azure/azure-monitor/app/app-insights-overview",
4646
"redirect_document_id": false
4747
},
48+
{
49+
"source_path_from_root": "/articles/azure-monitor/app/correlation.md",
50+
"redirect_url": "/previous-versions/azure/azure-monitor/app/distributed-tracing-telemetry-correlation",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/azure-monitor/app/distributed-tracing.md",
55+
"redirect_url": "/previous-versions/azure/azure-monitor/app/distributed-tracing-telemetry-correlation",
56+
"redirect_document_id": false
57+
},
4858
{
4959
"source_path_from_root": "/articles/azure-monitor/app/console.md",
5060
"redirect_url": "/previous-versions/azure/azure-monitor/app/console",
@@ -5812,6 +5822,16 @@
58125822
"redirect_url": "/azure/azure-monitor/app/opentelemetry-enable",
58135823
"redirect_document_id": false
58145824
},
5825+
{
5826+
"source_path_from_root": "/articles/azure-monitor/logs/logicapp-flow-connector.md",
5827+
"redirect_url": "/azure/connectors/connectors-azure-monitor-logs",
5828+
"redirect_document_id": false
5829+
},
5830+
{
5831+
"source_path_from_root": "/articles/azure-monitor/app/automate-with-logic-apps.md",
5832+
"redirect_url": "/azure/connectors/connectors-azure-application-insights",
5833+
"redirect_document_id": false
5834+
},
58155835
{
58165836
"source_path_from_root": "/articles/azure-monitor/insights/solutions.md",
58175837
"redirect_url": "/previous-versions/azure/azure-monitor/insights/solutions",

.openpublishing.redirection.azure-resource-manager.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,6 +1395,11 @@
13951395
"redirect_url": "/azure/azure-resource-manager/managed-applications/cli-samples",
13961396
"redirect_document_id": false
13971397
},
1398+
{
1399+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/cli-samples.md",
1400+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1401+
"redirect_document_id": false
1402+
},
13981403
{
13991404
"source_path_from_root": "/articles/managed-applications/concepts-custom-providers-built-in-policy.md",
14001405
"redirect_url": "/azure/azure-resource-manager/custom-providers/concepts-built-in-policy",
@@ -1585,6 +1590,11 @@
15851590
"redirect_url": "/azure/azure-resource-manager/managed-applications/powershell-samples",
15861591
"redirect_document_id": false
15871592
},
1593+
{
1594+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/powershell-samples.md",
1595+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1596+
"redirect_document_id": false
1597+
},
15881598
{
15891599
"source_path_from_root": "/articles/managed-applications/publish-managed-app-definition-quickstart.md",
15901600
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
@@ -1889,6 +1899,26 @@
18891899
"source_path_from_root": "/articles/xplat-cli-azure-resource-manager.md",
18901900
"redirect_url": "/azure/azure-resource-manager/management/manage-resources-cli",
18911901
"redirect_document_id": false
1902+
},
1903+
{
1904+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-define-create-cli-sample.md",
1905+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1906+
"redirect_document_id": false
1907+
},
1908+
{
1909+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-powershell-sample-create-definition.md",
1910+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1911+
"redirect_document_id": false
1912+
},
1913+
{
1914+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-poweshell-sample-create-application.md",
1915+
"redirect_url": "/azure/azure-resource-manager/managed-applications/deploy-service-catalog-quickstart",
1916+
"redirect_document_id": false
1917+
},
1918+
{
1919+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-powershell-sample-get-managed-group-resize-vm.md",
1920+
"redirect_url": "/azure/azure-resource-manager/managed-applications/overview",
1921+
"redirect_document_id": false
18921922
}
18931923
]
18941924
}

.openpublishing.redirection.dev-box.json

Lines changed: 0 additions & 19 deletions
This file was deleted.

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7548,6 +7548,11 @@
75487548
"redirect_url": "/azure/reliability/reliability-functions",
75497549
"redirect_document_id": false
75507550
},
7551+
{
7552+
"source_path_from_root": "/articles/azure-functions/functions-bindings-triggers-python.md",
7553+
"redirect_url": "/azure/azure-functions/functions-reference-python?pivots=python-mode-decorators#triggers-and-inputs",
7554+
"redirect_document_id": false
7555+
},
75517556
{
75527557
"source_path_from_root": "/articles/azure-government/documentation-government-k8.md",
75537558
"redirect_url": "/azure/azure-government",
@@ -22376,6 +22381,11 @@
2237622381
"redirect_url": "/azure/azure-arc/kubernetes/overview",
2237722382
"redirect_document_id": "false"
2237822383
},
22384+
{
22385+
"source_path_from_root": "/articles/azure-arc/kubernetes/tutorial-workload-management.md",
22386+
"redirect_url": "/azure/azure-arc/kubernetes/workload-management",
22387+
"redirect_document_id": "true"
22388+
},
2237922389
{
2238022390
"source_path": "articles/azure-cache-for-redis/redis-cache-insights-overview.md",
2238122391
"redirect_url": "/azure/azure-cache-for-redis/cache-insights-overview",

0 commit comments

Comments
 (0)