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

Author: b-ahibbard

.openpublishing.redirection.json

@@ -227,7 +227,7 @@
     },
     {
       "source_path": "articles/databox-online/azure-stack-edge-2301-release-notes.md",
-      "redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-2301-release-notes",
+      "redirect_url": "/previous-versions/azure/databox-online/azure-stack-edge-2301-release-notes"
     },
     {
       "source_path": "articles/network-watcher/nsg-flow-logs-rest.md",
@@ -2393,7 +2393,7 @@
       "source_path_from_root": "/articles/app-service/manage-disaster-recovery.md",
       "redirect_url": "/azure/architecture/web-apps/guides/multi-region-app-service/multi-region-app-service",
       "redirect_document_id": false
-    },       
+    },
     {
       "source_path_from_root": "/articles/public-multi-access-edge-compute-mec/tutorial-create-vm-using-python-sdk.md",
       "redirect_url": "/previous-versions/azure/public-multi-access-edge-compute-mec/tutorial-create-vm-using-python-sdk",
@@ -6875,49 +6875,49 @@
       "redirect_document_id": false
     },
     {
-         "source_path": "articles/storage/files/storage-files-enable-soft-delete.md",
+      "source_path": "articles/storage/files/storage-files-enable-soft-delete.md",
       "redirect_url": "/azure/storage/files/storage-files-prevent-file-share-deletion",
       "redirect_document_id": false
-     },
-     {
+    },
+    {
       "source_path": "articles/defender-for-iot/organizations/release-notes-archive.md",
       "redirect_url": "/azure/defender-for-iot/organizations/release-notes-ot-monitoring-sensor-archive",
-       "redirect_document_id": false
-     },
-     {
+      "redirect_document_id": false
+    },
+    {
       "source_path": "articles/nat-gateway/quickstart-create-nat-gateway-portal.md",
       "redirect_url": "/azure/nat-gateway/quickstart-create-nat-gateway",
-       "redirect_document_id": false
-     },
-     {
+      "redirect_document_id": false
+    },
+    {
       "source_path": "articles/nat-gateway/quickstart-create-nat-gateway-powershell.md",
       "redirect_url": "/azure/nat-gateway/quickstart-create-nat-gateway",
-       "redirect_document_id": false
-     },
-     {
+      "redirect_document_id": false
+    },
+    {
       "source_path": "articles/nat-gateway/quickstart-create-nat-gateway-cli.md",
       "redirect_url": "/azure/nat-gateway/quickstart-create-nat-gateway",
-       "redirect_document_id": false
-     },
-     {
+      "redirect_document_id": false
+    },
+    {
       "source_path": "articles/nat-gateway/quickstart-create-nat-gateway-template.md",
       "redirect_url": "/azure/nat-gateway/quickstart-create-nat-gateway",
-       "redirect_document_id": false
-     },
-     {
+      "redirect_document_id": false
+    },
+    {
       "source_path": "articles/nat-gateway/quickstart-create-nat-gateway-terraform.md",
       "redirect_url": "/azure/nat-gateway/quickstart-create-nat-gateway",
-       "redirect_document_id": false
-     },
-     {
+      "redirect_document_id": false
+    },
+    {
       "source_path": "articles/nat-gateway/quickstart-create-nat-gateway-bicep.md",
       "redirect_url": "/azure/nat-gateway/quickstart-create-nat-gateway",
-       "redirect_document_id": false
-     },
-     {
+      "redirect_document_id": false
+    },
+    {
       "source_path": "articles/defender-for-iot/organizations/eiot-sensor.md",
       "redirect_url": "/azure/defender-for-iot/organizations/concept-enterprise",
       "redirect_document_id": false
     }
   ]
-}
+}

articles/app-service/deploy-authentication-types.md

@@ -22,7 +22,7 @@ With Azure App Service, you have multiple options for deploying your web applica
 | SCM/Kudu/OneDeploy REST endpoint | Basic authentication<br/><br/>Microsoft Entra | [Deploy files to App Service](deploy-zip.md) |
 | Kudu UI | Basic authentication<br/><br/>Microsoft Entra | [Deploy files to App Service](deploy-zip.md) |
 | FTP/FTPS | Basic authentication | [Deploy your app to Azure App Service by using FTP/S](deploy-ftp.md) |
-| Visual Studio | Basic authentication  | [Quickstart: Deploy an ASP.NET web app](quickstart-dotnetcore.md)<br/><br/>[Develop and deploy WebJobs by using Visual Studio](webjobs-dotnet-deploy-vs.md)<br/><br/>[Troubleshoot an app in Azure App Service by using Visual Studio](troubleshoot-dotnet-visual-studio.md)<br/><br/>[GitHub Actions integration in Visual Studio](/visualstudio/azure/overview-github-actions)<br/><br/>[Deploy your application to Azure by using GitHub Actions workflows created by Visual Studio](/visualstudio/deployment/azure-deployment-using-github-actions) |
+| Visual Studio | Basic authentication<br/><br/>Microsoft Entra  | [Quickstart: Deploy an ASP.NET web app](quickstart-dotnetcore.md)<br/><br/>[Develop and deploy WebJobs by using Visual Studio](webjobs-dotnet-deploy-vs.md)<br/><br/>[Troubleshoot an app in Azure App Service by using Visual Studio](troubleshoot-dotnet-visual-studio.md)<br/><br/>[GitHub Actions integration in Visual Studio](/visualstudio/azure/overview-github-actions)<br/><br/>[Deploy your application to Azure by using GitHub Actions workflows created by Visual Studio](/visualstudio/deployment/azure-deployment-using-github-actions) |
 | Visual Studio Code | Microsoft Entra | [Quickstart: Deploy an ASP.NET web app](quickstart-dotnetcore.md)<br/><br/>[Working with GitHub in VS Code](https://code.visualstudio.com/docs/sourcecontrol/github) |
 | GitHub with GitHub Actions | Publish profile (basic authentication)<br/><br/>Service principal (Microsoft Entra)<br/><br/>OpenID Connect (Microsoft Entra) | [Deploy to App Service by using GitHub Actions](deploy-github-actions.md) |
 | GitHub with the App Service build service as a build engine | Basic authentication | [Continuous deployment to Azure App Service](deploy-continuous-deployment.md) |

articles/app-service/overview-diagnostics.md

@@ -15,7 +15,7 @@ This article explains how to troubleshoot issues with your app in Azure App Serv
 
 Azure App Service diagnostics is an interactive experience to help you troubleshoot your app with no configuration required. App Service diagnostics points out what's wrong and guides you to the right information to more easily and quickly troubleshoot and resolve the problem.
 
-Although this experience is most helpful for problems that occured within the last 24 hours, all the diagnostic graphs are always available for you to analyze.
+Although this experience is most helpful for problems that occurred within the last 24 hours, all the diagnostic graphs are always available for you to analyze.
 
 App Service diagnostics works for not only apps on Windows, but also for apps on built-in or custom containers, [App Service Environments](./environment/intro.md), and [Azure Functions](../azure-functions/functions-overview.md).
 

articles/app-service/overview-vnet-integration.md

@@ -108,6 +108,7 @@ You must have at least the following Role-based access control permissions on th
 |-|-|
 | Microsoft.Network/virtualNetworks/read | Read the virtual network definition |
 | Microsoft.Network/virtualNetworks/subnets/read | Read a virtual network subnet definition |
+| Microsoft.Network/virtualNetworks/subnets/write | Delegate the subnet. Only required when the subnet has not been delegated or has not already been used for virtual network integration |
 | Microsoft.Network/virtualNetworks/subnets/join/action | Joins a virtual network |
 
 If the virtual network is in a different subscription than the app, you must ensure that the subscription with the virtual network is registered for the `Microsoft.Web` resource provider. You can explicitly register the provider [by following this documentation](../azure-resource-manager/management/resource-providers-and-types.md#register-resource-provider), but it also automatically registers when creating the first web app in a subscription.

articles/app-service/tutorial-java-jboss-mysql-app.md

@@ -665,7 +665,7 @@ If you see the error: `The subscription '701ea799-fb46-4407-bb67-9cbcf289f1c7' i
 
 Depending on your subscription and the region you select, you might see the deployment status for Azure Database for MySQL Flexible Server to be `Conflict`, with the following message in Operation details:
 
-`InternalServerError: An unexpected error occured while processing the request.`
+`InternalServerError: An unexpected error occurred while processing the request.`
 
 This error is most likely caused by a limit on your subscription for the region you select. Try choosing a different region for your deployment.
 

articles/app-service/tutorial-java-tomcat-mysql-app.md

@@ -697,7 +697,7 @@ You can ignore the warnings. The Maven Jetty plugin shows the warnings because t
 
 Depending on your subscription and the region you select, you might see the deployment status for Azure Database for MySQL Flexible Server to be `Conflict`, with the following message in Operation details:
 
-`InternalServerError: An unexpected error occured while processing the request.`
+`InternalServerError: An unexpected error occurred while processing the request.`
 
 This error is most likely caused by a limit on your subscription for the region you select. Try choosing a different region for your deployment.
 

articles/application-gateway/configuration-http-settings.md

@@ -16,7 +16,7 @@ The Backend Settings enable you to manage the configurations for backend connect
 ## Types of Backend Settings in Application Gateway
 While Portal users will only see the "Backend Settings" option, API users will have access to two types of settings. You must utilize the correct configuration, according to the protocol.
 
-* Backend HTTP settings - It is for Layer 7 proxy configurations that support HTTP, HTTPS, and WebSockets protocols.
+* Backend HTTP settings - It is for Layer 7 proxy configurations that support HTTP and HTTPS protocols.
 * Backend settings - It is for Layer 4 proxy (Preview) configurations that support TLS and TCP protocols.
 
 ---

articles/application-gateway/for-containers/session-affinity.md

@@ -5,7 +5,7 @@ services: application gateway
 author: greg-lindsay
 ms.service: azure-appgw-for-containers
 ms.topic: concept-article
-ms.date: 5/9/2024
+ms.date: 5/12/2025
 ms.author: greglin
 ---
 
@@ -78,7 +78,7 @@ EOF
 
 Session affinity can be defined in an [IngressExtension](api-specification-kubernetes.md#alb.networking.azure.io/v1.IngressExtensionSpec) resource. You must specify `sessionAffinity` with an `affinityType` of either `application-cookie` or `managed-cookie`. In this example, we use `application-cookie` as the affinityType and explicitly define a cookie name and lifetime.
 
-Example command to create a new IngressExtension with a defined cookie called `nomnom` with a lifetime of 3,600 seconds (1 hour).
+Example command to create a new IngressExtension with a defined cookie called `nomnom` with a lifetime of 3,600 seconds (1 hour) targetting a backend service called `echo`.
 
 ```bash
 kubectl apply -f - <<EOF
@@ -89,7 +89,7 @@ metadata:
   namespace: test-infra
 spec:
   backendSettings:
-    - service: echo
+    - service: echo # replace with your service name
       sessionAffinity:
         affinityType: "application-cookie"
         cookieName: "nomnom"

articles/application-gateway/how-to-tcp-tls-proxy.md

@@ -6,7 +6,7 @@ services: application-gateway
 author: greg-lindsay
 ms.service: azure-application-gateway
 ms.topic: how-to
-ms.date: 03/21/2025
+ms.date: 05/12/2025
 ms.author: greglin
 ---
 
@@ -40,13 +40,7 @@ Use the following steps to enroll into the public preview for Application Gatewa
 
 1. Sign in to the [Azure portal](https://portal.azure.com/).
 2. In the search box, enter _subscriptions_ and select **Subscriptions**.
-
-    :::image type="content" source="../azure-resource-manager/management/media/preview-features/search.png" alt-text="Screenshot of Azure portal search.":::
-
 3. Select the link for your subscription's name.
-
-    :::image type="content" source="../azure-resource-manager/management/media/preview-features/subscriptions.png" alt-text="Screenshot selecting the Azure subscription.":::
-
 4. From the left menu, under **Settings** select **Preview features**.
 
     :::image type="content" source="../azure-resource-manager/management/media/preview-features/preview-features-menu.png" alt-text="Screenshot of the Azure preview features menu.":::
@@ -57,7 +51,7 @@ Use the following steps to enroll into the public preview for Application Gatewa
 
 6. From **Preview features** type into the filter box **AllowApplicationGatewayTlsProxy**, select the feature, and then select **Register**.
 
-    :::image type="content" source="../azure-resource-manager/management/media/preview-features/filter.png" alt-text="Screenshot of Azure portal filter preview features.":::
+   ![A screenshot of registering for the preview.](media/how-to-tcp-tls-proxy/preview.png)
 
 ## Create a SQL server