Skip to content

Commit a984584

Browse files
v-ccolinv-ccolin
authored
Merge pull request #280117 from MicrosoftDocs/main
Merge main to live, 4 AM
2 parents 495425d + a41d9c8 commit a984584

File tree

8 files changed

+180
-109
lines changed

8 files changed

+180
-109
lines changed

‎articles/ai-services/speech-service/how-to-pronunciation-assessment.md

Lines changed: 63 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,73 @@ For how to use Pronunciation Assessment in streaming mode in your own applicatio
8080
## Set configuration parameters
8181

8282
::: zone pivot="programming-language-go"
83+
8384
> [!NOTE]
8485
> Pronunciation assessment is not available with the Speech SDK for Go. You can read about the concepts in this guide. Select another programming language for your solution.
86+
87+
::: zone-end
88+
89+
In the `SpeechRecognizer`, you can specify the language to learn or practice improving pronunciation. The default locale is `en-US`. To learn how to specify the learning language for pronunciation assessment in your own application, you can use the following sample code.
90+
91+
::: zone pivot="programming-language-csharp"
92+
93+
```csharp
94+
var recognizer = new SpeechRecognizer(config, "en-US", audioInput);
95+
```
96+
97+
::: zone-end
98+
99+
::: zone pivot="programming-language-cpp"
100+
101+
```cpp
102+
auto recognizer = SpeechRecognizer::FromConfig(config, "en-US", audioConfig);
103+
```
104+
105+
::: zone-end
106+
107+
::: zone pivot="programming-language-java"
108+
109+
```Java
110+
SpeechRecognizer recognizer = new SpeechRecognizer(config, "en-US", audioInput);
111+
```
112+
85113
::: zone-end
86114

87-
In the `SpeechRecognizer`, you can specify the language to learn or practice improving pronunciation. The default locale is `en-US`. To learn how to specify the learning language for pronunciation assessment in your own application, see [sample code](https://github.com/Azure-Samples/cognitive-services-speech-sdk/blob/master/samples/csharp/sharedcontent/console/speech_recognition_samples.cs#LL1086C13-L1086C98).
115+
::: zone pivot="programming-language-python"
116+
117+
```Python
118+
speech_recognizer = speechsdk.SpeechRecognizer(speech_config=speech_config, language="en-US", audio_config=audio_config)
119+
```
120+
121+
::: zone-end
122+
123+
::: zone pivot="programming-language-javascript"
124+
125+
```JavaScript
126+
speechConfig.speechRecognitionLanguage = "en-US";
127+
```
128+
129+
::: zone-end
130+
131+
::: zone pivot="programming-language-objectivec"
132+
133+
```ObjectiveC
134+
SPXSpeechRecognizer* speechRecognizer = [[SPXSpeechRecognizer alloc] initWithSpeechConfiguration:speechConfig language:@"en-US" audioConfiguration:pronAudioSource];
135+
```
136+
137+
::: zone-end
138+
139+
::: zone pivot="programming-language-swift"
140+
141+
```swift
142+
let reco = try! SPXSpeechRecognizer(speechConfiguration: speechConfig, language: "en-US", audioConfiguration: audioInput)
143+
```
144+
145+
::: zone-end
146+
147+
::: zone pivot="programming-language-go"
148+
149+
::: zone-end
88150

89151
> [!TIP]
90152
> If you aren't sure which locale to set for a language that has multiple locales, try each locale separately. For instance, for Spanish, try `es-ES` and `es-MX`. Determine which locale scores higher for your scenario.

‎articles/ai-services/speech-service/includes/language-support/pronunciation-assessment.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ ms.author: eur
88

99
| Language | Locale (BCP-47) |
1010
|--|--|
11-
|Arabic (Egypt)|`ar-EG`<sup>1</sup> |
11+
|Arabic (Egypt)|`ar-EG` |
1212
|Arabic (Saudi Arabia)|`ar-SA` |
1313
|Catalan|`ca-ES`<sup>1</sup>|
1414
|Chinese (Cantonese, Traditional)|`zh-HK`<sup>1</sup>|
1515
|Chinese (Mandarin, Simplified)|`zh-CN`|
16-
|Chinese (Taiwanese Mandarin, Traditional)|`zh-TW`<sup>1</sup>|
16+
|Chinese (Taiwanese Mandarin, Traditional)|`zh-TW`|
1717
|Danish (Denmark)|`da-DK`<sup>1</sup>|
1818
|Dutch (Netherlands)|`nl-NL`|
1919
|English (Australia)|`en-AU`|
2020
|English (Canada)|`en-CA` |
2121
|English (India)|`en-IN` |
2222
|English (United Kingdom)|`en-GB`|
2323
|English (United States)|`en-US`|
24-
|Finnish (Finland)|`fi-FI`<sup>1</sup>|
24+
|Finnish (Finland)|`fi-FI`|
2525
|French (Canada)|`fr-CA`|
2626
|French (France)|`fr-FR`|
2727
|German (Germany)|`de-DE`|
@@ -31,14 +31,15 @@ ms.author: eur
3131
|Korean (Korea)|`ko-KR`|
3232
|Malay (Malaysia)|`ms-MY`|
3333
|Norwegian Bokmål (Norway)|`nb-NO`|
34-
|Polish (Poland)|`pl-PL`<sup>1</sup>|
34+
|Polish (Poland)|`pl-PL`|
3535
|Portuguese (Brazil)|`pt-BR`|
3636
|Portuguese (Portugal)|`pt-PT`|
3737
|Russian (Russia)|`ru-RU`|
3838
|Spanish (Mexico)|`es-MX` |
3939
|Spanish (Spain)|`es-ES` |
4040
|Swedish (Sweden)|`sv-SE`|
4141
|Tamil (India)|`ta-IN` |
42+
|Thai (Thailand)|`th-TH`<sup>1</sup> |
4243
|Vietnamese (Vietnam)|`vi-VN` |
4344

4445
<sup>1</sup> The language is in public preview for pronunciation assessment.

‎articles/ai-services/speech-service/language-support.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ With the cross-lingual feature, you can transfer your custom neural voice model
118118

119119
# [Pronunciation assessment](#tab/pronunciation-assessment)
120120

121-
The table in this section summarizes the 32 locales supported for pronunciation assessment, and each language is available on all [Speech to text regions](regions.md#speech-service). Latest update extends support from English to 31 more languages and quality enhancements to existing features, including accuracy, fluency and miscue assessment. You should specify the language that you're learning or practicing improving pronunciation. The default language is set as `en-US`. If you know your target learning language, [set the locale](how-to-pronunciation-assessment.md#get-pronunciation-assessment-results) accordingly. For example, if you're learning British English, you should specify the language as `en-GB`. If you're teaching a broader language, such as Spanish, and are uncertain about which locale to select, you can run various accent models (`es-ES`, `es-MX`) to determine the one that achieves the highest score to suit your specific scenario. If you're interested in languages not listed in the following table, fill out this [intake form](https://aka.ms/speechpa/intake) for further assistance.
121+
The table in this section summarizes the 33 locales supported for pronunciation assessment, and each language is available on all [Speech to text regions](regions.md#speech-service). Latest update extends support from English to 32 more languages and quality enhancements to existing features, including accuracy, fluency and miscue assessment. You should specify the language that you're learning or practicing improving pronunciation. The default language is set as `en-US`. If you know your target learning language, [set the locale](how-to-pronunciation-assessment.md#get-pronunciation-assessment-results) accordingly. For example, if you're learning British English, you should specify the language as `en-GB`. If you're teaching a broader language, such as Spanish, and are uncertain about which locale to select, you can run various accent models (`es-ES`, `es-MX`) to determine the one that achieves the highest score to suit your specific scenario. If you're interested in languages not listed in the following table, fill out this [intake form](https://aka.ms/speechpa/intake) for further assistance.
122122

123123
[!INCLUDE [Language support include](includes/language-support/pronunciation-assessment.md)]
124124

‎articles/azure-monitor/essentials/edge-pipeline-configure.md

Lines changed: 100 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -374,109 +374,117 @@ Replace the properties in the following table before deploying the template.
374374

375375
```json
376376
{
377-
"type": "Microsoft.monitor/pipelineGroups",
378-
"location": "eastus",
379-
"apiVersion": "2023-10-01-preview",
380-
"name": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-resource-group/providers/Microsoft.ExtendedLocation/customLocations/my-custom-location",
381-
382-
"extendedLocation": {
383-
"name": "my-custom-location",
384-
"type": "CustomLocation"
377+
"$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#",
378+
"contentVersion": "1.0.0.0",
379+
"metadata": {
380+
"description": "This template deploys an edge pipeline for azure monitor."
385381
},
386-
"properties": {
387-
"receivers": [
388-
{
389-
"type": "OTLP",
390-
"name": "receiver-OTLP",
391-
"otlp": {
392-
"endpoint": "0.0.0.0:4317"
393-
}
382+
"resources": [
383+
{
384+
"type": "Microsoft.monitor/pipelineGroups",
385+
"location": "eastus",
386+
"apiVersion": "2023-10-01-preview",
387+
"name": "my-pipeline-group-name",
388+
"extendedLocation": {
389+
"name": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/my-resource-group/providers/Microsoft.ExtendedLocation/customLocations/my-custom-location",
390+
"type": "CustomLocation"
394391
},
395-
{
396-
"type": "Syslog",
397-
"name": "receiver-Syslog",
398-
"syslog": {
399-
"endpoint": "0.0.0.0:514"
400-
}
401-
}
402-
],
403-
"processors": [],
404-
"exporters": [
405-
{
406-
"type": "AzureMonitorWorkspaceLogs",
407-
"name": "exporter-log-analytics-workspace",
408-
"azureMonitorWorkspaceLogs": {
409-
"api": {
410-
"dataCollectionEndpointUrl": "https://my-dce-4agr.eastus-1.ingest.monitor.azure.com",
411-
"dataCollectionRule": "dcr-00000000000000000000000000000000",
412-
"stream": "Custom-OTLP",
413-
"cache": {
414-
"maxStorageUsage": "10000",
415-
"retentionPeriod": "60"
416-
},
417-
"schema": {
418-
"recordMap": [
419-
{
420-
"from": "body",
421-
"to": "Body"
422-
},
423-
{
424-
"from": "severity_text",
425-
"to": "SeverityText"
426-
},
427-
{
428-
"from": "time_unix_nano",
429-
"to": "TimeGenerated"
392+
"properties": {
393+
"receivers": [
394+
{
395+
"type": "OTLP",
396+
"name": "receiver-OTLP",
397+
"otlp": {
398+
"endpoint": "0.0.0.0:4317"
399+
}
400+
},
401+
{
402+
"type": "Syslog",
403+
"name": "receiver-Syslog",
404+
"syslog": {
405+
"endpoint": "0.0.0.0:514"
406+
}
407+
}
408+
],
409+
"processors": [],
410+
"exporters": [
411+
{
412+
"type": "AzureMonitorWorkspaceLogs",
413+
"name": "exporter-log-analytics-workspace",
414+
"azureMonitorWorkspaceLogs": {
415+
"api": {
416+
"dataCollectionEndpointUrl": "https://my-dce-4agr.eastus-1.ingest.monitor.azure.com",
417+
"dataCollectionRule": "dcr-00000000000000000000000000000000",
418+
"stream": "Custom-OTLP",
419+
"schema": {
420+
"recordMap": [
421+
{
422+
"from": "body",
423+
"to": "Body"
424+
},
425+
{
426+
"from": "severity_text",
427+
"to": "SeverityText"
428+
},
429+
{
430+
"from": "time_unix_nano",
431+
"to": "TimeGenerated"
432+
}
433+
]
430434
}
431-
]
435+
},
436+
"cache": {
437+
"maxStorageUsage": 10000,
438+
"retentionPeriod": 60
439+
}
432440
}
433441
}
434-
}
435-
}
436-
],
437-
"service": {
438-
"pipelines": [
439-
{
440-
"name": "DefaultOTLPLogs",
441-
"receivers": [
442-
"receiver-OTLP"
443-
],
444-
"processors": [],
445-
"exporters": [
446-
"exporter-log-analytics-workspace"
442+
],
443+
"service": {
444+
"pipelines": [
445+
{
446+
"name": "DefaultOTLPLogs",
447+
"receivers": [
448+
"receiver-OTLP"
449+
],
450+
"processors": [],
451+
"exporters": [
452+
"exporter-log-analytics-workspace"
453+
],
454+
"type": "logs"
455+
},
456+
{
457+
"name": "DefaultSyslogs",
458+
"receivers": [
459+
"receiver-Syslog"
460+
],
461+
"processors": [],
462+
"exporters": [
463+
"exporter-log-analytics-workspace"
464+
],
465+
"type": "logs"
466+
}
447467
],
448-
"type": "logs"
468+
"persistence": {
469+
"persistentVolumeName": "my-persistent-volume"
470+
}
449471
},
450-
{
451-
"name": "DefaultSyslogs",
452-
"receivers": [
453-
"receiver-Syslog"
454-
],
455-
"processors": [],
456-
"exporters": [
457-
"exporter-log-analytics-workspace"
458-
],
459-
"type": "logs"
460-
}
461-
],
462-
"persistence": {
463-
"persistentVolume": "my-persistent-volume"
464-
}
465-
},
466-
"networkingConfigurations": [
467-
{
468-
"externalNetworkingMode": "LoadBalancerOnly",
469-
"routes": [
472+
"networkingConfigurations": [
470473
{
471-
"receiver": "receiver-OTLP"
472-
},
473-
{
474-
"receiver": "receiver-Syslog"
474+
"externalNetworkingMode": "LoadBalancerOnly",
475+
"routes": [
476+
{
477+
"receiver": "receiver-OTLP"
478+
},
479+
{
480+
"receiver": "receiver-Syslog"
481+
}
482+
]
475483
}
476484
]
477485
}
478-
]
479-
}
486+
}
487+
]
480488
}
481489
```
482490

‎articles/backup/backup-mabs-protection-matrix.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: MABS (Azure Backup Server) V4 protection matrix
33
description: This article provides a support matrix listing all workloads, data types, and installations that Azure Backup Server v4 protects.
4-
ms.date: 04/30/2024
4+
ms.date: 07/05/2024
55
ms.topic: conceptual
66
ms.service: backup
77
ms.custom: linux-related-content, engagement-fy24
@@ -48,7 +48,7 @@ The following sections details the protection support matrix for MABS:
4848
| **Workload** | **Version** | **Azure Backup Server installation** | **Supported Azure Backup Server** | **Protection and recovery** |
4949
| ------------------------------------------------------------ | ------------------------------------------------------- | ------------------------------------------------------------ | ---------------------------------- | ------------------------------------------------------------ |
5050
| Hyper-V host - MABS protection agent on Hyper-V host server, cluster, or VM | Windows Server 2022, 2019, 2016, 2012 R2, 2012 | Physical server <br><br> Hyper-V virtual machine <br><br> VMware virtual machine | V4 | Protect: Virtual machines, cluster shared volumes (CSVs) <br><br> Recover: Virtual machine, Item-level recovery of files and folders available only for Windows, volumes, virtual hard drives |
51-
| Azure Stack HCI | V1, 20H2, 21H2, and 22H2 | Physical server <br><br> Hyper-V / Azure Stack HCI virtual machine <br><br> VMware virtual machine | V4 | Protect: Virtual machines, cluster shared volumes (CSVs) <br><br> Recover: Virtual machine, Item-level recovery of files and folders available only for Windows, volumes, virtual hard drives |
51+
| Azure Stack HCI | V1, 20H2, 21H2, 22H2, and 23H2 | Physical server <br><br> Hyper-V / Azure Stack HCI virtual machine <br><br> VMware virtual machine | V4 | Protect: Virtual machines, cluster shared volumes (CSVs) <br><br> Recover: Virtual machine, Item-level recovery of files and folders available only for Windows, volumes, virtual hard drives <br><br> Recovery of Arc VMs is supported in a limited capacity in Azure Stack HCI, version 23H2. [Learn more](back-up-azure-stack-hyperconverged-infrastructure-virtual-machines.md). |
5252
| VMware VMs | VMware server 6.5, 6.7, 7.0, 8.0 (Licensed Version) | Hyper-V virtual machine <br><br> VMware virtual machine | V4 | Protect: VMware VMs on cluster-shared volumes (CSVs), NFS, and SAN storage <br><br> Recover: Virtual machine, Item-level recovery of files and folders available only for Windows, volumes, virtual hard drives <br><br> VMware vApps aren't supported. <br><br> vSphere 8.0 DataSets feature isn't supported for backup. |
5353

5454
>[!NOTE]

‎articles/energy-data-services/how-to-deploy-gcz.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.topic: how-to
77
ms.author: eihaugho
88
author: EirikHaughom
99
ms.date: 05/11/2024
10-
zone_pivot_groups: energy-data-services-gcz-options
10+
zone_pivot_groups: gcz-aks-or-windows
1111
---
1212

1313
# Deploy Geospatial Consumption Zone
@@ -34,13 +34,13 @@ There are two main deployment options for the GCZ service:
3434
- **Azure Kubernetes Service (AKS)**: Deploy the GCZ service on an AKS cluster. This deployment option is recommended for production environments. It requires more setup, configuration, and maintenance. It also has some limitations in the provided container images.
3535
- **Windows**: Deploy the GCZ service on a Windows. This deployment option recommended for development and testing environments, as it's easier to set up and configure, and requires less maintenance.
3636

37-
::: zone pivot="energy-data-services-gcz-aks"
37+
::: zone pivot="gcz-aks"
3838

3939
[!INCLUDE [Azure Kubernetes Service (AKS)](includes/how-to/how-to-deploy-gcz/deploy-gcz-on-aks.md)]
4040

4141
::: zone-end
4242

43-
::: zone pivot="energy-data-services-gcz-windows"
43+
::: zone pivot="gcz-windows"
4444

4545
[!INCLUDE [Windows](includes/how-to/how-to-deploy-gcz/deploy-gcz-on-windows.md)]
4646

@@ -74,18 +74,14 @@ Through APIM we can add policies to secure, monitor, and manage the APIs.
7474
- url: "http://<GCZ-Service-External-IP>/ignite-provider"
7575
```
7676
77-
::: zone pivot="energy-data-services-gcz-apim-portal"
77+
##### [Azure portal](#tab/portal)
7878
7979
[!INCLUDE [Azure portal](includes/how-to/how-to-deploy-gcz/deploy-gcz-apim-portal.md)]
8080
81-
::: zone-end
82-
83-
::: zone pivot="energy-data-services-gcz-apim-cli"
81+
##### [Azure CLI](#tab/cli)
8482
8583
[!INCLUDE [Azure CLI](includes/how-to/how-to-deploy-gcz/deploy-gcz-apim-cli.md)]
8684
87-
::: zone-end
88-
8985
## Testing the GCZ service
9086
9187
1. Download the API client collection from the [OSDU GitLab](https://community.opengroup.org/osdu/platform/consumption/geospatial/-/blob/master/docs/test-assets/postman/Geospatial%20Consumption%20Zone%20-%20Provider%20Postman%20Tests.postman_collection.json?ref_type=heads) and import it into your API client of choice (for example, Postman).

0 commit comments

Comments
 (0)