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

Author: tamram

articles/ai-services/language-service/question-answering/how-to/azure-openai-integration.md

@@ -74,4 +74,4 @@ At the same time, customers often require a custom answer authoring experience t
 You can now start exploring Azure OpenAI capabilities with a no-code approach through the chat playground. It's simply a text box where you can submit a prompt to generate a completion. From this page, you can quickly iterate and experiment with the capabilities. You can also launch a [web app](../../../openai/how-to/use-web-app.md) to chat with the model over the web.
 
 ## Next steps
-* [Using Azure OpenAI on your data](../../../openai/concepts/use-your-data.md) 
+* [Using Azure OpenAI on your data](../../../openai/concepts/use-your-data.md)

articles/ai-services/language-service/question-answering/overview.md

@@ -13,6 +13,9 @@ ms.custom: language-service-question-answering
 
 # What is custom question answering?
 
+> [!NOTE]
+> [Azure Open AI On Your Data](../../openai/concepts/use-your-data.md) utilizes large language models (LLMs) to produce similar results to Custom Question Answering. If you wish to connect an existing Custom Question Answering project to Azure Open AI On Your Data, please check out our [guide]( how-to/azure-openai-integration.md).
+
 Custom question answering provides cloud-based Natural Language Processing (NLP) that allows you to create a natural conversational layer over your data. It is used to find appropriate answers from customer input or from a project.
 
 Custom question answering is commonly used to build conversational client applications, which include social media applications, chat bots, and speech-enabled desktop applications. This offering includes features like enhanced relevance using a deep learning ranker, precise answers, and end-to-end region support.

articles/ai-services/language-service/question-answering/quickstart/sdk.md

@@ -15,6 +15,9 @@ zone_pivot_groups: custom-qna-quickstart
 
 # Quickstart: custom question answering
 
+> [!NOTE]
+> [Azure Open AI On Your Data](../../../openai/concepts/use-your-data.md) utilizes large language models (LLMs) to produce similar results to Custom Question Answering. If you wish to connect an existing Custom Question Answering project to Azure Open AI On Your Data, please check out our [guide](../how-to/azure-openai-integration.md).
+
 > [!NOTE]
 > Are you looking to migrate your workloads from QnA Maker? See our [migration guide](../how-to/migrate-qnamaker-to-question-answering.md) for information on feature comparisons and migration steps.
 

articles/ai-services/qnamaker/Overview/overview.md

@@ -13,6 +13,9 @@ keywords: "qna maker, low code chat bots, multi-turn conversations"
 
 # What is QnA Maker?
 
+> [!NOTE]
+> [Azure Open AI On Your Data](../../openai/concepts/use-your-data.md) utilizes large language models (LLMs) to produce similar results to QnA Maker. If you wish to migrate your QnA Maker project to Azure Open AI On Your Data, please check out our [guide](../How-To/migrate-to-openai.md).
+
 [!INCLUDE [Custom question answering](../includes/new-version.md)]
 
 [!INCLUDE [Azure AI services rebrand](../../includes/rebrand-note.md)]

articles/ai-services/qnamaker/Quickstarts/add-question-metadata-portal.md

@@ -13,6 +13,9 @@ ms.custom: mode-ui
 
 # Add questions and answer with QnA Maker portal
 
+> [!NOTE]
+> [Azure Open AI On Your Data](../../openai/concepts/use-your-data.md) utilizes large language models (LLMs) to produce similar results to QnA Maker. If you wish to migrate your QnA Maker project to Azure Open AI On Your Data, please check out our [guide](../How-To/migrate-to-openai.md).
+
 Once a knowledge base is created, add question and answer (QnA) pairs with metadata to filter the answer. The questions in the following table are about Azure service limits, but each has to do with a different Azure search service.
 
 [!INCLUDE [Custom question answering](../includes/new-version.md)]

articles/ai-services/qnamaker/Quickstarts/create-publish-knowledge-base.md

@@ -13,6 +13,9 @@ ms.custom: mode-other
 
 # Quickstart: Create, train, and publish your QnA Maker knowledge base
 
+> [!NOTE]
+> [Azure Open AI On Your Data](../../openai/concepts/use-your-data.md) utilizes large language models (LLMs) to produce similar results to QnA Maker. If you wish to migrate your QnA Maker project to Azure Open AI On Your Data, please check out our [guide](../How-To/migrate-to-openai.md).
+
 [!INCLUDE [Custom question answering](../includes/new-version.md)]
 
 You can create a QnA Maker knowledge base (KB) from your own content, such as FAQs or product manuals. This article includes an example of creating a QnA Maker knowledge base from a simple FAQ webpage, to answer questions.

articles/ai-services/qnamaker/Quickstarts/get-answer-from-knowledge-base-using-url-tool.md

@@ -15,6 +15,9 @@ ms.date: 01/19/2024
 
 # Get an answer from a QNA Maker knowledge base
 
+> [!NOTE]
+> [Azure Open AI On Your Data](../../openai/concepts/use-your-data.md) utilizes large language models (LLMs) to produce similar results to QnA Maker. If you wish to migrate your QnA Maker project to Azure Open AI On Your Data, please check out our [guide](../How-To/migrate-to-openai.md).
+
 [!INCLUDE [Custom question answering](../includes/new-version.md)]
 
 > [!NOTE]

articles/ai-services/qnamaker/Quickstarts/quickstart-sdk.md

@@ -15,6 +15,9 @@ zone_pivot_groups: qnamaker-quickstart
 
 # Quickstart: QnA Maker client library
 
+> [!NOTE]
+> [Azure Open AI On Your Data](../../openai/concepts/use-your-data.md) utilizes large language models (LLMs) to produce similar results to QnA Maker. If you wish to migrate your QnA Maker project to Azure Open AI On Your Data, please check out our [guide](../How-To/migrate-to-openai.md).
+
 Get started with the QnA Maker client library. Follow these steps to install the package and try out the example code for basic tasks.
 
 [!INCLUDE [Custom question answering](../includes/new-version.md)]

articles/application-gateway/ipv6-application-gateway-portal.md

@@ -14,7 +14,7 @@ ms.custom: mvc, mode-ui
 # Configure Application Gateway with a frontend public IPv6 address using the Azure portal
 
 > [!IMPORTANT]
-> Application Gateway IPv6 support is now generally available. Updates to the Azure portal for IPv6 support are currently being deployed across all regions and will be fully available within the next few weeks. In the meantime to use the portal to create an IPv6 Application Gateway continue using the [preview registration process](/azure/azure-resource-manager/management/preview-features?tabs=azure-portal) in the Azure portal to opt in for **Allow Application Gateway IPv6 Access**. 
+> Application Gateway IPv6 support is now generally available. 
 
 [Azure Application Gateway](overview.md) supports dual stack (IPv4 and IPv6) frontend connections from clients. To use IPv6 frontend connectivity, you need to create a new Application Gateway. Currently you can’t upgrade existing IPv4 only Application Gateways to dual stack (IPv4 and IPv6) Application Gateways. Also, currently backend IPv6 addresses aren't supported.
 
@@ -37,7 +37,7 @@ You can also complete this quickstart using [Azure PowerShell](ipv6-application-
 
 ## Regions and availability
 
-The IPv6 Application Gateway preview is available to all public cloud regions where Application Gateway v2 SKU is supported. It's also available in [Microsoft Azure operated by 21Vianet](https://www.azure.cn/) and [Azure Government](https://azure.microsoft.com/overview/clouds/government/)
+The IPv6 Application Gateway is available to all public cloud regions where Application Gateway v2 SKU is supported. It's also available in [Microsoft Azure operated by 21Vianet](https://www.azure.cn/) and [Azure Government](https://azure.microsoft.com/overview/clouds/government/)
 
 ## Limitations
 
@@ -56,7 +56,7 @@ An Azure account with an active subscription is required.  If you don't already
 
 Sign in to the [Azure portal](https://portal.azure.com) with your Azure account.
 
-Use the [preview registration process](/azure/azure-resource-manager/management/preview-features?tabs=azure-portal) in the Azure portal to **Allow Application Gateway IPv6 Access**. This is required until the feature is completely rolled out in the Azure portal.
+
 
 ## Create an application gateway
 
@@ -103,14 +103,14 @@ Create the application gateway using the tabs on the **Create application gatewa
 1. On the **Frontends** tab, verify **Frontend IP address type** is set to **Public**.
 
    > [!IMPORTANT]
-   > For the Application Gateway v2 SKU, there must be a **Public** frontend IP configuration. A private IPv6 frontend IP configuration (Only ILB mode) is currently not supported for the IPv6 Application Gateway preview. 
+   > For the Application Gateway v2 SKU, there must be a **Public** frontend IP configuration. A private IPv6 frontend IP configuration (Only ILB mode) is currently not supported for the IPv6 Application Gateway. 
 
 2. Select **Add new** for the **Public IP address**, enter a name for the public IP address, and select **OK**. For example, **myAGPublicIPAddress**. 
 
      ![A screenshot of create new application gateway: frontends.](./media/ipv6-application-gateway-portal/ipv6-frontends.png)
 
     > [!NOTE]
-    > IPv6 Application Gateway (preview) supports up to 4 frontend IP addresses: two IPv4 addresses (Public and Private) and two IPv6 addresses (Public and Private)
+    > IPv6 Application Gateway supports up to 4 frontend IP addresses: two IPv4 addresses (Public and Private) and two IPv6 addresses (Public and Private)
 
 
 3. Select **Next: Backends**.

articles/azure-cache-for-redis/cache-managed-identity.md

@@ -25,13 +25,9 @@ Presently, Azure Cache for Redis can use a managed identity to connect with a st
 
 Managed identity lets you simplify the process of securely connecting to your chosen storage account for these tasks.
 
-   > [!NOTE]
-   > This functionality does not yet support authentication for connecting to a cache instance.
-   >
-
 Azure Cache for Redis supports [both types of managed identity](../active-directory/managed-identities-azure-resources/overview.md):
 
-- **System-assigned identity** is specific to the resource. In this case, the cache is the resource. When the cache is deleted, the identity is deleted.
+- **System-assigned identity**   is specific to the resource. In this case, the cache is the resource. When the cache is deleted, the identity is deleted.
 
 - **User-assigned identity** is specific to a user, not the resource. It can be assigned to any resource that supports managed identity and remains even when you delete the cache.
 
@@ -130,23 +126,23 @@ Set-AzRedisCache -ResourceGroupName \"MyGroup\" -Name \"MyCache\" -IdentityType
 
 1. Create a new storage account or open an existing storage account that you would like to connect to your cache instance.
 
-2. Open the **Access control (IAM)** from the Resource menu. Then, select **Add**, and **Add role assignment**.
+1. Open the **Access control (IAM)** from the Resource menu. Then, select **Add**, and **Add role assignment**.
 
    :::image type="content" source="media/cache-managed-identity/demo-storage.png"  alt-text="Screenshot showing the Access Control (IAM) settings.":::
 
-3. Search for the **Storage Blob Data Contributor** on the Role pane. Select it and **Next**.
+1. Search for the **Storage Blob Data Contributor** on the Role pane. Select it and **Next**.
 
    :::image type="content" source="media/cache-managed-identity/role-assignment.png"  alt-text="Screenshot showing Add role assignment form with list of roles.":::
 
-4. Select the **Members** tab. Under **Assign access to** select **Managed Identity**, and select on **Select members**. A sidebar pops up next to the working pane.
+1. Select the **Members** tab. Under **Assign access to** select **Managed Identity**, and select on **Select members**. A sidebar pops up next to the working pane.
 
    :::image type="content" source="media/cache-managed-identity/select-members.png"  alt-text="Screenshot showing add role assignment form with members pane.":::
 
-5. Use the drop-down under **Managed Identity** to choose either a **User-assigned managed identity** or a **System-assigned managed identity**. If you have many managed identities, you can search by name. Choose the managed identities you want and then **Select**. Then, **Review + assign** to confirm.
+1. Use the drop-down under **Managed Identity** to choose either a **User-assigned managed identity** or a **System-assigned managed identity**. If you have many managed identities, you can search by name. Choose the managed identities you want and then **Select**. Then, **Review + assign** to confirm.
 
    :::image type="content" source="media/cache-managed-identity/review-assign.png"  alt-text="Screenshot showing Managed Identity form with User-assigned managed identity indicated.":::
 
-6. You can confirm if the identity has been assigned successfully by checking your storage account's role assignments under **Storage Blob Data Contributor**.
+1. You can confirm if the identity has been assigned successfully by checking your storage account's role assignments under **Storage Blob Data Contributor**.
 
    :::image type="content" source="media/cache-managed-identity/blob-data.png"  alt-text="Screenshot of Storage Blob Data Contributor list.":::
 
@@ -155,7 +151,6 @@ Set-AzRedisCache -ResourceGroupName \"MyGroup\" -Name \"MyCache\" -IdentityType
 >- add an Azure Cache for Redis instance as a storage blob data contributor through system-assigned identity, and 
 >- check [**Allow Azure services on the trusted services list to access this storage account**](../storage/common/storage-network-security.md?tabs=azure-portal#grant-access-to-trusted-azure-services). 
 
-
 If you're not using managed identity and instead authorizing a storage account with a key, then having firewall exceptions on the storage account breaks the persistence process and the import-export processes.
 
 ## Use managed identity to access a storage account
@@ -164,27 +159,27 @@ If you're not using managed identity and instead authorizing a storage account w
 
 1. Open the Azure Cache for Redis instance that has been assigned the Storage Blob Data Contributor role and go to the **Data persistence** on the Resource menu.
 
-2. Change the **Authentication Method** to **Managed Identity** and select the storage account you configured earlier in the article. select **Save**.
+1. Change the **Authentication Method** to **Managed Identity** and select the storage account you configured earlier in the article. select **Save**.
 
    :::image type="content" source="media/cache-managed-identity/data-persistence.png"  alt-text="Screenshot showing data persistence pane with authentication method selected.":::
 
    > [!IMPORTANT]
    > The identity defaults to the system-assigned identity if it is enabled. Otherwise, the first listed user-assigned identity is used.
    >
 
-3. Data persistence backups can now be saved to the storage account using managed identity authentication.
+1. Data persistence backups can now be saved to the storage account using managed identity authentication.
 
    :::image type="content" source="media/cache-managed-identity/redis-persistence.png"  alt-text="Screenshot showing export data in Resource menu.":::
 
 ### Use managed identity to import and export cache data
 
 1. Open your Azure Cache for Redis instance that has been assigned the Storage Blob Data Contributor role and go to the **Import** or **Export** tab under **Administration**.
 
-2. If importing data, choose the blob storage location that holds your chosen RDB file. If exporting data, type your desired blob name prefix and storage container. In both situations, you must use the storage account you've configured for managed identity access.
+1. If importing data, choose the blob storage location that holds your chosen RDB file. If exporting data, type your desired blob name prefix and storage container. In both situations, you must use the storage account you've configured for managed identity access.
 
    :::image type="content" source="media/cache-managed-identity/export-data.png"  alt-text="Screenshot showing Managed Identity selected.":::
 
-3. Under **Authentication Method**, choose **Managed Identity** and select **Import** or **Export**, respectively.
+1. Under **Authentication Method**, choose **Managed Identity** and select **Import** or **Export**, respectively.
 
 > [!NOTE]
 > It will take a few minutes to import or export the data.
@@ -193,7 +188,7 @@ If you're not using managed identity and instead authorizing a storage account w
 > [!IMPORTANT]
 >If you see an export or import failure, double check that your storage account has been configured with your cache's system-assigned or user-assigned identity. The identity used will default to system-assigned identity if it is enabled. Otherwise, the first listed user-assigned identity is used.
 
-## Next steps
+## Related content
 
 - [Learn more](cache-overview.md#service-tiers) about Azure Cache for Redis features
 - [What are managed identifies](../active-directory/managed-identities-azure-resources/overview.md)