Merge pull request #300622 from MicrosoftDocs/main

5/30/2025 AM Publish

Author: Taojunshen

articles/app-service/configure-language-java-deploy-run.md

@@ -193,7 +193,7 @@ Azure provides seamless Java App Service development experience in popular Java
 - **Eclipse IDE**: [Create a Hello World web app for Azure App Service by using Eclipse](/azure/developer/java/toolkit-for-eclipse/create-hello-world-web-app).
 
 ### Kudu and OneDeploy APIs
-Deployment clients such as the [Maven plugin](#maven), GitHub Actions using `azure/webapps-deploy@v3` and newer, or the [az webapp deploy](/cli/azure/webapp#az-webapp-deploy) command use OneDeploy, which is invoked by calling the `/api/publish` endpoint of the Kudu site under the hood. For more information on this API, see [this documentation](./deploy-zip.md#deploy-warjarear-packages)
+Deployment clients such as the [Maven plugin](#maven), GitHub Actions using `azure/webapps-deploy@v3` and newer, or the [az webapp deploy](/cli/azure/webapp#az-webapp-deploy) command use OneDeploy, which is invoked by calling the `/api/publish` endpoint of the Kudu site under the hood. For more information on this API, see [this documentation](./deploy-zip.md#deploy-warjarear-packages).
 
 ::: zone pivot="java-javase"
 

articles/app-service/reference-app-settings.md

@@ -202,10 +202,18 @@ This section shows the configurable runtime settings for each supported language
 | `AZURE_SITE_HOME` | Value added to the Java arguments as `-Dsite.home`. The default is the value of `HOME`. |
 | `HTTP_PLATFORM_PORT` | Added to Java arguments as `-Dport.http`. The following environment variables used by different Java web frameworks are also set to this value: `SERVER_PORT`, `MICRONAUT_SERVER_PORT`, `RATPACK_PORT`, `QUARKUS_HTTP_PORT`, `PAYARAMICRO_PORT`. |
 | `AZURE_LOGGING_DIR` | For Windows Apps, added to Java arguments as `-Dsite.logdir`. The default is `%HOME%\LogFiles\`. Default value in Linux is `AZURE_LOGGING_DIR=/home/LogFiles`. |
-| `WEBSITE_AUTH_ROLE_CLAIM_TYPE` | For Java web apps using built-in [authentication](overview-authentication-authorization.md), claims defined in Entra are available in the `HttpServletRequest.isUserInRole` API in the following format: `<claimType>\|<claimValue>` (e.g. `team\|contoso`). To add the values of claims with the type `roles` directly as role names in the `HttpServletRequest` implementation, set `WEBSITE_AUTH_ROLE_CLAIM_TYPE` to the value `roles`. |
+| `WEBSITE_AUTH_ROLE_CLAIM_TYPE` | For Java web apps using built-in [authentication](overview-authentication-authorization.md), claims defined in Entra are available in the `HttpServletRequest.isUserInRole` API in the following format: <code>&lt;claimType&gt;&vert;&lt;claimValue&gt;</code> (e.g. <code>team&vert;contoso</code>). To add the values of claims with the type `roles` directly as role names in the `HttpServletRequest` implementation, set `WEBSITE_AUTH_ROLE_CLAIM_TYPE` to the value `roles`. |
 | `WEBSITE_JAVA_GC_LOGGING` | For webapps using Java 11 or later in Linux, set this to `true` or `1` to capture Java Garbage Collector logs in `/home/LogFiles/Application` which can be used to troubleshoot performance issues. |
-| `WEBSITE_SKIP_DUMP_ON_OUT_OF_MEMORY` | Set to `true` or `1` to disable the following error-handling options that are passed as parameters to the JVM: `-XX:ErrorFile=/home/LogFiles/java_error_XXX.log`, `-XX:+CrashOnOutOfMemoryError`, `-XX:+HeapDumpOnOutOfMemoryError` and `-XX:HeapDumpPath=/home/LogFiles/java_memdump_XXX.log` |
+| `WEBSITE_SKIP_DUMP_ON_OUT_OF_MEMORY` | On Linux, set this to `true` or `1` to disable the following error-handling options that, by default, are passed as parameters to the JVM: `-XX:ErrorFile=/home/LogFiles/java_error_XXX.log`, `-XX:+CrashOnOutOfMemoryError`, `-XX:+HeapDumpOnOutOfMemoryError` and `-XX:HeapDumpPath=/home/LogFiles/java_memdump_XXX.log` |
 | `WEBSITE_WORKING_DIR` | On Linux, set this to a path where the bootstrapping process should change before launching Java/Tomcat/JBoss. This is useful for webapps using Java 8, where Java error logs are saved to the same directory where Java was launched. |
+| `WEBSITE_CATALINA_MAXCONNECTIONS` | Applies to Tomcat on Linux. The value is used to configure the `maxConnections` property of the Connector component in Tomcat's configuration. If not set, the value defaults to `10000`. |
+| `WEBSITE_CATALINA_MAXTHREADS` | Applies to Tomcat on Linux. The value is used to configure the `maxThreads` property of the Connector component in Tomcat's configuration. If not set, the value defaults to `200`. |
+| `WEBSITE_JAVA_JAR_FILE_NAME` | If set and the web application is a standalone Java (Java web server) application, this can be used to designate the name of a JAR file if there are multiple JAR files deployed, or the location of the file is not standard (e.g. in the `wwwroot` directory). Defaults to `app.jar`. |
+| `WEBSITE_JAVA_WAR_FILE_NAME` | If set and the web application is a Tomcat application, this can be used to designate the name of a single WAR file if there are multiple WAR files deployed, or the location of the file is not standard (e.g. in the `wwwroot` directory). Defaults to `app.war`. |
+| `WEBSITE_JAVA_KEYSTORE_PASSWORD` | The value of the keystore password used to store certificates with the `keytool` tool. |
+| `WEBSITE_TOMCAT_APPSERVICE_ERROR_PAGE` | On Tomcat webapps, when set to `1` or `true`, the default Tomcat error page is replaced with a custom App Service error page. Defaults to `true`. |
+| `WEBSITE_TOMCAT_ERROR_DETAILS` | Defaults to `false`. On Tomcat webapps, when set to `1` or `true`, the properties `showReport` and `showServerInfo` of the Error Report Valve are set to `true`, causing to show the stack trace of failed requests and the Tomcat version in the error page. |
+| `WEBSITE_SKIP_TROUBLESHOOT_ARCHIVE` | By default, JAR and WAR archives are scanned for common problems during application startup. This includes looking for duplicate/conflicting Java classes inside the archive, which is a common problem that causes Java apps to crash. Setting this value to `true` or `1` will skip the scanning process. Defaults to `false`. |
 
 <!-- 
 WEBSITE_JAVA_COPY_ALL

articles/azure-vmware/attach-azure-netapp-files-to-azure-vmware-solution-hosts.md

@@ -79,6 +79,7 @@ Azure NetApp Files datastores for Azure VMware Solution are currently supported
 
 * AV36 
 * AV36P
+* AV48
 * AV52
 * AV64
 

articles/azure-vmware/configure-vsan-esa.md

@@ -33,10 +33,12 @@ In this article, you learn more about:
 > - How to enable vSAN Compression
 > - How to enable or disable vSAN Data-In-Transit Encryption
 
-## Supported host type
+## Supported host types
 vSAN ESA (Express Storage Architecture) is supported on the following Azure VMware Solution host types:
 
 - AV48
+- AV48 (Stretched Clusters)
+- AV64 (Gen 2)
 
 ## Supported vSAN services
 

articles/cost-management-billing/manage/azure-plan-subscription-transfer-partners.md

@@ -6,7 +6,7 @@ ms.reviewer: macyso
 ms.service: cost-management-billing
 ms.subservice: billing
 ms.topic: conceptual
-ms.date: 01/22/2025
+ms.date: 05/29/2025
 ms.author: macyso
 ---
 
@@ -39,4 +39,4 @@ You can also seek help, report misconduct, or suspicious activity using any of t
 ## Related content
 
 - To give your new partner Azure RBAC access, see [What is Azure role-based access control (Azure RBAC)?](../../role-based-access-control/overview.md)
-- [Obtain permissions to manage a customers service or subscription](/partner-center/customers-revoke-admin-privileges).
+- [Obtain permissions to manage a customers service or subscription](/partner-center/customers-revoke-admin-privileges).

articles/cost-management-billing/manage/programmatically-create-subscription-microsoft-customer-agreement-across-tenants.md

@@ -5,7 +5,7 @@ author: kendayMS
 ms.service: cost-management-billing
 ms.subservice: billing
 ms.topic: how-to
-ms.date: 01/14/2025
+ms.date: 05/29/2025
 ms.reviewer: macyso
 ms.author: macyso
 ---

articles/cost-management-billing/manage/transfer-subscriptions-subscribers-csp.yml

@@ -6,7 +6,7 @@ metadata:
   author: preetione
   ms.author: macyso
   ms.reviewer: macyso
-  ms.date: 01/22/2025
+  ms.date: 05/29/2025
   ms.service: cost-management-billing
   ms.subservice: billing
   ms.topic: how-to

articles/cost-management-billing/manage/understand-mca-roles.md

@@ -22,7 +22,7 @@ Watch the [Manage access to your MCA billing account](https://www.youtube.com/wa
 
 ## Billing role definitions
 
-The following table describes the billing roles you use to manage your billing account, billing profiles, and invoice sections.
+The following table describes the billing roles you use to manage your billing account, billing profiles, and invoice sections. Permissions granted at the billing account level have the highest level of permission and will inherit permission on all billing groups and invoice sections under that billing account. These inherited permissions cannot be removed at the lower level as they are linked to the role granted at the higher level. If a user only needs access to a specific billing profile or invoice section, grant permission at that level rather than providing access at the billing account scope.
 
 |Role|Description|
 |---|---|
@@ -40,7 +40,7 @@ The following table describes the billing roles you use to manage your billing a
 
 ## Billing account roles and tasks
 
-A billing account is created when you sign up to use Azure. You use your billing account to manage invoices, payments, and track costs. Roles on the billing account have the highest level of permissions and users in these roles get visibility into the cost and billing information for your entire account. Assign these roles only to users that need to view invoices, and track costs for your entire account like member of the finance and the accounting teams. For more information, see [Understand billing account](../understand/mca-overview.md#your-billing-account).
+A billing account is created when you sign up to use Azure. You use your billing account to manage invoices, payments, and track costs. Roles on the billing account have the highest level of permissions and users in these roles get visibility into the cost and billing information for your entire account. Assign these roles only to users that need to view invoices, and track costs for your entire account like member of the finance and the accounting teams.   For more information, see [Understand billing account](../understand/mca-overview.md#your-billing-account).
 
 The following tables show what role you need to complete tasks in the context of the billing account.
 

articles/cost-management-billing/understand/mosp-new-customer-experience.md

@@ -6,7 +6,7 @@ ms.reviewer: jkinma
 ms.service: cost-management-billing
 ms.subservice: billing
 ms.topic: conceptual
-ms.date: 04/30/2024
+ms.date: 05/26/2025
 ms.author: jkinma
 ---
 

articles/cost-management-billing/understand/review-individual-bill.md

@@ -6,7 +6,7 @@ ms.reviewer: jkinma
 ms.service: cost-management-billing
 ms.subservice: billing
 ms.topic: tutorial
-ms.date: 04/30/2024
+ms.date: 05/27/2025
 ms.author: jkinma
 ---