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

Author: HeidiSteen

articles/ai-services/cognitive-services-virtual-networks.md

@@ -59,6 +59,7 @@ Virtual networks are supported in [regions where Azure AI services are available
 > - `AzureResourceManager`
 > - `CognitiveServicesManagement`
 > - `CognitiveServicesFrontEnd`
+> - `Storage` (Speech Studio only)
 
 ## Change the default network access rule
 

articles/ai-services/speech-service/includes/language-support/multilingual-voices.md

@@ -17,4 +17,4 @@ ms.author: v-baolianzou
 
 <sup>2</sup> The neural voice is a multilingual voice in Azure AI Speech. All multilingual voices (except `en-US-JennyMultilingualNeural`) can speak in the language in default locale of the input text without [using SSML](../../speech-synthesis-markup-voice.md#adjust-speaking-languages). However, you can still use the `<lang xml:lang>` element to adjust the speaking accent of each language to set preferred accent such as British accent (`en-GB`) for English. Check the [full list](https://speech.microsoft.com/portal/voicegallery) of supported locales through SSML.
 
-<sup>3</sup> The OpenAI text to speech voices in Azure AI Speech are in public preview and only available in North Central US (`northcentralus`) and Sweden Central (`swedencentral`).
+<sup>3</sup> The OpenAI text to speech voices in Azure AI Speech are in public preview and only available in North Central US (`northcentralus`) and Sweden Central (`swedencentral`). Locales not listed for OpenAI voices aren't supported by design.

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

@@ -59,23 +59,23 @@ The following steps guide you to create a Liberty runtime on AKS. After completi
    1. Create a new resource group. Because resource groups must be unique within a subscription, pick a unique name. An easy way to have unique names is to use a combination of your initials, today's date, and some identifier. For example, `ejb0913-java-liberty-project-rg`.
    1. Select *East US* as **Region**.
 
-   Create environment variables in your shell for the resource group names for the cluster and the database.
-
-   ### [Bash](#tab/in-bash)
-
-   ```bash
-   export RESOURCE_GROUP_NAME=<your-resource-group-name>
-   export DB_RESOURCE_GROUP_NAME=<your-resource-group-name>
-   ```
-
-   ### [PowerShell](#tab/in-powershell)
-
-   ```powershell
-   $Env:RESOURCE_GROUP_NAME="<your-resource-group-name>"
-   $Env:DB_RESOURCE_GROUP_NAME="<your-resource-group-name>"
-   ```
-
-   ---
+    Create environment variables in your shell for the resource group names for the cluster and the database.
+ 
+    ### [Bash](#tab/in-bash)
+ 
+    ```bash
+    export RESOURCE_GROUP_NAME=<your-resource-group-name>
+    export DB_RESOURCE_GROUP_NAME=<your-resource-group-name>
+    ```
+ 
+    ### [PowerShell](#tab/in-powershell)
+ 
+    ```powershell
+    $Env:RESOURCE_GROUP_NAME="<your-resource-group-name>"
+    $Env:DB_RESOURCE_GROUP_NAME="<your-resource-group-name>"
+    ```
+ 
+    ---
 
 1. Select **Next**, enter the **AKS** pane. This pane allows you to select an existing AKS cluster and Azure Container Registry (ACR), instead of causing the deployment to create a new one, if desired. This capability enables you to use the sidecar pattern, as shown in the [Azure architecture center](/azure/architecture/patterns/sidecar). You can also adjust the settings for the size and number of the virtual machines in the AKS node pool. The remaining values do not need to be changed from their default values.
 

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

@@ -1086,6 +1086,85 @@ You don't need to incrementally add instances (scaling out), you can add multipl
 
 JBoss EAP is only available on the Premium v3 and Isolated v2 App Service Plan types. Customers that created a JBoss EAP site on a different tier during the public preview should scale up to Premium or Isolated hardware tier to avoid unexpected behavior.
 
+## Tomcat Baseline Configuration On App Services
+
+Java developers can customize the server settings, troubleshoot issues, and deploy applications to Tomcat with confidence if they know about the server.xml file and configuration details of Tomcat. Some of these may be:
+* Customizing Tomcat configuration: By understanding the server.xml file and Tomcat's configuration details, developers can fine-tune the server settings to match the needs of their applications.
+* Debugging: When an application is deployed on a Tomcat server, developers need to know the server configuration to debug any issues that may arise. This includes checking the server logs, examining the configuration files, and identifying any errors that might be occurring.
+* Troubleshooting Tomcat issues: Inevitably, Java developers will encounter issues with their Tomcat server, such as performance problems or configuration errors. By understanding the server.xml file and Tomcat's configuration details, developers can quickly diagnose and troubleshoot these issues, which can save time and effort.
+* Deploying applications to Tomcat: To deploy a Java web application to Tomcat, developers need to know how to configure the server.xml file and other Tomcat settings. Understanding these details is essential for deploying applications successfully and ensuring that they run smoothly on the server.
+
+As you provision an App Service with Tomcat to host your Java workload (a WAR file or a JAR file), there are certain settings that you get out of the box for Tomcat configuration. You can refer to the [Official Apache Tomcat Documentation](https://tomcat.apache.org/) for detailed information, including the default configuration for Tomcat Web Server.
+
+Additionally, there are certain transformations that are further applied on top of the server.xml for Tomcat distribution upon start. These are transformations to the Connector, Host, and Valve settings.
+
+Please note that the latest versions of Tomcat will have these server.xml. (8.5.58 and 9.0.38 onward). Older versions of Tomcat do not use transforms and may have different behavior as a result.
+
+### Connector
+
+```xml 
+<Connector port="${port.http}" address="127.0.0.1" maxHttpHeaderSize="16384" compression="on" URIEncoding="UTF-8" connectionTimeout="${site.connectionTimeout}" maxThreads="${catalina.maxThreads}" maxConnections="${catalina.maxConnections}" protocol="HTTP/1.1" redirectPort="8443"/>
+ ```
+* `maxHttpHeaderSize` is set to `16384`
+* `URIEncoding` is set to `UTF-8`
+* `conectionTimeout` is set to `WEBSITE_TOMCAT_CONNECTION_TIMEOUT`, which defaults to `240000`
+* `maxThreads` is set to `WEBSITE_CATALINA_MAXTHREADS`, which defaults to `200`
+* `maxConnections` is set to `WEBSITE_CATALINA_MAXCONNECTIONS`, which defaults to `10000`
+ 
+> [!NOTE]
+> The connectionTimeout, maxThreads and maxConnections settings can be tuned with app settings
+
+Following are example CLI commands that you may use to alter the values of conectionTimeout, maxThreads, or maxConnections:
+
+```azurecli-interactive
+az webapp config appsettings set --resource-group myResourceGroup --name myApp --settings WEBSITE_TOMCAT_CONNECTION_TIMEOUT=120000
+```
+```azurecli-interactive
+az webapp config appsettings set --resource-group myResourceGroup --name myApp --settings WEBSITE_CATALINA_MAXTHREADS=100
+```
+```azurecli-interactive
+az webapp config appsettings set --resource-group myResourceGroup --name myApp --settings WEBSITE_CATALINA_MAXCONNECTIONS=5000
+```
+* Connector uses the address of the container instead of 127.0.0.1
+ 
+### Host
+
+```xml
+<Host appBase="${site.appbase}" xmlBase="${site.xmlbase}" unpackWARs="${site.unpackwars}" workDir="${site.tempdir}" errorReportValveClass="com.microsoft.azure.appservice.AppServiceErrorReportValve" name="localhost" autoDeploy="true">
+```
+
+* `appBase` is set to `AZURE_SITE_APP_BASE`, which defaults to local `WebappsLocalPath`
+* `xmlBase` is set to `AZURE_SITE_HOME`, which defaults to `/site/wwwroot`
+* `unpackWARs` is set to `AZURE_UNPACK_WARS`, which defaults to `true`
+* `workDir` is set to `JAVA_TMP_DIR`, which defaults `TMP`
+* errorReportValveClass uses our custom error report valve
+ 
+### Valve
+
+```xml
+<Valve prefix="site_access_log.${catalina.instance.name}" pattern="%h %l %u %t &quot;%r&quot; %s %b %D %{x-arr-log-id}i" directory="${site.logdir}/http/RawLogs" maxDays="${site.logRetentionDays}" className="org.apache.catalina.valves.AccessLogValve" suffix=".txt"/>
+ ```
+* `directory` is set to `AZURE_LOGGING_DIR`, which defaults to `home\logFiles`
+* `maxDays` is to `WEBSITE_HTTPLOGGING_RETENTION_DAYS`, which defaults to `0` [forever]
+ 
+On Linux, it has all of the same customization, plus:
+ 
+* Adds some error and reporting pages to the valve:
+ ```xml
+                <xsl:attribute name="appServiceErrorPage">
+                    <xsl:value-of select="'${appService.valves.appServiceErrorPage}'"/>
+                </xsl:attribute>
+ 
+                <xsl:attribute name="showReport">
+                    <xsl:value-of select="'${catalina.valves.showReport}'"/>
+                </xsl:attribute>
+                
+                <xsl:attribute name="showServerInfo">
+                    <xsl:value-of select="'${catalina.valves.showServerInfo}'"/>
+                </xsl:attribute>
+ ```
+
+
 ::: zone-end
 
 ## Next steps

articles/azure-arc/resource-bridge/upgrade.md

@@ -12,7 +12,7 @@ This article describes how Arc resource bridge is upgraded, and the two ways upg
 ## Private cloud providers
 Currently, private cloud providers differ in how they perform Arc resource bridge upgrades. Review the following information to see how to upgrade your Arc resource bridge for a specific provider.
 
-For **Arc-enabled VMware vSphere**, manual upgrade and cloud upgrade are available. Appliances on version 1.0.15 and higher are automatically opted-in to cloud-managed upgrade. With cloud-managed upgrade, Microsoft may attempt to upgrade your Arc resource bridge at any time if it is on an appliance version that will soon be out of support. In order for either upgrade option to work, the upgrade prerequisites must be met. While Microsoft offers cloud-managed upgrade, you’re still responsible for checking that your resource bridge is healthy, online, in a "Running" status, and within the supported n-3 versions. Disruptions could cause cloud-managed upgrades to fail.  Any appliances that are earlier than version 1.0.15 must be manually upgraded. A manual upgrade only upgrades the appliance to the next version, not the latest version. If you have multiple versions to upgrade, another option is to review the steps for [performing a recovery](/azure/azure-arc/vmware-vsphere/recover-from-resource-bridge-deletion), then delete the appliance VM and perform the recovery steps. This deploys a new Arc resource bridge using the latest version and reconnects pre-existing Azure resources.
+For **Arc-enabled VMware vSphere**, manual upgrade and cloud upgrade are available. Appliances on version 1.0.15 and higher are automatically opted-in to cloud-managed upgrade. In order for either upgrade option to work, [the upgrade prerequisites](/azure/azure-arc/resource-bridge/upgrade) must be met. Microsoft may attempt to perform a cloud-managed upgrade of your Arc resource bridge at any time if your appliance will soon be out of support. While Microsoft offers cloud-managed upgrade, you’re still responsible for ensuring that your Arc resource bridge is within the supported n-3 versions. Disruptions could cause cloud-managed upgrade to fail and you may need to manual upgrade the Arc resource bridge. If you are close to being out of support, please manual upgrade to stay in supported versions.  Do not wait for cloud-managed upgrade. Any appliances that are earlier than version 1.0.15 must be manually upgraded. 
 
 For **Azure Arc VM management (preview) on Azure Stack HCI**, appliance version 1.0.15 or higher is only available on Azure Stack HCI build 23H2. In HCI 23H2, the LCM tool manages upgrades across all HCI, Arc resource bridge, and extension components as a "validated recipe" package. Any preview version of Arc resource bridge must be removed prior to updating from 22H2 to 23H2. Attempting to upgrade Arc resource bridge independent of other HCI environment components may cause problems in your environment that could result in a disaster recovery scenario. For more information, visit the [Arc VM management FAQ page](/azure-stack/hci/manage/azure-arc-vms-faq).
 
@@ -22,7 +22,9 @@ For **Arc-enabled System Center Virtual Machine Manager (SCVMM)**, the manual up
 
 Before upgrading an Arc resource bridge, the following prerequisites must be met: 
 
-- The appliance VM must be online, healthy, status is "Running" and the [credentials in the appliance VM](maintenance.md#update-credentials-in-the-appliance-vm) must be valid.
+- The appliance VM must be online, healthy with a Status of "Running". You can check the Azure resource of your Arc resource bridge to verify.
+
+- The [credentials in the appliance VM](maintenance.md#update-credentials-in-the-appliance-vm) must be up-to-date.  To test that the credentials within the Arc resource bridge VM are valid, perform an operation on an Arc-enabled VM from Azure or [update the credentials](/azure/azure-arc/resource-bridge/maintenance) to be certain.
 
 - There must be sufficient space on the management machine (~3.5 GB) and appliance VM (35 GB) to download required images.
 
@@ -46,7 +48,7 @@ There are two ways to upgrade Arc resource bridge: cloud-managed upgrades manage
 
 ## Cloud-managed upgrade
 
-Arc resource bridges on a supported [private cloud provider](#private-cloud-providers) with an appliance version 1.0.15 or higher are automatically opted into cloud-managed upgrade. With cloud-managed upgrade, Microsoft may attempt to upgrade your Arc resource bridge at any time if it is on an appliance version that will soon be out of support. The upgrade prerequisites must be met for cloud-managed upgrade to work. While Microsoft offers cloud-managed upgrade, you’re still responsible for checking that your resource bridge is healthy, online, in a "Running" status, and within the supported n-3 versions. Disruptions could cause cloud-managed upgrades to fail. 
+Arc resource bridges on a supported [private cloud provider](#private-cloud-providers) with an appliance version 1.0.15 or higher are automatically opted into cloud-managed upgrade. With cloud-managed upgrade, Microsoft may attempt to upgrade your Arc resource bridge at any time if it is on an appliance version that will soon be out of support. The upgrade prerequisites must be met for cloud-managed upgrade to work. While Microsoft offers cloud-managed upgrade, you’re still responsible for checking that your resource bridge is healthy, online, in a "Running" status, and within the supported n-3 versions. Disruptions could cause cloud-managed upgrades to fail. If you are close to being out of support, please manual upgrade to stay in supported versions.  Do not wait for cloud-managed upgrade.
 
 To check your resource bridge status and the appliance version run the `az arcappliance show` command from your management machine or check the Azure resource of your Arc resource bridge. If your appliance VM isn't in a healthy, Running state, cloud-managed upgrade might fail.
 

articles/azure-functions/configure-networking-how-to.md

@@ -29,7 +29,7 @@ Complete the following tutorial to create a new function app a secured storage a
 
 ### [Deployment templates](#tab/templates)
 
-Use Bicep files or Azure Resource Manager (ARM) templates to create a secured function app and storage account resources. When you create a secured storage account in an automated deployment, you must also specifically set the `WEBSITE_CONTENTSHARE` setting and create the file share as part of your deployment. For more information, including links to example deployments, see [Secured deployments](functions-infrastructure-as-code.md#secured-deployments). 
+Use Bicep files or Azure Resource Manager (ARM) templates to create a secured function app and storage account resources. When you create a secured storage account in an automated deployment, you must set the `vnetContentShareEnabled` site property, create the file share as part of your deployment, and set the `WEBSITE_CONTENTSHARE` app setting to the name of the file share. For more information, including links to example deployments, see [Secured deployments](functions-infrastructure-as-code.md#secured-deployments). 
 
 ---
 

articles/azure-functions/functions-container-apps-hosting.md

@@ -1,7 +1,7 @@
 ---
 title: Azure Container Apps hosting of Azure Functions 
 description: Learn about how you can use Azure Functions on Azure Container Apps to host and manage containerized function apps in Azure.
-ms.date: 02/27/2024
+ms.date: 03/07/2024
 ms.topic: conceptual
 ms.custom: references_regions, build-2023
 # Customer intent: As a cloud developer, I want to learn more about hosting my function apps in Linux containers managed by Azure Container Apps.
@@ -84,6 +84,7 @@ Keep in mind the following considerations when deploying your function app conta
     + Timer  
     <sup>*</sup>The protocol value of `ssl` isn't supported when hosted on Container Apps. Use a [different protocol value](functions-bindings-kafka-trigger.md?pivots=programming-language-csharp#attributes).  
 + For the built-in Container Apps [policy definitions](../container-apps/policy-reference.md#policy-definitions), currently only environment-level policies apply to Azure Functions containers.
++ You currently can't move a Container Apps hosted function app deployment between resource groups or between subscriptions. Instead, you would have to recreate the existing containerized app deployment in a new resource group, subscription, or region. 
 + When using Container Apps, you don't have direct access to the lower-level Kubernetes APIs. 
 + The `containerapp` extension conflicts with the `appservice-kube` extension in Azure CLI. If you have previously published apps to Azure Arc, run `az extension list` and make sure that `appservice-kube` isn't installed. If it is, you can remove it by running `az extension remove -n appservice-kube`.  
 + The Functions Dapr extension is also in preview, with help provided [in the repository](https://github.com/Azure/azure-functions-dapr-extension/issues).