Merge branch 'MicrosoftDocs:main' into Concepts-Network-Fabric-OptionA-OptionB

Author: jmmason70

.openpublishing.redirection.json

@@ -5264,6 +5264,11 @@
       "redirect_url": "/azure/virtual-wan/monitor-virtual-wan",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/virtual-wan/openvpn-azure-ad-client-mac.md",
+      "redirect_url": "/azure/virtual-wan/point-to-site-entra-vpn-client-mac",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/virtual-wan/monitoring-best-practices.md",
       "redirect_url": "/azure/virtual-wan/monitor-virtual-wan",

articles/api-center/set-up-api-center.md

@@ -26,7 +26,7 @@ To register the resource provider using the portal:
 
 1. Select the subscription where you want to create the API center.
 
-1. In the left menu, under **Resources**, select **Resource providers**.
+1. In the left menu, under **Settings** > **Resources**, select **Resource providers**.
 
 1. Search for **Microsoft.ApiCenter** in the list of resource providers. If it's not registered, select **Register**.
 

articles/api-management/api-management-api-import-restrictions.md

@@ -147,6 +147,7 @@ The following fields are included in either [OpenAPI version 3.0.x](https://swag
 | **PathItem** | <ul><li>`trace`</li><li>`servers`</li></ul> |
 | **Operation** | <ul><li>`externalDocs`</li><li>`callbacks`</li><li>`security`</li><li>`servers`</li></ul> |
 | **Parameter** | <ul><li>`allowEmptyValue`</li><li>`style`</li><li>`explode`</li><li>`allowReserved`</li></ul> |
+| **Server templating** | <ul><li>`API Server and Base URL`</li></ul> |
 
 ## OpenAPI import, update, and export mechanisms
 

articles/api-management/azure-openai-enable-semantic-caching.md

@@ -115,7 +115,7 @@ If the request is successful, the response includes a vector representation of t
 
 ## Configure semantic caching policies
 
-Configure the following policies to enable semantic caching for Azure OpenAI APIs in Azure API Management:
+To enable semantic caching for Azure OpenAI APIs in Azure API Management, apply the following policies: one to check the cache before sending requests (lookup) and another to store responses for future reuse (store):
 * In the **Inbound processing** section for the API, add the [azure-openai-semantic-cache-lookup](azure-openai-semantic-cache-lookup-policy.md) policy. In the `embeddings-backend-id` attribute, specify the Embeddings API backend you created.
 
     > [!NOTE]

articles/api-management/backends.md

@@ -271,3 +271,4 @@ Include a JSON snippet similar to the following in your ARM template for a backe
 
 * Blog: [Using Azure API Management circuit breaker and load balancing with Azure OpenAI Service](https://techcommunity.microsoft.com/t5/fasttrack-for-azure/using-azure-api-management-circuit-breaker-and-load-balancing/ba-p/4041003)
 * Set up a [Service Fabric backend](how-to-configure-service-fabric-backend.yml) using the Azure portal.
+* Quickstart [Create a Backend Pool in Azure API Management using Bicep for load balance OpenAI requests](https://github.com/Azure-Samples/apim-lbpool-openai-quickstart)

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

@@ -10,10 +10,3 @@ Azure App Service runs Java web applications on a fully managed service in three
 * 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.
-
-::: zone pivot="java-javase"
-
-> [!NOTE]
-> For Spring applications, we recommend using Azure Spring Apps. However, you can still use Azure App Service as a destination. See [Java Workload Destination Guidance](https://aka.ms/javadestinations) for advice.
-
-::: zone-end

articles/app-service/includes/deploy-github-actions/deploy-github-actions-openid-connect.md

@@ -122,7 +122,7 @@ jobs:
 
 # [Java SE](#tab/java)
 
-Build and deploy a Java Spring app to Azure using an Azure service principal. The example uses GitHub secrets for the `client-id`, `tenant-id`, and `subscription-id` values. You can also pass these values directly in the sign-in action.
+Build and deploy a Java Spring Boot app to Azure using an Azure service principal. The example uses GitHub secrets for the `client-id`, `tenant-id`, and `subscription-id` values. You can also pass these values directly in the sign-in action.
 
 ```yaml
 name: Java CI with Maven

articles/app-service/includes/deploy-github-actions/deploy-github-actions-publish-profile.md

@@ -93,7 +93,7 @@ jobs:
 
 # [Java SE](#tab/java)
 
-Build and deploy a Java Spring app to Azure using an Azure publish profile. The `publish-profile` input references the `AZURE_WEBAPP_PUBLISH_PROFILE` secret that you created earlier.
+Build and deploy a Java Spring Boot app to Azure using an Azure publish profile. The `publish-profile` input references the `AZURE_WEBAPP_PUBLISH_PROFILE` secret that you created earlier.
 
 ```yaml
 name: Java CI with Maven

articles/app-service/includes/deploy-github-actions/deploy-github-actions-service-principal.md

@@ -110,7 +110,7 @@ jobs:
 
 # [Java SE](#tab/java)
 
-Build and deploy a Java Spring app to Azure using an Azure service principal. The `creds` input references the `AZURE_CREDENTIALS` secret that you created earlier.
+Build and deploy a Java Spring Boot app to Azure using an Azure service principal. The `creds` input references the `AZURE_CREDENTIALS` secret that you created earlier.
 
 ```yaml
 name: Java CI with Maven

articles/app-service/includes/quickstart-java/quickstart-java-javase.md

@@ -11,9 +11,6 @@ In this quickstart, you use the [Maven Plugin for Azure App Service Web Apps](ht
 
 The quickstart deploys either a Spring Boot app, embedded Tomcat, or Quarkus app using the [azure-webapp-maven-plugin](https://github.com/microsoft/azure-maven-plugins/wiki/Azure-Web-App) plugin.
 
-> [!NOTE]
-> App Service can host Spring apps. For Spring apps that require all the Spring services, try [Azure Spring Apps](../../../spring-apps/quickstart.md) instead.
-
 ### [Spring Boot](#tab/springboot)
 
 :::image type="content" source="../../media/quickstart-java/springboot-hello-world-in-browser-azure-app-service.png" alt-text="Screenshot of Spring Boot Hello World web app running in Azure App Service in introduction.":::