Skip to content

Commit dd02741

Browse files
authored
Merge pull request #271706 from MicrosoftDocs/main
4/10 11:00 AM IST Publish
2 parents 49264a8 + 0eb63ee commit dd02741

File tree

96 files changed

+677
-226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+677
-226
lines changed

.acrolinx-config.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
{:allowed-branchname-matches ["main" "release-.*"]
2-
:allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md|.*policy/samples/|.*resource-graph/samples/))" "(?i)includes/(?:(?!policy/reference/|policy/standards/))"]}
2+
:allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md|.*policy/samples/|.*resource-graph/samples/))" "(?i)includes/(?:(?!policy/reference/|policy/standards/|resource-graph/samples/))"]}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,4 @@ At the same time, customers often require a custom answer authoring experience t
7474
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.
7575

7676
## Next steps
77-
* [Using Azure OpenAI on your data](../../../openai/concepts/use-your-data.md)
77+
* [Using Azure OpenAI on your data](../../../openai/concepts/use-your-data.md)

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ ms.custom: language-service-question-answering
1313

1414
# What is custom question answering?
1515

16+
> [!NOTE]
17+
> [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).
18+
1619
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.
1720

1821
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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ zone_pivot_groups: custom-qna-quickstart
1515

1616
# Quickstart: custom question answering
1717

18+
> [!NOTE]
19+
> [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).
20+
1821
> [!NOTE]
1922
> 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.
2023

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ keywords: "qna maker, low code chat bots, multi-turn conversations"
1313

1414
# What is QnA Maker?
1515

16+
> [!NOTE]
17+
> [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).
18+
1619
[!INCLUDE [Custom question answering](../includes/new-version.md)]
1720

1821
[!INCLUDE [Azure AI services rebrand](../../includes/rebrand-note.md)]

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ ms.custom: mode-ui
1313

1414
# Add questions and answer with QnA Maker portal
1515

16+
> [!NOTE]
17+
> [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).
18+
1619
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.
1720

1821
[!INCLUDE [Custom question answering](../includes/new-version.md)]

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ ms.custom: mode-other
1313

1414
# Quickstart: Create, train, and publish your QnA Maker knowledge base
1515

16+
> [!NOTE]
17+
> [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).
18+
1619
[!INCLUDE [Custom question answering](../includes/new-version.md)]
1720

1821
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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ ms.date: 01/19/2024
1515

1616
# Get an answer from a QNA Maker knowledge base
1717

18+
> [!NOTE]
19+
> [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).
20+
1821
[!INCLUDE [Custom question answering](../includes/new-version.md)]
1922

2023
> [!NOTE]

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ zone_pivot_groups: qnamaker-quickstart
1515

1616
# Quickstart: QnA Maker client library
1717

18+
> [!NOTE]
19+
> [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).
20+
1821
Get started with the QnA Maker client library. Follow these steps to install the package and try out the example code for basic tasks.
1922

2023
[!INCLUDE [Custom question answering](../includes/new-version.md)]

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.custom: mvc, mode-ui
1414
# Configure Application Gateway with a frontend public IPv6 address using the Azure portal
1515

1616
> [!IMPORTANT]
17-
> 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**.
17+
> Application Gateway IPv6 support is now generally available.
1818
1919
[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.
2020

@@ -37,7 +37,7 @@ You can also complete this quickstart using [Azure PowerShell](ipv6-application-
3737

3838
## Regions and availability
3939

40-
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/)
40+
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/)
4141

4242
## Limitations
4343

@@ -56,7 +56,7 @@ An Azure account with an active subscription is required. If you don't already
5656

5757
Sign in to the [Azure portal](https://portal.azure.com) with your Azure account.
5858

59-
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.
59+
6060

6161
## Create an application gateway
6262

@@ -103,14 +103,14 @@ Create the application gateway using the tabs on the **Create application gatewa
103103
1. On the **Frontends** tab, verify **Frontend IP address type** is set to **Public**.
104104

105105
> [!IMPORTANT]
106-
> 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.
106+
> 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.
107107
108108
2. Select **Add new** for the **Public IP address**, enter a name for the public IP address, and select **OK**. For example, **myAGPublicIPAddress**.
109109

110110
![A screenshot of create new application gateway: frontends.](./media/ipv6-application-gateway-portal/ipv6-frontends.png)
111111

112112
> [!NOTE]
113-
> IPv6 Application Gateway (preview) supports up to 4 frontend IP addresses: two IPv4 addresses (Public and Private) and two IPv6 addresses (Public and Private)
113+
> IPv6 Application Gateway supports up to 4 frontend IP addresses: two IPv4 addresses (Public and Private) and two IPv6 addresses (Public and Private)
114114
115115

116116
3. Select **Next: Backends**.

0 commit comments

Comments
 (0)