Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into cluster-cleanup-policy

Author: allyford

.openpublishing.publish.config.json

@@ -755,7 +755,7 @@
     {
       "path_to_root": "azure-spring-apps-reference-architecture",
       "url": "https://github.com/Azure/azure-spring-apps-reference-architecture",
-      "branch": "main",
+      "branch": "reference-architecture",
       "branch_mapping": {}
     },
     {
@@ -926,6 +926,7 @@
     ".openpublishing.redirection.json",
     ".openpublishing.redirection.azure-arc-data.json",
     ".openpublishing.redirection.active-directory.json",
+    ".openpublishing.redirection.api-management.json",
     ".openpublishing.redirection.azure-attestation.json",
     ".openpublishing.redirection.azure-blob.json",
     "articles/data-factory/.openpublishing.redirection.data-factory.json",

.openpublishing.redirection.active-directory.json

@@ -55,6 +55,16 @@
       "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/otsuka-shokai-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/active-directory/saas-apps/netsuite-provisioning-tutorial.md",
+      "redirect_url": "/azure/active-directory/saas-apps/tutorial-list",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/active-directory/governance/tutorial-onboard-custom-workflow-graph.md",
       "redirect_url": "/graph/tutorial-lifecycle-workflows-onboard-custom-workflow",
@@ -1942,8 +1952,8 @@
     },
     {
       "source_path_from_root": "/articles/active-directory/active-directory-b2b-add-user-without-invite.md",
-      "redirect_url": "/azure/active-directory/b2b/add-user-without-invite",
-      "redirect_document_id": true
+      "redirect_url": "/azure/active-directory/external-identities/redemption-experience",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/active-directory-b2b-allow-deny-list.md",
@@ -3908,8 +3918,8 @@
     },
     {
       "source_path_from_root": "/articles/active-directory/b2b/add-user-without-invite.md",
-      "redirect_url": "/azure/active-directory/external-identities/add-user-without-invite",
-      "redirect_document_id": true
+      "redirect_url": "/azure/active-directory/external-identities/redemption-experience",
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/b2b/allow-deny-list.md",
@@ -4089,7 +4099,7 @@
     {
       "source_path_from_root": "/articles/active-directory/b2b/redemption-experience.md",
       "redirect_url": "/azure/active-directory/external-identities/redemption-experience",
-      "redirect_document_id": true
+      "redirect_document_id": false
     },
     {
       "source_path_from_root": "/articles/active-directory/b2b/self-service-portal.md",

.openpublishing.redirection.api-management.json

@@ -0,0 +1,154 @@
+{
+  "redirections": [
+    {
+        "source_path_from_root": "/articles/api-management/api-management-access-restriction-policies.md",
+        "redirect_url": "/azure/api-management/api-management-policies#access-restriction-policies",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/api-management-advanced-policies.md",
+        "redirect_url": "/azure/api-management/api-management-policies#advanced-policies",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/api-management-authentication-policies.md",
+        "redirect_url": "/azure/api-management/api-management-policies#authentication-policies",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/api-management-caching-policies.md",
+        "redirect_url": "/azure/api-management/api-management-policies#caching-policies",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/api-management-cross-domain-policies.md",
+        "redirect_url": "/azure/api-management/api-management-policies#cross-domain-policies",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/api-management-dapr-policies.md",
+        "redirect_url": "/azure/api-management/api-management-policies#dapr-integration-policies",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/graphql-policies.md",
+        "redirect_url": "/azure/api-management/api-management-policies#graphql-api-policies",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/api-management-transformation-policies.md",
+        "redirect_url": "/azure/api-management/api-management-policies#transformation-policies",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/developer-portal-widget-contribution-guidelines.md",
+        "redirect_url": "/azure/api-management/developer-portal-extend-custom-functionality",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/developer-portal-use-community-widgets.md",
+        "redirect_url": "/azure/api-management/developer-portal-extend-custom-functionality",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/zone-redundancy.md",
+        "redirect_url": "/azure/availability-zones/migrate-api-mgt",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/developer-portal-implement-widgets.md",
+        "redirect_url": "/azure/api-management/developer-portal-extend-custom-functionality",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/import-api-app-as-api.md",
+        "redirect_url": "/azure/api-management/import-app-service-as-api",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/api-management-product.md",
+        "redirect_url": "/azure/api-management/api-management-howto-add-products",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/graphql-validation-policies.md",
+        "redirect_url": "/azure/api-management/api-management-policies#graphql-policies",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/api-management-policy-reference.md",
+        "redirect_url": "/azure/api-management/api-management-policies",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/api-management-howto-deploy-self-hosted-gateway-to-docker.md",
+        "redirect_url": "/azure/api-management/how-to-deploy-self-hosted-gateway-docker",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/api-management-howto-deploy-self-hosted-gateway-to-k8s.md",
+        "redirect_url": "/azure/api-management/how-to-deploy-self-hosted-gateway-kubernetes",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/api-management-get-started.md",
+        "redirect_url": "/azure/api-management/import-and-publish",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/api-management-howto-create-apis.md",
+        "redirect_url": "/azure/api-management/import-and-publish",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/api-management-howto-import-api.md",
+        "redirect_url": "/azure/api-management/import-and-publish",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/api-management-howto-add-operations.md",
+        "redirect_url": "/azure/api-management/mock-api-responses",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/policy-samples.md",
+        "redirect_url": "/azure/api-management/policy-reference",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/api-management-security-attributes.md",
+        "redirect_url": "/azure/api-management/security-baseline",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/api-management-security-controls.md",
+        "redirect_url": "/azure/api-management/security-baseline",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/api-management-howto-product-with-rules.md",
+        "redirect_url": "/azure/api-management/transform-api",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/azure-functions/app-service-export-api-to-powerapps-and-flow.md",
+        "redirect_url": "/azure/api-management/export-api-power-platform",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/service-fabric/service-fabric-api-management-quick-start.md",
+        "redirect_url": "/azure/service-fabric/service-fabric-tutorial-deploy-api-management",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/azure-api-management-certs.md",
+        "redirect_url": "/previous-versions/azure/azure-api-management-certs",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/api-management/validation-policies.md",
+        "redirect_url": "/azure/api-management/api-management-policies#validation-policies",
+        "redirect_document_id": false
+    }
+  ]
+}

.openpublishing.redirection.defender-for-iot.json

@@ -1,5 +1,19 @@
 {
     "redirections": [
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/resources-training-sessions.md",
+            "redirect_url": "https://techcommunity.microsoft.com/t5/microsoft-defender-for-iot-blog/microsoft-defender-for-iot-ninja-training/ba-p/2428899",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-manage-the-alert-event.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/how-to-view-alerts",
+            "redirect_document_id": false
+        },
+        {   "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-install-software.md",
+            "redirect_url": "/azure/defender-for-iot/organizations/ot-deploy/install-software-ot-sensor",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/defender-for-iot/organizations/how-to-create-and-manage-users.md",
             "redirect_url": "/azure/defender-for-iot/organizations/manage-users-overview",
@@ -117,7 +131,7 @@
         },
         {
             "source_path_from_root": "/articles/defender-for-iot/how-to-install-software.md",
-            "redirect_url": "/azure/defender-for-iot/organizations/how-to-install-software",
+            "redirect_url": "/azure/defender-for-iot/organizations/ot-deploy/install-software-ot-sensor",
             "redirect_document_id": false
         },
         {

.openpublishing.redirection.healthcare-apis.json

@@ -633,6 +633,10 @@
         "redirect_url": "/azure/healthcare-apis/iot/how-to-use-iotjsonpathcontenttemplate-mappings",
         "redirect_document_id": false
     },
+    {   "source_path_from_root": "/articles/healthcare-apis/iot/deploy-new-button.md",
+        "redirect_url": "/azure/healthcare-apis/iot/deploy-new-arm",
+        "redirect_document_id": false
+    },
     {   "source_path_from_root": "/articles/healthcare-apis/events/events-display-metrics.md",
         "redirect_url": "/azure/healthcare-apis/events/events-use-metrics",
         "redirect_document_id": false