Skip to content

Commit 2b6cd2c

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into sanRE
2 parents e8d9091 + 602b160 commit 2b6cd2c

File tree

5,792 files changed

+95685
-81807
lines changed

Some content is hidden

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

5,792 files changed

+95685
-81807
lines changed

.openpublishing.publish.config.json

Lines changed: 41 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",
@@ -878,6 +896,18 @@
878896
"branch": "docs-snippets",
879897
"branch_mapping": {}
880898
},
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+
},
881911
{
882912
"path_to_root": "ms-identity-node",
883913
"url": "https://github.com/Azure-Samples/ms-identity-node",
@@ -937,6 +967,12 @@
937967
"url": "https://github.com/Azure-Samples/azure-cache-redis-samples",
938968
"branch": "main",
939969
"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": {}
940976
}
941977
],
942978
"branch_target_mapping": {
@@ -961,6 +997,7 @@
961997
".openpublishing.redirection.azure-australia.json",
962998
".openpublishing.redirection.azure-databricks.json",
963999
".openpublishing.redirection.azure-hpc.json",
1000+
".openpublishing.redirection.azure-kubernetes-service.json",
9641001
".openpublishing.redirection.azure-monitor.json",
9651002
".openpublishing.redirection.azure-percept.json",
9661003
".openpublishing.redirection.azure-productivity.json",
@@ -971,8 +1008,6 @@
9711008
".openpublishing.redirection.baremetal-infrastructure.json",
9721009
".openpublishing.redirection.defender-for-cloud.json",
9731010
".openpublishing.redirection.defender-for-iot.json",
974-
".openpublishing.redirection.deployment-environments.json",
975-
".openpublishing.redirection.dev-box.json",
9761011
".openpublishing.redirection.healthcare-apis.json",
9771012
".openpublishing.redirection.iot-hub-device-update.json",
9781013
".openpublishing.redirection.json",
@@ -982,6 +1017,7 @@
9821017
".openpublishing.redirection.security-benchmark.json",
9831018
".openpublishing.redirection.sql-database.json",
9841019
".openpublishing.redirection.virtual-desktop.json",
1020+
".openpublishing.redirection.devops-project.json",
9851021
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-old.json",
9861022
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
9871023
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
@@ -1028,6 +1064,8 @@
10281064
"articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
10291065
"articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
10301066
"articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
1031-
"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"
10321070
]
10331071
}

.openpublishing.redirection.active-directory.json

Lines changed: 40 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",
@@ -75,6 +80,11 @@
7580
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
7681
"redirect_document_id": false
7782
},
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+
},
7888
{
7989
"source_path_from_root": "/articles/active-directory/saas-apps/usertesting-tutorial.md",
8090
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
@@ -130,6 +140,11 @@
130140
"redirect_url": "/azure/active-directory/saas-apps/f5-big-ip-headers-easy-button",
131141
"redirect_document_id": false
132142
},
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+
},
133148
{
134149
"source_path_from_root": "/articles/active-directory/saas-apps/oracle-peoplesoft-protected-by-f5-big-ip-apm-tutorial.md",
135150
"redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
@@ -165,6 +180,11 @@
165180
"redirect_url": "/azure/active-directory/develop/workload-identity-federation-create-trust",
166181
"redirect_document_id": false
167182
},
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+
},
168188
{
169189
"source_path_from_root": "/articles/active-directory/develop/workload-identities-overview.md",
170190
"redirect_url": "/azure/active-directory/workload-identities/workload-identities-overview",
@@ -7214,7 +7234,7 @@
72147234
{
72157235
"source_path_from_root": "/articles/active-directory/active-directory-privileged-identity-management-how-to-add-role-to-user.md",
72167236
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-how-to-add-role-to-user",
7217-
"redirect_document_id": true
7237+
"redirect_document_id": false
72187238
},
72197239
{
72207240
"source_path_from_root": "/articles/active-directory/active-directory-privileged-identity-management-how-to-change-default-settings.md",
@@ -7531,6 +7551,11 @@
75317551
"redirect_url": "/azure/active-directory/roles/view-assignments",
75327552
"redirect_document_id": false
75337553
},
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+
},
75347559
{
75357560
"source_path_from_root": "/articles/active-directory/users-groups-roles/directory-administrative-units.md",
75367561
"redirect_url": "/azure/active-directory/roles/administrative-units",
@@ -7648,8 +7673,8 @@
76487673
},
76497674
{
76507675
"source_path_from_root": "/articles/active-directory/users-groups-roles/roles-groups-pim-eligible.md",
7651-
"redirect_url": "/azure/active-directory/roles/groups-pim-eligible",
7652-
"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
76537678
},
76547679
{
76557680
"source_path_from_root": "/articles/active-directory/users-groups-roles/roles-groups-remove-assignment.md",
@@ -11175,6 +11200,16 @@
1117511200
"source_path_from_root": "/articles/active-directory/governance/create-access-review-privileged-access-groups.md",
1117611201
"redirect_url": "/azure/active-directory/governance/create-access-review-pim-for-groups",
1117711202
"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
1117811213
}
1117911214
]
1118011215
}
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+
}

.openpublishing.redirection.azure-monitor.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,16 @@
4545
"redirect_url": "/azure/azure-monitor/app/app-insights-overview",
4646
"redirect_document_id": false
4747
},
48+
{
49+
"source_path_from_root": "/articles/azure-monitor/app/correlation.md",
50+
"redirect_url": "/previous-versions/azure/azure-monitor/app/distributed-tracing-telemetry-correlation",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/azure-monitor/app/distributed-tracing.md",
55+
"redirect_url": "/previous-versions/azure/azure-monitor/app/distributed-tracing-telemetry-correlation",
56+
"redirect_document_id": false
57+
},
4858
{
4959
"source_path_from_root": "/articles/azure-monitor/app/console.md",
5060
"redirect_url": "/previous-versions/azure/azure-monitor/app/console",
@@ -5812,6 +5822,16 @@
58125822
"redirect_url": "/azure/azure-monitor/app/opentelemetry-enable",
58135823
"redirect_document_id": false
58145824
},
5825+
{
5826+
"source_path_from_root": "/articles/azure-monitor/logs/logicapp-flow-connector.md",
5827+
"redirect_url": "/azure/connectors/connectors-azure-monitor-logs",
5828+
"redirect_document_id": false
5829+
},
5830+
{
5831+
"source_path_from_root": "/articles/azure-monitor/app/automate-with-logic-apps.md",
5832+
"redirect_url": "/azure/connectors/connectors-azure-application-insights",
5833+
"redirect_document_id": false
5834+
},
58155835
{
58165836
"source_path_from_root": "/articles/azure-monitor/insights/solutions.md",
58175837
"redirect_url": "/previous-versions/azure/azure-monitor/insights/solutions",

.openpublishing.redirection.azure-productivity.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,11 @@
144144
"source_path": "articles/lab-services/quick-create-lab-template.md",
145145
"redirect_url": "/azure/lab-services/how-to-create-lab-template",
146146
"redirect_document_id": true
147+
},
148+
{
149+
"source_path": "articles/lab-services/classroom-labs-faq.yml",
150+
"redirect_url": "/azure/lab-services/lab-services-overview",
151+
"redirect_document_id": false
147152
}
148153
]
149154
}

.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.defender-for-cloud.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -809,6 +809,11 @@
809809
"source_path_from_root": "/articles/defender-for-cloud/faq-azure-monitor-logs.yml",
810810
"redirect_url": "/azure/defender-for-cloud/faq-data-collection-agents",
811811
"redirect_document_id": true
812+
},
813+
{
814+
"source_path_from_root": "/articles/defender-for-cloud/defender-for-storage-exclude.md",
815+
"redirect_url": "/azure/defender-for-cloud/defender-for-storage-classic-enable#exclude-a-storage-account-from-a-protected-subscription-in-the-per-transaction-plan",
816+
"redirect_document_id": true
812817
}
813818
]
814819
}

.openpublishing.redirection.dev-box.json

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

0 commit comments

Comments
 (0)