On branch edburns-msft-em-5574-josefree-main

modified:   articles/aks/howto-deploy-java-liberty-app.md
modified:   articles/aks/howto-deploy-java-wls-app.md
modified:   articles/openshift/howto-deploy-java-jboss-enterprise-application-platform-app.md
modified:   articles/openshift/howto-deploy-java-liberty-app.md
modified:   articles/virtual-machines/workloads/oracle/oracle-weblogic.md
modified:   articles/virtual-machines/workloads/oracle/weblogic-aks.md
modified:   articles/virtual-machines/workloads/oracle/weblogic-server-azure-virtual-machine.md
modified:   articles/virtual-machines/workloads/redhat/jboss-eap-single-server-azure-vm.md

Author: edburns

articles/aks/howto-deploy-java-liberty-app.md

@@ -29,15 +29,15 @@ This article uses the Azure Marketplace offer for Open Liberty or WebSphere Libe
 * The Open Liberty Operator and WebSphere Liberty Operator.
 * Optionally, a container image that includes Liberty and your application.
 
-If you prefer manual step-by-step guidance for running Liberty on AKS, see [Manually deploy a Java application with Open Liberty or WebSphere Liberty on an Azure Kubernetes Service (AKS) cluster](/azure/developer/java/ee/howto-deploy-java-liberty-app-manual).
+If you prefer manual step-by-step guidance for running Liberty on AKS, see [Manually deploy a Java application with Open Liberty or WebSphere Liberty on an Azure Kubernetes Service (AKS) cluster](/azure/developer/java/ee/howto-deploy-java-liberty-app-manual?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json).
 
 This article is intended to help you quickly get to deployment. Before you go to production, you should explore the [IBM documentation about tuning Liberty](https://www.ibm.com/docs/was-liberty/base?topic=tuning-liberty).
 
 If you're interested in providing feedback or working closely on your migration scenarios with the engineering team developing WebSphere on Azure solutions, fill out this short [survey on WebSphere migration](https://aka.ms/websphere-on-azure-survey) and include your contact information. The team of program managers, architects, and engineers will promptly get in touch with you to initiate close collaboration.
 
 ## Prerequisites
 
-* [!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
+* [!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note-java.md)]
 * Install the [Azure CLI](/cli/azure/install-azure-cli). If you're running on Windows or macOS, consider running Azure CLI in a Docker container. For more information, see [How to run the Azure CLI in a Docker container](/cli/azure/run-azure-cli-docker).
 * Sign in to the Azure CLI by using the [az login](/cli/azure/reference-index#az-login) command. To finish the authentication process, follow the steps displayed in your terminal. For other sign-in options, see [Sign in with the Azure CLI](/cli/azure/authenticate-azure-cli).
 * When you're prompted, install the Azure CLI extension on first use. For more information about extensions, see [Use extensions with the Azure CLI](/cli/azure/azure-cli-extensions-overview).
@@ -531,4 +531,4 @@ You can learn more from the following references:
 Learn more about deploying IBM WebSphere family on Azure by following these links:
 
 > [!div class="nextstepaction"]
-> [Explore the IBM WebSphere family of products on Azure](/azure/developer/java/ee/websphere-family)
+> [Explore the IBM WebSphere family of products on Azure](/azure/developer/java/ee/websphere-family?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json)

articles/aks/howto-deploy-java-wls-app.md

@@ -723,7 +723,7 @@ az group delete --name <db-resource-group-name> --yes --no-wait
 
 Learn more about running WebLogic Server on AKS or virtual machines by following these links:
 
-* [WebLogic Server on AKS](/azure/virtual-machines/workloads/oracle/weblogic-aks?toc=/azure/developer/java/ee/toc.json&bc=/azure/developer/java/breadcrumb/toc.json)
-* [WebLogic Server on virtual machines](/azure/virtual-machines/workloads/oracle/oracle-weblogic?toc=/azure/developer/java/ee/toc.json&bc=/azure/developer/java/breadcrumb/toc.json)
+* [WebLogic Server on AKS](/azure/virtual-machines/workloads/oracle/weblogic-aks?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json)
+* [WebLogic Server on virtual machines](/azure/virtual-machines/workloads/oracle/oracle-weblogic?toc=/azure/aks/toc.json&bc=/azure/aks/breadcrumb/toc.json)
 
 To find more about Oracle WebLogic offers, visit the overview page of [Oracle WebLogic Server on Azure](https://aka.ms/wls-contact-me). These offers are all _Bring-Your-Own-License_. They assume you've already got the appropriate licenses with Oracle and are properly licensed to run offers in Azure.

articles/openshift/howto-deploy-java-jboss-enterprise-application-platform-app.md

@@ -522,4 +522,4 @@ If you're not going to continue to use the OpenShift cluster, navigate back to y
 Learn more about deploying JBoss EAP on Azure by following these links:
 
 > [!div class="nextstepaction"]
-> [Red Hat JBoss EAP on Azure](/azure/developer/java/ee/jboss-on-azure)
+> [Red Hat JBoss EAP on Azure](/azure/developer/java/ee/jboss-on-azure?toc=/azure/openshift/toc.json&bc=/azure/openshift/breadcrumb/toc.json)

articles/openshift/howto-deploy-java-liberty-app.md

@@ -24,7 +24,7 @@ If you're interested in providing feedback or working closely on your migration
 
 ## Prerequisites
 
-- [!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
+- [!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note-java.md)]
 - A local machine with a Unix-like operating system installed (for example, Ubuntu, macOS, or Windows Subsystem for Linux).
 - The [Azure CLI](/cli/azure/install-azure-cli). If you're running on Windows or macOS, consider running Azure CLI in a Docker container. For more information, see [How to run the Azure CLI in a Docker container](/cli/azure/run-azure-cli-docker).
 * Sign in to the Azure CLI by using the [az login](/cli/azure/reference-index#az-login) command. To finish the authentication process, follow the steps displayed in your terminal. For other sign-in options, see [Sign in with the Azure CLI](/cli/azure/authenticate-azure-cli).
@@ -420,4 +420,4 @@ az group delete --name $DB_RESOURCE_GROUP_NAME --yes --no-wait
 Learn more about deploying IBM WebSphere family on Azure by following these links:
 
 > [!div class="nextstepaction"]
-> [Explore the IBM WebSphere family of products on Azure](/azure/developer/java/ee/websphere-family)
+> [Explore the IBM WebSphere family of products on Azure](/azure/developer/java/ee/websphere-family?toc=/azure/openshift/toc.json&bc=/azure/openshift/breadcrumb/toc.json)

articles/virtual-machines/workloads/oracle/oracle-weblogic.md

@@ -15,7 +15,7 @@ ms.custom: devx-track-java, devx-track-javaee, devx-track-javaee-wls, devx-track
 
 This page describes the solutions for running Oracle WebLogic Server (WLS) on Azure Virtual Machines. These solutions are jointly developed and supported by Oracle and Microsoft.
 
-You can also run WebLogic Server on the Azure Kubernetes Service. The solutions to do so are described in the article [Running Oracle WebLogic Server on the Azure Kubernetes Service](./weblogic-aks.md?toc=/azure/developer/java/ee/toc.json&bc=/azure/developer/java/breadcrumb/toc.json).
+You can also run WebLogic Server on the Azure Kubernetes Service. The solutions to do so are described in the article [Running Oracle WebLogic Server on the Azure Kubernetes Service](/azure/virtual-machines/workloads/oracle/weblogic-aks).
 
 WebLogic Server is a leading Java application server running some of the most mission-critical enterprise Java applications across the globe. WebLogic Server forms the middleware foundation for the Oracle software suite. Oracle and Microsoft are committed to empowering WebLogic customers with choice and flexibility to run workloads on Azure as a leading cloud platform. 
 
@@ -60,10 +60,10 @@ The solution templates introduced above support a range of operating system, Jav
 
 The following articles provide more information on getting started with these technologies.
 
-* [Quickstart: Deploy WebLogic Server on Azure Virtual Machine using the Azure portal](./weblogic-server-azure-virtual-machine.md?toc=/azure/developer/java/ee/toc.json&bc=/azure/developer/java/breadcrumb/toc.json)
-* [Manually install Oracle WebLogic Server on Azure Virtual Machines](/azure/developer/java/migration/migrate-weblogic-to-azure-vm-manually?toc=/azure/developer/java/ee/toc.json&bc=/azure/developer/java/breadcrumb/toc.json)
-* [What are solutions for running Oracle WebLogic Server on the Azure Kubernetes Service?](./weblogic-aks.md?toc=/azure/developer/java/ee/toc.json&bc=/azure/developer/java/breadcrumb/toc.json)
+* [Quickstart: Deploy WebLogic Server on Azure Virtual Machine using the Azure portal](./weblogic-server-azure-virtual-machine.md)
+* [Manually install Oracle WebLogic Server on Azure Virtual Machines](/azure/developer/java/migration/migrate-weblogic-to-azure-vm-manually?toc=/azure/virtual-machines/workloads/oracle/toc.json&bc=/azure/virtual-machines/workloads/oracle/breadcrumb/toc.json)
+* [What are solutions for running Oracle WebLogic Server on the Azure Kubernetes Service?](./weblogic-aks.md)
 
 To find more about Oracle WebLogic offers, visit the overview page of [Oracle WebLogic Server on Azure](https://aka.ms/wls-contact-me). These offers are all _Bring-Your-Own-License_. They assume you've already got the appropriate licenses with Oracle and are properly licensed to run offers in Azure.
 
-You're encouraged to [connect with the development team](https://aka.ms/wls-on-azure-survey) and provide feedback on further improving WebLogic on Azure solutions.
+You're encouraged to [connect with the development team](https://aka.ms/wls-on-azure-survey) and provide feedback on further improving WebLogic on Azure solutions.

articles/virtual-machines/workloads/oracle/weblogic-aks.md

@@ -16,7 +16,7 @@ ms.custom: devx-track-java, devx-track-javaee, devx-track-javaee-wls, devx-track
 
 This page describes the solutions for running Oracle WebLogic Server (WLS) on the Azure Kubernetes Service (AKS). These solutions are jointly developed and supported by Oracle and Microsoft.
 
-It's also possible to run WebLogic Server on Azure Virtual Machines. The solutions to do so are described in the article [Running Oracle WebLogic Server on the Azure Virtual Machines](./oracle-weblogic.md?toc=/azure/developer/java/ee/toc.json&bc=/azure/developer/java/breadcrumb/toc.json).
+It's also possible to run WebLogic Server on Azure Virtual Machines. The solutions to do so are described in the article [Running Oracle WebLogic Server on the Azure Virtual Machines](./oracle-weblogic.md).
 
 WebLogic Server is a leading Java application server running some of the most mission-critical enterprise Java applications across the globe. WebLogic Server forms the middleware foundation for the Oracle software suite. Oracle and Microsoft are committed to empowering WebLogic Server customers with choice and flexibility to run workloads on Azure as a leading cloud platform.
 
@@ -52,7 +52,7 @@ Beyond what the solutions provide you have complete flexibility to customize you
 
 The following articles provide more information on getting started with these technologies.
 
-* [Deploy a Java application with WebLogic Server on an Azure Kubernetes Service (AKS) cluster](/azure/aks/howto-deploy-java-wls-app?toc=/azure/developer/java/ee/toc.json&bc=/azure/developer/java/breadcrumb/toc.json)
-* [What are solutions for running Oracle WebLogic Server on Azure Virtual Machines?](./oracle-weblogic.md?toc=/azure/developer/java/ee/toc.json&bc=/azure/developer/java/breadcrumb/toc.json)
+* [Deploy a Java application with WebLogic Server on an Azure Kubernetes Service (AKS) cluster](/azure/aks/howto-deploy-java-wls-app?toc=/azure/virtual-machines/workloads/oracle/toc.json&bc=/azure/virtual-machines/workloads/oracle/breadcrumb/toc.json)
+* [What are solutions for running Oracle WebLogic Server on Azure Virtual Machines?](./oracle-weblogic.md)
 
-To find more about Oracle WebLogic offers, visit the overview page of [Oracle WebLogic Server on Azure](https://aka.ms/wls-contact-me). These offers are all _Bring-Your-Own-License_. They assume you've already got the appropriate licenses with Oracle and are properly licensed to run offers in Azure. You're encouraged to [connect with the development team](https://aka.ms/wls-on-azure-survey) and provide feedback on further improving WebLogic on AKS solutions.
+To find more about Oracle WebLogic offers, visit the overview page of [Oracle WebLogic Server on Azure](https://aka.ms/wls-contact-me). These offers are all _Bring-Your-Own-License_. They assume you've already got the appropriate licenses with Oracle and are properly licensed to run offers in Azure. You're encouraged to [connect with the development team](https://aka.ms/wls-on-azure-survey) and provide feedback on further improving WebLogic on AKS solutions.

articles/virtual-machines/workloads/oracle/weblogic-server-azure-virtual-machine.md

@@ -11,7 +11,7 @@ ms.custom: devx-track-java, devx-track-javaee, devx-track-javaee-wls, devx-track
 
 # Quickstart: Deploy WebLogic Server on Azure Virtual Machines (VMs)
 
-This article shows you how to quickly deploy WebLogic Server (WLS) on Azure Virtual Machine (VM) with the simplest possible set of configuration choices using the Azure portal. For a more full featured tutorial, including the use of Azure Application Gateway to make WLS cluster on VM securely visible on the public internet, see [Tutorial: Migrate a WebLogic Server cluster to Azure with Azure Application Gateway as a load balancer](/azure/developer/java/migration/migrate-weblogic-with-app-gateway?toc=/azure/developer/java/ee/toc.json&bc=/azure/developer/java/breadcrumb/toc.json).
+This article shows you how to quickly deploy WebLogic Server (WLS) on Azure Virtual Machine (VM) with the simplest possible set of configuration choices using the Azure portal. For a more full featured tutorial, including the use of Azure Application Gateway to make WLS cluster on VM securely visible on the public internet, see [Tutorial: Migrate a WebLogic Server cluster to Azure with Azure Application Gateway as a load balancer](/azure/developer/java/migration/migrate-weblogic-with-app-gateway?toc=/azure/virtual-machines/workloads/oracle/toc.json&bc=/azure/virtual-machines/workloads/oracle/breadcrumb/toc.json).
 
 In this quickstart, you will learn how to:
 
@@ -150,9 +150,9 @@ If you're not going to continue to use the WebLogic Server, navigate back to you
 
 Continue to explore options to run WebLogic Server on Azure.
 
-* [WebLogic Server on virtual machines](/azure/virtual-machines/workloads/oracle/oracle-weblogic?toc=/azure/developer/java/ee/toc.json&bc=/azure/developer/java/breadcrumb/toc.json)
-* [WebLogic Server on AKS](/azure/virtual-machines/workloads/oracle/weblogic-aks?toc=/azure/developer/java/ee/toc.json&bc=/azure/developer/java/breadcrumb/toc.json)
-* [Migrate WebLogic Server applications to Azure Kubernetes Service](/azure/developer/java/migration/migrate-weblogic-to-virtual-machines?toc=/azure/developer/java/ee/toc.json&bc=/azure/developer/java/breadcrumb/toc.json)
+* [WebLogic Server on virtual machines](/azure/virtual-machines/workloads/oracle/oracle-weblogic)
+* [WebLogic Server on AKS](/azure/virtual-machines/workloads/oracle/weblogic-aks)
+* [Migrate WebLogic Server applications to Azure Kubernetes Service](/azure/developer/java/migration/migrate-weblogic-to-virtual-machines?toc=/azure/virtual-machines/workloads/oracle/toc.json&bc=/azure/virtual-machines/workloads/oracle/breadcrumb/toc.json)
 * [Explore options for day 2 and beyond](https://aka.ms/wls-vms-day2)
 
 To find more about Oracle WebLogic offers at Azure Marketplace, visit the overview page of [Oracle WebLogic Server on Azure](https://aka.ms/wls-contact-me). These offers are all _Bring-Your-Own-License_. They assume you've already got the appropriate licenses with Oracle and are properly licensed to run offers in Azure.

articles/virtual-machines/workloads/redhat/jboss-eap-single-server-azure-vm.md

@@ -13,7 +13,7 @@ ms.custom: devx-track-java, devx-track-javaee, devx-track-javaee-jbosseap, devx-
 
 This article shows you how to quickly deploy JBoss Enterprise Application Platform (EAP) on an Azure Virtual Machine (VM) using the Azure portal.
 
-This article uses the Azure Marketplace offer for JBoss EAP standalone server to accelerate your journey to Azure Virtual Machine. This solution automates most boilerplate steps to provision a single JBoss EAP instance on an Azure Virtual Machine. Once initial provisioning is complete, you are completely free to customize deployments further. The solution is jointly developed by Red Hat and Microsoft. If you prefer manual step-by-step guidance for installing Red Hat JBoss EAP Cluster on Azure VMs that doesn't utilize the automation enabled by the offer, see [Tutorial: Install Red Hat JBoss EAP on Azure Virtual Machines manually](/Azure/developer/java/migration/migrate-jboss-eap-to-azure-vm-manually).
+This article uses the Azure Marketplace offer for JBoss EAP standalone server to accelerate your journey to Azure Virtual Machine. This solution automates most boilerplate steps to provision a single JBoss EAP instance on an Azure Virtual Machine. Once initial provisioning is complete, you are completely free to customize deployments further. The solution is jointly developed by Red Hat and Microsoft. If you prefer manual step-by-step guidance for installing Red Hat JBoss EAP Cluster on Azure VMs that doesn't utilize the automation enabled by the offer, see [Tutorial: Install Red Hat JBoss EAP on Azure Virtual Machines manually](/azure/developer/java/migration/migrate-jboss-eap-to-azure-vm-manually?toc=/azure/virtual-machines/workloads/redhat/toc.json&bc=/azure/virtual-machines/workloads/redhat/breadcrumb/toc.json)).
 
 If you're interested in providing feedback or working closely on your migration scenarios with the engineering team developing JBoss EAP on Azure solutions, fill out this short [survey on JBoss EAP migration](https://aka.ms/jboss-on-azure-survey) and include your contact information. The team of program managers, architects, and engineers will promptly get in touch with you to initiate close collaboration.
 
@@ -180,4 +180,4 @@ az group delete --name <resource-group-name> --yes --no-wait
 Learn more about options of deploying JBoss EAP on Azure:
 
 > [!div class="nextstepaction"]
-> [JBoss EAP on Azure](/azure/developer/java/ee/jboss-on-azure)
+> [JBoss EAP on Azure](/azure/developer/java/ee/jboss-on-azure?toc=/azure/virtual-machines/workloads/redhat/toc.json&bc=/azure/virtual-machines/workloads/redhat/breadcrumb/toc.json)