Merge branch 'main' into us406760-13

Author: TimShererWithAquent

.openpublishing.redirection.json

@@ -5749,6 +5749,26 @@
       "redirect_url": "/azure/vpn-gateway/point-to-site-vpn-client-cert-windows",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/sql-server-stretch-database/sql-server-stretch-database-encryption-tde.md",
+      "redirect_url": "/azure/azure-sql/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/sql-server-stretch-database/sql-server-stretch-database-tde-tsql.md",
+      "redirect_url": "/azure/azure-sql/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/sql-server-stretch-database/sql-server-stretch-database-index-all-articles.md",
+      "redirect_url": "/azure/azure-sql/",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/sql-server-stretch-database/index.yml",
+      "redirect_url": "/azure/azure-sql/",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/vs-azure-tools-access-private-azure-clouds-with-visual-studio.md",
       "redirect_url": "/visualstudio/azure/vs-azure-tools-access-private-azure-clouds-with-visual-studio",

articles/app-service/configure-common.md

@@ -4,7 +4,7 @@ description: Learn how to configure common settings for an Azure App Service app
 keywords: azure app service, web app, app settings, environment variables
 ms.assetid: 9af8a367-7d39-4399-9941-b80cbc5f39a0
 ms.topic: how-to
-ms.date: 03/24/2025
+ms.date: 03/27/2025
 ms.custom: devx-track-csharp, devx-track-azurecli, devx-track-azurepowershell, AppServiceConnectivity
 ms.devlang: azurecli
 author: cephalin
@@ -34,10 +34,10 @@ For ASP.NET and ASP.NET Core developers, configuring app settings in App Service
 Other language stacks get the app settings as environment variables at runtime. For steps that are specific to each language stack, see:
 
 - [ASP.NET Core](configure-language-dotnetcore.md#access-environment-variables)
+- [Java](configure-language-java-data-sources.md)
 - [Node.js](configure-language-nodejs.md#access-environment-variables)
-- [PHP](configure-language-php.md#access-environment-variables)
 - [Python](configure-language-python.md#access-app-settings-as-environment-variables)
-- [Java](configure-language-java-data-sources.md)
+- [PHP](configure-language-php.md#access-environment-variables)
 - [Custom containers](configure-custom-container.md#configure-environment-variables)
 
 App settings are always encrypted when they're stored (encrypted at rest).
@@ -230,10 +230,10 @@ At runtime, connection strings are available as environment variables, prefixed
 For example, a MySQL connection string named *connectionstring1* can be accessed as the environment variable `MYSQLCONNSTR_connectionString1`. For steps that are specific to each language stack, see:
 
 - [ASP.NET Core](configure-language-dotnetcore.md#access-environment-variables)
+- [Java](configure-language-java-data-sources.md)
 - [Node.js](configure-language-nodejs.md#access-environment-variables)
-- [PHP](configure-language-php.md#access-environment-variables)
 - [Python](configure-language-python.md#access-environment-variables)
-- [Java](configure-language-java-data-sources.md)
+- [PHP](configure-language-php.md#access-environment-variables)
 - [Custom containers](configure-custom-container.md#configure-environment-variables)
 
 Connection strings are always encrypted when they're stored (encrypted at rest).
@@ -411,10 +411,10 @@ It's not possible to edit connection strings in bulk by using a JSON file with A
 To configure language stack settings, see these resources:
 
 - [ASP.NET Core](configure-language-dotnetcore.md)
+- [Java](configure-language-java-deploy-run.md)
 - [Node.js](configure-language-nodejs.md)
-- [PHP](configure-language-php.md)
 - [Python](configure-language-python.md)
-- [Java](configure-language-java-deploy-run.md)
+- [PHP](configure-language-php.md)
 
 <a name="alwayson"></a>
 

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

@@ -68,6 +68,8 @@ You can run an unsupported version of Python by building your own container imag
 <a name="access-environment-variables"></a>
 
 ## Customize build automation
+> [!NOTE]
+> When Python applications are deployed with build automation, content will be deployed to and served from `/tmp/<uid>`, not under `/home/site/wwwroot`. This content directory can be access through the `APP_PATH` environment variable. Any additional files created at runtime should be written to a location under `/home` or using [Bring Your Own Storage](configure-connect-to-azure-storage.md) for persistence. More information on this behavior can be found [here](https://github.com/Azure-App-Service/KuduLite/wiki/Python-Build-Changes).
 
 App Service's build system, called Oryx, performs the following steps when you deploy your app, if the app setting `SCM_DO_BUILD_DURING_DEPLOYMENT` is set to `1`:
 

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

@@ -2,11 +2,11 @@
 author: cephalin
 ms.author: cephalin
 ms.topic: include
-ms.date: 05/17/2024
+ms.date: 03/27/2025
 ---
 
 Azure App Service runs Java web applications on a fully managed service in three variants:
 
-* Java SE - Can run an app deployed as a JAR package that contains an embedded server (such as Spring Boot, Dropwizard, Quarkus, or one with an embedded Tomcat or Jetty server).   
-* Tomcat - The built-in Tomcat server can run an app deployed as a WAR package.
-* JBoss EAP - Supported for Linux apps in the Free, Premium v3, and Isolated v2 pricing tiers only. The built-in JBoss EAP server can run an app deployed as a WAR or EAR package.
+* Java Standard Edition (SE) - Can run an app deployed as a Java Archive (JAR) package that contains an embedded server (such as Spring Boot, Quarkus, Dropwizard, or one with an embedded Tomcat or Jetty server).   
+* Tomcat - The built-in Tomcat server can run an app deployed as a Web application ARchive (WAR) package.
+* JBoss Enterprise Application Platform (EAP) - The built-in JBoss EAP server can run an app deployed as a WAR or Enterprise Archive (EAR) package. Supported for Linux apps in a set of pricing tiers which includes Free, Premium v3, and Isolated v2.

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

@@ -4,7 +4,7 @@ ms.service: azure-app-service
 ms.devlang: java
 ms.custom: linux-related-content
 ms.topic: quickstart
-ms.date: 02/14/2025
+ms.date: 03/18/2025
 ms.author: cephalin
 ---
 
@@ -70,6 +70,23 @@ docker --version
    ENTRYPOINT ["dotnet", "/defaulthome/hostingstart/hostingstart.dll"]
    ```
 
+   # [Java](#tab/java)
+
+   In this Dockerfile, the parent image is one of the built-in Java containers of App Service. You can find the source files for it at
+   [java/tree/dev/java11-alpine](https://github.com/Azure-App-Service/java/tree/dev/java11-alpine).
+   Its [Dockerfile](https://github.com/Azure-App-Service/java/blob/dev/java11-alpine/Dockerfile) copies a simple Java app into `/tmp/appservice`. Your Dockerfile starts
+   that app.
+
+   <!-- https://mcr.microsoft.com/v2/azure-app-service%2Fjava/tags/list -->
+   ```dockerfile
+   FROM mcr.microsoft.com/azure-app-service/java:11-java11_stable
+
+   ENV PORT 80
+   EXPOSE 80
+
+   ENTRYPOINT ["java", "-Dserver.port=80", "-jar", "/tmp/appservice/parkingpage.jar"]
+   ```
+
    # [Node.js](#tab/node)
 
    In this Dockerfile, the parent image is one of the built-in Node.js containers of App Service.
@@ -98,20 +115,6 @@ docker --version
 
    ENTRYPOINT ["gunicorn", "--timeout", "600", "--access-logfile", "'-'", "--error-logfile", "'-'", "--chdir=/opt/defaultsite", "application:app"]
    ```
-
-   # [Java](#tab/java)
-
-   In this Dockerfile, the parent image is one of the built-in Java containers of App Service. You can find the source files for it at [java/tree/dev/java11-alpine](https://github.com/Azure-App-Service/java/tree/dev/java11-alpine). Its [Dockerfile](https://github.com/Azure-App-Service/java/blob/dev/java11-alpine/Dockerfile) copies a simple Java app into `/tmp/appservice`. Your Dockerfile starts that app.
-
-   <!-- https://mcr.microsoft.com/v2/azure-app-service%2Fjava/tags/list -->
-   ```dockerfile
-   FROM mcr.microsoft.com/azure-app-service/java:11-java11_stable
-
-   ENV PORT 80
-   EXPOSE 80
-
-   ENTRYPOINT ["java", "-Dserver.port=80", "-jar", "/tmp/appservice/parkingpage.jar"]
-   ```
    ---
 
 1. [Open the Command Palette](https://code.visualstudio.com/docs/getstarted/userinterface#_command-palette), and type **Docker Images: Build Image**. Select **Enter** to run the command.
@@ -155,7 +158,7 @@ The **Output** panel shows the status of the deployment operations. When the ope
 
 ## Related content
 
-Congratulations, you've successfully completed this quickstart.
+Congratulations, you successfully completed this quickstart!
 
 The App Service app pulls from the container registry every time it starts. If you rebuild your image, you just need to push it to your container registry, and the app pulls in the updated image when it restarts. To tell your app to pull in the updated image immediately, restart it.