Skip to content

Commit f0f1785

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents 971d2ad + 8ac7623 commit f0f1785

File tree

9,457 files changed

+154762
-145160
lines changed

Some content is hidden

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

9,457 files changed

+154762
-145160
lines changed

.openpublishing.publish.config.json

Lines changed: 40 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",
@@ -943,6 +967,18 @@
943967
"url": "https://github.com/Azure-Samples/azure-cache-redis-samples",
944968
"branch": "main",
945969
"branch_mapping": {}
970+
},
971+
{
972+
"path_to_root": "azure-load-testing-samples",
973+
"url": "https://github.com/Azure-Samples/azure-load-testing-samples",
974+
"branch": "main",
975+
"branch_mapping": {}
976+
},
977+
{
978+
"path_to_root": "microsoft-graph",
979+
"url": "https://github.com/MicrosoftGraph/microsoft-graph-docs",
980+
"branch": "main",
981+
"branch_mapping": {}
946982
}
947983
],
948984
"branch_target_mapping": {
@@ -964,6 +1000,7 @@
9641000
".openpublishing.redirection.app-service.json",
9651001
".openpublishing.redirection.azure-arc-data.json",
9661002
".openpublishing.redirection.azure-attestation.json",
1003+
".openpublishing.redirection.azure-app-configuration.json",
9671004
".openpublishing.redirection.azure-australia.json",
9681005
".openpublishing.redirection.azure-databricks.json",
9691006
".openpublishing.redirection.azure-hpc.json",
@@ -978,8 +1015,6 @@
9781015
".openpublishing.redirection.baremetal-infrastructure.json",
9791016
".openpublishing.redirection.defender-for-cloud.json",
9801017
".openpublishing.redirection.defender-for-iot.json",
981-
".openpublishing.redirection.deployment-environments.json",
982-
".openpublishing.redirection.dev-box.json",
9831018
".openpublishing.redirection.healthcare-apis.json",
9841019
".openpublishing.redirection.iot-hub-device-update.json",
9851020
".openpublishing.redirection.json",
@@ -1036,6 +1071,8 @@
10361071
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
10371072
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
10381073
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
1039-
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json"
1074+
"articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
1075+
"articles/dev-box/.openpublishing.redirection.dev-box.json",
1076+
"articles/deployment-environments/.openpublishing.redirection.deployment-environments.json"
10401077
]
10411078
}

.openpublishing.redirection.active-directory.json

Lines changed: 51 additions & 6 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",
@@ -4241,6 +4256,11 @@
42414256
"redirect_url": "/azure/active-directory/external-identities/user-token",
42424257
"redirect_document_id": true
42434258
},
4259+
{
4260+
"source_path_from_root": "/articles/active-directory/fundamentals/certificate-authorities.md",
4261+
"redirect_url": "/azure/security/fundamentals/azure-CA-details",
4262+
"redirect_document_id": true
4263+
},
42444264
{
42454265
"source_path_from_root": "/articles/active-directory/b2b/what-is-b2b.md",
42464266
"redirect_url": "/azure/active-directory/external-identities/what-is-b2b",
@@ -5803,7 +5823,12 @@
58035823
},
58045824
{
58055825
"source_path_from_root": "/articles/active-directory/manage-apps/active-directory-app-proxy-protect-ndes.md",
5806-
"redirect_url": "/azure/active-directory/app-proxy/active-directory-app-proxy-protect-ndes",
5826+
"redirect_url": "/azure/active-directory/app-proxy/app-proxy-protect-ndes",
5827+
"redirect_document_id": false
5828+
},
5829+
{
5830+
"source_path_from_root": "/articles/active-directory/app-proxy/active-directory-app-proxy-protect-ndes.md",
5831+
"redirect_url": "/azure/active-directory/app-proxy/app-proxy-protect-ndes",
58075832
"redirect_document_id": false
58085833
},
58095834
{
@@ -7219,7 +7244,7 @@
72197244
{
72207245
"source_path_from_root": "/articles/active-directory/active-directory-privileged-identity-management-how-to-add-role-to-user.md",
72217246
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-how-to-add-role-to-user",
7222-
"redirect_document_id": true
7247+
"redirect_document_id": false
72237248
},
72247249
{
72257250
"source_path_from_root": "/articles/active-directory/active-directory-privileged-identity-management-how-to-change-default-settings.md",
@@ -7536,6 +7561,11 @@
75367561
"redirect_url": "/azure/active-directory/roles/view-assignments",
75377562
"redirect_document_id": false
75387563
},
7564+
{
7565+
"source_path_from_root": "/articles/active-directory/roles/groups-pim-eligible.md",
7566+
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-how-to-add-role-to-user",
7567+
"redirect_document_id": true
7568+
},
75397569
{
75407570
"source_path_from_root": "/articles/active-directory/users-groups-roles/directory-administrative-units.md",
75417571
"redirect_url": "/azure/active-directory/roles/administrative-units",
@@ -7653,8 +7683,8 @@
76537683
},
76547684
{
76557685
"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
7686+
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-how-to-add-role-to-user",
7687+
"redirect_document_id": false
76587688
},
76597689
{
76607690
"source_path_from_root": "/articles/active-directory/users-groups-roles/roles-groups-remove-assignment.md",
@@ -11180,6 +11210,21 @@
1118011210
"source_path_from_root": "/articles/active-directory/governance/create-access-review-privileged-access-groups.md",
1118111211
"redirect_url": "/azure/active-directory/governance/create-access-review-pim-for-groups",
1118211212
"redirect_document_id": false
11213+
},
11214+
{
11215+
"source_path_from_root": "/articles/active-directory-domain-services/concepts-resource-forest.md",
11216+
"redirect_url": "/azure/active-directory-domain-services/concepts-forest-trust",
11217+
"redirect_document_id": false
11218+
},
11219+
{
11220+
"source_path_from_root": "/articles/active-directory-domain-services/create-resource-forest-powershell.md",
11221+
"redirect_url": "/azure/active-directory-domain-services/create-forest-trust-powershell",
11222+
"redirect_document_id": false
11223+
},
11224+
{
11225+
"source_path_from_root": "/articles/active-directory/privileged-identity-management/powershell-for-azure-ad-roles.md",
11226+
"redirect_url": "/powershell/microsoftgraph/tutorial-pim?view=graph-powershell-1.0",
11227+
"redirect_document_id": false
1118311228
}
1118411229
]
1118511230
}

.openpublishing.redirection.api-management.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,16 @@
149149
"source_path_from_root": "/articles/api-management/validation-policies.md",
150150
"redirect_url": "/azure/api-management/api-management-policies#validation-policies",
151151
"redirect_document_id": false
152+
},
153+
{
154+
"source_path_from_root": "/articles/api-management/authorizations-how-to.md",
155+
"redirect_url": "/azure/api-management/authorizations-how-to-github",
156+
"redirect_document_id": false
157+
},
158+
{
159+
"source_path_from_root": "/articles/api-management/authorizations-reference.md",
160+
"redirect_url": "/azure/api-management/authorizations-configure-common-providers",
161+
"redirect_document_id": false
152162
}
153163
]
154164
}
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/azure-app-configuration/howto-backup-config-store.md",
5+
"redirect_url": "/articles/azure-app-configuration/concept-geo-replication.md",
6+
"redirect_document_id": false
7+
}
8+
]
9+
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
{
22
"redirections": [
3-
{
3+
{
4+
"source_path_from_root": "/articles/azure-monitor/snapshot-debugger/snapshot-collector-release-notes.md",
5+
"redirect_url": "/azure/azure-monitor/snapshot-debugger/snapshot-debugger#release-notes-for-microsoftapplicationinsightssnapshotcollector",
6+
"redirect_document_id": false
7+
},
8+
{
49
"source_path_from_root": "/articles/azure-monitor/best-practices.md",
510
"redirect_url": "/azure/azure-monitor/getting-started",
611
"redirect_document_id": false
@@ -45,14 +50,34 @@
4550
"redirect_url": "/azure/azure-monitor/app/app-insights-overview",
4651
"redirect_document_id": false
4752
},
53+
{
54+
"source_path_from_root": "/articles/azure-monitor/app/tutorial-runtime-exceptions.md",
55+
"redirect_url": "/previous-versions/azure/azure-monitor/app/tutorial-runtime-exceptions",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path_from_root": "/articles/azure-monitor/app/tutorial-performance.md",
60+
"redirect_url": "/previous-versions/azure/azure-monitor/app/tutorial-performance",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path_from_root": "/articles/azure-monitor/app/tutorial-users.md",
65+
"redirect_url": "/previous-versions/azure/azure-monitor/app/tutorial-users",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path_from_root": "/articles/azure-monitor/app/custom-data-correlation.md",
70+
"redirect_url": "/previous-versions/azure/azure-monitor/app/custom-data-correlation",
71+
"redirect_document_id": false
72+
},
4873
{
4974
"source_path_from_root": "/articles/azure-monitor/app/correlation.md",
50-
"redirect_url": "/previous-versions/azure/azure-monitor/app/distributed-tracing-telemetry-correlation",
75+
"redirect_url": "/azure/azure-monitor/app/distributed-tracing-telemetry-correlation",
5176
"redirect_document_id": false
5277
},
5378
{
5479
"source_path_from_root": "/articles/azure-monitor/app/distributed-tracing.md",
55-
"redirect_url": "/previous-versions/azure/azure-monitor/app/distributed-tracing-telemetry-correlation",
80+
"redirect_url": "/azure/azure-monitor/app/distributed-tracing-telemetry-correlation",
5681
"redirect_document_id": false
5782
},
5883
{
@@ -6110,7 +6135,17 @@
61106135
"source_path_from_root": "/articles/azure-monitor/app/data-model-context.md",
61116136
"redirect_url": "/azure/azure-monitor/app/data-model-complete",
61126137
"redirect_document_id": false
6138+
},
6139+
{
6140+
"source_path_from_root": "/articles/azure-monitor/vm/monitor-virtual-machine-management-packs.md",
6141+
"redirect_url": "/azure/azure-monitor/azure-monitor-operations-manager#migrate-management-pack-logic",
6142+
"redirect_document_id": false
6143+
},
6144+
{
6145+
"source_path_from_root": "/articles/azure-monitor/logs/dashboard-upgrade.md",
6146+
"redirect_url": "/azure/azure-monitor/visualize/tutorial-logs-dashboards",
6147+
"redirect_document_id": false
61136148
}
6114-
6149+
61156150
]
61166151
}

.openpublishing.redirection.azure-productivity.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,11 @@
149149
"source_path": "articles/lab-services/classroom-labs-faq.yml",
150150
"redirect_url": "/azure/lab-services/lab-services-overview",
151151
"redirect_document_id": false
152-
}
152+
},
153+
{
154+
"source_path": "articles/lab-services/how-to-enable-nested-virtualization-template-vm-ui.md",
155+
"redirect_url": "/azure/lab-services/how-to-enable-nested-virtualization-template-vm-using-script",
156+
"redirect_document_id": false
157+
}
153158
]
154159
}

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

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1395,6 +1395,11 @@
13951395
"redirect_url": "/azure/azure-resource-manager/managed-applications/cli-samples",
13961396
"redirect_document_id": false
13971397
},
1398+
{
1399+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/cli-samples.md",
1400+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1401+
"redirect_document_id": false
1402+
},
13981403
{
13991404
"source_path_from_root": "/articles/managed-applications/concepts-custom-providers-built-in-policy.md",
14001405
"redirect_url": "/azure/azure-resource-manager/custom-providers/concepts-built-in-policy",
@@ -1585,6 +1590,11 @@
15851590
"redirect_url": "/azure/azure-resource-manager/managed-applications/powershell-samples",
15861591
"redirect_document_id": false
15871592
},
1593+
{
1594+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/powershell-samples.md",
1595+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1596+
"redirect_document_id": false
1597+
},
15881598
{
15891599
"source_path_from_root": "/articles/managed-applications/publish-managed-app-definition-quickstart.md",
15901600
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
@@ -1889,6 +1899,31 @@
18891899
"source_path_from_root": "/articles/xplat-cli-azure-resource-manager.md",
18901900
"redirect_url": "/azure/azure-resource-manager/management/manage-resources-cli",
18911901
"redirect_document_id": false
1892-
}
1902+
},
1903+
{
1904+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-define-create-cli-sample.md",
1905+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1906+
"redirect_document_id": false
1907+
},
1908+
{
1909+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-powershell-sample-create-definition.md",
1910+
"redirect_url": "/azure/azure-resource-manager/managed-applications/publish-service-catalog-app",
1911+
"redirect_document_id": false
1912+
},
1913+
{
1914+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-poweshell-sample-create-application.md",
1915+
"redirect_url": "/azure/azure-resource-manager/managed-applications/deploy-service-catalog-quickstart",
1916+
"redirect_document_id": false
1917+
},
1918+
{
1919+
"source_path_from_root": "/articles/azure-resource-manager/managed-applications/scripts/managed-application-powershell-sample-get-managed-group-resize-vm.md",
1920+
"redirect_url": "/azure/azure-resource-manager/managed-applications/overview",
1921+
"redirect_document_id": false
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+
}
18931928
]
18941929
}

0 commit comments

Comments
 (0)