Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)

Author: Learn Build Service GitHub App

.github/ISSUE_TEMPLATE/aks-customer-feedback.yml

@@ -1,14 +1,14 @@
-name: "📄 Feedback control template"
+name: "📄 Azure Kubernetes Services - Feedback control template"
 title: "Feedback"
 description: >-
-  ⛔ This template is intended for use by the feedback control on the bottom of every page on the
-  live site. If you aren't using the feedback control, choose one of the other templates.⛔
+  🛈 FYI - This issue template is intended for use by the feedback control on the bottom of Azure Kubernetes Services pages on the
+  https://learn.microsoft.com/azure/aks site.
 labels:
-  - "needs-triage"
+  - "azure-kubernetes-services/svc"
 body:
   - type: markdown
     attributes:
-      value: "## 🎁Enter your feedback🎁"
+      value: "## Enter your feedback"
   - type: markdown
     attributes:
       value: Select the issue type, and describe the issue in the text box below. Add as much detail as needed to help us resolve the issue.

.openpublishing.redirection.virtual-desktop.json

@@ -424,6 +424,11 @@
             "source_path_from_root": "/articles/virtual-desktop/fslogix-containers-azure-files.md",
             "redirect_url": "/azure/virtual-desktop/fslogix-profile-containers",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-desktop/host-pool-load-balancing.md",
+            "redirect_url": "/azure/virtual-desktop/configure-host-pool-load-balancing",
+            "redirect_document_id": false
         }
     ]
 }

articles/ai-services/openai/concepts/legacy-models.md

@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
 description: Learn about the deprecated models in Azure OpenAI.
 ms.service: azure-ai-openai
 ms.topic: conceptual
-ms.date: 02/26/2024
+ms.date: 06/14/2024
 ms.custom: references_regions, build-2023, build-2023-dataai
 manager: nitinme
 author: mrbullwinkle 
@@ -14,7 +14,7 @@ recommendations: false
 
 # Azure OpenAI Service deprecated models
 
-Azure OpenAI Service offers a variety of models for different use cases. The following models were deprecated on July 6, 2023 and will be retired on July 5, 2024.  These models are no longer available for new deployments. Deployments created prior to July 6, 2023 remain available to customers until July 5, 2024. We recommend customers migrate their applications to deployments of replacement models prior to the July 5, 2024 retirement.
+Azure OpenAI Service offers a variety of models for different use cases. The following models were deprecated on July 6, 2023 and will be retired on June 14, 2024.  These models are no longer available for new deployments. Deployments created prior to July 6, 2023 remain available to customers until June 14, 2024. We recommend customers migrate their applications to deployments of replacement models prior to the June 14, 2024 retirement.
 
 At the time of retirement, deployments of these models will stop returning valid API responses.
 
@@ -38,7 +38,7 @@ The impacted GPT-3 models are the following. The replacement for the GPT-3 model
 
 ## Embedding models
 
-The embedding models below will be retired effective July 5, 2024. Customers should migrate to `text-embedding-ada-002` (version 2).
+The embedding models below will be retired effective June 14, 2024. Customers should migrate to `text-embedding-ada-002` (version 2).
 
 - [Similarity](#similarity-embedding)
 - [Text search](#text-search-embedding)

articles/aks/azure-linux-aks-partner-solutions.md

@@ -6,14 +6,14 @@ ms.author: schaffererin
 author: schaffererin
 ms.topic: article
 ms.custom: linux-related-content
-ms.date: 04/15/2024
+ms.date: 06/13/2024
 ---
 
 # Azure Linux AKS Container Host partner solutions
 
 Microsoft collaborates with partners to ensure your build, test, deployment, configuration, and monitoring of your applications perform optimally with Azure Linux Container Host on AKS.
 
-Our third party partners featured in this article have introduction guides to help you start using their solutions with your applications running on Azure Linux Container Host on AKS.
+The third party partners featured in this article have introduction guides to help you start using their solutions with your applications running on Azure Linux Container Host on AKS.
 
 | Solutions          | Partners                                                                                       |
 |--------------------|------------------------------------------------------------------------------------------------|
@@ -31,6 +31,8 @@ DevOps streamlines the delivery process, improves collaboration across teams, an
 
 ### Advantech
 
+#### iFactoryEHS
+
 :::image type="icon" source="./media/azure-linux-aks-partner-solutions/advantech.png":::
 
 | Solution | Categories |
@@ -41,6 +43,24 @@ The right EHS management system can strengthen organizations behind the scenes a
 
 For more information, see [Advantech & iFactoryEHS](https://page.advantech.com/en/global/solutions/ifactory/ifactory_ehs).
 
+#### FactoryOEE
+
+:::image type="icon" source="./media/azure-linux-aks-partner-solutions/factoryoee.png":::
+
+| Solution | Categories |
+|----------|------------|
+| FactoryOEE | DevOps |
+
+Advantech FactoryOEE is an innovative factory management tool that enhances production efficiency and focuses on energy consumption and carbon emissions.
+
+<details> <summary> See more </summary><br>
+
+Through advanced data analytics, it monitors energy usage in real-time, reducing carbon footprint. We're committed to creating an efficient, eco-friendly production model, optimizing your factory for peak performance while minimizing environmental impact. Choose FactoryOEE for the perfect balance of efficiency and sustainability.
+
+</details>
+
+For more information, see [Advantech & FactoryOEE solutions](https://wise-paas.advantech.com/marketplace/product/advantech.FactoryOEE) and [Advantech on Azure Marketplace](https://azuremarketplace.microsoft.com/marketplace/apps/advantech.ifactory_tpm?tab=Overview).
+
 ### Akuity
 
 :::image type="icon" source="./media/azure-linux-aks-partner-solutions/akuity.png":::

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

@@ -33,10 +33,11 @@ If you prefer manual step-by-step guidance for running Liberty on AKS, see [Manu
 
 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).
 
-[!INCLUDE [quickstarts-free-trial-note](~/reusable-content/ce-skilling/azure/includes/quickstarts-free-trial-note.md)]
+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
 
+* An Azure subscription. [!INCLUDE [quickstarts-free-trial-note](~/reusable-content/ce-skilling/azure/includes/quickstarts-free-trial-note.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).
@@ -526,3 +527,5 @@ You can learn more from the following references:
 * [Open Liberty](https://openliberty.io/)
 * [Open Liberty Operator](https://github.com/OpenLiberty/open-liberty-operator)
 * [Open Liberty server configuration](https://openliberty.io/docs/ref/config/)
+
+For more information about deploying the IBM WebSphere family on Azure, see [What are solutions to run the WebSphere family of products on Azure?](/azure/developer/java/ee/websphere-family)