Skip to content

Commit 9283c76

Browse files
Merge branch 'main' of https://github.com/James-Green-Microsoft/azure-docs-pr into network-connectivity-bug
2 parents d771589 + 4bc4147 commit 9283c76

File tree

14,559 files changed

+252199
-254244
lines changed

Some content is hidden

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

14,559 files changed

+252199
-254244
lines changed

.openpublishing.publish.config.json

Lines changed: 44 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",
@@ -913,6 +931,24 @@
913931
"url": "https://github.com/Azure-Samples/azure-cosmos-db-mongodb-python-getting-started",
914932
"branch": "main",
915933
"branch_mapping": {}
934+
},
935+
{
936+
"path_to_root": "azure-ai-vision-sdk",
937+
"url": "https://github.com/Azure-Samples/azure-ai-vision-sdk",
938+
"branch": "main",
939+
"branch_mapping": {}
940+
},
941+
{
942+
"path_to_root": "azure-cache-redis-samples",
943+
"url": "https://github.com/Azure-Samples/azure-cache-redis-samples",
944+
"branch": "main",
945+
"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": {}
916952
}
917953
],
918954
"branch_target_mapping": {
@@ -937,6 +973,7 @@
937973
".openpublishing.redirection.azure-australia.json",
938974
".openpublishing.redirection.azure-databricks.json",
939975
".openpublishing.redirection.azure-hpc.json",
976+
".openpublishing.redirection.azure-kubernetes-service.json",
940977
".openpublishing.redirection.azure-monitor.json",
941978
".openpublishing.redirection.azure-percept.json",
942979
".openpublishing.redirection.azure-productivity.json",
@@ -947,8 +984,6 @@
947984
".openpublishing.redirection.baremetal-infrastructure.json",
948985
".openpublishing.redirection.defender-for-cloud.json",
949986
".openpublishing.redirection.defender-for-iot.json",
950-
".openpublishing.redirection.deployment-environments.json",
951-
".openpublishing.redirection.dev-box.json",
952987
".openpublishing.redirection.healthcare-apis.json",
953988
".openpublishing.redirection.iot-hub-device-update.json",
954989
".openpublishing.redirection.json",
@@ -958,6 +993,7 @@
958993
".openpublishing.redirection.security-benchmark.json",
959994
".openpublishing.redirection.sql-database.json",
960995
".openpublishing.redirection.virtual-desktop.json",
996+
".openpublishing.redirection.devops-project.json",
961997
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
962998
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
963999
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
@@ -984,7 +1020,7 @@
9841020
"articles/iot-develop/.openpublishing.redirection.iot-develop.json",
9851021
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
9861022
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",
987-
"articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
1023+
"articles/iot/.openpublishing.redirection.iot.json",
9881024
"articles/iot-hub/.openpublishing.redirection.iot-hub.json",
9891025
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
9901026
"articles/logic-apps/.openpublishing.redirection.logic-apps.json",
@@ -1004,6 +1040,8 @@
10041040
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
10051041
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
10061042
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
1007-
"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"
10081046
]
10091047
}

.openpublishing.redirection.active-directory.json

Lines changed: 96 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,16 @@
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+
},
83+
{
84+
"source_path_from_root": "/articles/active-directory/saas-apps/usertesting-tutorial.md",
85+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
86+
"redirect_document_id": false
87+
},
7888
{
7989
"source_path_from_root": "/articles/active-directory/saas-apps/otsuka-shokai-tutorial.md",
8090
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
@@ -90,6 +100,11 @@
90100
"redirect_url": "/graph/tutorial-lifecycle-workflows-onboard-custom-workflow",
91101
"redirect_document_id": false
92102
},
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+
},
93108
{
94109
"source_path_from_root": "/articles/active-directory/governance/lifecycle-workflows-developer-reference.md",
95110
"redirect_url": "/graph/api/resources/identitygovernance-workflow",
@@ -119,6 +134,11 @@
119134
"source_path_from_root": "/articles/active-directory/saas-apps/headerf5-tutorial.md",
120135
"redirect_url": "/azure/active-directory/saas-apps/f5-big-ip-headers-easy-button",
121136
"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
122142
},
123143
{
124144
"source_path_from_root": "/articles/active-directory/saas-apps/oracle-peoplesoft-protected-by-f5-big-ip-apm-tutorial.md",
@@ -155,6 +175,51 @@
155175
"redirect_url": "/azure/active-directory/develop/workload-identity-federation-create-trust",
156176
"redirect_document_id": false
157177
},
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+
},
183+
{
184+
"source_path_from_root": "/articles/active-directory/develop/workload-identities-overview.md",
185+
"redirect_url": "/azure/active-directory/workload-identities/workload-identities-overview",
186+
"redirect_document_id": false
187+
},
188+
{
189+
"source_path_from_root": "/articles/active-directory/develop/workload-identities-faqs.md",
190+
"redirect_url": "/azure/active-directory/workload-identities/workload-identities-faqs",
191+
"redirect_document_id": false
192+
},
193+
{
194+
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation.md",
195+
"redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation",
196+
"redirect_document_id": false
197+
},
198+
{
199+
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-create-trust.md",
200+
"redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation-create-trust",
201+
"redirect_document_id": false
202+
},
203+
{
204+
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-create-trust-user-assigned-managed-identity.md",
205+
"redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation-create-trust-user-assigned-managed-identity",
206+
"redirect_document_id": false
207+
},
208+
{
209+
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-create-trust-gcp.md",
210+
"redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation-create-trust-gcp",
211+
"redirect_document_id": false
212+
},
213+
{
214+
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-block-using-azure-policy.md",
215+
"redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation-block-using-azure-policy",
216+
"redirect_document_id": false
217+
},
218+
{
219+
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-considerations.md",
220+
"redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation-considerations",
221+
"redirect_document_id": false
222+
},
158223
{
159224
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-limitations.md",
160225
"redirect_url": "/azure/active-directory/develop/v2-overview",
@@ -1875,6 +1940,11 @@
18751940
"redirect_url": "/azure/active-directory/hybrid/migrate-from-federation-to-cloud-authentication",
18761941
"redirect_document_id": true
18771942
},
1943+
{
1944+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-deployment-checklist-p2.md",
1945+
"redirect_url": "/azure/active-directory/fundamentals/concept-secure-remote-workers",
1946+
"redirect_document_id": true
1947+
},
18781948
{
18791949
"source_path_from_root": "/articles/active-directory/conditional-access/app-based-mfa.md",
18801950
"redirect_url": "/azure/active-directory/authentication/tutorial-enable-azure-mfa",
@@ -4400,7 +4470,7 @@
44004470
"source_path_from_root": "/articles/active-directory/reports-monitoring/recommendations-integrate-third-party-apps.md",
44014471
"redirect_url": "/azure/active-directory/reports-monitoring/overview-recommendations",
44024472
"redirect_document_id": false
4403-
},
4473+
},
44044474
{
44054475
"source_path_from_root": "/articles/active-directory/reports-monitoring/workbook-legacy authentication.md",
44064476
"redirect_url": "/azure/active-directory/reports-monitoring/workbook-legacy-authentication",
@@ -4436,6 +4506,11 @@
44364506
"redirect_url": "/azure/active-directory/reports-monitoring/reference-azure-ad-sla-performance",
44374507
"redirect_document_id": false
44384508
},
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+
},
44394514
{
44404515
"source_path_from_root": "/articles/active-directory/customize-branding.md",
44414516
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
@@ -7219,6 +7294,11 @@
72197294
{
72207295
"source_path_from_root": "/articles/active-directory/active-directory-privileged-identity-management-how-to-require-mfa.md",
72217296
"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",
72227302
"redirect_document_id": true
72237303
},
72247304
{
@@ -10931,6 +11011,11 @@
1093111011
"redirect_url": "/azure/active-directory-b2c/tenant-management-add-administrator",
1093211012
"redirect_document_id": false
1093311013
},
11014+
{
11015+
"source_path_from_root": "/articles/active-directory-b2c/support-options.md",
11016+
"redirect_url": "/azure/active-directory-b2c/find-help-open-support-ticket",
11017+
"redirect_document_id": false
11018+
},
1093411019
{
1093511020
"source_path": "articles/active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-arm.md",
1093611021
"redirect_url": "/azure/active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities?pivots=identity-mi-methods-arm",
@@ -11105,6 +11190,16 @@
1110511190
"source_path_from_root": "/articles/active-directory/governance/create-access-review-privileged-access-groups.md",
1110611191
"redirect_url": "/azure/active-directory/governance/create-access-review-pim-for-groups",
1110711192
"redirect_document_id": false
11193+
},
11194+
{
11195+
"source_path_from_root": "/articles/active-directory-domain-services/concepts-resource-forest.md",
11196+
"redirect_url": "/azure/active-directory-domain-services/concepts-forest-trust",
11197+
"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
1110811203
}
1110911204
]
1111011205
}
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)