Skip to content

Commit 4cbca0f

Browse files
authored
Merge pull request #268910 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents ae15394 + f61c916 commit 4cbca0f

File tree

8 files changed

+15
-7
lines changed

8 files changed

+15
-7
lines changed

articles/ai-services/speech-service/includes/common/environment-variables.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ After you add the environment variables, you might need to restart any programs
3030

3131
#### [Linux](#tab/linux)
3232

33+
##### Bash
34+
35+
Edit your *.bashrc* file, and add the environment variables:
36+
3337
```bash
3438
export SPEECH_KEY=your-key
3539
export SPEECH_REGION=your-region

articles/ai-services/speech-service/includes/how-to/recognize-speech/csharp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ You can initialize `SpeechConfig` in a few other ways:
4545
4646
## Recognize speech from a microphone
4747

48-
To recognize speech by using your device microphone, create an [`AudioConfig`](/dotnet/api/microsoft.cognitiveservices.speech.audio.audioconfig) instance by using the `FromDefaultMicrophoneInput()` method. Then initialize the[`SpeechRecognizer`](/dotnet/api/microsoft.cognitiveservices.speech.speechrecognizer) object by passing `audioConfig` and `speechConfig`.
48+
To recognize speech by using your device microphone, create an [`AudioConfig`](/dotnet/api/microsoft.cognitiveservices.speech.audio.audioconfig) instance by using the `FromDefaultMicrophoneInput()` method. Then initialize the [`SpeechRecognizer`](/dotnet/api/microsoft.cognitiveservices.speech.speechrecognizer) object by passing `speechConfig` and `audioConfig`.
4949

5050
```csharp
5151
using System;

articles/aks/network-observability-managed-cli.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ Use [az aks update](/cli/azure/aks#az-aks-update) to enable Network Observabilit
116116

117117
```azurecli-interactive
118118
az aks update \
119-
--resource-groupmyResourceGroup \
120-
--namemyAKSCluster \
119+
--resource-group myResourceGroup \
120+
--name myAKSCluster \
121121
--enable-network-observability
122122
```
123123

articles/iot-hub/iot-hub-devguide-messaging.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Learn more about these topics:
2929

3030
* [Understand IoT Hub endpoints](iot-hub-devguide-endpoints.md#custom-endpoints-for-message-routing)
3131

32-
* [Use IoT Hub message routing to send device-to-cloud messages to different endponts](iot-hub-devguide-messages-d2c.md)
32+
* [Use IoT Hub message routing to send device-to-cloud messages to different endpoints](iot-hub-devguide-messages-d2c.md)
3333

3434
## Send cloud-to-device messages from IoT Hub
3535

articles/openshift/openshift-faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ sections:
3131
answer: |
3232
The actual number of supported pods depends on an application’s memory, CPU, and storage requirements.
3333
34-
Azure Red Hat OpenShift 4.x has a 250 pod-per-node limit and a 60 compute node limit. These limits cap the maximum number of pods supported in a cluster to 250×60 = 15,000. If the cluster is created using User Defined Routing (UDR) and runs version 4.11 or higher, the limits are 120 compute nodes and 30,000 pods.
34+
Azure Red Hat OpenShift 4.x has a 250 pod-per-node limit and a 60 compute node limit. These limits cap the maximum number of pods supported in a cluster to 250×60 = 15,000. For a private cluster without any public IPs (for example, created by using [User Defined Routing (UDR)](howto-create-private-cluster-4x.md#create-a-private-cluster-without-a-public-ip-address) and running version 4.11 or higher), the limits are 120 compute nodes and 30,000 pods.
3535
3636
- question: Can a cluster have compute nodes across multiple Azure regions?
3737
answer: No. All nodes in an Azure Red Hat OpenShift cluster must originate in the same Azure region.

articles/postgresql/flexible-server/concepts-major-version-upgrade.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ If in-place major version upgrade pre-check operations fail, then the upgrade ab
6161

6262
- Servers configured with logical replication slots aren't supported.
6363

64+
- In-place major version upgrade doesn't yet support upgrading to version 16, our team is actively working on this feature.
6465

6566
## Next steps
6667

articles/reliability/availability-zones-migration-overview.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,11 @@ The table below lists each product that offers migration guidance and/or informa
4343
| --- |
4444
| [Azure API Management](migrate-api-mgt.md)|
4545
| [Azure App Configuration](migrate-app-configuration.md)|
46+
| [Azure App Service](reliability-app-service.md#availability-zone-support)|
47+
| [Azure Batch](reliability-batch.md#availability-zone-migration)|
4648
| [Azure Cache for Redis](migrate-cache-redis.md)|
4749
| [Azure AI Search](migrate-search-service.md)|
50+
| [Azure Container Apps](reliability-azure-container-apps.md#availability-zone-migration)|
4851
| [Azure Container Instances](migrate-container-instances.md)|
4952
| [Azure Container Registry](/azure/container-registry/zone-redundancy?toc=/azure/reliability) |
5053
| [Azure Cosmos DB](/azure/cosmos-db/high-availability?toc=/azure/reliability) |

articles/virtual-desktop/licensing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This article explains the licensing requirements for using Azure Virtual Desktop
1616
In the context of providing virtualized infrastructure with Azure Virtual Desktop, *internal users* (for internal commercial purposes) refers to people who are members of your own organization, such as employees of a business or students of a school, including external vendors or contractors. *External users* (for external commercial purposes) aren't members of your organization, but your customers where you might provide a Software-as-a-Service (SaaS) application using Azure Virtual Desktop.
1717

1818
> [!NOTE]
19-
> Take care not to confuse external *users* with external *identities*. Azure Virtual Desktop doesn't support external identities, including guest accounts or business-to-business (B2B) identities. Whether you're serving internal commercial purposes or external users with Azure Virtual Desktop, you'll need to create and manage identities for those users yourself. For more information, see [Recommendations for deploying Azure Virtual Desktop for internal or external commercial purposes](organization-internal-external-commercial-purposes-recommendations.md).
19+
> Take care not to confuse external *users* with external *identities*. Azure Virtual Desktop doesn't support external identities, including external guest accounts or business-to-business (B2B) identities. Whether you're serving internal commercial purposes or external users with Azure Virtual Desktop, you'll need to create and manage identities for those users yourself. For more information, see [Recommendations for deploying Azure Virtual Desktop for internal or external commercial purposes](organization-internal-external-commercial-purposes-recommendations.md).
2020
2121
Licensing Azure Virtual Desktop works differently for internal and external commercial purposes. Consider the following examples:
2222

@@ -27,7 +27,7 @@ Licensing Azure Virtual Desktop works differently for internal and external comm
2727
- A software vendor called *Contoso* might use Azure Virtual Desktop to sell remote access of Contoso's productivity app to Contoso's customers (external users). Because Contoso is serving external users for external commercial purposes, Contoso must enroll in Azure Virtual Desktop's per-user access pricing. This enables Contoso to pay for Azure Virtual Desktop access rights on behalf of those external users who connect to Contoso's deployment. The users don't need a separate license like Microsoft 365 to access Azure Virtual Desktop. Contoso still needs to create and manage identities for those external users.
2828

2929
> [!IMPORTANT]
30-
> Per-user access pricing can only be used for external commercial purposes, not internal purposes. Per-user access pricing isn't a way to enable guest user accounts with Azure Virtual Desktop. Check if your Azure Virtual Desktop solution is is applicable for per-user access pricing by reviewing [our licensing documentation](https://www.microsoft.com/licensing/terms/productoffering/MicrosoftAzure/EAEAS#Documents).
30+
> Per-user access pricing can only be used for external commercial purposes, not internal purposes. Per-user access pricing isn't a way to enable external guest user accounts with Azure Virtual Desktop. Check if your Azure Virtual Desktop solution is is applicable for per-user access pricing by reviewing [our licensing documentation](https://www.microsoft.com/licensing/terms/productoffering/MicrosoftAzure/EAEAS#Documents).
3131
3232
## Eligible licenses to use Azure Virtual Desktop
3333

0 commit comments

Comments
 (0)