Skip to content

Commit 9470a40

Browse files
committed
Merge branch 'main' into auth-migration
2 parents e67ea3e + 4b8da40 commit 9470a40

File tree

4,462 files changed

+79197
-67160
lines changed

Some content is hidden

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

4,462 files changed

+79197
-67160
lines changed

.openpublishing.publish.config.json

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,13 @@
233233
{
234234
"path_to_root": "azure-functions-durable-js",
235235
"url": "https://github.com/Azure/azure-functions-durable-js",
236-
"branch": "main",
236+
"branch": "v2.x",
237+
"branch_mapping": {}
238+
},
239+
{
240+
"path_to_root": "azure-functions-durable-js-v3",
241+
"url": "https://github.com/Azure/azure-functions-durable-js",
242+
"branch": "v3.x",
237243
"branch_mapping": {}
238244
},
239245
{
@@ -536,6 +542,12 @@
536542
"branch": "main",
537543
"branch_mapping": {}
538544
},
545+
{
546+
"path_to_root": "azure-cosmos-db-mongodb-mern-web-app",
547+
"url": "https://github.com/Azure-samples/msdocs-azure-cosmos-db-mongodb-mern-web-app/",
548+
"branch": "main",
549+
"branch_mapping": {}
550+
},
539551
{
540552
"path_to_root": "azure-cosmos-spark",
541553
"url": "https://github.com/Azure/azure-cosmosdb-spark",
@@ -866,6 +878,12 @@
866878
"branch": "docs-snippets",
867879
"branch_mapping": {}
868880
},
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+
},
869887
{
870888
"path_to_root": "ms-identity-node",
871889
"url": "https://github.com/Azure-Samples/ms-identity-node",
@@ -925,6 +943,12 @@
925943
"url": "https://github.com/Azure-Samples/azure-cache-redis-samples",
926944
"branch": "main",
927945
"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": {}
928952
}
929953
],
930954
"branch_target_mapping": {
@@ -949,6 +973,7 @@
949973
".openpublishing.redirection.azure-australia.json",
950974
".openpublishing.redirection.azure-databricks.json",
951975
".openpublishing.redirection.azure-hpc.json",
976+
".openpublishing.redirection.azure-kubernetes-service.json",
952977
".openpublishing.redirection.azure-monitor.json",
953978
".openpublishing.redirection.azure-percept.json",
954979
".openpublishing.redirection.azure-productivity.json",
@@ -959,8 +984,6 @@
959984
".openpublishing.redirection.baremetal-infrastructure.json",
960985
".openpublishing.redirection.defender-for-cloud.json",
961986
".openpublishing.redirection.defender-for-iot.json",
962-
".openpublishing.redirection.deployment-environments.json",
963-
".openpublishing.redirection.dev-box.json",
964987
".openpublishing.redirection.healthcare-apis.json",
965988
".openpublishing.redirection.iot-hub-device-update.json",
966989
".openpublishing.redirection.json",
@@ -970,6 +993,7 @@
970993
".openpublishing.redirection.security-benchmark.json",
971994
".openpublishing.redirection.sql-database.json",
972995
".openpublishing.redirection.virtual-desktop.json",
996+
".openpublishing.redirection.devops-project.json",
973997
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
974998
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
975999
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
@@ -996,7 +1020,7 @@
9961020
"articles/iot-develop/.openpublishing.redirection.iot-develop.json",
9971021
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
9981022
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",
999-
"articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
1023+
"articles/iot/.openpublishing.redirection.iot.json",
10001024
"articles/iot-hub/.openpublishing.redirection.iot-hub.json",
10011025
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
10021026
"articles/logic-apps/.openpublishing.redirection.logic-apps.json",
@@ -1016,6 +1040,8 @@
10161040
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
10171041
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
10181042
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
1019-
"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"
10201046
]
10211047
}

.openpublishing.redirection.active-directory.json

Lines changed: 30 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",
@@ -129,6 +134,11 @@
129134
"source_path_from_root": "/articles/active-directory/saas-apps/headerf5-tutorial.md",
130135
"redirect_url": "/azure/active-directory/saas-apps/f5-big-ip-headers-easy-button",
131136
"redirect_document_id": false
137+
},
138+
{
139+
"source_path_from_root": "/articles/active-directory/saas-apps/tripactions-tutorial.md",
140+
"redirect_url": "/azure/active-directory/saas-apps/navan-tutorial",
141+
"redirect_document_id": false
132142
},
133143
{
134144
"source_path_from_root": "/articles/active-directory/saas-apps/oracle-peoplesoft-protected-by-f5-big-ip-apm-tutorial.md",
@@ -165,6 +175,11 @@
165175
"redirect_url": "/azure/active-directory/develop/workload-identity-federation-create-trust",
166176
"redirect_document_id": false
167177
},
178+
{
179+
"source_path_from_root": "/articles/active-directory/workload-identities/workload-identity-federation-create-trust-gcp.md",
180+
"redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation",
181+
"redirect_document_id": false
182+
},
168183
{
169184
"source_path_from_root": "/articles/active-directory/develop/workload-identities-overview.md",
170185
"redirect_url": "/azure/active-directory/workload-identities/workload-identities-overview",
@@ -4491,6 +4506,11 @@
44914506
"redirect_url": "/azure/active-directory/reports-monitoring/reference-azure-ad-sla-performance",
44924507
"redirect_document_id": false
44934508
},
4509+
{
4510+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-users-profile-azure-portal.md",
4511+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-user-profile-info",
4512+
"redirect_document_id": false
4513+
},
44944514
{
44954515
"source_path_from_root": "/articles/active-directory/customize-branding.md",
44964516
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
@@ -7274,6 +7294,11 @@
72747294
{
72757295
"source_path_from_root": "/articles/active-directory/active-directory-privileged-identity-management-how-to-require-mfa.md",
72767296
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-how-to-require-mfa",
7297+
"redirect_document_id": false
7298+
},
7299+
{
7300+
"source_path_from_root": "/articles/active-directory/privileged-identity-management/pim-how-to-require-mfa.md",
7301+
"redirect_url": "/azure/active-directory/authentication/howto-mfa-getstarted",
72777302
"redirect_document_id": true
72787303
},
72797304
{
@@ -11170,6 +11195,11 @@
1117011195
"source_path_from_root": "/articles/active-directory-domain-services/concepts-resource-forest.md",
1117111196
"redirect_url": "/azure/active-directory-domain-services/concepts-forest-trust",
1117211197
"redirect_document_id": false
11198+
},
11199+
{
11200+
"source_path_from_root": "/articles/active-directory-domain-services/create-resource-forest-powershell.md",
11201+
"redirect_url": "/azure/active-directory-domain-services/create-forest-trust-powershell",
11202+
"redirect_document_id": false
1117311203
}
1117411204
]
1117511205
}
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: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,21 @@
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+
},
58+
{
59+
"source_path_from_root": "/articles/azure-monitor/app/console.md",
60+
"redirect_url": "/previous-versions/azure/azure-monitor/app/console",
61+
"redirect_document_id": false
62+
},
4863
{
4964
"source_path_from_root": "/articles/azure-monitor/app/resource-manager-web-app.md",
5065
"redirect_url": "/previous-versions/azure/azure-monitor/app/resource-manager-web-app",
@@ -5807,6 +5822,16 @@
58075822
"redirect_url": "/azure/azure-monitor/app/opentelemetry-enable",
58085823
"redirect_document_id": false
58095824
},
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+
},
58105835
{
58115836
"source_path_from_root": "/articles/azure-monitor/insights/solutions.md",
58125837
"redirect_url": "/previous-versions/azure/azure-monitor/insights/solutions",

.openpublishing.redirection.azure-productivity.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,11 @@
144144
"source_path": "articles/lab-services/quick-create-lab-template.md",
145145
"redirect_url": "/azure/lab-services/how-to-create-lab-template",
146146
"redirect_document_id": true
147+
},
148+
{
149+
"source_path": "articles/lab-services/classroom-labs-faq.yml",
150+
"redirect_url": "/azure/lab-services/lab-services-overview",
151+
"redirect_document_id": false
147152
}
148153
]
149154
}

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

Lines changed: 41 additions & 1 deletion
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",
@@ -1410,6 +1415,11 @@
14101415
"redirect_url": "/azure/azure-resource-manager/managed-applications/concepts-custom-role-definition",
14111416
"redirect_document_id": false
14121417
},
1418+
{
1419+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/concepts-custom-role-definition.md",
1420+
"redirect_url": "/azure/azure-resource-manager/managed-applications/overview",
1421+
"redirect_document_id": false
1422+
},
14131423
{
14141424
"source_path_from_root": "/articles/managed-applications/concepts-managed-applications-built-in-policy.md",
14151425
"redirect_url": "/azure/azure-resource-manager/managed-applications/concepts-built-in-policy",
@@ -1580,6 +1590,11 @@
15801590
"redirect_url": "/azure/azure-resource-manager/managed-applications/powershell-samples",
15811591
"redirect_document_id": false
15821592
},
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+
},
15831598
{
15841599
"source_path_from_root": "/articles/managed-applications/publish-managed-app-definition-quickstart.md",
15851600
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
@@ -1600,6 +1615,11 @@
16001615
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-portal",
16011616
"redirect_document_id": false
16021617
},
1618+
{
1619+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/publish-portal.md",
1620+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1621+
"redirect_document_id": false
1622+
},
16031623
{
16041624
"source_path_from_root": "/articles/managed-applications/publish-service-catalog-app.md",
16051625
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
@@ -1879,6 +1899,26 @@
18791899
"source_path_from_root": "/articles/xplat-cli-azure-resource-manager.md",
18801900
"redirect_url": "/azure/azure-resource-manager/management/manage-resources-cli",
18811901
"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
18821922
}
18831923
]
1884-
}
1924+
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -809,6 +809,11 @@
809809
"source_path_from_root": "/articles/defender-for-cloud/faq-azure-monitor-logs.yml",
810810
"redirect_url": "/azure/defender-for-cloud/faq-data-collection-agents",
811811
"redirect_document_id": true
812+
},
813+
{
814+
"source_path_from_root": "/articles/defender-for-cloud/defender-for-storage-exclude.md",
815+
"redirect_url": "/azure/defender-for-cloud/defender-for-storage-classic-enable#exclude-a-storage-account-from-a-protected-subscription-in-the-per-transaction-plan",
816+
"redirect_document_id": true
812817
}
813818
]
814819
}

.openpublishing.redirection.dev-box.json

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

0 commit comments

Comments
 (0)