Skip to content

Commit 8f10265

Browse files
committed
Merge branch 'main' into release-azure-policy-versioning
2 parents 78860bb + c7f1a78 commit 8f10265

File tree

358 files changed

+1542
-568
lines changed

Some content is hidden

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

358 files changed

+1542
-568
lines changed

articles/ai-services/openai/how-to/provisioned-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ We recommend the following workflow:
175175
* For more information on provisioned deployments, check out [What is provisioned throughput?](../concepts/provisioned-throughput.md)
176176
* For more information on retry logic within each SDK, check out:
177177
* [Python reference documentation](https://github.com/openai/openai-python?tab=readme-ov-file#retries)
178-
* [.NET reference documentation](/dotnet/api/azure.ai.openai.openaiclientoptions?view=azure-dotnet-preview&preserve-view=true)
178+
* [.NET reference documentation](/dotnet/api/overview/azure/ai.openai-readme)
179179
* [Java reference documentation](/java/api/com.azure.ai.openai.openaiclientbuilder?view=azure-java-preview&preserve-view=true#com-azure-ai-openai-openaiclientbuilder-retryoptions(com-azure-core-http-policy-retryoptions))
180180
* [JavaScript reference documentation](/javascript/api/@azure/openai/openaiclientoptions?view=azure-node-preview&preserve-view=true#@azure-openai-openaiclientoptions-retryoptions)
181181
* [GO reference documentation](https://pkg.go.dev/github.com/Azure/azure-sdk-for-go/sdk/ai/azopenai#ChatCompletionsOptions)

articles/ai-services/qnamaker/whats-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Learn what's new with QnA Maker.
2424

2525
### November 2021
2626
* [Question answering](../language-service/question-answering/overview.md) is now [generally available](https://techcommunity.microsoft.com/t5/ai-cognitive-services-blog/question-answering-feature-is-generally-available/ba-p/2899497) as a feature within [Azure AI Language](https://portal.azure.com/?quickstart=true#create/Microsoft.CognitiveServicesTextAnalytics).
27-
* Question answering is powered by **state-of-the-art transformer models** and [Turing](https://turing.microsoft.com/) Natural Language models.
27+
* Question answering is powered by **state-of-the-art transformer models** and [Turing](https://www.microsoft.com/research/project/project-turing/) Natural Language models.
2828
* The erstwhile QnA Maker product will be [retired](https://azure.microsoft.com/updates/azure-qna-maker-will-be-retired-on-31-march-2025/) on 31st March 2025, and no new QnA Maker resources will be created beginning 1st October 2022.
2929
* All existing QnA Maker customers are strongly advised to [migrate](../language-service/question-answering/how-to/migrate-qnamaker.md) their QnA Maker knowledge bases to Question answering as soon as possible to continue experiencing the best of QnA capabilities offered by Azure.
3030

articles/ai-studio/how-to/deploy-models-jamba.md

Lines changed: 305 additions & 0 deletions
Large diffs are not rendered by default.

articles/ai-studio/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,8 @@ items:
106106
href: how-to/fine-tune-model-llama.md
107107
- name: Deploy JAIS models
108108
href: how-to/deploy-jais-models.md
109+
- name: Deploy Jamba Instruct model
110+
href: how-to/deploy-models-jamba.md
109111
- name: Deploy Mistral family models
110112
href: how-to/deploy-models-mistral.md
111113
displayName: maas

articles/api-management/v2-service-tiers-overview.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ services: api-management
55
author: dlepow
66

77
ms.service: api-management
8-
ms.topic: conceptual
9-
ms.date: 03/21/2024
8+
ms.topic: concept-article
9+
ms.date: 06/20/2024
1010
ms.author: danlep
1111
ms.custom: references_regions
1212
---
@@ -45,19 +45,19 @@ The v2 tiers are supported in API Management API version **2023-05-01-preview**
4545

4646
### Supported regions
4747
The v2 tiers are available in the following regions:
48+
* East US 2
4849
* South Central US
50+
* North Central US
4951
* West US
52+
* West US 2
5053
* France Central
5154
* Germany West Central
5255
* North Europe
53-
* West Europe
54-
* UK South
55-
* UK West
56-
* Brazil South
57-
* Australia Central
56+
* Central India
5857
* Australia East
5958
* Australia Southeast
6059
* East Asia
60+
* Japan East
6161
* Southeast Asia
6262
* Korea Central
6363

articles/application-gateway/for-containers/migrate-from-agic-to-agc.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: greg-lindsay
66
ms.service: application-gateway
77
ms.subservice: appgw-for-containers
88
ms.topic: conceptual
9-
ms.date: 06/19/2024
9+
ms.date: 06/20/2024
1010
ms.author: greglin
1111
---
1212

@@ -82,9 +82,9 @@ Here's a summarized list of AGIC annotations and whether Application Gateway for
8282

8383
Migration from Application Gateway Ingress Controller to Application Gateway for Containers is designed to be a four step process:
8484

85-
[Step 1](#step-1-install-alb-controller): Install Application Gateway for Containers' ALB Controller
86-
[Step 2](#step-2-translate-ingress): Translate AGIC Ingress to Application Gateway for Containers Ingress
87-
[Step 3](#step-3-perform-end-to-end-validation): Perform end-to-end testing against Application Gateway for Containers
85+
[Step 1](#step-1-install-alb-controller): Install Application Gateway for Containers' ALB Controller<br/>
86+
[Step 2](#step-2-translate-ingress): Translate AGIC Ingress to Application Gateway for Containers Ingress<br/>
87+
[Step 3](#step-3-perform-end-to-end-validation): Perform end-to-end testing against Application Gateway for Containers<br/>
8888
[Step 4](#step-4-direct-traffic-to-application-gateway-for-containers): Direct traffic from AGIC to Application Gateway for Containers
8989

9090
Steps 2 through 4 will be repeated for each service you plan to migrate.

articles/azure-government/documentation-government-csp-list.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ Below you can find a list of all the authorized Cloud Solution Providers (CSPs),
142142
|[Datastrong](https://www.datastrong.com)|
143143
|[Daymark Solutions Inc.](https://www.daymarksi.com/)|
144144
|[Deborgem Enterprises Incorporated](https://deborgem.com)|
145-
|[Definitive Logic Corporation](https://www.definitivelogic.com/)|
146145
|[Dell Federal Services](https://www.dellemc.com/en-us/industry/federal/federal-government-it.htm#)|
147146
|[Dell Marketing LP](https://www.dell.com/)|
148147
|[Delphi Technology Solutions](https://delphi-ts.com/)|

0 commit comments

Comments
 (0)