Skip to content

Commit 2edc609

Browse files
authored
Merge pull request #183690 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 9eeda42 + e6cd4b3 commit 2edc609

File tree

7 files changed

+66
-60
lines changed

7 files changed

+66
-60
lines changed

articles/automanage/automanage-hotpatch.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ To start using Hotpatch on a new VM, follow these steps:
6262
The following example describes how to enable the preview for your subscription:
6363

6464
```
65-
POST on `/subscriptions/{subscriptionId}/providers/Microsoft.Features/providers/Microsoft.Compute/features/ InGuestHotPatchVMPreview/register?api-version=2015-12-01`
65+
POST on `/subscriptions/{subscriptionId}/providers/Microsoft.Features/providers/Microsoft.Compute/features/InGuestHotPatchVMPreview/register?api-version=2015-12-01`
6666
POST on `/subscriptions/{subscriptionId}/providers/Microsoft.Features/providers/Microsoft.Compute/features/InGuestAutoPatchVMPreview/register?api-version=2015-12-01`
6767
POST on `/subscriptions/{subscriptionId}/providers/Microsoft.Features/providers/Microsoft.Compute/features/InGuestPatchVMPreview/register?api-version=2015-12-01`
6868
```

articles/cognitive-services/Speech-Service/speech-container-faq.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,7 @@ sections:
134134
- question: |
135135
Is CentOS supported for Speech containers?
136136
answer: |
137-
CentOS 7 is not supported by Python SDK yet, also Ubuntu 19.04 is not supported.
138-
139-
The Python Speech SDK package is available for these operating systems:
140-
- **Windows** - x64 and x86
141-
- **Mac** - macOS X version 10.12 or later
142-
- **Linux** - Ubuntu 16.04 (until September), Ubuntu 18.04, Debian 9 on x64
143-
144-
For more information on environment setup, see [Python platform setup](quickstarts/setup-platform.md?pivots=programming-language-python). For now, Ubuntu 18.04 is the recommended version.
137+
Speech containers run on most operating systems, including some CentOS configurations. For more information about supported environments, see [Get the Speech SDK](speech-sdk.md?tabs=linux%2Cubuntu%2Cios-xcode%2Cmac-xcode%2Candroid-studio#get-the-speech-sdk).
145138
146139
- question: |
147140
Why am I getting errors when attempting to call LUIS prediction endpoints?

articles/governance/blueprints/create-blueprint-azurecli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: In this quickstart, you use Azure Blueprints to create, define, and
44
ms.date: 08/17/2021
55
ms.topic: quickstart
66
---
7-
# Quickstart: Define and Assign an Azure Blueprint with Azure CLI
7+
# Quickstart: Define and Assign an Azure blueprint with Azure CLI
88

99
Learning how to create and assign blueprints enables the definition of common patterns to develop
1010
reusable and rapidly deployable configurations based on Azure Resource Manager templates (ARM

articles/governance/blueprints/create-blueprint-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ms.date: 08/17/2021
55
ms.topic: quickstart
66
ms.custom: mode-api
77
---
8-
# Quickstart: Define and Assign an Azure Blueprint with PowerShell
8+
# Quickstart: Define and Assign an Azure blueprint with PowerShell
99

1010
Learning how to create and assign blueprints enables the definition of common patterns to develop
1111
reusable and rapidly deployable configurations based on Azure Resource Manager templates (ARM

articles/mariadb/howto-configure-server-logs-portal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.topic: how-to
88
ms.date: 4/13/2020
99
---
1010

11-
# Configure and access Azure Database for Maria DB slow query logs from the Azure portal
11+
# Configure and access Azure Database for MariaDB slow query logs from the Azure portal
1212

1313
You can configure, list, and download the [Azure Database for MariaDB slow query logs](concepts-server-logs.md) from the Azure portal.
1414

@@ -80,4 +80,4 @@ After logging begins, you can view a list of available slow query logs, and down
8080
## Next steps
8181
- See [Access slow query logs in CLI](howto-configure-server-logs-cli.md) to learn how to download slow query logs programmatically.
8282
- Learn more about [slow query logs](concepts-server-logs.md) in Azure Database for MariaDB.
83-
- For more information about the parameter definitions and logging, see the MariaDB documentation on [logs](https://mariadb.com/kb/en/library/slow-query-log-overview/).
83+
- For more information about the parameter definitions and logging, see the MariaDB documentation on [logs](https://mariadb.com/kb/en/library/slow-query-log-overview/).

articles/postgresql/howto-data-encryption-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ After Azure Database for PostgreSQL Single server is encrypted with a customer's
8484
8585
:::image type="content" source="media/concepts-data-access-and-security-data-encryption/show-revalidate-data-encryption.png" alt-text="Screenshot of Azure Database for PostgreSQL, with revalidation step highlighted":::
8686
87-
You will have to give the key vault access to the new server.
87+
You will have to give the key vault access to the new server. For more information, see [Enable Azure RBAC permissions on Key Vault](../key-vault/general/rbac-guide.md?tabs=azure-cli#enable-azure-rbac-permissions-on-key-vault).
8888
8989
4. After registering the service principal, revalidate the key again, and the server resumes its normal functionality.
9090

0 commit comments

Comments
 (0)