Skip to content

Commit d239cfa

Browse files
authored
Merge pull request #112498 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 15525ee + 5ec0b28 commit d239cfa

File tree

14 files changed

+21
-17
lines changed

14 files changed

+21
-17
lines changed

articles/active-directory/develop/quickstart-v2-windows-desktop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ In this quickstart, you'll learn how to write a Windows desktop .NET (WPF) appli
3838
>
3939
> 1. Sign in to the [Azure portal](https://portal.azure.com) using either a work or school account, or a personal Microsoft account.
4040
> 1. If your account gives you access to more than one tenant, select your account in the top right corner, and set your portal session to the desired Azure AD tenant.
41-
> 1. Navigate to the Microsoft identity platform for developers [App registrations](https://aka.ms/MobileAppReg) page.
41+
> 1. Go to the [App registrations](https://aka.ms/MobileAppReg) blade for Azure Active Directory in the Azure portal.
4242
> 1. Select **New registration**.
4343
> - In the **Name** section, enter a meaningful application name that will be displayed to users of the app, for example `Win-App-calling-MsGraph`.
4444
> - In the **Supported account types** section, select **Accounts in any organizational directory and personal Microsoft accounts (for example, Skype, Xbox, Outlook.com)**.

articles/aks/use-managed-identity.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ A successful cluster creation using managed identities contains this service pri
5656

5757
> [!NOTE]
5858
> For creating and using your own VNet, static IP address, or attached Azure disk where the resources are outside of the MC_* resource group, use the PrincipalID of the cluster System Assigned Managed Identity to perform a role assignment. For more information on role assignment, see [Delegate access to other Azure resources](kubernetes-service-principal.md#delegate-access-to-other-azure-resources).
59+
>
60+
> Permission grants to cluster Managed Identity used by Azure Cloud provider may take up 60 minutes to populate.
5961
6062
Finally, get credentials to access the cluster:
6163

articles/azure-cache-for-redis/cache-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Azure Cache for Redis provides an in-memory data store based on the open-source
1616

1717
Azure Cache for Redis can be used as an in-memory data structure store, a distributed non-relational database, and a message broker. Application performance is improved by taking advantage of the low-latency, high-throughput performance of the Redis engine.
1818

19-
Azure Cache for Redis provides access to a secure, dedicated Redis cache. Azure Cache for Redis is managed by Microsoft, hosted within Azure, and accessible to any application within or outside of Azure.
19+
Azure Cache for Redis provides access to a secure, dedicated Redis cache. Azure Cache for Redis is managed by Microsoft, hosted within Azure, and accessible to any application within or outside of Azure. Additionally, Azure Redis for Cache uses the strategy of diskless replication, enhancing the compatibility with the payment card industry.
2020

2121
## Using Azure Cache for Redis
2222

articles/cognitive-services/Speech-Service/includes/how-to/speech-to-text-basics/speech-to-text-basics-javascript.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,14 @@ Reference the `AudioConfig` object as follows:
9797

9898
```javascript
9999
const audioConfig = AudioConfig.fromDefaultMicrophoneInput();
100-
const speechConfig = SpeechConfig.fromSubscription(speechConfig, audioConfig);
100+
const recognizer = new SpeechRecognizer(speechConfig, audioConfig);
101101
```
102102

103103
If you want to provide an audio file instead of using a microphone, you'll still need to provide an `audioConfig`. However, this can only be done when targeting **Node.js** and when you create an [`AudioConfig`](https://docs.microsoft.com/javascript/api/microsoft-cognitiveservices-speech-sdk/audioconfig?view=azure-node-latest), instead of calling `fromDefaultMicrophoneInput`, you'll call `fromWavFileOutput` and pass the `filename` parameter.
104104

105105
```javascript
106106
const audioConfig = AudioConfig.fromWavFileInput("YourAudioFile.wav");
107-
const speechConfig = SpeechConfig.fromSubscription(speechConfig, audioConfig);
107+
const recognizer = new SpeechRecognizer(speechConfig, audioConfig);
108108
```
109109

110110
## Recognize speech
@@ -262,4 +262,4 @@ phraseList.clear();
262262
Phrase lists are only one option to improve recognition accuracy. You can also:
263263

264264
* [Improve accuracy with Custom Speech](../../../how-to-custom-speech.md)
265-
* [Improve accuracy with tenant models](../../../tutorial-tenant-model.md)
265+
* [Improve accuracy with tenant models](../../../tutorial-tenant-model.md)

articles/cognitive-services/Speech-Service/language-support.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ The **Speech Translation** API supports different languages for speech-to-speech
236236
| French | `fr` |
237237
| German | `de` |
238238
| Greek | `el` |
239+
| Gujarati | `gu` |
239240
| Haitian Creole | `ht` |
240241
| Hebrew | `he` |
241242
| Hindi | `hi` |
@@ -256,6 +257,8 @@ The **Speech Translation** API supports different languages for speech-to-speech
256257
| Malay | `ms` |
257258
| Malayalam | `ml` |
258259
| Maltese | `mt` |
260+
| Maori | `mi` |
261+
| Marathi | `mr` |
259262
| Norwegian | `nb` |
260263
| Persian | `fa` |
261264
| Polish | `pl` |

articles/cognitive-services/form-recognizer/deploy-label-tool.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,14 @@ From the Azure CLI, run this command to create a web app resource for the sample
9999
DNS_NAME_LABEL=aci-demo-$RANDOM
100100
101101
az container create \
102-
--resource-group <resorunce_group_name> \
102+
--resource-group <resource_group_name> \
103103
--name <name> \
104104
--image mcr.microsoft.com/azure-cognitive-services/custom-form/labeltool \
105105
--ports 3000 \
106106
--dns-name-label $DNS_NAME_LABEL \
107107
--location <region name> \
108108
--cpu 2 \
109-
--memory 8
109+
--memory 8 \
110110
--command-line "./run.sh eula=accept"
111111
```
112112

articles/event-grid/event-schema-blob-storage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This article provides the properties and schema for blob storage events. For an
1616

1717

1818
>[!NOTE]
19-
> Only storage accounts of kind **StorageV2 (general purpose v2)**, **BlockBlobStorage**, and **BlobStorage** support event integration. **Storage (genral purpose v1)** does *not* support integration with Event Grid.
19+
> Only storage accounts of kind **StorageV2 (general purpose v2)**, **BlockBlobStorage**, and **BlobStorage** support event integration. **Storage (general purpose v1)** does *not* support integration with Event Grid.
2020
2121
## Event Grid event schema
2222

articles/iot-hub/iot-hub-reliability-features-in-sdks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ For code samples in other languages, review the following implementation documen
125125

126126
* [Node SDK](https://github.com/Azure/azure-iot-sdk-node/wiki/Connectivity-and-Retries#types-of-errors-and-how-to-detect-them)
127127

128-
* [Python SDK](https://github.com/Azure/azure-iot-sdk-python)
128+
* [Python SDK](https://github.com/Azure/azure-iot-sdk-python) (Reliability not yet implemented)
129129

130130
## Next steps
131131

articles/key-vault/general/vs-key-vault-add-connected-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Now, you can access your secrets in code. The next steps are different depending
120120
1. Add the configuration variable.
121121

122122
```csharp
123-
private static readonly IConfiguration _configuration;
123+
private static IConfiguration _configuration;
124124
```
125125

126126
1. Add this constructor or replace the existing constructor with this:

articles/machine-learning/how-to-enable-virtual-network.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,14 +223,15 @@ The NSG rule configuration in the Azure portal is shown in the following image:
223223
224224
If you're using forced tunneling with the Machine Learning Compute, add [user-defined routes (UDRs)](https://docs.microsoft.com/azure/virtual-network/virtual-networks-udr-overview) to the subnet that contains the compute resource.
225225
226-
* Establish a UDR for each IP address that's used by the Azure Batch service in the region where your resources exist. These UDRs enable the Batch service to communicate with compute nodes for task scheduling. To get a list of IP addresses of the Batch service, use one of the following methods:
226+
* Establish a UDR for each IP address that's used by the Azure Batch service in the region where your resources exist. These UDRs enable the Batch service to communicate with compute nodes for task scheduling. Also add the IP address for the Azure Machine Learning service where the resources exist, as this is required for access to Compute Instances. To get a list of IP addresses of the Batch service and Azure Machine Learning service, use one of the following methods:
227227
228-
* Download the [Azure IP Ranges and Service Tags](https://www.microsoft.com/download/details.aspx?id=56519) and search the file for `BatchNodeManagement.<region>`, where `<region>` is your Azure region.
228+
* Download the [Azure IP Ranges and Service Tags](https://www.microsoft.com/download/details.aspx?id=56519) and search the file for `BatchNodeManagement.<region>` and `AzureMachineLearning.<region>`, where `<region>` is your Azure region.
229229
230230
* Use the [Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest) to download the information. The following example downloads the IP address information and filters out the information for the East US 2 region:
231231
232232
```azurecli-interactive
233233
az network list-service-tags -l "East US 2" --query "values[?starts_with(id, 'Batch')] | [?properties.region=='eastus2']"
234+
az network list-service-tags -l "East US 2" --query "values[?starts_with(id, 'AzureMachineLearning')] | [?properties.region=='eastus2']"
234235
```
235236
236237
* Outbound traffic to Azure Storage must not be blocked by your on-premises network appliance. Specifically, the URLs are in the form `<account>.table.core.windows.net`, `<account>.queue.core.windows.net`, and `<account>.blob.core.windows.net`.

0 commit comments

Comments
 (0)