Skip to content

Commit 93085d3

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into release-one-file-for-SK
2 parents 515a5da + bfd11f4 commit 93085d3

File tree

1,877 files changed

+25138
-39009
lines changed

Some content is hidden

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

1,877 files changed

+25138
-39009
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: 22 additions & 2 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
{
@@ -134,6 +134,11 @@
134134
"source_path_from_root": "/articles/active-directory/saas-apps/headerf5-tutorial.md",
135135
"redirect_url": "/azure/active-directory/saas-apps/f5-big-ip-headers-easy-button",
136136
"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
137142
},
138143
{
139144
"source_path_from_root": "/articles/active-directory/saas-apps/oracle-peoplesoft-protected-by-f5-big-ip-apm-tutorial.md",
@@ -170,6 +175,11 @@
170175
"redirect_url": "/azure/active-directory/develop/workload-identity-federation-create-trust",
171176
"redirect_document_id": false
172177
},
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+
},
173183
{
174184
"source_path_from_root": "/articles/active-directory/develop/workload-identities-overview.md",
175185
"redirect_url": "/azure/active-directory/workload-identities/workload-identities-overview",
@@ -11180,6 +11190,16 @@
1118011190
"source_path_from_root": "/articles/active-directory/governance/create-access-review-privileged-access-groups.md",
1118111191
"redirect_url": "/azure/active-directory/governance/create-access-review-pim-for-groups",
1118211192
"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
1118311203
}
1118411204
]
1118511205
}

.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
}

.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)