Skip to content

Commit df933ae

Browse files
authored
Merge pull request #273222 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 adb9c92 + a472081 commit df933ae

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

articles/machine-learning/how-to-setup-customer-managed-keys.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,11 @@ In the [customer-managed keys concepts article](concept-customer-managed-keys.md
3232
| Microsoft.MachineLearningServices | Creating the Azure Machine Learning workspace.
3333
| Microsoft.Storage | Storage Account is used as the default storage for the workspace.
3434
| Microsoft.KeyVault |Azure Key Vault is used by the workspace to store secrets.
35-
| Microsoft.DocumentDB/databaseAccounts | Azure Cosmos DB instance that logs metadata for the workspace.
36-
| Microsoft.Search/searchServices | Azure Search provides indexing capabilities for the workspace.
35+
| Microsoft.DocumentDB | Azure Cosmos DB instance that logs metadata for the workspace.
36+
| Microsoft.Search | Azure AI Search provides indexing capabilities for the workspace.
3737

3838
For information on registering resource providers, see [Resolve errors for resource provider registration](/azure/azure-resource-manager/templates/error-register-resource-provider).
3939

40-
4140
## Limitations
4241

4342
* After workspace creation, the customer-managed encryption key for resources that the workspace depends on can only be updated to another key in the original Azure Key Vault resource..

articles/managed-grafana/how-to-connect-to-data-source-privately.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ Managed private endpoints work with Azure services that support private link. Us
3333
- Azure SQL managed instance
3434
- Azure SQL server
3535
- Private link services
36+
- Azure Databricks
37+
- Azure Database for PostgreSQL flexible servers
3638

3739
## Prerequisites
3840

articles/virtual-desktop/autoscale-create-assign-scaling-plan.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,9 @@ Here's how to create a scaling plan using the Az.DesktopVirtualization PowerShel
239239
RampDownLoadBalancingAlgorithm = 'BreadthFirst'
240240
RampDownMinimumHostsPct = '20'
241241
RampDownCapacityThresholdPct = '20'
242-
RampDownForceLogoffUser:$true
242+
RampDownForceLogoffUser = $true
243243
RampDownWaitTimeMinute = '30'
244-
RampDownNotificationMessage = '"Log out now, please."'
244+
RampDownNotificationMessage = 'Log out now, please.'
245245
RampDownStopHostsWhen = 'ZeroSessions'
246246
OffPeakStartTimeHour = '22'
247247
OffPeakStartTimeMinute = '45'

articles/virtual-machines/windows/compute-benchmark-scores.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ The following CoreMark benchmark scores show compute performance for select Azur
697697

698698
## About CoreMark
699699

700-
[CoreMark](https://www.eembc.org/coremark/faq.php) is a benchmark that tests the functionality of a microctronoller (MCU) or central processing unit (CPU). CoreMark isn't system dependent, so it functions the same regardless of the platform (for example, big or little endian, high-end or low-end processor).
700+
[CoreMark](https://www.eembc.org/coremark/faq.php) is a benchmark that tests the functionality of a microcontroller (MCU) or central processing unit (CPU). CoreMark isn't system dependent, so it functions the same regardless of the platform (for example, big or little endian, high-end or low-end processor).
701701

702702
Windows numbers were computed by running CoreMark on Windows Server 2019. CoreMark was configured with the number of threads set to the number of virtual CPUs, and concurrency set to `PThreads`. The target number of iterations was adjusted based on expected performance to provide a runtime of at least 20 seconds (typically much longer). The final score represents the number of iterations completed divided by the number of seconds it took to run the test. Each test was run at least seven times on each VM. Test run dates shown above. Tests run on multiple VMs across Azure public regions the VM was supported in on the date run.
703703

0 commit comments

Comments
 (0)