Skip to content

Commit 79641eb

Browse files
authored
Merge pull request #296174 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 8ca66ba + 19dda85 commit 79641eb

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

articles/azure-app-configuration/enable-dynamic-configuration-aspnet-core.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ A *sentinel key* is a key that you update after you complete the change of all o
4343
// Load configuration from Azure App Configuration
4444
builder.Configuration.AddAzureAppConfiguration(options =>
4545
{
46-
options.Connect(new Uri(endpoint), new DefaultAzureCredential());
46+
options.Connect(new Uri(endpoint), new DefaultAzureCredential())
4747
// Load all keys that start with `TestApp:` and have no label
4848
.Select("TestApp:*", LabelFilter.Null)
4949
// Configure to reload configuration if the registered sentinel key is modified

articles/azure-cache-for-redis/managed-redis/managed-redis-how-to-encryption.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ In the **Flash Optimized** tier, keys and values are also partially stored on-di
7373

7474
1. Select your chosen user assigned managed identity, and then choose the key input method to use.
7575

76-
1. If using the **Select Azure key vault and key** input method, choose the Key Vault instance that holds your customer managed key. This instance must be in the same region as your cache.
76+
1. If using the **Select Azure Key Vault and key** input method, choose the Key Vault instance that holds your customer managed key. This instance must be in the same region as your cache.
7777

7878
> [!NOTE]
7979
> For instructions on how to set up an Azure Key Vault instance, see the [Azure Key Vault quickstart guide](/azure/key-vault/secrets/quick-create-portal). You can also select the _Create a key vault_ link beneath the Key Vault selection to create a new Key Vault instance. Remember that both purge protection and soft delete must be enabled in your Key Vault instance.
@@ -99,7 +99,7 @@ In the **Flash Optimized** tier, keys and values are also partially stored on-di
9999

100100
1. Select your chosen user assigned managed identity, and then choose which key input method to use.
101101

102-
1. If using the **Select Azure key vault and key** input method, choose the Key Vault instance that holds your customer managed key. This instance must be in the same region as your cache.
102+
1. If using the **Select Azure Key Vault and key** input method, choose the Key Vault instance that holds your customer managed key. This instance must be in the same region as your cache.
103103

104104
> [!NOTE]
105105
> For instructions on how to set up an Azure Key Vault instance, see the [Azure Key Vault quickstart guide](/azure/key-vault/secrets/quick-create-portal). You can also select the _Create a key vault_ link beneath the Key Vault selection to create a new Key Vault instance.

articles/cost-management-billing/reservations/buy-vm-software-reservation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ There are two ways to purchase a virtual machine software reservation:
2626

2727
**Option 1**
2828

29-
1. Navigate to Reservations, select **Add**, and then select **Virtual Machine**. The Azure Marketplace shows offers that have reservation pricing.
29+
1. Navigate to Reservations, select **Add**, and then select **Virtual Machine software reservation**. The Azure Marketplace shows offers that have reservation pricing.
3030
2. Select the desired Virtual machine software plan that you want to buy.
3131
Any virtual machine software reservation that matches the attributes of what you buy gets a discount. The actual number of deployments that get the discount depend on the scope and quantity selected.
3232
3. Select a subscription. It's used to pay for the plan.

articles/security/fundamentals/iaas.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ Organizations that don't monitor VM performance can’t determine whether certai
138138
## Encrypt your virtual hard disk files
139139
We recommend that you encrypt your virtual hard disks (VHDs) to help protect your boot volume and data volumes at rest in storage, along with your encryption keys and secrets.
140140

141-
[Azure Disk Encryption for Linux VMs](/azure/virtual-machines/linux/disk-encryption-overview) and [Azure Disk Encryption for Windows VMs](/azure/virtual-machines/linux/disk-encryption-overview) helps you encrypt your Linux and Windows IaaS virtual machine disks. Azure Disk Encryption uses the industry-standard [DM-Crypt](https://en.wikipedia.org/wiki/Dm-crypt) feature of Linux and the [BitLocker](/previous-versions/windows/it-pro/windows-server-2008-R2-and-2008/cc732774(v=ws.11)) feature of Windows to provide volume encryption for the OS and the data disks. The solution is integrated with [Azure Key Vault](/azure/key-vault/) to help you control and manage the disk-encryption keys and secrets in your key vault subscription. The solution also ensures that all data on the virtual machine disks are encrypted at rest in Azure Storage.
141+
[Azure Disk Encryption for Linux VMs](/azure/virtual-machines/linux/disk-encryption-overview) and [Azure Disk Encryption for Windows VMs](/azure/virtual-machines/windows/disk-encryption-overview) helps you encrypt your Linux and Windows IaaS virtual machine disks. Azure Disk Encryption uses the industry-standard [DM-Crypt](https://en.wikipedia.org/wiki/Dm-crypt) feature of Linux and the [BitLocker](/previous-versions/windows/it-pro/windows-server-2008-R2-and-2008/cc732774(v=ws.11)) feature of Windows to provide volume encryption for the OS and the data disks. The solution is integrated with [Azure Key Vault](/azure/key-vault/) to help you control and manage the disk-encryption keys and secrets in your key vault subscription. The solution also ensures that all data on the virtual machine disks are encrypted at rest in Azure Storage.
142142

143143
Following are best practices for using Azure Disk Encryption:
144144

0 commit comments

Comments
 (0)