resolved merge conflict; added include

Author: dlepow

.github/workflows/stale.yml

@@ -23,11 +23,11 @@ jobs:
         # start-date: '2021-03-19'
         stale-pr-message: >
           This pull request has been inactive for at least 14 days.
-          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.
+          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.
                     
-          [Get Help](https://review.docs.microsoft.com/help/contribute/help-options?branch=main)  
+          [Get Help](https://review.learn.microsoft.com/help/contribute/help-options?branch=main)  
           
           [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)  
           
-          [Resolve Merge Conflict](https://review.docs.microsoft.com/help/contribute/resolve-merge-conflicts?branch=main)  
+          [Resolve Merge Conflict](https://review.learn.microsoft.com/help/contribute/resolve-merge-conflicts?branch=main)  
         

.openpublishing.publish.config.json

@@ -287,19 +287,19 @@
     {
       "path_to_root": "azure-search-javascript-samples",
       "url": "https://github.com/Azure-Samples/azure-search-javascript-samples",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
       "path_to_root": "azure-search-dotnet-samples",
       "url": "https://github.com/Azure-Samples/azure-search-dotnet-samples",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
       "path_to_root": "azure-search-python-samples",
       "url": "https://github.com/Azure-Samples/azure-search-python-samples",
-      "branch": "master",
+      "branch": "main",
       "branch_mapping": {}
     },
     {
@@ -374,12 +374,6 @@
       "branch": "master",
       "branch_mapping": {}
     },
-    {
-      "path_to_root": "media-services-v3-dotnet-quickstarts",
-      "url": "https://github.com/Azure-Samples/media-services-v3-dotnet-quickstarts",
-      "branch": "master",
-      "branch_mapping": {}
-    },
     {
       "path_to_root": "media-services-v3-dotnet-tutorials",
       "url": "https://github.com/Azure-Samples/media-services-v3-dotnet-tutorials",
@@ -464,6 +458,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azureml-examples-v2samplesreorg",
+      "url": "https://github.com/azure/azureml-examples",
+      "branch": "v2samplesreorg",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azureml-examples-sdk-preview",
       "url": "https://github.com/azure/azureml-examples",
@@ -680,6 +680,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "cosmos-db-sql-api-javascript-samples",
+      "url": "https://github.com/Azure-Samples/cosmos-db-sql-api-javascript-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azure-cosmos-db-python-getting-started",
       "url": "https://github.com/Azure-Samples/azure-cosmos-db-python-getting-started",

.openpublishing.redirection.active-directory.json

@@ -4178,12 +4178,12 @@
     },
     {
       "source_path_from_root": "/articles/active-directory/active-directory-troubleshooting-support-howto.md",
-      "redirect_url": "/azure/active-directory/fundamentals/active-directory-troubleshooting-support-howto",
+      "redirect_url": "/azure/active-directory/fundamentals/how-to-get-support",
       "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/b2b/get-support.md",
-      "redirect_url": "/azure/active-directory/fundamentals/active-directory-troubleshooting-support-howto",
+      "redirect_url": "/azure/active-directory/fundamentals/how-to-get-support",
       "redirect_document_id": false
     },
     {
@@ -10831,11 +10831,6 @@
       "redirect_url": "/azure/active-directory/manage-apps/tutorial-manage-certificates-for-federated-single-sign-on",
       "redirect_document_id": false
     },
-    {
-      "source_path": "articles/active-directory/manage-apps/howto-enforce-signed-saml-authentication.md",
-      "redirect_url": "/azure/active-directory/manage-apps/howto-saml-token-encryption",
-      "redirect_document_id": true
-    },
     {
       "source_path": "articles/active-directory/manage-apps/recover-deleted-apps-faq.md",
       "redirect_url": "/azure/active-directory/manage-apps/delete-recover-faq",
@@ -10845,8 +10840,61 @@
       "source_path": "articles/azure-percept/voice-control-your-inventory-then-visualize-with-power-bi-dashboard.md",
       "redirect_url": "/azure/azure-percept/index",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-create-azure-portal.md",
+      "redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
+      "redirect_document_id": false
+    },
+{
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-members-azure-portal.md",
+      "redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
+      "redirect_document_id": false
+    },
+{
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-delete-group.md",
+      "redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
+      "redirect_document_id": false
+    },
+{
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-membership-azure-portal.md",
+      "redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
+      "redirect_document_id": false
+    },
+{
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-groups-settings-azure-portal.md",
+      "redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
+      "redirect_document_id": false
+    },
+{
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-accessmanagement-managing-group-owners.md",
+      "redirect_url": "/azure/active-directory/fundamentals/how-to-manage-groups",
+      "redirect_document_id": false
+    },
+{
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-manage-groups.md",
+      "redirect_url": "/azure/active-directory/fundamentals/concept-learn-about-groups",
+      "redirect_document_id": false
+       },
+{   
+      "source_path_from_root": "/articles/active-directory/fundamentals/keep-me-signed-in.md",
+      "redirect_url": "/azure/active-directory/fundamentals/customize-branding",
+      "redirect_document_id": false
+    },
+{   
+      "source_path_from_root": "/articles/active-directory/cloud-infrastructure-entitlement-management/product-integrations.md",
+      "redirect_url": "/azure/active-directory/cloud-infrastructure-entitlement-management",
+      "redirect_document_id": false
+    },
+{
+      "source_path_from_root": "/articles/active-directory/fundamentals/active-directory-troubleshooting-support-howto.md",
+      "redirect_url": "/azure/active-directory/fundamentals/how-to-get-support",
+      "redirect_document_id": false
+    },
+{
+      "source_path_from_root": "/articles/active-directory/fundamentals/support-help-options.md",
+      "redirect_url": "/azure/active-directory/fundamentals/how-to-get-support",
+      "redirect_document_id": false
     }
-
-
   ]
 }

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

@@ -164,6 +164,121 @@
             "source_path_from_root": "/articles/azure-arc/data/reference/reference-az-sql-midb-arc.md",
             "redirect_url": "/cli/azure/sql/midb-arc",
             "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/concepts-distributed-postgres-hyperscale.md",
+            "redirect_url": "/azure/azure-arc/data/release-notes",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/create-postgresql-hyperscale-server-group-azure-portal.md",
+            "redirect_url": "/azure/azure-arc/data/release-notes",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/postgresql-hyperscale-server-group-placement-on-kubernetes-cluster-nodes.md",
+            "redirect_url": "/azure/azure-arc/data/release-notes",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/scale-out-in-postgresql-hyperscale-server-group.md",
+            "redirect_url": "/azure/azure-arc/data/release-notes",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/backup-restore-postgresql-hyperscale.md",
+            "redirect_url": "/azure/azure-arc/data/backup-restore-postgresql",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/configure-security-postgres-hyperscale.md",
+            "redirect_url": "/azure/azure-arc/data/configure-security-postgresql",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/configure-server-parameters-postgresql-hyperscale.md",
+            "redirect_url": "/azure/azure-arc/data/configure-server-parameters-postgresql",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/create-postgresql-hyperscale-server-group-azure-data-studio.md",
+            "redirect_url": "/azure/azure-arc/data/create-postgresql-server-azure-data-studio",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/create-postgresql-hyperscale-server-group-kubernetes-native-tools.md",
+            "redirect_url": "/azure/azure-arc/data/create-postgresql-server-kubernetes-native-tools",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/create-postgresql-hyperscale-server-group.md",
+            "redirect_url": "/azure/azure-arc/data/create-postgresql-server",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/delete-postgresql-hyperscale-server-group.md",
+            "redirect_url": "/azure/azure-arc/data/delete-postgresql-server",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/get-connection-endpoints-and-connection-strings-postgres-hyperscale.md",
+            "redirect_url": "/azure/azure-arc/data/get-connection-endpoints-and-connection-strings-postgresql-server",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/limitations-postgresql-hyperscale.md",
+            "redirect_url": "/azure/azure-arc/data/limitations-postgresql",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/manage-postgresql-hyperscale-server-group-with-azure-data-studio.md",
+            "redirect_url": "/azure/azure-arc/data/manage-postgresql-server-with-azure-data-studio",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/migrate-postgresql-data-into-postgresql-hyperscale-server-group.md",
+            "redirect_url": "/azure/azure-arc/data/migrate-postgresql-data",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/restore-adventureworks-sample-db-into-postgresql-hyperscale-server-group.md",
+            "redirect_url": "/azure/azure-arc/data/restore-adventureworks-sample-db-into-postgresql-server",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/scale-up-down-postgresql-hyperscale-server-group-using-cli.md",
+            "redirect_url": "/azure/azure-arc/data/scale-up-down-postgresql-server-using-cli",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/show-configuration-postgresql-hyperscale-server-group.md",
+            "redirect_url": "/azure/azure-arc/data/show-configuration-postgresql-server",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/supported-versions-postgres-hyperscale.md",
+            "redirect_url": "/azure/azure-arc/data/supported-versions-postgresql",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/using-extensions-in-postgresql-hyperscale-server-group.md",
+            "redirect_url": "/azure/azure-arc/data/using-extensions-in-postgresql-server",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/list-server-groups-postgres-hyperscale.md",
+            "redirect_url": "/azure/azure-arc/data/list-servers-postgresql",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/configure-server-parameters-postgresql.md",
+            "redirect_url": "/azure/azure-arc/data/show-configuration-postgresql-server",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/azure-arc/data/what-is-azure-arc-enabled-postgres-hyperscale.md",
+            "redirect_url": "/azure/azure-arc/data/what-is-azure-arc-enabled-postgresql",
+            "redirect_document_id": false
           }
           ]
-}
+}