Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into patricka-archive-devops

Author: PatAltimore

.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

@@ -188,6 +188,12 @@
       "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",
@@ -515,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": {}
     },
     {
@@ -992,12 +998,36 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "cosmos-db-nosql-nodejs-quickstart",
+      "url": "https://github.com/azure-samples/cosmos-db-nosql-nodejs-quickstart",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "cosmos-db-nosql-python-samples",
       "url": "https://github.com/azure-samples/cosmos-db-nosql-python-samples",
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "cosmos-db-nosql-python-quickstart",
+      "url": "https://github.com/azure-samples/cosmos-db-nosql-python-quickstart",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "cosmos-db-nosql-java-quickstart",
+      "url": "https://github.com/azure-samples/cosmos-db-nosql-java-quickstart",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "cosmos-db-nosql-go-quickstart",
+      "url": "https://github.com/azure-samples/cosmos-db-nosql-go-quickstart",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "cosmos-db-mongodb-dotnet-samples",
       "url": "https://github.com/azure-samples/cosmos-db-mongodb-dotnet-samples",
@@ -1198,6 +1228,7 @@
   "articles/ai-services/.openpublishing.redirection.applied-ai-old.json",
   "articles/ai-services/.openpublishing.redirection.applied-ai-services.json",
   "articles/ai-services/.openpublishing.redirection.cognitive-services.json",
+  "articles/energy-data-services/.openpublishing.redirection.energy-data-services.json",
   "articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
   "articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
   "articles/azure-relay/.openpublishing.redirection.relay.json",
@@ -1248,9 +1279,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,80 @@
 {
   "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",