Skip to content

Commit b6ac272

Browse files
authored
Merge branch 'main' into patch-1
2 parents 12b255a + 5ff687a commit b6ac272

File tree

8,126 files changed

+135032
-104773
lines changed

Some content is hidden

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

8,126 files changed

+135032
-104773
lines changed

.openpublishing.publish.config.json

Lines changed: 82 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,12 @@
3232
"need_preview_pull_request": true,
3333
"contribution_branch_mappings": {},
3434
"dependent_repositories": [
35+
{
36+
"path_to_root": "azure-docs-snippets-pr",
37+
"url": "https://github.com/MicrosoftDocs/azure-docs-snippets-pr",
38+
"branch": "main",
39+
"branch_mapping": {}
40+
},
3541
{
3642
"path_to_root": "azure-dev-docs-pr",
3743
"url": "https://github.com/MicrosoftDocs/azure-dev-docs-pr",
@@ -755,7 +761,7 @@
755761
{
756762
"path_to_root": "azure-spring-apps-reference-architecture",
757763
"url": "https://github.com/Azure/azure-spring-apps-reference-architecture",
758-
"branch": "main",
764+
"branch": "reference-architecture",
759765
"branch_mapping": {}
760766
},
761767
{
@@ -923,74 +929,79 @@
923929
"name": "docfx_v3"
924930
},
925931
"redirection_files": [
926-
".openpublishing.redirection.json",
927-
".openpublishing.redirection.azure-arc-data.json",
928-
".openpublishing.redirection.active-directory.json",
929-
".openpublishing.redirection.azure-attestation.json",
930-
".openpublishing.redirection.azure-blob.json",
931-
"articles/data-factory/.openpublishing.redirection.data-factory.json",
932-
".openpublishing.redirection.defender-for-cloud.json",
933-
".openpublishing.redirection.defender-for-iot.json",
934-
".openpublishing.redirection.healthcare-apis.json",
935-
"articles/iot-hub/.openpublishing.redirection.iot-hub.json",
936-
".openpublishing.redirection.app-service.json",
937-
".openpublishing.redirection.key-vault.json",
938-
".openpublishing.redirection.sql-database.json",
939-
".openpublishing.redirection.machine-configuration.json",
940-
".openpublishing.redirection.security-benchmark.json",
941-
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
942-
".openpublishing.redirection.azure-web-pubsub.json",
943-
".openpublishing.redirection.azure-monitor.json",
944-
".openpublishing.redirection.azure-percept.json",
945-
".openpublishing.redirection.azure-productivity.json",
946-
".openpublishing.redirection.azure-australia.json",
947-
".openpublishing.redirection.iot-hub-device-update.json",
948-
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
949-
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
950-
"articles/azure-relay/.openpublishing.redirection.relay.json",
951-
"articles/communication-services/.openpublishing.redirection.communication-services.json",
952-
"articles/confidential-computing/.openpublishing.redirection.json",
953-
"articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",
954-
"articles/cost-management-billing/.openpublishing.redirection.cost-management-billing.json",
955-
"articles/data-catalog/.openpublishing.redirection.data-catalog.json",
956-
"articles/data-lake-analytics/.openpublishing.redirection.data-lake-analytics.json",
957-
"articles/digital-twins/.openpublishing.redirection.digital-twins.json",
958-
"articles/event-grid/.openpublishing.redirection.event-grid.json",
959-
"articles/event-hubs/.openpublishing.redirection.event-hubs.json",
960-
"articles/hdinsight/.openpublishing.redirection.hdinsight.json",
961-
"articles/iot-central/.openpublishing.redirection.iot-central.json",
962-
"articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
963-
"articles/iot-develop/.openpublishing.redirection.iot-develop.json",
964-
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",
965-
"articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
966-
"articles/mariadb/.openpublishing.redirection.mariadb.json",
967-
"articles/marketplace/.openpublishing.redirection.marketplace.json",
968-
"articles/mysql/.openpublishing.redirection.mysql.json",
969-
"articles/object-anchors/.openpublishing.redirection.object-anchors.json",
970-
"articles/postgresql/.openpublishing.redirection.postgresql.json",
971-
"articles/purview/.openpublishing.redirection.purview.json",
972-
"articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
973-
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
974-
"articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
975-
"articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
976-
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
977-
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
978-
"articles/mysql/.openpublishing.redirection.mysql.json",
979-
"articles/container-apps/.openpublishing.redirection.container-apps.json",
980-
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
981-
"articles/spring-apps/.openpublishing.redirection.spring-apps.json",
982-
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
983-
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
984-
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
985-
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
986-
".openpublishing.redirection.virtual-desktop.json",
987-
".openpublishing.redirection.deployment-environments.json",
988-
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
989-
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
990-
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
991-
".openpublishing.redirection.baremetal-infrastructure.json",
992-
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
993-
"articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
994-
".openpublishing.redirection.azure-vmware.json"
995-
]
932+
".openpublishing.redirection.active-directory.json",
933+
".openpublishing.redirection.api-management.json",
934+
".openpublishing.redirection.app-service.json",
935+
".openpublishing.redirection.azure-arc-data.json",
936+
".openpublishing.redirection.azure-attestation.json",
937+
".openpublishing.redirection.azure-australia.json",
938+
".openpublishing.redirection.azure-databricks.json",
939+
".openpublishing.redirection.azure-hpc.json",
940+
".openpublishing.redirection.azure-monitor.json",
941+
".openpublishing.redirection.azure-percept.json",
942+
".openpublishing.redirection.azure-productivity.json",
943+
".openpublishing.redirection.azure-resource-manager.json",
944+
".openpublishing.redirection.azure-stack.json",
945+
".openpublishing.redirection.azure-vmware.json",
946+
".openpublishing.redirection.azure-web-pubsub.json",
947+
".openpublishing.redirection.baremetal-infrastructure.json",
948+
".openpublishing.redirection.defender-for-cloud.json",
949+
".openpublishing.redirection.defender-for-iot.json",
950+
".openpublishing.redirection.deployment-environments.json",
951+
".openpublishing.redirection.dev-box.json",
952+
".openpublishing.redirection.healthcare-apis.json",
953+
".openpublishing.redirection.iot-hub-device-update.json",
954+
".openpublishing.redirection.json",
955+
".openpublishing.redirection.key-vault.json",
956+
".openpublishing.redirection.machine-configuration.json",
957+
".openpublishing.redirection.openshift.json",
958+
".openpublishing.redirection.security-benchmark.json",
959+
".openpublishing.redirection.sql-database.json",
960+
".openpublishing.redirection.virtual-desktop.json",
961+
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
962+
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
963+
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
964+
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
965+
"articles/azure-relay/.openpublishing.redirection.relay.json",
966+
"articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",
967+
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
968+
"articles/cloud-shell/.openpublishing.redirection.cloud-shell.json",
969+
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json",
970+
"articles/communication-services/.openpublishing.redirection.communication-services.json",
971+
"articles/confidential-computing/.openpublishing.redirection.json",
972+
"articles/container-apps/.openpublishing.redirection.container-apps.json",
973+
"articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",
974+
"articles/cost-management-billing/.openpublishing.redirection.cost-management-billing.json",
975+
"articles/data-catalog/.openpublishing.redirection.data-catalog.json",
976+
"articles/data-factory/.openpublishing.redirection.data-factory.json",
977+
"articles/data-lake-analytics/.openpublishing.redirection.data-lake-analytics.json",
978+
"articles/digital-twins/.openpublishing.redirection.digital-twins.json",
979+
"articles/event-grid/.openpublishing.redirection.event-grid.json",
980+
"articles/event-hubs/.openpublishing.redirection.event-hubs.json",
981+
"articles/hdinsight/.openpublishing.redirection.hdinsight.json",
982+
"articles/iot-accelerators/.openpublishing.redirection.iot-accelerators.json",
983+
"articles/iot-central/.openpublishing.redirection.iot-central.json",
984+
"articles/iot-develop/.openpublishing.redirection.iot-develop.json",
985+
"articles/iot-dps/.openpublishing.redirection.iot-dps.json",
986+
"articles/iot-edge/.openpublishing.redirection.iot-edge.json",
987+
"articles/iot-fundamentals/.openpublishing.redirection.iot-fundamentals.json",
988+
"articles/iot-hub/.openpublishing.redirection.iot-hub.json",
989+
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
990+
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
991+
"articles/mariadb/.openpublishing.redirection.mariadb.json",
992+
"articles/marketplace/.openpublishing.redirection.marketplace.json",
993+
"articles/mysql/.openpublishing.redirection.mysql.json",
994+
"articles/object-anchors/.openpublishing.redirection.object-anchors.json",
995+
"articles/postgresql/.openpublishing.redirection.postgresql.json",
996+
"articles/purview/.openpublishing.redirection.purview.json",
997+
"articles/service-bus-messaging/.openpublishing.redirection.service-bus-messaging.json",
998+
"articles/spatial-anchors/.openpublishing.redirection.spatial-anchors.json",
999+
"articles/spring-apps/.openpublishing.redirection.spring-apps.json",
1000+
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
1001+
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
1002+
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
1003+
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
1004+
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
1005+
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json"
1006+
]
9961007
}

.openpublishing.redirection.active-directory.json

Lines changed: 75 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
{
22
"redirections": [
3+
{
4+
"source_path_from_root": "/articles/active-directory/develop/active-directory-claims-mapping.md",
5+
"redirect_url": "/azure/active-directory/develop/active-directory-saml-claims-customization",
6+
"redirect_document_id": false
7+
},
8+
{
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",
11+
"redirect_document_id": false
12+
},
313
{
414
"source_path_from_root": "/articles/active-directory/authentication/how-to-mfa-microsoft-managed.md",
515
"redirect_url": "/azure/active-directory/authentication/concept-authentication-default-enablement",
@@ -50,11 +60,26 @@
5060
"redirect_url": "/azure/active-directory/saas-apps/safety-culture-tutorial",
5161
"redirect_document_id": false
5262
},
63+
{
64+
"source_path_from_root": "/articles/active-directory/saas-apps/firstbird-tutorial.md",
65+
"redirect_url": "/azure/active-directory/saas-apps/radancys-employee-referrals-tutorial",
66+
"redirect_document_id": false
67+
},
5368
{
5469
"source_path_from_root": "/articles/active-directory/saas-apps/icertisicm-tutorial.md",
5570
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
5671
"redirect_document_id": false
5772
},
73+
{
74+
"source_path_from_root": "/articles/active-directory/saas-apps/otsuka-shokai-tutorial.md",
75+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path_from_root": "/articles/active-directory/saas-apps/netsuite-provisioning-tutorial.md",
80+
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
81+
"redirect_document_id": false
82+
},
5883
{
5984
"source_path_from_root": "/articles/active-directory/governance/tutorial-onboard-custom-workflow-graph.md",
6085
"redirect_url": "/graph/tutorial-lifecycle-workflows-onboard-custom-workflow",
@@ -1942,8 +1967,8 @@
19421967
},
19431968
{
19441969
"source_path_from_root": "/articles/active-directory/active-directory-b2b-add-user-without-invite.md",
1945-
"redirect_url": "/azure/active-directory/b2b/add-user-without-invite",
1946-
"redirect_document_id": true
1970+
"redirect_url": "/azure/active-directory/external-identities/redemption-experience",
1971+
"redirect_document_id": false
19471972
},
19481973
{
19491974
"source_path_from_root": "/articles/active-directory/active-directory-b2b-allow-deny-list.md",
@@ -3908,8 +3933,8 @@
39083933
},
39093934
{
39103935
"source_path_from_root": "/articles/active-directory/b2b/add-user-without-invite.md",
3911-
"redirect_url": "/azure/active-directory/external-identities/add-user-without-invite",
3912-
"redirect_document_id": true
3936+
"redirect_url": "/azure/active-directory/external-identities/redemption-experience",
3937+
"redirect_document_id": false
39133938
},
39143939
{
39153940
"source_path_from_root": "/articles/active-directory/b2b/allow-deny-list.md",
@@ -4089,7 +4114,7 @@
40894114
{
40904115
"source_path_from_root": "/articles/active-directory/b2b/redemption-experience.md",
40914116
"redirect_url": "/azure/active-directory/external-identities/redemption-experience",
4092-
"redirect_document_id": true
4117+
"redirect_document_id": false
40934118
},
40944119
{
40954120
"source_path_from_root": "/articles/active-directory/b2b/self-service-portal.md",
@@ -4336,6 +4361,11 @@
43364361
"redirect_url": "/azure/active-directory/fundamentals/concept-fundamentals-mfa-get-started",
43374362
"redirect_document_id": true
43384363
},
4364+
{
4365+
"source_path_from_root": "/articles/active-directory/conditional-access/faqs.md",
4366+
"redirect_url": "/azure/active-directory/conditional-access/overview",
4367+
"redirect_document_id": false
4368+
},
43394369
{
43404370
"source_path_from_root": "/articles/active-directory/conditional-access/concept-baseline-protection.md",
43414371
"redirect_url": "/azure/active-directory/fundamentals/concept-fundamentals-security-defaults",
@@ -4361,11 +4391,31 @@
43614391
"redirect_url": "/azure/active-directory/reports-monitoring/reports-faq",
43624392
"redirect_document_id": false
43634393
},
4394+
{
4395+
"source_path_from_root": "/articles/active-directory/reports-monitoring/workbook-legacy authentication.md",
4396+
"redirect_url": "/azure/active-directory/reports-monitoring/workbook-legacy-authentication",
4397+
"redirect_document_id": false
4398+
},
43644399
{
43654400
"source_path_from_root": "/articles/active-directory/reports-monitoring/troubleshoot-missing-audit-data.md",
43664401
"redirect_url": "/azure/active-directory/reports-monitoring/reports-faq",
43674402
"redirect_document_id": false
43684403
},
4404+
{
4405+
"source_path_from_root": "/articles/active-directory/reports-monitoring/tutorial-access-api-with-certificates.md",
4406+
"redirect_url": "/azure/active-directory/reports-monitoring/howto-configure-prerequisites-for-reporting-api",
4407+
"redirect_document_id": false
4408+
},
4409+
{
4410+
"source_path_from_root": "/articles/active-directory/reports-monitoring/troubleshoot-graph-api.md",
4411+
"redirect_url": "/azure/active-directory/reports-monitoring/howto-configure-prerequisites-for-reporting-api",
4412+
"redirect_document_id": false
4413+
},
4414+
{
4415+
"source_path_from_root": "/articles/active-directory/reports-monitoring/concept-reporting-api.md",
4416+
"redirect_url": "/azure/active-directory/reports-monitoring/howto-configure-prerequisites-for-reporting-api",
4417+
"redirect_document_id": false
4418+
},
43694419
{
43704420
"source_path_from_root": "/articles/active-directory/customize-branding.md",
43714421
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
@@ -11005,6 +11055,26 @@
1100511055
"source_path_from_root": "/articles/active-directory/cloud-infrastructure-entitlement-management/permissions-management-trial-playbook.md",
1100611056
"redirect_url": "/azure/active-directory/cloud-infrastructure-entitlement-management/permissions-management-trial-user-guide",
1100711057
"redirect_document_id": false
11058+
},
11059+
{
11060+
"source_path_from_root": "/articles/active-directory/develop/microsoft-graph-intro.md",
11061+
"redirect_url": "/graph/overview?toc=/azure/active-directory/develop/toc.json&bc=/azure/active-directory/develop/breadcrumb/toc.json",
11062+
"redirect_document_id": false
11063+
},
11064+
{
11065+
"source_path_from_root": "/articles/active-directory/privileged-identity-management/concept-privileged-access-versus-role-assignable.md",
11066+
"redirect_url": "/azure/active-directory/privileged-identity-management/concept-pim-for-groups",
11067+
"redirect_document_id": false
11068+
},
11069+
{
11070+
"source_path_from_root": "/articles/active-directory/privileged-identity-management/groups-features.md",
11071+
"redirect_url": "/azure/active-directory/privileged-identity-management/concept-pim-for-groups",
11072+
"redirect_document_id": false
11073+
},
11074+
{
11075+
"source_path_from_root": "/articles/active-directory/cloud-infrastructure-entitlement-management/product-data-inventory.md",
11076+
"redirect_url": "/azure/active-directory/cloud-infrastructure-entitlement-management/product-data-billable-resources",
11077+
"redirect_document_id": false
1100811078
}
1100911079
]
1101011080
}

0 commit comments

Comments
 (0)