Skip to content

Commit 6960b4f

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into fw-basic
2 parents ffb47e7 + d6e402c commit 6960b4f

File tree

6,431 files changed

+132505
-74962
lines changed

Some content is hidden

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

6,431 files changed

+132505
-74962
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: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -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",

.openpublishing.redirection.active-directory.json

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -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
{
@@ -10880,7 +10880,21 @@
1088010880
"source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
1088110881
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
1088210882
"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",
10897+
"redirect_document_id": false
1088310898
}
10884-
1088510899
]
1088610900
}

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