merge from main

Author: PatrickFarley

.acrolinx-config.edn

@@ -1,2 +1,2 @@
 {:allowed-branchname-matches ["main" "release-.*"]
- :allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md))" "includes/"]}
+ :allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md|.*policy/samples/|.*resource-graph/samples/))" "(?i)includes/(?:(?!policy/reference/|policy/standards/))"]}

.openpublishing.publish.config.json

@@ -176,12 +176,24 @@
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "azure_powershell_scripts",
+      "url": "https://github.com/Azure-Samples/azure-docs-powershell-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "powershell_scripts",
       "url": "https://github.com/Azure/azure-docs-powershell-samples",
       "branch": "master",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "new_powershell_scripts",
+      "url": "https://github.com/Azure-Samples/azure-docs-powershell-samples",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "policy-templates",
       "url": "https://github.com/Azure/azure-policy",
@@ -509,7 +521,7 @@
     {
       "path_to_root": "azureml-examples-temp-fix",
       "url": "https://github.com/Azure/azureml-examples",
-      "branch": "temp-fix-doc-error",
+      "branch": "temp-fix",
       "branch_mapping": {}
     },
     {
@@ -944,6 +956,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "msdocs-quarkus-postgresql-sample-app",
+      "url": "https://github.com/Azure-Samples/msdocs-quarkus-postgresql-sample-app",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azuresignalr-samples",
       "url": "https://github.com/aspnet/AzureSignalR-samples",
@@ -1129,6 +1147,12 @@
       "url": "https://github.com/MicrosoftDocs/azure-reference-other-pr",
       "branch": "main",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "azure-iot-operations-samples",
+      "url": "https://github.com/Azure-Samples/explore-iot-operations",
+      "branch": "main",
+      "branch_mapping": {}
     }
   ],
   "branch_target_mapping": {
@@ -1210,6 +1234,7 @@
   "articles/iot-edge/.openpublishing.redirection.iot-edge.json",
   "articles/iot/.openpublishing.redirection.iot.json",
   "articles/iot-hub/.openpublishing.redirection.iot-hub.json",
+  "articles/iot-operations/.openpublishing.redirection.iot-operations.json",
   "articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
   "articles/logic-apps/.openpublishing.redirection.logic-apps.json",
   "articles/machine-learning/.openpublishing.redirection.machine-learning.json",
@@ -1229,9 +1254,11 @@
   "articles/spring-apps/.openpublishing.redirection.spring-apps.json",
   "articles/spring-cloud/.openpublishing.redirection.spring-cloud.json",
   "articles/static-web-apps/.openpublishing.redirection.static-web-apps.json",
+  "articles/storsimple/.openpublishing.redirection.storsimple.json",
   "articles/stream-analytics/.openpublishing.redirection.stream-analytics.json",
   "articles/synapse-analytics/.openpublishing.redirection.synapse-analytics.json",
   "articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json",
-  "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json"
+  "articles/virtual-machines/.openpublishing.redirection.virtual-machines.json",
+  "articles/operator-nexus/.openpublishing.redirection.operator-nexus.json"
 ]
 }

.openpublishing.redirection.api-management.json

@@ -1,5 +1,105 @@
 {
   "redirections": [
+      {
+        "source_path": "articles/api-management/set-graphql-resolver-policy.md",
+        "redirect_url": "/previous-versions/azure/api-management/set-graphql-resolver-policy",
+        "redirect_document_id": false
+      },      
+      {
+        "source_path": "articles/api-management/api-management-api-templates.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-api-templates",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-application-templates.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-application-templates",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-customize-styles.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-customize-styles",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-developer-portal-templates-reference.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-developer-portal-templates-reference",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-developer-portal-templates.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-developer-portal-templates",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-issue-templates.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-issue-templates",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-modify-content-layout.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-modify-content-layout",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-page-controls.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-page-controls",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-page-templates.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-page-templates",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-product-templates.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-product-templates",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-template-data-model-reference.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-template-data-model-reference",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-template-resources.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-template-resources",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/api-management-user-profile-templates.md",
+        "redirect_url": "/previous-versions/azure/api-management/api-management-user-profile-templates",
+        "redirect_document_id": false
+      },
+      {
+        "source_path": "articles/api-management/developer-portal-deprecated-migration.md",
+        "redirect_url": "/previous-versions/azure/api-management/developer-portal-deprecated-migration",
+        "redirect_document_id": false
+      }, 
+    {
+        "source_path_from_root": "/articles/api-management/authorizations-overview.md",
+        "redirect_url": "/azure/api-management/credentials-overview",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/authorizations-configure-common-providers.md",
+        "redirect_url": "/azure/api-management/credentials-configure-common-providers",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/configure-authorization-connection.md",
+        "redirect_url": "/azure/api-management/configure-credential-connection",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/authorizations-how-to-azure-ad.md",
+        "redirect_url": "/azure/api-management/credentials-how-to-azure-ad",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/authorizations-how-to-github.md",
+        "redirect_url": "/azure/api-management/credentials-how-to-github",
+        "redirect_document_id": false
+    },
     {
         "source_path_from_root": "/articles/api-management/powershell-samples.md",
         "redirect_url": "https://github.com/Azure/azure-docs-powershell-samples",

.openpublishing.redirection.app-service.json

@@ -54,6 +54,96 @@
       "source_path_from_root": "/articles/app-service/networking/private-endpoint.md",
       "redirect_url": "/azure/app-service/overview-private-endpoint",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-deploy-ftp.md",
+      "redirect_url": "https://github.com/Azure-Samples/azure-cli-samples/blob/master/app-service/deploy-ftp/deploy-ftp.sh",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-deploy-github.md",
+      "redirect_url": "https://github.com/Azure-Samples/azure-cli-samples/blob/master/app-service/deploy-github/deploy-github.sh",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-continuous-deployment-github.md",
+      "redirect_url": "https://github.com/Azure-Samples/azure-cli-samples/blob/master/app-service/deploy-github/deploy-github.sh",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-deploy-local-git.md",
+      "redirect_url": "https://github.com/Azure-Samples/azure-cli-samples/blob/master/app-service/deploy-github/deploy-github.sh",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-deploy-staging-environment.md",
+      "redirect_url": "https://github.com/Azure-Samples/azure-cli-samples/blob/master/app-service/deploy-deployment-slot/deploy-deployment-slot.sh",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-linux-docker-aspnetcore.md",
+      "redirect_url": "https://github.com/Azure-Samples/azure-cli-samples/blob/master/app-service/deploy-linux-docker/deploy-linux-docker-webapp-only.sh",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-deploy-privateendpoint.md",
+      "redirect_url": "https://github.com/Azure-Samples/azure-cli-samples/blob/master/app-service/integrate-with-app-gateway/integrate-with-app-gateway.sh",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-configure-custom-domain.md",
+      "redirect_url": "https://github.com/Azure-Samples/azure-cli-samples/blob/master/app-service/configure-custom-domain/configure-custom-domain-webapp-only.sh",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-configure-ssl-certificate.md",
+      "redirect_url": "https://github.com/Azure-Samples/azure-cli-samples/blob/master/app-service/configure-ssl-certificate/configure-ssl-certificate-webapp-only.sh",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-scale-manual.md",
+      "redirect_url": "https://github.com/Azure-Samples/azure-cli-samples/blob/master/app-service/scale-manual/scale-manual.sh",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-scale-high-availability.md",
+      "redirect_url": "https://github.com/Azure-Samples/azure-cli-samples/blob/master/app-service/scale-geographic/scale-geographic.sh",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-integrate-app-service-with-application-gateway.md",
+      "redirect_url": "/azure/app-service/samples-cli",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-connect-to-sql.md",
+      "redirect_url": "https://github.com/Azure-Samples/azure-cli-samples/blob/master/app-service/connect-to-sql/connect-to-sql.sh",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-connect-to-storage.md",
+      "redirect_url": "https://github.com/Azure-Samples/azure-cli-samples/blob/master/app-service/connect-to-storage/connect-to-storage.sh",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-connect-to-redis.md",
+      "redirect_url": "https://github.com/Azure-Samples/azure-cli-samples/blob/master/app-service/connect-to-redis/connect-to-redis.sh",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-connect-to-documentdb.md",
+      "redirect_url": "https://github.com/Azure-Samples/azure-cli-samples/blob/master/app-service/connect-to-documentdb/connect-to-documentdb.sh",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-backup-schedule-restore.md",
+      "redirect_url": "https://github.com/Azure-Samples/azure-cli-samples/blob/master/app-service/backup-one-time-schedule-restore/backup-restore.sh",
+      "redirect_document_id": false
+    },    
+    {
+      "source_path_from_root": "/articles/app-service/scripts/cli-monitor.md",
+      "redirect_url": "https://github.com/Azure-Samples/azure-cli-samples/blob/master/app-service/monitor-with-logs/monitor-with-logs.sh",
+      "redirect_document_id": false
     }
   ]
 }

.openpublishing.redirection.azure-kubernetes-service.json

@@ -1,5 +1,15 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/aks/auto-upgrade-node-image.md",
+            "redirect_url": "/azure/aks/auto-upgrade-node-os-image",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/aks/managed-azure-ad.md",
+            "redirect_url": "/azure/aks/enable-authentication-microsoft-entra-id",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/aks/stop-api-upgrade.md",
             "redirect_url": "/azure/aks/upgrade-cluster",
@@ -10,6 +20,11 @@
             "redirect_url": "/azure/aks/azure-cni-powered-by-cilium",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/aks/app-routing-configuration.md",
+            "redirect_url": "/azure/aks/app-routing-dns-ssl",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/aks/web-app-routing.md",
             "redirect_url": "/azure/aks/app-routing",