Merge pull request #295531 from rmca14/fixmc2-28

Resolve merge conflicts in migration PR 294978

Author: rmca14

.openpublishing.redirection.json

@@ -4090,36 +4090,6 @@
       "redirect_url": "/azure/notification-hubs/notification-hubs-push-notification-http2-token-authentication",
       "redirect_document_id": false
     },
-    {
-      "source_path_from_root": "/articles/openshift/howto-encrypt-data-disks.md",
-      "redirect_url": "/azure/openshift/howto-byok",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/openshift/howto-deploy-java-jboss-enterprise-application-platform-with-auto-redeploy.md",
-      "redirect_url": "/azure/openshift/index",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/openshift/quickstart-portal.md",
-      "redirect_url": "/azure/openshift/create-cluster",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/openshift/tutorial-connect-cluster.md",
-      "redirect_url": "/azure/openshift/connect-cluster",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/openshift/tutorial-create-cluster.md",
-      "redirect_url": "/azure/openshift/create-cluster",
-      "redirect_document_id": false
-    },
-    {
-      "source_path_from_root": "/articles/openshift/tutorial-delete-cluster.md",
-      "redirect_url": "/azure/openshift/delete-cluster",
-      "redirect_document_id": false
-    },
     {
       "source_path_from_root": "/articles/operator-service-manager/overview.md",
       "redirect_url": "azure/operator-service-manager/azure-operator-service-manager-overview",

articles/azure-government/compliance/azure-services-in-fedramp-auditscope.md

@@ -98,7 +98,7 @@ This article provides a detailed list of Azure, Dynamics 365, Microsoft 365, and
 | [Azure OpenAI](/azure/ai-services/openai/) | ✅ | ✅ |
 | [Azure Policy](../../governance/policy/index.yml) | ✅ | ✅ |
 | [Azure Policy's guest configuration](../../governance/machine-configuration/overview.md) | ✅ | ✅ |
-| [Azure Red Hat OpenShift](../../openshift/index.yml) | ✅ | ✅ |
+| [Azure Red Hat OpenShift](/azure/openshift/) | ✅ | ✅ |
 | [Azure Resource Manager](../../azure-resource-manager/management/index.yml) | ✅ | ✅ |
 | [Azure Service Manager (RDFE)](/previous-versions/azure/ee460799(v=azure.100)) | ✅ | ✅ |
 | [Azure Sign-up portal](https://signup.azure.com/) | ✅ | ✅ |
@@ -315,7 +315,7 @@ This article provides a detailed list of Azure, Dynamics 365, Microsoft 365, and
 | [Azure OpenAI](/azure/ai-services/openai/) | ✅ | ✅ | ✅ | ✅ | ✅ |
 | [Azure Policy](../../governance/policy/index.yml) | ✅ | ✅ | ✅ | ✅ | ✅ |
 | [Azure Policy's guest configuration](../../governance/machine-configuration/overview.md) | ✅ | ✅ | ✅ | ✅ | |
-| [Azure Red Hat OpenShift](../../openshift/index.yml) | ✅ | ✅ | ✅ |  |  |
+| [Azure Red Hat OpenShift](/azure/openshift/) | ✅ | ✅ | ✅ |  |  |
 | **Service** | **FedRAMP High** | **DoD IL2** | **DoD IL4** | **DoD IL5** | **DoD IL6** |
 | [Azure Resource Manager](../../azure-resource-manager/management/index.yml) | ✅ | ✅ | ✅ | ✅ | ✅ |
 | [Azure Service Manager (RDFE)](/previous-versions/azure/ee460799(v=azure.100)) | ✅ | ✅ | ✅ | ✅ | ✅ |

articles/container-apps/compare-options.md

@@ -54,7 +54,7 @@ You can get started building your first container app [using the quickstarts](ge
 [Azure Spring Apps](../spring-apps/basic-standard/overview.md) is a fully managed service for Spring developers. If you want to run Spring Boot, Spring Cloud or any other Spring applications on Azure, Azure Spring Apps is an ideal option. The service manages the infrastructure of Spring applications so developers can focus on their code. Azure Spring Apps provides lifecycle management using comprehensive monitoring and diagnostics, configuration management, service discovery, CI/CD integration, blue-green deployments, and more. 
 
 ### Azure Red Hat OpenShift
-[Azure Red Hat OpenShift](../openshift/intro-openshift.md) is an integrated product with Red Hat and Microsoft jointly engineered, operated, and supported. This collaboration provides an integrated product and support experience for running Kubernetes-powered OpenShift. With Azure Red Hat OpenShift, teams can choose their own registry, networking, storage, and CI/CD solutions. Alternatively, they can use the built-in solutions for automated source code management, container and application builds, deployments, scaling, health management, and more from OpenShift. If your team or organization is using OpenShift, Azure Red Hat OpenShift is an ideal option.
+[Azure Red Hat OpenShift](/azure/openshift/intro-openshift) is an integrated product with Red Hat and Microsoft jointly engineered, operated, and supported. This collaboration provides an integrated product and support experience for running Kubernetes-powered OpenShift. With Azure Red Hat OpenShift, teams can choose their own registry, networking, storage, and CI/CD solutions. Alternatively, they can use the built-in solutions for automated source code management, container and application builds, deployments, scaling, health management, and more from OpenShift. If your team or organization is using OpenShift, Azure Red Hat OpenShift is an ideal option.
 
 ## Next steps
 

articles/containers/index.yml

@@ -149,18 +149,18 @@ conceptualContent:
     # Card
     - title: Managed OpenShift service
       links:
-        - url: ../openshift/intro-openshift.md
+        - url: /azure/openshift/intro-openshift
           itemType: overview
           text: What is Azure Red Hat OpenShift?
-        - url: ../openshift/tutorial-create-cluster.md
+        - url: /azure/openshift/tutorial-create-cluster
           itemType: tutorial
           text: Create an Azure Red Hat OpenShift cluster
-        - url: ../openshift/tutorial-connect-cluster.md
+        - url: /azure/openshift/tutorial-connect-cluster
           itemType: tutorial
           text: Connect to an Azure Red Hat OpenShift cluster
       # footerLink (optional)
       footerLink:
-        url: ../openshift/index.yml
+        url: /azure/openshift/
         text: See more
     # Card
     - title: Serverless application development