Resolve conflict.

Author: TimShererWithAquent

.openpublishing.publish.config.json

@@ -1289,7 +1289,6 @@
   ".openpublishing.redirection.azure-databricks.json",
   ".openpublishing.redirection.azure-datalake-storage-gen1.json",
   ".openpublishing.redirection.azure-hpc.json",
-  ".openpublishing.redirection.azure-kubernetes-service.json",
   ".openpublishing.redirection.azure-monitor.json",
   ".openpublishing.redirection.azure-percept.json",
   ".openpublishing.redirection.azure-productivity.json",
@@ -1337,7 +1336,6 @@
   "articles/active-directory-b2c/.openpublishing.redirection.active-directory-b2c.json",
   "articles/ai-services.openpublishing.redirection.ai-services.json",
   "articles/ai-studio/.openpublishing.redirection.ai-studio.json",
-  "articles/aks/.openpublishing.redirection.aks.json",
   "articles/analysis-services/.openpublishing.redirection.analysis-services.json",
   "articles/application-gateway/.openpublishing.redirection.application-gateway.json",
   "articles/automation/.openpublishing.redirection.automation.json",

.openpublishing.redirection.azure-kubernetes-service.json

@@ -165,6 +165,16 @@
             "source_path": "articles/container-registry/monitor-service-reference.md",
             "redirect_url": "/azure/container-registry/monitor-container-registry-reference",
             "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/container-registry/container-registry-auth-aks.md",
+            "redirect_url": "/azure/aks/cluster-container-registry-integration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/container-service/kubernetes/container-service-kubernetes-jenkins.md",
+            "redirect_url": "/azure/aks/jenkins-continuous-deployment",
+            "redirect_document_id": false
         }
     ]
 }

.openpublishing.redirection.container-registry.json

@@ -7,6 +7,12 @@ ms.author: eur
 ms.custom: references_regions
 ---
 
+### July 2024 release
+
+#### Text to speech avatar (GA)
+
+Text to speech avatar is now generally available. For more information, see [text to speech avatar](../../text-to-speech-avatar/what-is-text-to-speech-avatar.md).
+
 ### June 2024 release
 
 #### Prebuilt neural voice

.openpublishing.redirection.json

@@ -15,17 +15,14 @@ ms.custom: references_regions
 
 # Synthetic data generation in Azure AI Studio
 
-In this article
-  - [Synthetic data generation](#synthetic-data-generation)
-  - [Next Steps](#next-steps)
+In Azure AI Studio, you can use synthetic data generation to efficiently produce predictions for your datasets. In this article, you're introduced to the concept of synthetic data generation and how it can be used in machine learning.
 
-In Azure AI Studio, you can leverage synthetic data generation to efficiently produce predictions for your datasets.
 
 ## Synthetic data generation
 
 Synthetic data generation involves creating artificial data that mimics the statistical properties of real-world data. This data is generated using algorithms and machine learning techniques, and it can be used in various ways, such as computer simulations or by modeling real-world events.
 
-In machine learning, synthetic data is particularly valuable for several reasons:
+In machine learning, synthetic data is valuable for several reasons:
 
 **Data Augmentation:** It helps in expanding the size of training datasets, which is crucial for training robust machine learning models. This is especially useful when real-world data is scarce or expensive to obtain.
 
@@ -37,4 +34,4 @@ You can use the sample notebook available at this [link](https://aka.ms/meta-lla
 - [What is Azure AI Studio?](../what-is-ai-studio.md)
 - [Learn more about deploying Meta Llama models](../how-to/deploy-models-llama.md)
 
-- [Azure AI FAQ article](../faq.yml)
+- [Azure AI FAQ article](../faq.yml)

articles/ai-services/speech-service/includes/release-notes/release-notes-tts.md

@@ -4,7 +4,7 @@ description: Build, discover, try, and consume APIs from your Azure API center u
 author: dlepow
 ms.service: azure-api-center
 ms.topic: how-to
-ms.date: 07/15/2024
+ms.date: 08/01/2024
 ms.author: danlep 
 ms.custom: 
 # Customer intent: As a developer, I want to use my Visual Studio Code environment to build, discover, try, and consume APIs in my organization's API center.
@@ -33,6 +33,9 @@ To build, discover, try, and consume APIs in your [API center](overview.md), you
 * [Visual Studio Code](https://code.visualstudio.com/)
 
 * [Azure API Center extension for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=apidev.azure-api-center)
+
+    > [!NOTE]
+    > Where noted, certain features are available only in the extension's pre-release version. When installing the extension from the [Visual Studio Code Marketplace](https://marketplace.visualstudio.com/items?itemName=apidev.azure-api-center&ssr=false#overview), you can choose to install the release version or a pre-release version. Switch between the two versions at any time by using the extension's **Manage** button context menu in the Extensions view. 
     
 The following Visual Studio Code extensions are optional and needed only for certain scenarios as indicated:
 
@@ -86,7 +89,10 @@ Visual Studio Code will open a diff view between the two API specifications. Any
 
 ## Generate OpenAPI specification file from API code 
 
-Use the power of GitHub Copilot with the Azure API Center extension for Visual Studio Code to create an OpenAPI specification file from your API code. Right click on the API code, select **Copilot** from the options, and select **Generate API documentation**. This will create an OpenAPI specification file.
+Use the power of GitHub Copilot with the Azure API Center extension for Visual Studio Code to create an OpenAPI specification file from your API code. Right-click on the API code, select **Copilot** from the options, and select **Generate API documentation**. This will create an OpenAPI specification file.
+
+> [!NOTE]
+> This feature is available in the pre-release version of the API Center extension.
 
 :::image type="content" source="media/use-vscode-extension/generate-api-documentation.gif" alt-text="Animation showing how to use GitHub Copilot to generate an OpenAPI spec from code." lightbox="media/use-vscode-extension/generate-api-documentation.gif":::
 
@@ -115,7 +121,7 @@ You can view the documentation for an API definition in your API center and try
     > Depending on the API, you might need to provide authorization credentials or an API key to try the API.
 
     > [!TIP]
-    > You can also use the extension to generate API documentation in Markdown, a format that's easy to maintain and share with end users. Right-click on the definition, and select **Generate Markdown**.
+    > Using the pre-release version of the extension, you can generate API documentation in Markdown, a format that's easy to maintain and share with end users. Right-click on the definition, and select **Generate Markdown**.
 
 ## Generate HTTP file
 

articles/ai-studio/concepts/concept-synthetic-data.md

@@ -99,7 +99,9 @@ In this step, add the Microsoft Entra app registration as an identity provider f
         > Do not use the version 2.0 endpoint for the issuer URL (URL ending in `/v2.0`).
 1. In **Allowed token audiences**, enter the **Application ID URI** from the app registration. Example: `api://<app-id>`.
 1. Under **Additional checks**, select values appropriate for your environment, or use the default values.
-1. Accept the default values for the remaining settings and select **Add**.
+1. Configure your desired the values for the remaining settings, or use the default values. Select **Add**.
+    > [!NOTE]
+    > If you want to allow guest users as well as signed-in users to access the developer portal on WordPress, you can enable unauthenticated access. In **Restrict access**, select **Allow unauthenticated access**. [Learn more](../app-service/overview-authentication-authorization.md#authorization-behavior)
 
 The identity provider is added to the app service.
 
@@ -289,15 +291,14 @@ Add a custom stylesheet for the API Management developer portal.
 
 ## Step 9: Sign into the API Management developer portal deployed on WordPress 
 
-Sign into the WordPress site to see your new API Management developer portal deployed on WordPress and hosted on App Service.
+Access the WordPress site to see your new API Management developer portal deployed on WordPress and hosted on App Service.
+
+1. In a new browser window, navigate to your WordPress site, substituting the name of your app service in the following URL: `https://<yourapp-service-name>.azurewebsites.net`.
+1. When prompted, sign in using Microsoft Entra ID credentials for a developer account. If unauthenticated access to the developer portal is enabled, select **Sign in** on the home page of the developer portal.
 
 > [!NOTE]
 > You can only sign in to the developer portal on WordPress using Microsoft Entra ID credentials. Basic authentication isn't supported. 
 
-1. In a new browser window, navigate to your WordPress site, substituting the name of your app service in the following URL: `https://<yourapp-service-name>.azurewebsites.net` 
-1. When prompted, sign in using Microsoft Entra ID credentials for a developer account.
-
-
 You can now use the following features of the API Management developer portal: 
 
 * Sign into the portal

articles/api-center/use-vscode-extension.md

@@ -4,7 +4,7 @@ titleSuffix: Azure Application Gateway
 description: Learn how to use Backend health report in Azure Application Gateway
 services: application-gateway
 author: jaesoni
-ms.service: application-gateway
+ms.service: azure-application-gateway
 ms.topic: article
 ms.date: 05/30/2024
 ms.author: jaysoni 

articles/api-management/developer-portal-wordpress-plugin.md

@@ -3,7 +3,7 @@ title: Create Azure Application Gateway custom error pages
 description: This article shows you how to create Application Gateway custom error pages. You can use your own branding and layout using a custom error page.
 services: application-gateway
 author: greg-lindsay
-ms.service: application-gateway
+ms.service: azure-application-gateway
 ms.topic: how-to
 ms.date: 12/19/2023
 ms.author: jaysoni