Skip to content

Commit 8a8c02f

Browse files
authored
Merge branch 'main' into lb-admin-state-pp
2 parents 7fce656 + 8a03319 commit 8a8c02f

File tree

198 files changed

+3015
-3610
lines changed

Some content is hidden

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

198 files changed

+3015
-3610
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@
8080
"redirect_url": "/azure/aks/azure-csi-files-storage-provision",
8181
"redirect_document_id": false
8282
},
83+
{
84+
"source_path_from_root": "/articles/aks/learn/tutorial-kubernetes-workload-identity.md",
85+
"redirect_url": "/azure/aks/workload-identity-deploy-cluster",
86+
"redirect_document_id": false
87+
},
8388
{
8489
"source_path_from_root": "/articles/aks/workload-identity-migration-sidecar.md",
8590
"redirect_url": "/azure/aks/workload-identity-migrate-from-pod-identity",
@@ -451,11 +456,6 @@
451456
"redirect_url": "/azure/aks/create-node-pools",
452457
"redirect_document_id": false
453458
},
454-
{
455-
"source_path_from_root": "/articles/copilot/limited-access.md",
456-
"redirect_url": "/azure/copilot/manage-access",
457-
"redirect_document_id": false
458-
},
459459
{
460460
"source_path_from_root": "/articles/aks/command-invoke.md",
461461
"redirect_url": "/azure/aks/access-private-cluster",

.openpublishing.redirection.container-registry.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,22 @@
11
{
22
"redirections": [
3+
4+
{
5+
"source_path_from_root": "/articles/container-registry/container-registry-oci-artifacts.md",
6+
"redirect_url": "/azure/container-registry/container-registry-manage-artifact",
7+
"redirect_document_id": false
8+
},
9+
{
10+
"source_path_from_root": "/articles/container-registry/container-registry-oras-artifacts.md",
11+
"redirect_url": "/azure/container-registry/container-registry-manage-artifact",
12+
"redirect_document_id": false
13+
},
314
{
415
"source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache-auth.md",
516
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",
617
"redirect_document_id": false
718
},
19+
820
{
921
"source_path_from_root": "/articles/container-registry/tutorial-enable-registry-cache-auth-cli.md",
1022
"redirect_url": "/azure/container-registry/container-registry-artifact-cache",

.openpublishing.redirection.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4063,6 +4063,16 @@
40634063
"redirect_url":"/azure/reliability/reliability-cosmos-db-nosql",
40644064
"redirect_document_id":false
40654065
},
4066+
{
4067+
"source_path_from_root": "/articles/copilot/limited-access.md",
4068+
"redirect_url": "/azure/copilot/manage-access",
4069+
"redirect_document_id": false
4070+
},
4071+
{
4072+
"source_path_from_root": "/articles/azure-portal/mobile-app/microsoft-copilot-for-azure.md",
4073+
"redirect_url": "/azure/azure-portal/mobile-app/microsoft-copilot-in-azure",
4074+
"redirect_document_id": false
4075+
},
40664076
{
40674077
"source_path_from_root":"/articles/migrate/how-to-assess.md",
40684078
"redirect_url":"/azure/migrate/whats-new#update-april-2024",

articles/ai-services/openai/concepts/use-your-data.md

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -581,24 +581,22 @@ Each user message can translate to multiple search queries, all of which get sen
581581

582582
## Regional availability and model support
583583

584-
| Region | `gpt-35-turbo-16k (0613)` | `gpt-35-turbo (1106)` | `gpt-4-32k (0613)` | `gpt-4 (1106-preview)` | `gpt-4 (0125-preview)` | `gpt-4-32k (0314)`** | `gpt-4 (0613)` | `gpt-4 (0314)`** | `gpt-4o` | `gpt-turbo (409)` |
585-
|------|---|---|---|---|---|----|----|----|----|---|
586-
| Australia East ||||| |||| | |
587-
| Canada East ||||| |||| | |
588-
| East US || | | ||| ||| |
589-
| East US 2 || | || || ||||
590-
| France Central ||||| |||| | |
591-
| Japan East || | | | || || | |
592-
| North Central US || | | ||| ||| |
593-
| Norway East || | || || || | |
594-
| South Central US | | | | ||| ||| |
595-
| South India | || || || || | |
596-
| Sweden Central ||||| |||| ||
597-
| Switzerland North || || | |||| | |
598-
| UK South ||| |||| || | |
599-
| West US | || || || ||| |
600-
601-
** Models are being retired no sooner than 31 July 2024
584+
| Region | `gpt-35-turbo-16k (0613)` | `gpt-35-turbo (1106)` | `gpt-4-32k (0613)` | `gpt-4 (1106-preview)` | `gpt-4 (0125-preview)` | `gpt-4 (0613)` | `gpt-4o` | `gpt-turbo (409)` |
585+
|------|---|---|---|---|---|----|----|----|
586+
| Australia East ||||| || | |
587+
| Canada East ||||| || | |
588+
| East US || | | || || |
589+
| East US 2 || | || | |||
590+
| France Central ||||| || | |
591+
| Japan East || | | | | | | |
592+
| North Central US || | | || || |
593+
| Norway East || | || | | | |
594+
| South Central US | | | | || || |
595+
| South India | || || | | | |
596+
| Sweden Central ||||| || ||
597+
| Switzerland North || || | || | |
598+
| UK South ||| ||| | | |
599+
| West US | || || | || |
602600

603601
If your Azure OpenAI resource is in another region, you won't be able to use Azure OpenAI On Your Data.
604602

articles/ai-services/speech-service/toc.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,10 @@ items:
572572
- name: Text to speech REST API
573573
href: rest-text-to-speech.md
574574
displayName: reference, tts output, output format
575+
- name: Custom voice REST API
576+
href: /rest/api/speechapi/operation-groups?&preserve-view=true=rest-speechapi-2023-12-01-preview
577+
- name: Batch synthesis REST API
578+
href: /rest/api/batchtexttospeech/operation-groups?&preserve-view=true=rest-batchtexttospeech-2024-04-01
575579
- name: Speaker Recognition REST API
576580
href: /rest/api/speakerrecognition/
577581
displayName: reference

articles/ai-studio/concepts/fine-tuning-overview.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.service: azure-ai-studio
77
ms.custom:
88
- build-2024
99
ms.topic: conceptual
10-
ms.date: 5/21/2024
10+
ms.date: 5/29/2024
1111
ms.reviewer: eur
1212
ms.author: eur
1313
author: eric-urban
@@ -112,10 +112,9 @@ The following Azure OpenAI models are supported in Azure AI Studio for fine-tuni
112112
| `gpt-35-turbo` (0613) | East US2 <br> North Central US <br> Sweden Central <br> Switzerland West | 4,096 | Sep 2021 |
113113
| `gpt-35-turbo` (1106) | East US2 <br> North Central US <br> Sweden Central <br> Switzerland West | Input: 16,385<br> Output: 4,096 | Sep 2021|
114114
| `gpt-35-turbo` (0125) | East US2 <br> North Central US <br> Sweden Central <br> Switzerland West | 16,385 | Sep 2021 |
115+
| `gpt-4` (0613) <sup>1<sup> | North Central US <br> Sweden Central | 8192 | Sep 2021 |
115116

116-
`babbage-002` and `davinci-002` are not trained to follow instructions. Querying these base models should only be done as a point of reference to a fine-tuned version to evaluate the progress of your training.
117-
118-
`gpt-35-turbo` - fine-tuning of this model is limited to a subset of regions, and is not available in every region the base model is available.
117+
<sup>1<sup> GPT-4 fine-tuning is currently in public preview. See our [GPT-4 fine-tuning safety evaluation guidance](/azure/ai-services/openai/how-to/fine-tuning?tabs=turbo%2Cpython-new&pivots=programming-language-python#safety-evaluation-gpt-4-fine-tuning---public-preview) for more information.
119118

120119
Please note for fine-tuning Azure OpenAI models, you must add a connection to an Azure OpenAI resource with a supported region to your project.
121120

articles/aks/TOC.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,6 @@
8989
href: tutorial-kubernetes-scale.md
9090
- name: 7 - Upgrade cluster
9191
href: tutorial-kubernetes-upgrade-cluster.md
92-
- name: Security
93-
items:
94-
- name: Configure application to use workload identity
95-
href: learn/tutorial-kubernetes-workload-identity.md
9692
- name: Concepts
9793
items:
9894
- name: Core concepts

articles/aks/learn/quick-kubernetes-deploy-bicep-extensibility-kubernetes-provider.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
---
2-
title: 'Quickstart: Deploy an Azure Kubernetes Service (AKS) cluster using the Bicep extensibility Kubernetes provider'
2+
title: Deploy an AKS cluster using the Bicep extensibility Kubernetes provider
33
description: Learn how to quickly deploy a Kubernetes cluster using the Bicep extensibility Kubernetes provider and deploy an application in Azure Kubernetes Service (AKS).
4+
author: tamram
5+
46
ms.topic: quickstart
57
ms.custom: devx-track-bicep
68
ms.date: 01/11/2024
7-
author: tamram
89
ms.author: tamram
910

1011
#Customer intent: As a developer or cluster operator, I want to quickly deploy an AKS cluster and deploy an application so that I can see how to run applications using the managed Kubernetes service in Azure.
@@ -36,7 +37,7 @@ Azure Kubernetes Service (AKS) is a managed Kubernetes service that lets you qui
3637
This quickstart assumes a basic understanding of Kubernetes concepts. For more information, see [Kubernetes core concepts for Azure Kubernetes Service (AKS)][kubernetes-concepts].
3738
3839
- [!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
39-
- Make sure the identity you use to create your cluster has the appropriate minimum permissions. For more details on access and identity for AKS, see [Access and identity options for Azure Kubernetes Service (AKS)](../concepts-identity.md).
40+
- Make sure that the identity you use to create your cluster has the appropriate minimum permissions. For more details on access and identity for AKS, see [Access and identity options for Azure Kubernetes Service (AKS)](../concepts-identity.md).
4041
4142
[!INCLUDE [About Bicep](../../../includes/resource-manager-quickstart-bicep-introduction.md)]
4243

articles/aks/learn/quick-kubernetes-deploy-bicep.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Azure Kubernetes Service (AKS) is a managed Kubernetes service that lets you qui
4343
---
4444

4545
* To create an AKS cluster using a Bicep file, you provide an SSH public key. If you need this resource, see the following section. Otherwise, skip to [Review the Bicep file](#review-the-bicep-file).
46-
* Make sure the identity you use to create your cluster has the appropriate minimum permissions. For more details on access and identity for AKS, see [Access and identity options for Azure Kubernetes Service (AKS)](../concepts-identity.md).
46+
* Make sure that the identity you use to create your cluster has the appropriate minimum permissions. For more details on access and identity for AKS, see [Access and identity options for Azure Kubernetes Service (AKS)](../concepts-identity.md).
4747
* To deploy a Bicep file, you need write access on the resources you create and access to all operations on the `Microsoft.Resources/deployments` resource type. For example, to create a virtual machine, you need `Microsoft.Compute/virtualMachines/write` and `Microsoft.Resources/deployments/*` permissions. For a list of roles and permissions, see [Azure built-in roles](../../role-based-access-control/built-in-roles.md).
4848

4949
### Create an SSH key pair

articles/aks/learn/quick-kubernetes-deploy-rm-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ This article assumes a basic understanding of Kubernetes concepts. For more info
2828

2929
- [!INCLUDE [quickstarts-free-trial-note](../../../includes/quickstarts-free-trial-note.md)]
3030

31-
- Make sure the identity you use to create your cluster has the appropriate minimum permissions. For more details on access and identity for AKS, see [Access and identity options for Azure Kubernetes Service (AKS)](../concepts-identity.md).
31+
- Make sure that the identity you use to create your cluster has the appropriate minimum permissions. For more details on access and identity for AKS, see [Access and identity options for Azure Kubernetes Service (AKS)](../concepts-identity.md).
3232

3333
- To deploy an ARM template, you need write access on the resources you're deploying and access to all operations on the `Microsoft.Resources/deployments` resource type. For example, to deploy a virtual machine, you need `Microsoft.Compute/virtualMachines/write` and `Microsoft.Resources/deployments/*` permissions. For a list of roles and permissions, see [Azure built-in roles](../../role-based-access-control/built-in-roles.md).
3434

0 commit comments

Comments
 (0)