Skip to content

Commit 7101689

Browse files
authored
Merge branch 'MicrosoftDocs:main' into previewexp
2 parents 7c09264 + 516fd74 commit 7101689

File tree

3,691 files changed

+51805
-48247
lines changed

Some content is hidden

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

3,691 files changed

+51805
-48247
lines changed

.openpublishing.publish.config.json

Lines changed: 27 additions & 3 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",
@@ -374,6 +380,12 @@
374380
"branch": "master",
375381
"branch_mapping": {}
376382
},
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+
},
377389
{
378390
"path_to_root": "remote-monitoring-webui",
379391
"url": "https://github.com/Azure/pcs-remote-monitoring-webui.git",
@@ -698,6 +710,12 @@
698710
"branch": "master",
699711
"branch_mapping": {}
700712
},
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+
},
701719
{
702720
"path_to_root": "cognitive-services-quickstart-code",
703721
"url": "https://github.com/Azure-Samples/cognitive-services-quickstart-code",
@@ -884,6 +902,12 @@
884902
"branch": "main",
885903
"branch_mapping": {}
886904
},
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+
},
887911
{
888912
"path_to_root": "ms-identity-node",
889913
"url": "https://github.com/Azure-Samples/ms-identity-node",
@@ -984,8 +1008,6 @@
9841008
".openpublishing.redirection.baremetal-infrastructure.json",
9851009
".openpublishing.redirection.defender-for-cloud.json",
9861010
".openpublishing.redirection.defender-for-iot.json",
987-
".openpublishing.redirection.deployment-environments.json",
988-
".openpublishing.redirection.dev-box.json",
9891011
".openpublishing.redirection.healthcare-apis.json",
9901012
".openpublishing.redirection.iot-hub-device-update.json",
9911013
".openpublishing.redirection.json",
@@ -1042,6 +1064,8 @@
10421064
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
10431065
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
10441066
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
1045-
"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"
10461070
]
10471071
}

.openpublishing.redirection.active-directory.json

Lines changed: 35 additions & 5 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
{
@@ -60,6 +60,11 @@
6060
"redirect_url": "/azure/active-directory/saas-apps/atlassian-cloud-tutorial",
6161
"redirect_document_id": false
6262
},
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+
},
6368
{
6469
"source_path_from_root": "/articles/active-directory/saas-apps/iauditor-tutorial.md",
6570
"redirect_url": "/azure/active-directory/saas-apps/safety-culture-tutorial",
@@ -135,6 +140,11 @@
135140
"redirect_url": "/azure/active-directory/saas-apps/f5-big-ip-headers-easy-button",
136141
"redirect_document_id": false
137142
},
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+
},
138148
{
139149
"source_path_from_root": "/articles/active-directory/saas-apps/oracle-peoplesoft-protected-by-f5-big-ip-apm-tutorial.md",
140150
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
@@ -170,6 +180,11 @@
170180
"redirect_url": "/azure/active-directory/develop/workload-identity-federation-create-trust",
171181
"redirect_document_id": false
172182
},
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+
},
173188
{
174189
"source_path_from_root": "/articles/active-directory/develop/workload-identities-overview.md",
175190
"redirect_url": "/azure/active-directory/workload-identities/workload-identities-overview",
@@ -7219,7 +7234,7 @@
72197234
{
72207235
"source_path_from_root": "/articles/active-directory/active-directory-privileged-identity-management-how-to-add-role-to-user.md",
72217236
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-how-to-add-role-to-user",
7222-
"redirect_document_id": true
7237+
"redirect_document_id": false
72237238
},
72247239
{
72257240
"source_path_from_root": "/articles/active-directory/active-directory-privileged-identity-management-how-to-change-default-settings.md",
@@ -7536,6 +7551,11 @@
75367551
"redirect_url": "/azure/active-directory/roles/view-assignments",
75377552
"redirect_document_id": false
75387553
},
7554+
{
7555+
"source_path_from_root": "/articles/active-directory/roles/groups-pim-eligible.md",
7556+
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-how-to-add-role-to-user",
7557+
"redirect_document_id": true
7558+
},
75397559
{
75407560
"source_path_from_root": "/articles/active-directory/users-groups-roles/directory-administrative-units.md",
75417561
"redirect_url": "/azure/active-directory/roles/administrative-units",
@@ -7653,8 +7673,8 @@
76537673
},
76547674
{
76557675
"source_path_from_root": "/articles/active-directory/users-groups-roles/roles-groups-pim-eligible.md",
7656-
"redirect_url": "/azure/active-directory/roles/groups-pim-eligible",
7657-
"redirect_document_id": true
7676+
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-how-to-add-role-to-user",
7677+
"redirect_document_id": false
76587678
},
76597679
{
76607680
"source_path_from_root": "/articles/active-directory/users-groups-roles/roles-groups-remove-assignment.md",
@@ -11180,6 +11200,16 @@
1118011200
"source_path_from_root": "/articles/active-directory/governance/create-access-review-privileged-access-groups.md",
1118111201
"redirect_url": "/azure/active-directory/governance/create-access-review-pim-for-groups",
1118211202
"redirect_document_id": false
11203+
},
11204+
{
11205+
"source_path_from_root": "/articles/active-directory-domain-services/concepts-resource-forest.md",
11206+
"redirect_url": "/azure/active-directory-domain-services/concepts-forest-trust",
11207+
"redirect_document_id": false
11208+
},
11209+
{
11210+
"source_path_from_root": "/articles/active-directory-domain-services/create-resource-forest-powershell.md",
11211+
"redirect_url": "/azure/active-directory-domain-services/create-forest-trust-powershell",
11212+
"redirect_document_id": false
1118311213
}
1118411214
]
1118511215
}

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1919,6 +1919,11 @@
19191919
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-powershell-sample-get-managed-group-resize-vm.md",
19201920
"redirect_url": "/azure/azure-resource-manager/managed-applications/overview",
19211921
"redirect_document_id": false
1922-
}
1922+
},
1923+
{
1924+
"source_path_from_root": "/articles/governance/policy/tutorials/policy-as-code-github.md",
1925+
"redirect_url": "/azure/governance/policy/concepts/policy-as-code",
1926+
"redirect_document_id": false
1927+
}
19231928
]
19241929
}

.openpublishing.redirection.dev-box.json

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

.openpublishing.redirection.healthcare-apis.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -590,11 +590,19 @@
590590
"redirect_document_id": false
591591
},
592592
{ "source_path_from_root": "/articles/healthcare-apis/iot/data-flow.md",
593-
"redirect_url": "/azure/healthcare-apis/iot/understand-service",
593+
"redirect_url": "/azure/healthcare-apis/iot/overview-of-device-message-processing-stages",
594+
"redirect_document_id": false
595+
},
596+
{ "source_path_from_root": "/articles/healthcare-apis/iot/understand-service.md",
597+
"redirect_url": "/azure/healthcare-apis/iot/overview-of-device-message-processing-stages",
594598
"redirect_document_id": false
595599
},
596600
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-device-mappings.md",
597-
"redirect_url": "/azure/healthcare-apis/iot/how-to-configure-device-mappings",
601+
"redirect_url": "/azure/healthcare-apis/iot/overview-of-device-mapping",
602+
"redirect_document_id": false
603+
},
604+
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-configure-device-mappings.md",
605+
"redirect_url": "/azure/healthcare-apis/iot/overview-of-device-mapping",
598606
"redirect_document_id": false
599607
},
600608
{ "source_path_from_root": "/articles/healthcare-apis/iot/how-to-use-fhir-mappings.md",

0 commit comments

Comments
 (0)