Skip to content

Commit cbf94d7

Browse files
authored
Merge branch 'main' into patch-2
2 parents 789e2ab + 5d00781 commit cbf94d7

File tree

10,262 files changed

+173446
-154337
lines changed

Some content is hidden

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

10,262 files changed

+173446
-154337
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: 56 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",
@@ -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",
@@ -4236,6 +4256,11 @@
42364256
"redirect_url": "/azure/active-directory/external-identities/user-token",
42374257
"redirect_document_id": true
42384258
},
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+
},
42394264
{
42404265
"source_path_from_root": "/articles/active-directory/b2b/what-is-b2b.md",
42414266
"redirect_url": "/azure/active-directory/external-identities/what-is-b2b",
@@ -5798,7 +5823,12 @@
57985823
},
57995824
{
58005825
"source_path_from_root": "/articles/active-directory/manage-apps/active-directory-app-proxy-protect-ndes.md",
5801-
"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",
58025832
"redirect_document_id": false
58035833
},
58045834
{
@@ -7214,7 +7244,7 @@
72147244
{
72157245
"source_path_from_root": "/articles/active-directory/active-directory-privileged-identity-management-how-to-add-role-to-user.md",
72167246
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-how-to-add-role-to-user",
7217-
"redirect_document_id": true
7247+
"redirect_document_id": false
72187248
},
72197249
{
72207250
"source_path_from_root": "/articles/active-directory/active-directory-privileged-identity-management-how-to-change-default-settings.md",
@@ -7531,6 +7561,11 @@
75317561
"redirect_url": "/azure/active-directory/roles/view-assignments",
75327562
"redirect_document_id": false
75337563
},
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+
},
75347569
{
75357570
"source_path_from_root": "/articles/active-directory/users-groups-roles/directory-administrative-units.md",
75367571
"redirect_url": "/azure/active-directory/roles/administrative-units",
@@ -7648,8 +7683,8 @@
76487683
},
76497684
{
76507685
"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
7686+
"redirect_url": "/azure/active-directory/privileged-identity-management/pim-how-to-add-role-to-user",
7687+
"redirect_document_id": false
76537688
},
76547689
{
76557690
"source_path_from_root": "/articles/active-directory/users-groups-roles/roles-groups-remove-assignment.md",
@@ -11175,6 +11210,21 @@
1117511210
"source_path_from_root": "/articles/active-directory/governance/create-access-review-privileged-access-groups.md",
1117611211
"redirect_url": "/azure/active-directory/governance/create-access-review-pim-for-groups",
1117711212
"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
1117811228
}
1117911229
]
1118011230
}

.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/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: 52 additions & 2 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,6 +50,36 @@
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+
},
73+
{
74+
"source_path_from_root": "/articles/azure-monitor/app/correlation.md",
75+
"redirect_url": "/azure/azure-monitor/app/distributed-tracing-telemetry-correlation",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path_from_root": "/articles/azure-monitor/app/distributed-tracing.md",
80+
"redirect_url": "/azure/azure-monitor/app/distributed-tracing-telemetry-correlation",
81+
"redirect_document_id": false
82+
},
4883
{
4984
"source_path_from_root": "/articles/azure-monitor/app/console.md",
5085
"redirect_url": "/previous-versions/azure/azure-monitor/app/console",
@@ -5812,6 +5847,16 @@
58125847
"redirect_url": "/azure/azure-monitor/app/opentelemetry-enable",
58135848
"redirect_document_id": false
58145849
},
5850+
{
5851+
"source_path_from_root": "/articles/azure-monitor/logs/logicapp-flow-connector.md",
5852+
"redirect_url": "/azure/connectors/connectors-azure-monitor-logs",
5853+
"redirect_document_id": false
5854+
},
5855+
{
5856+
"source_path_from_root": "/articles/azure-monitor/app/automate-with-logic-apps.md",
5857+
"redirect_url": "/azure/connectors/connectors-azure-application-insights",
5858+
"redirect_document_id": false
5859+
},
58155860
{
58165861
"source_path_from_root": "/articles/azure-monitor/insights/solutions.md",
58175862
"redirect_url": "/previous-versions/azure/azure-monitor/insights/solutions",
@@ -6090,7 +6135,12 @@
60906135
"source_path_from_root": "/articles/azure-monitor/app/data-model-context.md",
60916136
"redirect_url": "/azure/azure-monitor/app/data-model-complete",
60926137
"redirect_document_id": false
6138+
},
6139+
{
6140+
"source_path_from_root": "/articles/azure-monitor/logs/dashboard-upgrade.md",
6141+
"redirect_url": "/azure/azure-monitor/visualize/tutorial-logs-dashboards",
6142+
"redirect_document_id": false
60936143
}
6094-
6144+
60956145
]
60966146
}

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

0 commit comments

Comments
 (0)