Skip to content

Commit a5bd5ab

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into appgw-upd
2 parents b98bf00 + 83a196e commit a5bd5ab

File tree

18,274 files changed

+314325
-290400
lines changed

Some content is hidden

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

18,274 files changed

+314325
-290400
lines changed

.openpublishing.publish.config.json

Lines changed: 69 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@
6868
"branch": "master",
6969
"branch_mapping": {}
7070
},
71+
{
72+
"path_to_root": "ms-identity-docs-code-javascript",
73+
"url": "https://github.com/Azure-Samples/ms-identity-docs-code-javascript",
74+
"branch": "main",
75+
"branch_mapping": {}
76+
},
7177
{
7278
"path_to_root": "_themes",
7379
"url": "https://github.com/Microsoft/templates.docs.msft",
@@ -233,7 +239,13 @@
233239
{
234240
"path_to_root": "azure-functions-durable-js",
235241
"url": "https://github.com/Azure/azure-functions-durable-js",
236-
"branch": "main",
242+
"branch": "v2.x",
243+
"branch_mapping": {}
244+
},
245+
{
246+
"path_to_root": "azure-functions-durable-js-v3",
247+
"url": "https://github.com/Azure/azure-functions-durable-js",
248+
"branch": "v3.x",
237249
"branch_mapping": {}
238250
},
239251
{
@@ -368,6 +380,12 @@
368380
"branch": "master",
369381
"branch_mapping": {}
370382
},
383+
{
384+
"path_to_root": "ms-identity-docs-code-dotnet",
385+
"url": "https://github.com/Azure-Samples/ms-identity-docs-code-dotnet",
386+
"branch": "main",
387+
"branch_mapping": {}
388+
},
371389
{
372390
"path_to_root": "remote-monitoring-webui",
373391
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
@@ -536,6 +554,12 @@
536554
"branch": "main",
537555
"branch_mapping": {}
538556
},
557+
{
558+
"path_to_root": "azure-cosmos-db-mongodb-mern-web-app",
559+
"url": "https://github.com/Azure-samples/msdocs-azure-cosmos-db-mongodb-mern-web-app/",
560+
"branch": "main",
561+
"branch_mapping": {}
562+
},
539563
{
540564
"path_to_root": "azure-cosmos-spark",
541565
"url": "https://github.com/Azure/azure-cosmosdb-spark",
@@ -686,6 +710,12 @@
686710
"branch": "master",
687711
"branch_mapping": {}
688712
},
713+
{
714+
"path_to_root": "ms-identity-javascript-react-docs",
715+
"url": "https://github.com/Azure-Samples/ms-identity-javascript-react-docs",
716+
"branch": "main",
717+
"branch_mapping": {}
718+
},
689719
{
690720
"path_to_root": "cognitive-services-quickstart-code",
691721
"url": "https://github.com/Azure-Samples/cognitive-services-quickstart-code",
@@ -760,7 +790,7 @@
760790
},
761791
{
762792
"path_to_root": "azure-spring-apps-reference-architecture",
763-
"url": "https://github.com/Azure/azure-spring-apps-reference-architecture",
793+
"url": "https://github.com/Azure/azure-spring-apps-landing-zone-accelerator",
764794
"branch": "reference-architecture",
765795
"branch_mapping": {}
766796
},
@@ -866,6 +896,18 @@
866896
"branch": "docs-snippets",
867897
"branch_mapping": {}
868898
},
899+
{
900+
"path_to_root": "ms-identity-python-webapp",
901+
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
902+
"branch": "main",
903+
"branch_mapping": {}
904+
},
905+
{
906+
"path_to_root": "ms-identity-python-webapp-tutorial",
907+
"url": "https://github.com/Azure-Samples/ms-identity-python-webapp",
908+
"branch": "0.5.0",
909+
"branch_mapping": {}
910+
},
869911
{
870912
"path_to_root": "ms-identity-node",
871913
"url": "https://github.com/Azure-Samples/ms-identity-node",
@@ -913,6 +955,24 @@
913955
"url": "https://github.com/Azure-Samples/azure-cosmos-db-mongodb-python-getting-started",
914956
"branch": "main",
915957
"branch_mapping": {}
958+
},
959+
{
960+
"path_to_root": "azure-ai-vision-sdk",
961+
"url": "https://github.com/Azure-Samples/azure-ai-vision-sdk",
962+
"branch": "main",
963+
"branch_mapping": {}
964+
},
965+
{
966+
"path_to_root": "azure-cache-redis-samples",
967+
"url": "https://github.com/Azure-Samples/azure-cache-redis-samples",
968+
"branch": "main",
969+
"branch_mapping": {}
970+
},
971+
{
972+
"path_to_root": "microsoft-graph",
973+
"url": "https://github.com/MicrosoftGraph/microsoft-graph-docs",
974+
"branch": "main",
975+
"branch_mapping": {}
916976
}
917977
],
918978
"branch_target_mapping": {
@@ -937,6 +997,7 @@
937997
".openpublishing.redirection.azure-australia.json",
938998
".openpublishing.redirection.azure-databricks.json",
939999
".openpublishing.redirection.azure-hpc.json",
1000+
".openpublishing.redirection.azure-kubernetes-service.json",
9401001
".openpublishing.redirection.azure-monitor.json",
9411002
".openpublishing.redirection.azure-percept.json",
9421003
".openpublishing.redirection.azure-productivity.json",
@@ -947,8 +1008,6 @@
9471008
".openpublishing.redirection.baremetal-infrastructure.json",
9481009
".openpublishing.redirection.defender-for-cloud.json",
9491010
".openpublishing.redirection.defender-for-iot.json",
950-
".openpublishing.redirection.deployment-environments.json",
951-
".openpublishing.redirection.dev-box.json",
9521011
".openpublishing.redirection.healthcare-apis.json",
9531012
".openpublishing.redirection.iot-hub-device-update.json",
9541013
".openpublishing.redirection.json",
@@ -958,6 +1017,7 @@
9581017
".openpublishing.redirection.security-benchmark.json",
9591018
".openpublishing.redirection.sql-database.json",
9601019
".openpublishing.redirection.virtual-desktop.json",
1020+
".openpublishing.redirection.devops-project.json",
9611021
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
9621022
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
9631023
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
@@ -984,9 +1044,10 @@
9841044
"articles/iot-develop/.openpublishing.redirection.iot-develop.json",
9851045
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
9861046
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",
987-
"articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
1047+
"articles/iot/.openpublishing.redirection.iot.json",
9881048
"articles/iot-hub/.openpublishing.redirection.iot-hub.json",
9891049
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
1050+
"articles/logic-apps/.openpublishing.redirection.logic-apps.json",
9901051
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
9911052
"articles/mariadb/.openpublishing.redirection.mariadb.json",
9921053
"articles/marketplace/.openpublishing.redirection.marketplace.json",
@@ -1003,6 +1064,8 @@
10031064
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
10041065
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
10051066
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
1006-
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json"
1067+
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
1068+
"articles/dev-box/.openpublishing.redirection.dev-box.json",
1069+
"articles/deployment-environments/.openpublishing.redirection.deployment-environments.json"
10071070
]
10081071
}

.openpublishing.redirection.active-directory.json

Lines changed: 108 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"redirect_document_id": false
77
},
88
{
9-
"source_path_from_root": "/articles/active-directory/develop/configure-token-lifetimes.md",
10-
"redirect_url": "/azure/active-directory/develop/active-directory-saml-claims-customization",
9+
"source_path_from_root": "/articles/active-directory/develop/registration-config-change-token-lifetime-how-to.md",
10+
"redirect_url": "/azure/active-directory/develop/configure-token-lifetimes",
1111
"redirect_document_id": false
1212
},
1313
{
@@ -55,6 +55,16 @@
5555
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
5656
"redirect_document_id": false
5757
},
58+
{
59+
"source_path_from_root": "/articles/active-directory/saas-apps/trello-tutorial.md",
60+
"redirect_url": "/azure/active-directory/saas-apps/atlassian-cloud-tutorial",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path_from_root": "/articles/active-directory/saas-apps/easy-metrics-auth0-connector-tutorial.md",
65+
"redirect_url": "/azure/active-directory/saas-apps/easy-metrics-connector-tutorial",
66+
"redirect_document_id": false
67+
},
5868
{
5969
"source_path_from_root": "/articles/active-directory/saas-apps/iauditor-tutorial.md",
6070
"redirect_url": "/azure/active-directory/saas-apps/safety-culture-tutorial",
@@ -70,6 +80,16 @@
7080
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
7181
"redirect_document_id": false
7282
},
83+
{
84+
"source_path_from_root": "/articles/active-directory/saas-apps/teamzskill-tutorial.md",
85+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
86+
"redirect_document_id": false
87+
},
88+
{
89+
"source_path_from_root": "/articles/active-directory/saas-apps/usertesting-tutorial.md",
90+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
91+
"redirect_document_id": false
92+
},
7393
{
7494
"source_path_from_root": "/articles/active-directory/saas-apps/otsuka-shokai-tutorial.md",
7595
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
@@ -85,6 +105,11 @@
85105
"redirect_url": "/graph/tutorial-lifecycle-workflows-onboard-custom-workflow",
86106
"redirect_document_id": false
87107
},
108+
{
109+
"source_path_from_root": "/articles/active-directory/governance/manage-lifecycle-workflows.md",
110+
"redirect_url": "/azure/active-directory/governance/understanding-lifecycle-workflows",
111+
"redirect_document_id": false
112+
},
88113
{
89114
"source_path_from_root": "/articles/active-directory/governance/lifecycle-workflows-developer-reference.md",
90115
"redirect_url": "/graph/api/resources/identitygovernance-workflow",
@@ -115,6 +140,11 @@
115140
"redirect_url": "/azure/active-directory/saas-apps/f5-big-ip-headers-easy-button",
116141
"redirect_document_id": false
117142
},
143+
{
144+
"source_path_from_root": "/articles/active-directory/saas-apps/tripactions-tutorial.md",
145+
"redirect_url": "/azure/active-directory/saas-apps/navan-tutorial",
146+
"redirect_document_id": false
147+
},
118148
{
119149
"source_path_from_root": "/articles/active-directory/saas-apps/oracle-peoplesoft-protected-by-f5-big-ip-apm-tutorial.md",
120150
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
@@ -150,6 +180,51 @@
150180
"redirect_url": "/azure/active-directory/develop/workload-identity-federation-create-trust",
151181
"redirect_document_id": false
152182
},
183+
{
184+
"source_path_from_root": "/articles/active-directory/workload-identities/workload-identity-federation-create-trust-gcp.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-identities-overview.md",
190+
"redirect_url": "/azure/active-directory/workload-identities/workload-identities-overview",
191+
"redirect_document_id": false
192+
},
193+
{
194+
"source_path_from_root": "/articles/active-directory/develop/workload-identities-faqs.md",
195+
"redirect_url": "/azure/active-directory/workload-identities/workload-identities-faqs",
196+
"redirect_document_id": false
197+
},
198+
{
199+
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation.md",
200+
"redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation",
201+
"redirect_document_id": false
202+
},
203+
{
204+
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-create-trust.md",
205+
"redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation-create-trust",
206+
"redirect_document_id": false
207+
},
208+
{
209+
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-create-trust-user-assigned-managed-identity.md",
210+
"redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation-create-trust-user-assigned-managed-identity",
211+
"redirect_document_id": false
212+
},
213+
{
214+
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-create-trust-gcp.md",
215+
"redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation-create-trust-gcp",
216+
"redirect_document_id": false
217+
},
218+
{
219+
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-block-using-azure-policy.md",
220+
"redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation-block-using-azure-policy",
221+
"redirect_document_id": false
222+
},
223+
{
224+
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-considerations.md",
225+
"redirect_url": "/azure/active-directory/workload-identities/workload-identity-federation-considerations",
226+
"redirect_document_id": false
227+
},
153228
{
154229
"source_path_from_root": "/articles/active-directory/develop/active-directory-v2-limitations.md",
155230
"redirect_url": "/azure/active-directory/develop/v2-overview",
@@ -1870,6 +1945,11 @@
18701945
"redirect_url": "/azure/active-directory/hybrid/migrate-from-federation-to-cloud-authentication",
18711946
"redirect_document_id": true
18721947
},
1948+
{
1949+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-deployment-checklist-p2.md",
1950+
"redirect_url": "/azure/active-directory/fundamentals/concept-secure-remote-workers",
1951+
"redirect_document_id": true
1952+
},
18731953
{
18741954
"source_path_from_root": "/articles/active-directory/conditional-access/app-based-mfa.md",
18751955
"redirect_url": "/azure/active-directory/authentication/tutorial-enable-azure-mfa",
@@ -4395,7 +4475,7 @@
43954475
"source_path_from_root": "/articles/active-directory/reports-monitoring/recommendations-integrate-third-party-apps.md",
43964476
"redirect_url": "/azure/active-directory/reports-monitoring/overview-recommendations",
43974477
"redirect_document_id": false
4398-
},
4478+
},
43994479
{
44004480
"source_path_from_root": "/articles/active-directory/reports-monitoring/workbook-legacy authentication.md",
44014481
"redirect_url": "/azure/active-directory/reports-monitoring/workbook-legacy-authentication",
@@ -4431,6 +4511,11 @@
44314511
"redirect_url": "/azure/active-directory/reports-monitoring/reference-azure-ad-sla-performance",
44324512
"redirect_document_id": false
44334513
},
4514+
{
4515+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-users-profile-azure-portal.md",
4516+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-user-profile-info",
4517+
"redirect_document_id": false
4518+
},
44344519
{
44354520
"source_path_from_root": "/articles/active-directory/customize-branding.md",
44364521
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
@@ -7214,6 +7299,11 @@
72147299
{
72157300
"source_path_from_root": "/articles/active-directory/active-directory-privileged-identity-management-how-to-require-mfa.md",
72167301
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-how-to-require-mfa",
7302+
"redirect_document_id": false
7303+
},
7304+
{
7305+
"source_path_from_root": "/articles/active-directory/privileged-identity-management/pim-how-to-require-mfa.md",
7306+
"redirect_url": "/azure/active-directory/authentication/howto-mfa-getstarted",
72177307
"redirect_document_id": true
72187308
},
72197309
{
@@ -10926,6 +11016,11 @@
1092611016
"redirect_url": "/azure/active-directory-b2c/tenant-management-add-administrator",
1092711017
"redirect_document_id": false
1092811018
},
11019+
{
11020+
"source_path_from_root": "/articles/active-directory-b2c/support-options.md",
11021+
"redirect_url": "/azure/active-directory-b2c/find-help-open-support-ticket",
11022+
"redirect_document_id": false
11023+
},
1092911024
{
1093011025
"source_path": "articles/active-directory/managed-identities-azure-resources/how-to-manage-ua-identity-arm.md",
1093111026
"redirect_url": "/azure/active-directory/managed-identities-azure-resources/how-manage-user-assigned-managed-identities?pivots=identity-mi-methods-arm",
@@ -11100,6 +11195,16 @@
1110011195
"source_path_from_root": "/articles/active-directory/governance/create-access-review-privileged-access-groups.md",
1110111196
"redirect_url": "/azure/active-directory/governance/create-access-review-pim-for-groups",
1110211197
"redirect_document_id": false
11198+
},
11199+
{
11200+
"source_path_from_root": "/articles/active-directory-domain-services/concepts-resource-forest.md",
11201+
"redirect_url": "/azure/active-directory-domain-services/concepts-forest-trust",
11202+
"redirect_document_id": false
11203+
},
11204+
{
11205+
"source_path_from_root": "/articles/active-directory-domain-services/create-resource-forest-powershell.md",
11206+
"redirect_url": "/azure/active-directory-domain-services/create-forest-trust-powershell",
11207+
"redirect_document_id": false
1110311208
}
1110411209
]
1110511210
}
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)