Skip to content

Commit 1668c22

Browse files
PhaniShekharPhaniShekhar
committed
Merge master and resolve conflicts on v1/toc.yml
2 parents 7213cda + 1af1ad7 commit 1668c22

File tree

6,202 files changed

+119418
-71583
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,202 files changed

+119418
-71583
lines changed

‎.openpublishing.publish.config.json

Lines changed: 3 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",
@@ -986,7 +980,6 @@
986980
".openpublishing.redirection.azure-percept.json",
987981
".openpublishing.redirection.azure-productivity.json",
988982
".openpublishing.redirection.azure-australia.json",
989-
".openpublishing.redirection.aks.json",
990983
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
991984
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
992985
"articles/azure-relay/.openpublishing.redirection.relay.json",

‎.openpublishing.redirection.active-directory.json

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10831,11 +10831,6 @@
1083110831
"redirect_url": "/azure/active-directory/manage-apps/tutorial-manage-certificates-for-federated-single-sign-on",
1083210832
"redirect_document_id": false
1083310833
},
10834-
{
10835-
"source_path": "articles/active-directory/manage-apps/howto-enforce-signed-saml-authentication.md",
10836-
"redirect_url": "/azure/active-directory/manage-apps/howto-saml-token-encryption",
10837-
"redirect_document_id": true
10838-
},
1083910834
{
1084010835
"source_path": "articles/active-directory/manage-apps/recover-deleted-apps-faq.md",
1084110836
"redirect_url": "/azure/active-directory/manage-apps/delete-recover-faq",
@@ -10847,9 +10842,49 @@
1084710842
"redirect_document_id": false
1084810843
},
1084910844
{
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+
{
1085010880
"source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
1085110881
"redirect_url": "/azure/active-directory/fundamentals/customize-branding",
1085210882
"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
1085310888
}
1085410889

1085510890
]

‎.openpublishing.redirection.aks.json

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

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