Skip to content

Commit 6aa8ce8

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vnet-peer-update
2 parents 2c6b19d + 6a55bc2 commit 6aa8ce8

File tree

214 files changed

+1095
-13218
lines changed

Some content is hidden

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

214 files changed

+1095
-13218
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 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",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ Each user message can translate to multiple search queries, all of which get sen
592592

593593
## Regional availability and model support
594594

595-
| 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 (0409)` |
595+
| 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-4 (turbo-2024-04-09)` |
596596
|------|---|---|---|---|---|----|----|----|
597597
| Australia East ||||| || | |
598598
| Canada East ||||| || | |

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/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.

articles/application-gateway/overview-v2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ The following table displays a comparison between Basic and Standard_v2.
5151
| Feature | Capabilities | Basic SKU (preview)| Standard SKU |
5252
| :---: | :--- | :---: | :---: |
5353
| Reliability | SLA | 99.9 | 99.95 |
54-
| Functionality - basic | HTTP/HTTP2/HTTPS<br>Websocket<br>Public/Private IP<br>Cookie Affinity<br>Path-based affinity<br>Wildcard<br>Multisite<br>KeyVault<br>AKS (via AGIC)<br>Zone | &#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br> | &#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;|
54+
| Functionality - basic | HTTP/HTTP2/HTTPS<br>Websocket<br>Public/Private IP<br>Cookie Affinity<br>Path-based affinity<br>Wildcard<br>Multisite<br>KeyVault<br>AKS (via AGIC)<br>Zone<br>Header rewrite | &#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br> | &#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713; |
5555
| Functionality - advanced | URL rewrite<br>mTLS<br>Private Link<br>Private-only<sup>1</sup><br>TCP/TLS Proxy | | &#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713; |
5656
| Scale | Max. connections per second<br>Number of listeners<br>Number of backend pools<br>Number of backend servers per pool<br>Number of rules | 200<sup>1</sup><br>5<br>5<br>5<br>5 | 62500<sup>1</sup><br>100<br>100<br>1200<br>400 |
5757
| Capacity Unit | Connections per second per compute unit<br>Throughput<br>Persistent new connections | 10<br>2.22 Mbps<br>2500 | 50<br>2.22 Mbps<br>2500 |

articles/automation/troubleshoot/extension-based-hybrid-runbook-worker.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ To help troubleshoot issues with extension-based Hybrid Runbook Workers:
3333

3434
- Check whether the hybrid worker process is running.
3535
- For Windows: check the `Hybrid Worker Service` service.
36-
- For Linux: check the `hwd.` service.
36+
- For Linux: check the `hwd` service.
3737

3838
- Collect logs:
3939
- For Windows: Run the log collector tool in </br>`C:\Packages\Plugins\Microsoft.Azure.Automation.HybridWorker.HybridWorkerForWindows\<version>\bin\troubleshooter\PullLogs.ps1` </br>

0 commit comments

Comments
 (0)