Skip to content

Commit 79591b2

Browse files
authored
Merge branch 'main' into patch-4
2 parents bd95522 + e1bba2b commit 79591b2

File tree

13,207 files changed

+253132
-141019
lines changed

Some content is hidden

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

13,207 files changed

+253132
-141019
lines changed

.github/workflows/stale.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ jobs:
2323
# start-date: '2021-03-19'
2424
stale-pr-message: >
2525
This pull request has been inactive for at least 14 days.
26-
If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.docs.microsoft.com/help/contribute/contribute-how-to-write-pull-request-automation?branch=main) for instructions.
26+
If you are finished with your changes, don't forget to sign off. See the [contributor guide](https://review.learn.microsoft.com/help/contribute/contribute-how-to-write-pull-request-automation?branch=main) for instructions.
2727
28-
[Get Help](https://review.docs.microsoft.com/help/contribute/help-options?branch=main)
28+
[Get Help](https://review.learn.microsoft.com/help/contribute/help-options?branch=main)
2929
3030
[Docs Support Teams Channel](https://teams.microsoft.com/l/channel/19%3a7ecffca1166a4a3986fed528cf0870ee%40thread.skype/General?groupId=de9ddba4-2574-4830-87ed-41668c07a1ca&tenantId=72f988bf-86f1-41af-91ab-2d7cd011db47)
3131
32-
[Resolve Merge Conflict](https://review.docs.microsoft.com/help/contribute/resolve-merge-conflicts?branch=main)
32+
[Resolve Merge Conflict](https://review.learn.microsoft.com/help/contribute/resolve-merge-conflicts?branch=main)
3333

.openpublishing.publish.config.json

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -287,19 +287,19 @@
287287
{
288288
"path_to_root": "azure-search-javascript-samples",
289289
"url": "https://github.com/Azure-Samples/azure-search-javascript-samples",
290-
"branch": "master",
290+
"branch": "main",
291291
"branch_mapping": {}
292292
},
293293
{
294294
"path_to_root": "azure-search-dotnet-samples",
295295
"url": "https://github.com/Azure-Samples/azure-search-dotnet-samples",
296-
"branch": "master",
296+
"branch": "main",
297297
"branch_mapping": {}
298298
},
299299
{
300300
"path_to_root": "azure-search-python-samples",
301301
"url": "https://github.com/Azure-Samples/azure-search-python-samples",
302-
"branch": "master",
302+
"branch": "main",
303303
"branch_mapping": {}
304304
},
305305
{
@@ -374,12 +374,6 @@
374374
"branch": "master",
375375
"branch_mapping": {}
376376
},
377-
{
378-
"path_to_root": "media-services-v3-dotnet-quickstarts",
379-
"url": "https://github.com/Azure-Samples/media-services-v3-dotnet-quickstarts",
380-
"branch": "master",
381-
"branch_mapping": {}
382-
},
383377
{
384378
"path_to_root": "media-services-v3-dotnet-tutorials",
385379
"url": "https://github.com/Azure-Samples/media-services-v3-dotnet-tutorials",
@@ -464,6 +458,12 @@
464458
"branch": "main",
465459
"branch_mapping": {}
466460
},
461+
{
462+
"path_to_root": "azureml-examples-v2samplesreorg",
463+
"url": "https://github.com/azure/azureml-examples",
464+
"branch": "v2samplesreorg",
465+
"branch_mapping": {}
466+
},
467467
{
468468
"path_to_root": "azureml-examples-sdk-preview",
469469
"url": "https://github.com/azure/azureml-examples",
@@ -680,6 +680,12 @@
680680
"branch": "main",
681681
"branch_mapping": {}
682682
},
683+
{
684+
"path_to_root": "cosmos-db-sql-api-javascript-samples",
685+
"url": "https://github.com/Azure-Samples/cosmos-db-sql-api-javascript-samples",
686+
"branch": "main",
687+
"branch_mapping": {}
688+
},
683689
{
684690
"path_to_root": "azure-cosmos-db-python-getting-started",
685691
"url": "https://github.com/Azure-Samples/azure-cosmos-db-python-getting-started",
@@ -990,6 +996,7 @@
990996
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
991997
"articles/azure-relay/.openpublishing.redirection.relay.json",
992998
"articles/communication-services/.openpublishing.redirection.communication-services.json",
999+
"articles/confidential-computing/.openpublishing.redirection.json",
9931000
"articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",
9941001
"articles/cost-management-billing/.openpublishing.redirection.cost-management-billing.json",
9951002
"articles/data-catalog/.openpublishing.redirection.data-catalog.json",
@@ -1022,6 +1029,9 @@
10221029
"articles/azure-video-indexer/.openpublishing.redirection.azure-video-indexer.json",
10231030
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
10241031
"articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
1025-
".openpublishing.redirection.virtual-desktop.json"
1032+
".openpublishing.redirection.virtual-desktop.json",
1033+
"articles/applied-ai-services/.openpublishing.redirection.applied-ai-services.json",
1034+
"articles/applied-ai-services/.openpublishing.archived.json",
1035+
"articles/cognitive-services/.openpublishing.redirection.cognitive-services.json"
10261036
]
10271037
}

.openpublishing.redirection.active-directory.json

Lines changed: 72 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
},
5858
{
5959
"source_path_from_root": "/articles/active-directory/develop/workload-identity-federation-create-trust-github.md",
60-
"redirect_url":"/azure/active-directory/develop/workload-identity-federation-create-trust",
60+
"redirect_url": "/azure/active-directory/develop/workload-identity-federation-create-trust",
6161
"redirect_document_id": false
6262
},
6363
{
@@ -2038,7 +2038,7 @@
20382038
{
20392039
"source_path_from_root": "/articles/active-directory/conditional-access/conditional-access-for-exo-and-spo.md",
20402040
"redirect_url": "/azure/active-directory/conditional-access/block-legacy-authentication",
2041-
"redirect_document_id": true
2041+
"redirect_document_id": false
20422042
},
20432043
{
20442044
"source_path_from_root": "/articles/active-directory/conditional-access/baseline-protection.md",
@@ -2427,7 +2427,7 @@
24272427
},
24282428
{
24292429
"source_path_from_root": "/articles/active-directory/develop/active-directory-graph-api.md",
2430-
"redirect_url": "https://docs.microsoft.com/graph/migrate-azure-ad-graph-planning-checklist",
2430+
"redirect_url": "/graph/migrate-azure-ad-graph-planning-checklist",
24312431
"redirect_document_id": false
24322432
},
24332433
{
@@ -2800,7 +2800,7 @@
28002800
"redirect_url": "/azure/active-directory/develop/howto-authenticate-service-principal-powershell",
28012801
"redirect_document_id": false
28022802
},
2803-
2803+
28042804
{
28052805
"source_path_from_root": "/articles/active-directory/develop/active-directory-devhowto-multi-tenant-overview.md",
28062806
"redirect_url": "/azure/active-directory/develop/howto-convert-app-to-be-multi-tenant",
@@ -4178,12 +4178,12 @@
41784178
},
41794179
{
41804180
"source_path_from_root": "/articles/active-directory/active-directory-troubleshooting-support-howto.md",
4181-
"redirect_url": "/azure/active-directory/fundamentals/active-directory-troubleshooting-support-howto",
4181+
"redirect_url": "/azure/active-directory/fundamentals/how-to-get-support",
41824182
"redirect_document_id": false
41834183
},
41844184
{
41854185
"source_path_from_root": "/articles/active-directory/b2b/get-support.md",
4186-
"redirect_url": "/azure/active-directory/fundamentals/active-directory-troubleshooting-support-howto",
4186+
"redirect_url": "/azure/active-directory/fundamentals/how-to-get-support",
41874187
"redirect_document_id": false
41884188
},
41894189
{
@@ -4253,7 +4253,12 @@
42534253
},
42544254
{
42554255
"source_path_from_root": "/articles/active-directory/conditional-access/concept-conditional-access-block-legacy-authentication.md",
4256-
"redirect_url": "/azure/active-directory/fundamentals/concept-fundamentals-block-legacy-authentication",
4256+
"redirect_url": "/azure/active-directory/conditional-access/block-legacy-authentication",
4257+
"redirect_document_id": false
4258+
},
4259+
{
4260+
"source_path_from_root": "/articles/active-directory/fundamentals/concept-fundamentals-block-legacy-authentication.md",
4261+
"redirect_url": "/azure/active-directory/conditional-access/block-legacy-authentication",
42574262
"redirect_document_id": true
42584263
},
42594264
{
@@ -10827,16 +10832,69 @@
1082710832
"redirect_document_id": false
1082810833
},
1082910834
{
10830-
"source_path": "articles/active-directory/manage-apps/howto-enforce-signed-saml-authentication.md",
10831-
"redirect_url": "/azure/active-directory/manage-apps/howto-saml-token-encryption",
10832-
"redirect_document_id": true
10835+
"source_path": "articles/active-directory/manage-apps/recover-deleted-apps-faq.md",
10836+
"redirect_url": "/azure/active-directory/manage-apps/delete-recover-faq",
10837+
"redirect_document_id": false
1083310838
},
1083410839
{
10835-
"source_path_from_root": "/articles/active-directory/manage-apps/recover-deleted-apps-faq.md",
10836-
"redirect_url": "/azure/active-directory/manage-apps/delete-recover-faq",
10840+
"source_path": "articles/azure-percept/voice-control-your-inventory-then-visualize-with-power-bi-dashboard.md",
10841+
"redirect_url": "/azure/azure-percept/index",
10842+
"redirect_document_id": false
10843+
},
10844+
{
10845+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-create-azure-portal.md",
10846+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10847+
"redirect_document_id": false
10848+
},
10849+
{
10850+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-members-azure-portal.md",
10851+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10852+
"redirect_document_id": false
10853+
},
10854+
{
10855+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-delete-group.md",
10856+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10857+
"redirect_document_id": false
10858+
},
10859+
{
10860+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-membership-azure-portal.md",
10861+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10862+
"redirect_document_id": false
10863+
},
10864+
{
10865+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-settings-azure-portal.md",
10866+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10867+
"redirect_document_id": false
10868+
},
10869+
{
10870+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-accessmanagement-managing-group-owners.md",
10871+
"redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
10872+
"redirect_document_id": false
10873+
},
10874+
{
10875+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-manage-groups.md",
10876+
"redirect_url": "/azure/active-directory/fundamentals/concept-learn-about-groups",
10877+
"redirect_document_id": false
10878+
},
10879+
{
10880+
"source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
10881+
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
10882+
"redirect_document_id": false
10883+
},
10884+
{
10885+
"source_path_from_root": "/articles/active-directory/cloud-infrastructure-entitlement-management/product-integrations.md",
10886+
"redirect_url": "/azure/active-directory/cloud-infrastructure-entitlement-management",
10887+
"redirect_document_id": false
10888+
},
10889+
{
10890+
"source_path_from_root": "/articles/active-directory/fundamentals/active-directory-troubleshooting-support-howto.md",
10891+
"redirect_url": "/azure/active-directory/fundamentals/how-to-get-support",
10892+
"redirect_document_id": false
10893+
},
10894+
{
10895+
"source_path_from_root": "/articles/active-directory/fundamentals/support-help-options.md",
10896+
"redirect_url": "/azure/active-directory/fundamentals/how-to-get-support",
1083710897
"redirect_document_id": false
1083810898
}
10839-
10840-
1084110899
]
1084210900
}

.openpublishing.redirection.azure-arc-data.json

Lines changed: 116 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,121 @@
164164
"source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-midb-arc.md",
165165
"redirect_url": "/cli/azure/sql/midb-arc",
166166
"redirect_document_id": false
167+
},
168+
{
169+
"source_path_from_root": "/articles/azure-arc/data/concepts-distributed-postgres-hyperscale.md",
170+
"redirect_url": "/azure/azure-arc/data/release-notes",
171+
"redirect_document_id": false
172+
},
173+
{
174+
"source_path_from_root": "/articles/azure-arc/data/create-postgresql-hyperscale-server-group-azure-portal.md",
175+
"redirect_url": "/azure/azure-arc/data/release-notes",
176+
"redirect_document_id": false
177+
},
178+
{
179+
"source_path_from_root": "/articles/azure-arc/data/postgresql-hyperscale-server-group-placement-on-kubernetes-cluster-nodes.md",
180+
"redirect_url": "/azure/azure-arc/data/release-notes",
181+
"redirect_document_id": false
182+
},
183+
{
184+
"source_path_from_root": "/articles/azure-arc/data/scale-out-in-postgresql-hyperscale-server-group.md",
185+
"redirect_url": "/azure/azure-arc/data/release-notes",
186+
"redirect_document_id": false
187+
},
188+
{
189+
"source_path_from_root": "/articles/azure-arc/data/backup-restore-postgresql-hyperscale.md",
190+
"redirect_url": "/azure/azure-arc/data/backup-restore-postgresql",
191+
"redirect_document_id": false
192+
},
193+
{
194+
"source_path_from_root": "/articles/azure-arc/data/configure-security-postgres-hyperscale.md",
195+
"redirect_url": "/azure/azure-arc/data/configure-security-postgresql",
196+
"redirect_document_id": false
197+
},
198+
{
199+
"source_path_from_root": "/articles/azure-arc/data/configure-server-parameters-postgresql-hyperscale.md",
200+
"redirect_url": "/azure/azure-arc/data/configure-server-parameters-postgresql",
201+
"redirect_document_id": false
202+
},
203+
{
204+
"source_path_from_root": "/articles/azure-arc/data/create-postgresql-hyperscale-server-group-azure-data-studio.md",
205+
"redirect_url": "/azure/azure-arc/data/create-postgresql-server-azure-data-studio",
206+
"redirect_document_id": false
207+
},
208+
{
209+
"source_path_from_root": "/articles/azure-arc/data/create-postgresql-hyperscale-server-group-kubernetes-native-tools.md",
210+
"redirect_url": "/azure/azure-arc/data/create-postgresql-server-kubernetes-native-tools",
211+
"redirect_document_id": false
212+
},
213+
{
214+
"source_path_from_root": "/articles/azure-arc/data/create-postgresql-hyperscale-server-group.md",
215+
"redirect_url": "/azure/azure-arc/data/create-postgresql-server",
216+
"redirect_document_id": false
217+
},
218+
{
219+
"source_path_from_root": "/articles/azure-arc/data/delete-postgresql-hyperscale-server-group.md",
220+
"redirect_url": "/azure/azure-arc/data/delete-postgresql-server",
221+
"redirect_document_id": false
222+
},
223+
{
224+
"source_path_from_root": "/articles/azure-arc/data/get-connection-endpoints-and-connection-strings-postgres-hyperscale.md",
225+
"redirect_url": "/azure/azure-arc/data/get-connection-endpoints-and-connection-strings-postgresql-server",
226+
"redirect_document_id": false
227+
},
228+
{
229+
"source_path_from_root": "/articles/azure-arc/data/limitations-postgresql-hyperscale.md",
230+
"redirect_url": "/azure/azure-arc/data/limitations-postgresql",
231+
"redirect_document_id": false
232+
},
233+
{
234+
"source_path_from_root": "/articles/azure-arc/data/manage-postgresql-hyperscale-server-group-with-azure-data-studio.md",
235+
"redirect_url": "/azure/azure-arc/data/manage-postgresql-server-with-azure-data-studio",
236+
"redirect_document_id": false
237+
},
238+
{
239+
"source_path_from_root": "/articles/azure-arc/data/migrate-postgresql-data-into-postgresql-hyperscale-server-group.md",
240+
"redirect_url": "/azure/azure-arc/data/migrate-postgresql-data",
241+
"redirect_document_id": false
242+
},
243+
{
244+
"source_path_from_root": "/articles/azure-arc/data/restore-adventureworks-sample-db-into-postgresql-hyperscale-server-group.md",
245+
"redirect_url": "/azure/azure-arc/data/restore-adventureworks-sample-db-into-postgresql-server",
246+
"redirect_document_id": false
247+
},
248+
{
249+
"source_path_from_root": "/articles/azure-arc/data/scale-up-down-postgresql-hyperscale-server-group-using-cli.md",
250+
"redirect_url": "/azure/azure-arc/data/scale-up-down-postgresql-server-using-cli",
251+
"redirect_document_id": false
252+
},
253+
{
254+
"source_path_from_root": "/articles/azure-arc/data/show-configuration-postgresql-hyperscale-server-group.md",
255+
"redirect_url": "/azure/azure-arc/data/show-configuration-postgresql-server",
256+
"redirect_document_id": false
257+
},
258+
{
259+
"source_path_from_root": "/articles/azure-arc/data/supported-versions-postgres-hyperscale.md",
260+
"redirect_url": "/azure/azure-arc/data/supported-versions-postgresql",
261+
"redirect_document_id": false
262+
},
263+
{
264+
"source_path_from_root": "/articles/azure-arc/data/using-extensions-in-postgresql-hyperscale-server-group.md",
265+
"redirect_url": "/azure/azure-arc/data/using-extensions-in-postgresql-server",
266+
"redirect_document_id": false
267+
},
268+
{
269+
"source_path_from_root": "/articles/azure-arc/data/list-server-groups-postgres-hyperscale.md",
270+
"redirect_url": "/azure/azure-arc/data/list-servers-postgresql",
271+
"redirect_document_id": false
272+
},
273+
{
274+
"source_path_from_root": "/articles/azure-arc/data/configure-server-parameters-postgresql.md",
275+
"redirect_url": "/azure/azure-arc/data/show-configuration-postgresql-server",
276+
"redirect_document_id": false
277+
},
278+
{
279+
"source_path_from_root": "/articles/azure-arc/data/what-is-azure-arc-enabled-postgres-hyperscale.md",
280+
"redirect_url": "/azure/azure-arc/data/what-is-azure-arc-enabled-postgresql",
281+
"redirect_document_id": false
167282
}
168283
]
169-
}
284+
}

0 commit comments

Comments
 (0)