Skip to content

Commit afed7c6

Browse files
authored
Merge branch 'main' into patch-141
2 parents 304be9c + 6f88d6d commit afed7c6

File tree

10,176 files changed

+177327
-110670
lines changed

Some content is hidden

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

10,176 files changed

+177327
-110670
lines changed

.openpublishing.publish.config.json

Lines changed: 32 additions & 6 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",
@@ -760,7 +772,7 @@
760772
},
761773
{
762774
"path_to_root": "azure-spring-apps-reference-architecture",
763-
"url": "https://github.com/Azure/azure-spring-apps-reference-architecture",
775+
"url": "https://github.com/Azure/azure-spring-apps-landing-zone-accelerator",
764776
"branch": "reference-architecture",
765777
"branch_mapping": {}
766778
},
@@ -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: 65 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",
@@ -95,6 +100,11 @@
95100
"redirect_url": "/graph/tutorial-lifecycle-workflows-onboard-custom-workflow",
96101
"redirect_document_id": false
97102
},
103+
{
104+
"source_path_from_root": "/articles/active-directory/governance/manage-lifecycle-workflows.md",
105+
"redirect_url": "/azure/active-directory/governance/understanding-lifecycle-workflows",
106+
"redirect_document_id": false
107+
},
98108
{
99109
"source_path_from_root": "/articles/active-directory/governance/lifecycle-workflows-developer-reference.md",
100110
"redirect_url": "/graph/api/resources/identitygovernance-workflow",
@@ -160,6 +170,46 @@
160170
"redirect_url": "/azure/active-directory/develop/workload-identity-federation-create-trust",
161171
"redirect_document_id": false
162172
},
173+
{
174+
"source_path_from_root": "/articles/active-directory/develop/workload-identities-overview.md",
175+
"redirect_url": "/azure/active-directory/workload-identities/workload-identities-overview",
176+
"redirect_document_id": false
177+
},
178+
{
179+
"source_path_from_root": "/articles/active-directory/develop/workload-identities-faqs.md",
180+
"redirect_url": "/azure/active-directory/workload-identities/workload-identities-faqs",
181+
"redirect_document_id": false
182+
},
183+
{
184+
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation.md",
185+
"redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation",
186+
"redirect_document_id": false
187+
},
188+
{
189+
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-create-trust.md",
190+
"redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation-create-trust",
191+
"redirect_document_id": false
192+
},
193+
{
194+
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-create-trust-user-assigned-managed-identity.md",
195+
"redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation-create-trust-user-assigned-managed-identity",
196+
"redirect_document_id": false
197+
},
198+
{
199+
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-create-trust-gcp.md",
200+
"redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation-create-trust-gcp",
201+
"redirect_document_id": false
202+
},
203+
{
204+
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-block-using-azure-policy.md",
205+
"redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation-block-using-azure-policy",
206+
"redirect_document_id": false
207+
},
208+
{
209+
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-considerations.md",
210+
"redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation-considerations",
211+
"redirect_document_id": false
212+
},
163213
{
164214
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-limitations.md",
165215
"redirect_url": "/azure/active-directory/develop/v2-overview",
@@ -4446,6 +4496,11 @@
44464496
"redirect_url": "/azure/active-directory/reports-monitoring/reference-azure-ad-sla-performance",
44474497
"redirect_document_id": false
44484498
},
4499+
{
4500+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-users-profile-azure-portal.md",
4501+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-user-profile-info",
4502+
"redirect_document_id": false
4503+
},
44494504
{
44504505
"source_path_from_root": "/articles/active-directory/customize-branding.md",
44514506
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
@@ -7229,6 +7284,11 @@
72297284
{
72307285
"source_path_from_root": "/articles/active-directory/active-directory-privileged-identity-management-how-to-require-mfa.md",
72317286
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-how-to-require-mfa",
7287+
"redirect_document_id": false
7288+
},
7289+
{
7290+
"source_path_from_root": "/articles/active-directory/privileged-identity-management/pim-how-to-require-mfa.md",
7291+
"redirect_url": "/azure/active-directory/authentication/howto-mfa-getstarted",
72327292
"redirect_document_id": true
72337293
},
72347294
{
@@ -10941,6 +11001,11 @@
1094111001
"redirect_url": "/azure/active-directory-b2c/tenant-management-add-administrator",
1094211002
"redirect_document_id": false
1094311003
},
11004+
{
11005+
"source_path_from_root": "/articles/active-directory-b2c/support-options.md",
11006+
"redirect_url": "/azure/active-directory-b2c/find-help-open-support-ticket",
11007+
"redirect_document_id": false
11008+
},
1094411009
{
1094511010
"source_path": "articles/active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-arm.md",
1094611011
"redirect_url": "/azure/active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities?pivots=identity-mi-methods-arm",
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+
}

0 commit comments

Comments
 (0)