Skip to content

Commit e2927a8

Browse files
authored
Merge pull request #280879 from MicrosoftDocs/main
7/15/2024 PM Publish
2 parents 3d23459 + b4257d8 commit e2927a8

File tree

492 files changed

+3079
-2587
lines changed

Some content is hidden

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

492 files changed

+3079
-2587
lines changed

.openpublishing.redirection.json

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/networking/connectivity-interoperability-configuration.md",
5+
"redirect_url": "/previous-versions/azure/networking/connectivity-interoperability-configuration",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/expressroute/expressroute-howto-add-gateway-classic.md",
10+
"redirect_url": "/previous-versions/azure/expressroute/expressroute-howto-add-gateway-classic",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/expressroute/expressroute-howto-set-global-reach-cli.md",
15+
"redirect_url": "/previous-versions/azure/expressroute/expressroute-howto-set-global-reach-cli",
16+
},
317
{
418
"source_path": "articles/digital-twins/how-to-integrate-maps.md",
519
"redirect_url": "/previous-versions/azure/digital-twins/how-to-integrate-maps",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ zone_pivot_groups: custom-qna-quickstart
1616
# Quickstart: custom question answering
1717

1818
> [!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).
19+
> [Azure OpenAI 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 OpenAI On Your Data, please check out our [guide](../how-to/azure-openai-integration.md).
2020
2121
> [!NOTE]
2222
> 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/openai/how-to/use-your-data-securely.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: azure-ai-openai
88
ms.topic: how-to
99
author: aahill
1010
ms.author: aahi
11-
ms.date: 06/13/2024
11+
ms.date: 07/15/2024
1212
recommendations: false
1313
---
1414

@@ -17,7 +17,7 @@ recommendations: false
1717
> [!NOTE]
1818
> As of June 2024, the application form for the Microsoft managed private endpoint to Azure AI Search is no longer needed.
1919
>
20-
> The managed private endpoint will be deleted from the Microsoft managed virtual network at July 2025. If you have already provisioned a managed private endpoint through the application process before June 2024, migrate to the [Azure AI Search trusted service](#enable-trusted-service-1) as early as possible to avoid service disruption.
20+
> The managed private endpoint will be deleted from the Microsoft managed virtual network at July 2025. If you have already provisioned a managed private endpoint through the application process before June 2024, enable [Azure AI Search trusted service](#enable-trusted-service-1) as early as possible to avoid service disruption.
2121
2222
Use this article to learn how to use Azure OpenAI On Your Data securely by protecting data and resources with Microsoft Entra ID role-based access control, virtual networks, and private endpoints.
2323

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.custom: mode-ui
1414
# Add questions and answer with QnA Maker portal
1515

1616
> [!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).
17+
> [Azure OpenAI 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 OpenAI On Your Data, please check out our [guide](../How-To/migrate-to-openai.md).
1818
1919
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.
2020

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.custom: mode-other
1414
# Quickstart: Create, train, and publish your QnA Maker knowledge base
1515

1616
> [!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).
17+
> [Azure OpenAI 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 OpenAI On Your Data, please check out our [guide](../How-To/migrate-to-openai.md).
1818
1919
[!INCLUDE [Custom question answering](../includes/new-version.md)]
2020

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.date: 01/19/2024
1616
# Get an answer from a QNA Maker knowledge base
1717

1818
> [!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).
19+
> [Azure OpenAI 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 OpenAI On Your Data, please check out our [guide](../How-To/migrate-to-openai.md).
2020
2121
[!INCLUDE [Custom question answering](../includes/new-version.md)]
2222

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ zone_pivot_groups: qnamaker-quickstart
1616
# Quickstart: QnA Maker client library
1717

1818
> [!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).
19+
> [Azure OpenAI 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 OpenAI On Your Data, please check out our [guide](../How-To/migrate-to-openai.md).
2020
2121
Get started with the QnA Maker client library. Follow these steps to install the package and try out the example code for basic tasks.
2222

articles/ai-studio/concepts/ai-resources.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ author: Blackmist
1616

1717
# Manage, collaborate, and organize with hubs
1818

19-
[!INCLUDE [Feature preview](~/reusable-content/ce-skilling/azure/includes/ai-studio/includes/feature-preview.md)]
20-
2119
Hubs are the primary top-level Azure resource for AI studio and provide a central way for a team to govern security, connectivity, and computing resources across playgrounds and projects. Once a hub is created, developers can create projects from it and access shared company resources without needing an IT administrator's repeated help.
2220

2321
Project workspaces that are created using a hub inherit the same security settings and shared resource access. Teams can create project workspaces as needed to organize their work, isolate data, and/or restrict access.

articles/ai-studio/how-to/create-azure-ai-resource.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ author: Blackmist
1616

1717
# How to create and manage an Azure AI Studio hub
1818

19-
[!INCLUDE [Feature preview](~/reusable-content/ce-skilling/azure/includes/ai-studio/includes/feature-preview.md)]
20-
2119
In AI Studio, hubs provide the environment for a team to collaborate and organize work, and help you as a team lead or IT admin centrally set up security settings and govern usage and spend. You can create and manage a hub from the Azure portal or from the AI Studio.
2220

2321
In this article, you learn how to create and manage a hub in AI Studio with the default settings so you can get started quickly. Do you need to customize security or the dependent resources of your hub? Then use [Azure Portal](create-secure-ai-hub.md) or [template options](create-azure-ai-hub-template.md).
2422

23+
> [!TIP]
24+
> If you'd like to create your Azure AI Studio hub using a template, see the articles on using [Bicep](create-azure-ai-hub-template.md) or [Terraform](create-hub-terraform.md).
25+
2526
## Create a hub in AI Studio
2627

2728
To create a new hub, you need either the Owner or Contributor role on the resource group or on an existing hub. If you're unable to create a hub due to permissions, reach out to your administrator. If your organization is using [Azure Policy](../../governance/policy/overview.md), don't create the resource in AI Studio. Create the hub [in the Azure portal](#create-a-secure-hub-in-the-azure-portal) instead.

articles/aks/TOC.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@
6262
href: learn/quick-windows-container-deploy-powershell.md
6363
- name: Use the Azure portal
6464
href: learn/quick-windows-container-deploy-portal.md
65+
- name: Use Terraform
66+
href: learn/quick-windows-container-deploy-terraform.md
6567
- name: Work with package managers
6668
expanded: true
6769
items:
@@ -156,6 +158,8 @@
156158
items:
157159
- name: Small and large language models
158160
href: concepts-ai-ml-language-models.md
161+
- name: Fine-tuning language models
162+
href: concepts-fine-tune-language-models.md
159163
- name: Advanced Container Networking Services
160164
items:
161165
- name: Advanced Container Networking Services overview
@@ -777,6 +781,8 @@
777781
href: keda-deploy-add-on-arm.md
778782
- name: Use Azure CLI
779783
href: keda-deploy-add-on-cli.md
784+
- name: Securely scale your applications using the Kubernetes Event-driven Autoscaling (KEDA) add-on and workload identity
785+
href: keda-workload-identity.md
780786
- name: Kubernetes Event-driven Autoscaler (KEDA) integrations
781787
href: keda-integrations.md
782788
- name: Troubleshoot Kubernetes Event-driven Autoscaler (KEDA)

0 commit comments

Comments
 (0)