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

Author: gitName

articles/app-service/tutorial-java-tomcat-connect-managed-identity-postgresql-database.md

@@ -7,7 +7,7 @@ ms.date: 06/04/2024
 author: KarlErickson
 ms.author: karler
 ms.reviewer: edburns
-ms.custom: passwordless-java, service-connector, devx-track-azurecli, devx-track-extended-java, AppServiceConnectivity
+ms.custom: passwordless-java, service-connector, devx-track-azurecli, devx-track-java, AppServiceConnectivity
 ---
 
 # Tutorial: Connect to a PostgreSQL Database from Java Tomcat App Service without secrets using a managed identity

articles/container-apps/java-application-performance-management-config.md

@@ -5,7 +5,7 @@ description: Learn how to configure the Application Performance Management (APM)
 customer intent: As a developer, I want to configure the APM Java agent with init containers in Azure Container Apps so that I can monitor and manage application performance.
 services: container-apps
 ms.service: azure-container-apps
-ms.custom: devx-track-azurecli
+ms.custom: devx-track-azurecli, devx-track-java
 ms.topic: tutorial
 ms.date: 02/03/2025
 author: KarlErickson

articles/container-apps/java-microservice-get-started.md

@@ -6,7 +6,7 @@ author: KarlErickson
 ms.author: karler
 ms.reviewer: yiliu6
 ms.service: azure-container-apps
-ms.custom: devx-track-extended-java
+ms.custom: devx-track-java
 ms.topic: quickstart
 ms.date: 11/25/2024
 ---

articles/container-apps/java-petclinic-ai-tutorial.md

@@ -8,7 +8,7 @@ ms.reviewer: sonwan
 ms.service: azure-container-apps
 ms.topic: tutorial
 ms.date: 02/12/2025
-ms.custom:
+ms.custom: devx-track-java
 #customer intent: As a developer, I want to see a simple example of an AI application deployed to Azure Container Apps.
 ---
 

articles/lab-services/vm-deletion-policy.md

@@ -13,6 +13,10 @@ ms.date: 04/23/2025
 
 On June 9, 2025, Azure Lab Services will delete all virtual machines (VMs) that have been inactive since July 1, 2023. 
 
-A virtual machine is considered inactive if no operations were performed on it. These operations include actions such as starting, stopping, resetting passwords, and reimaging. Any associated labs for these virtual machines will also be deleted. This policy applies to template VMs and production VMs. 
+A virtual machine is considered inactive if no operations were performed on it. These operations include actions such as starting, stopping, resetting passwords, and reimaging. Any associated labs for these virtual machines will also be deleted. This policy applies to template VMs and production VMs.
 
-After the virtual machines are deleted, we won't be able to recover them or their data. Back up any required data from these inactive virtual machines, and then delete the virtual machines if you don't need them. Delete the virtual machines and the associated labs yourself to avoid incurring any unnecessary charges. Once the virtual machines are deleted, there's no way to recover the virtual machines or the data on them.
+After the virtual machines are deleted, we won't be able to recover them or their data.  
+
+**Recommended actions**: 
+1. Back up any required data from your inactive virtual machines. 
+1. Delete the virtual machines and the associated labs to avoid incurring any unnecessary charges. 

articles/spring-apps/basic-standard/concept-app-customer-responsibilities.md

@@ -6,7 +6,7 @@ author: KarlErickson
 ms.author: karler
 ms.reviewer: zhiyongli
 ms.service: azure-spring-apps
-ms.custom: devx-track-extended-java
+ms.custom: devx-track-java
 ms.topic: conceptual
 ms.date: 08/28/2024
 ---

articles/spring-apps/basic-standard/how-to-configure-planned-maintenance.md

@@ -7,6 +7,7 @@ ms.reviewer: haochuang
 ms.service: azure-spring-apps
 ms.topic: how-to
 ms.date: 11/07/2023
+ms.custom: devx-track-java
 ---
 
 # How to configure planned maintenance (preview)
@@ -81,7 +82,7 @@ Notifications and messages are sent out before and during the maintenance. The f
 Currently, Azure Spring Apps performs one regular planned maintenance to upgrade the underlying infrastructure every three months. For a detailed maintenance timeline, check the notifications on the [Azure Service Health](https://azure.microsoft.com/get-started/azure-portal/service-health) page.
 
 > [!NOTE]
-> In compliance with Microsoft’s security standards, we perform additional security patching for underlying Azure Kubernetes Service (AKS) clusters during the second week of each month. Maintenance occurs within an 8-hour window during non-working hours. We do this work in a rolling fashion to ensure uninterrupted service.
+> In compliance with Microsoft's security standards, we perform additional security patching for underlying Azure Kubernetes Service (AKS) clusters during the second week of each month. Maintenance occurs within an 8-hour window during non-working hours. We do this work in a rolling fashion to ensure uninterrupted service.
 
 ## Best practices
 

includes/api-management-azure-openai-models.md

@@ -14,7 +14,7 @@ The policy is used with APIs [added to API Management from the Azure OpenAI Serv
 
 | API type | Supported models |
 |-------|-------------|
-| Chat completion     |  gpt-3.5<br/><br/>gpt-4<br/><br/>gpt-4o<sup>1</sup> |
+| Chat completion     |  gpt-3.5<br/><br/>gpt-4<br/><br/>gpt-4o<sup>1</sup><br/><br/>gpt-4o-mini |
 | Embeddings | text-embedding-3-large<br/><br/> text-embedding-3-small<br/><br/>text-embedding-ada-002 |
 
 <sup>1</sup> The `gpt-4o` model is multimodal (accepts text or image inputs and generates text).