Skip to content

Commit 5697062

Browse files
committed
Merge branch 'main' into release-postgresql-migrations-dms
2 parents bec0717 + 9dbe672 commit 5697062

File tree

726 files changed

+7324
-18691
lines changed

Some content is hidden

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

726 files changed

+7324
-18691
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@
1010
"redirect_url": "/azure/azure-monitor/vm/scom-managed-instance-overview",
1111
"redirect_document_id": false
1212
},
13+
{
14+
"source_path_from_root": "/articles/azure-monitor/vm/scom-managed-instance-overview.md",
15+
"redirect_url": "/azure/azure-monitor/scom-manage-instance/overview",
16+
"redirect_document_id": false
17+
},
1318
{
1419
"source_path_from_root": "/articles/azure-monitor/best-practices.md",
1520
"redirect_url": "/azure/azure-monitor/getting-started",
@@ -6733,9 +6738,11 @@
67336738
"source_path_from_root": "/articles/azure-monitor/essentials/pipeline-overview.md",
67346739
"redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-overview",
67356740
"redirect_document_id": false
6736-
}
6737-
6738-
6739-
6741+
},
6742+
{
6743+
"source_path_from_root": "/articles/azure-monitor/agents/azure-monitor-agent-migration-tools.md",
6744+
"redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-migration",
6745+
"redirect_document_id": false
6746+
}
67406747
]
67416748
}

articles/ai-services/openai/how-to/gpt-with-vision.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ The following is a sample request body. The format is the same as the chat compl
4747
> [!IMPORTANT]
4848
> Remember to set a `"max_tokens"` value, or the return output will be cut off.
4949
50+
> [!IMPORTANT]
51+
> When uploading images, there is a limit of 10 images per chat request.
52+
5053
```json
5154
{
5255
"messages": [

articles/ai-services/openai/how-to/working-with-models.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ titleSuffix: Azure OpenAI
44
description: Learn about managing model deployment life cycle, updates, & retirement.
55
ms.service: azure-ai-openai
66
ms.topic: conceptual
7-
ms.date: 10/04/2023
7+
ms.date: 06/18/2023
88
ms.custom: references_regions, build-2023, build-2023-dataai, devx-track-azurepowershell
99
manager: nitinme
1010
author: mrbullwinkle #ChrisHMSFT
@@ -75,7 +75,7 @@ There are three distinct model deployment upgrade options:
7575
|`NoAutoUpgrade` | The model deployment never automatically upgrades. Once the retirement date is reached the model deployment stops working. You need to update your code referencing that deployment to point to a nonexpired model deployment. |
7676

7777
> [!NOTE]
78-
> `null` is equivalent to `AutoUpgradeWhenExpired`. If the **Version update policy** option is not present in the properties for a model that supports model upgrades this indicates the value is currently `null`. Once you explicitly modify this value, the property is visible in the studio properties page as well as via the REST API.
78+
> `null` is equivalent to `OnceCurrentVersionExpired`. If the **Version update policy** option is not present in the properties for a model that supports model upgrades this indicates the value is currently `null`. Once you explicitly modify this value, the property is visible in the studio properties page as well as via the REST API.
7979
8080
### Examples
8181

articles/ai-services/speech-service/includes/how-to/professional-voice/train-voice/speech-studio.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ To create a custom neural voice in Speech Studio, follow these steps for one of
4848
:::image type="content" source="../../../../media/custom-voice/cnv-train-neural.png" alt-text="Screenshot that shows how to select neural training.":::
4949

5050
1. Select a version of the training recipe for your model. The latest version is selected by default. The supported features and training time can vary by version. Normally, we recommend the latest version. In some cases, you can choose an earlier version to reduce training time. See [Bilingual training](#bilingual-training) for more information about bilingual training and differences between locales.
51+
52+
> [!NOTE]
53+
> Model versions `V2.2021.07`, `V4.2021.10`, `V5.2022.05`, `V6.2022.11`, and `V9.2023.10` will be retired by October 1, 2024. The voice models already created on these retired versions won't be affected.
54+
5155
1. Select the data that you want to use for training. Duplicate audio names are removed from the training. Make sure that the data you select doesn't contain the same audio names across multiple *.zip* files.
5256

5357
You can select only successfully processed datasets for training. If you don't see your training set in the list, check your data processing status.

articles/ai-services/speech-service/regions.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ The following regions are supported for Speech service features such as speech t
3232
| ------------- | -------------------- | --------------------------------------- |
3333
| Africa | South Africa North | `southafricanorth` <sup>6</sup> |
3434
| Asia Pacific | East Asia | `eastasia` <sup>5</sup> |
35-
| Asia Pacific | Southeast Asia | `southeastasia` <sup>1,2,4,5,7,9</sup> |
35+
| Asia Pacific | Southeast Asia | `southeastasia` <sup>1,2,4,5,7,9,10</sup> |
3636
| Asia Pacific | Australia East | `australiaeast` <sup>1,2,4,7</sup> |
3737
| Asia Pacific | Central India | `centralindia` <sup>1,2,4,5</sup> |
3838
| Asia Pacific | Japan East | `japaneast` <sup>2,5</sup> |
3939
| Asia Pacific | Japan West | `japanwest` <sup>3</sup> |
4040
| Asia Pacific | Korea Central | `koreacentral` <sup>2</sup> |
4141
| Canada | Canada Central | `canadacentral` <sup>1</sup> |
4242
| Europe | North Europe | `northeurope` <sup>1,2,4,5,7</sup> |
43-
| Europe | West Europe | `westeurope` <sup>1,2,4,5,7,9</sup> |
43+
| Europe | West Europe | `westeurope` <sup>1,2,4,5,7,9,10</sup> |
4444
| Europe | France Central | `francecentral` |
4545
| Europe | Germany West Central | `germanywestcentral` |
4646
| Europe | Norway East | `norwayeast` |
@@ -52,13 +52,13 @@ The following regions are supported for Speech service features such as speech t
5252
| South America | Brazil South | `brazilsouth` <sup>6</sup> |
5353
| Qatar | Qatar Central | `qatarcentral`<sup>3,8</sup> |
5454
| US | Central US | `centralus` |
55-
| US | East US | `eastus` <sup>1,2,4,5,7,9</sup> |
55+
| US | East US | `eastus` <sup>1,2,4,5,7,9,11</sup> |
5656
| US | East US 2 | `eastus2` <sup>1,2,4,5</sup> |
5757
| US | North Central US | `northcentralus` <sup>4,6</sup> |
5858
| US | South Central US | `southcentralus` <sup>1,2,4,5,6,7</sup> |
5959
| US | West Central US | `westcentralus` <sup>3,5</sup> |
6060
| US | West US | `westus` <sup>2,5</sup> |
61-
| US | West US 2 | `westus2` <sup>1,2,4,5,7</sup> |
61+
| US | West US 2 | `westus2` <sup>1,2,4,5,7,10</sup> |
6262
| US | West US 3 | `westus3` <sup>3</sup> |
6363

6464
<sup>1</sup> The region has dedicated hardware for custom speech training. If you plan to train a custom model with audio data, use one of the regions with dedicated hardware for faster training. Then you can [copy the trained model](how-to-custom-speech-train-model.md#copy-a-model) to another region.
@@ -79,6 +79,10 @@ The following regions are supported for Speech service features such as speech t
7979

8080
<sup>9</sup> The region supports personal voice.
8181

82+
<sup>10</sup> The region supports text to speech avatar.
83+
84+
<sup>11</sup> The region supports video translation.
85+
8286
## Intent recognition
8387

8488
Available regions for intent recognition via the Speech SDK are in the following table.
108 KB
Loading
138 KB
Loading
40.3 KB
Loading
63.7 KB
Loading
2.37 KB
Loading

0 commit comments

Comments
 (0)