Skip to content

Commit ad5c1a0

Browse files
committed
Revert Managed Disk casing from PR #312345
1 parent 062bae2 commit ad5c1a0

82 files changed

Lines changed: 166 additions & 166 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

articles/active-directory-b2c/partner-onfido.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ REST API settings:
113113
#### Upload your files
114114

115115
1. Store the UI folder files in your blob container.
116-
2. [Use Azure Storage Explorer to manage Azure Managed Disks](/azure/virtual-machines/disks-use-storage-explorer-managed-disks) and access permissions.
116+
2. [Use Azure Storage Explorer to manage Azure managed disks](/azure/virtual-machines/disks-use-storage-explorer-managed-disks) and access permissions.
117117

118118
### Configure Azure AD B2C
119119

articles/azure-government/azure-secure-isolation-guidance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ The DEK, encrypted with the KEK, is stored separately and only an entity with ac
772772
For [Windows VMs](/azure/virtual-machines/windows/disk-encryption-faq), Azure Disk encryption selects the encryption method in BitLocker based on the version of Windows, for example, XTS-AES 256 bit for Windows Server 2012 or greater. These crypto modules are FIPS 140 validated as part of the Microsoft [Windows FIPS validation program](/windows/security/threat-protection/fips-140-validation#modules-used-by-windows-server). For [Linux VMs](/azure/virtual-machines/linux/disk-encryption-faq), Azure Disk encryption uses the decrypt default of aes-xts-plain64 with a 256-bit volume master key that is FIPS 140 validated as part of DM-Crypt validation obtained by suppliers of Linux IaaS VM images in Microsoft Azure Marketplace.
773773

774774
##### *Server-side encryption for managed disks*
775-
[Azure Managed Disks](/azure/virtual-machines/managed-disks-overview) are block-level storage volumes that are managed by Azure and used with Azure Windows and Linux virtual machines. They simplify disk management for Azure IaaS VMs by handling storage account management transparently for you. Azure Managed Disks automatically encrypt your data by default using [256-bit AES encryption](/azure/virtual-machines/disk-encryption) that is FIPS 140 validated. For encryption key management, you have the following choices:
775+
[Azure managed disks](/azure/virtual-machines/managed-disks-overview) are block-level storage volumes that are managed by Azure and used with Azure Windows and Linux virtual machines. They simplify disk management for Azure IaaS VMs by handling storage account management transparently for you. Azure managed disks automatically encrypt your data by default using [256-bit AES encryption](/azure/virtual-machines/disk-encryption) that is FIPS 140 validated. For encryption key management, you have the following choices:
776776

777777
- [Platform-managed keys](/azure/virtual-machines/disk-encryption#platform-managed-keys) is the default choice that provides transparent data encryption at rest for managed disks whereby keys are managed by Microsoft.
778778
- [Customer-managed keys](/azure/virtual-machines/disk-encryption#customer-managed-keys) enables you to have control over your own keys that can be imported into or generated inside Azure Key Vault or Managed HSM. This approach relies on two sets of keys as described previously: DEK and KEK. DEK encrypts the data using an AES-256 based encryption and is in turn encrypted by an RSA KEK that is stored in Azure Key Vault or Managed HSM.

articles/azure-netapp-files/azacsnap-preview.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This article provides a guide on setup and usage of the new features in preview
1818
The preview features provided with AzAcSnap 11 are:
1919

2020
- Azure NetApp Files backup
21-
- Azure Managed Disks
21+
- Azure managed disks
2222

2323
> [!NOTE]
2424
> Previews are provided "as is," "with all faults," and "as available," and are excluded from the service-level agreements and may not be covered by customer support.
@@ -51,7 +51,7 @@ You can also enable this feature by using `azacsnap -c configure --configuration
5151

5252
For more information about this feature, see [Configure the Azure Application Consistent Snapshot tool](azacsnap-cmd-ref-configure.md).
5353

54-
## Azure Managed Disks
54+
## Azure managed disks
5555

5656
Microsoft provides many storage options for deploying databases such as SAP HANA. For details about some of these options, see [Azure Storage types for SAP workload](/azure/virtual-machines/workloads/sap/planning-guide-storage). There's also a [cost-conscious solution with Azure premium storage](/azure/virtual-machines/workloads/sap/hana-vm-premium-ssd-v1#cost-conscious-solution-with-azure-premium-storage).
5757

@@ -62,13 +62,13 @@ AzAcSnap can take application-consistent database snapshots when you deploy it o
6262
6363
Here's the architecture at a high level:
6464

65-
1. Attach Azure Managed Disks to the VM by using the Azure portal.
65+
1. Attach Azure managed disks to the VM by using the Azure portal.
6666
1. Create a logical volume from these managed disks.
6767
1. Mount the logical volume to a Linux directory.
6868
1. Enable communication in the same way as for Azure NetApp Files in the [AzAcSnap installation](azacsnap-configure-storage.md?tabs=azure-netapp-files#enable-communication-with-storage).
6969
1. Install and configure AzAcSnap.
7070

71-
For more information about using Azure Managed Disks as a storage back end, see [Configure the Azure Application Consistent Snapshot tool](azacsnap-cmd-ref-configure.md).
71+
For more information about using Azure managed disks as a storage back end, see [Configure the Azure Application Consistent Snapshot tool](azacsnap-cmd-ref-configure.md).
7272

7373
### Example configuration file
7474

@@ -168,7 +168,7 @@ The storage hierarchy looks like the following example for SAP HANA:
168168
VG Size 1023.99 GiB
169169
```
170170

171-
- Physical volumes (attached Azure Managed Disks):
171+
- Physical volumes (attached Azure managed disks):
172172

173173
```bash
174174
pvdisplay
@@ -197,17 +197,17 @@ The storage hierarchy looks like the following example for SAP HANA:
197197
PV UUID RNCylW-F3OG-G93c-1XL3-W6pw-M0XB-2mYFGV
198198
```
199199

200-
Installing and setting up the Azure VM and Azure Managed Disks in this way follows Microsoft guidance to create Logical Volume Manager (LVM) stripes of the managed disks on the VM.
200+
Installing and setting up the Azure VM and Azure managed disks in this way follows Microsoft guidance to create Logical Volume Manager (LVM) stripes of the managed disks on the VM.
201201

202-
With the Azure VM set up as prescribed, AzAcSnap can take snapshots of Azure Managed Disks. The snapshot operations are similar to those for other storage back ends that AzAcSnap supports; for example, Azure NetApp Files or Azure Large Instances (bare metal). Because AzAcSnap communicates with Azure Resource Manager to take snapshots, it also needs a service principal with the correct permissions to take managed disk snapshots.
202+
With the Azure VM set up as prescribed, AzAcSnap can take snapshots of Azure managed disks. The snapshot operations are similar to those for other storage back ends that AzAcSnap supports; for example, Azure NetApp Files or Azure Large Instances (bare metal). Because AzAcSnap communicates with Azure Resource Manager to take snapshots, it also needs a service principal with the correct permissions to take managed disk snapshots.
203203

204204
This capability allows customers to test AzAcSnap on a smaller system and scale up to Azure NetApp Files and/or Azure Large Instances (bare metal).
205205

206-
Supported `azacsnap` command functionality with Azure Managed Disks is `configure`, `test`, `backup`, `delete`, and `details`, but not yet `restore`.
206+
Supported `azacsnap` command functionality with Azure managed disks is `configure`, `test`, `backup`, `delete`, and `details`, but not yet `restore`.
207207

208-
### Restore from an Azure Managed Disk snapshot
208+
### Restore from an Azure managed disk snapshot
209209

210-
Although `azacsnap` is currently missing the `-c restore` option for Azure Managed Disks, it's possible to restore manually as follows:
210+
Although `azacsnap` is currently missing the `-c restore` option for Azure managed disks, it's possible to restore manually as follows:
211211

212212
1. Create disks from the snapshots via the Azure portal.
213213

articles/azure-netapp-files/volume-hard-quota-guidelines.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Many customers have requested direct control over provisioned capacity. They wan
2828

2929
## What is the volume hard quota change
3030

31-
With the volume hard quota change, Azure NetApp Files volumes are no longer thinly provisioned at (the maximum) 100 TiB. The volumes are provisioned at the actual configured size (quota). Also, the underlying capacity pools no longer automatically grow upon reaching full-capacity consumption. This change reflects the behavior like Azure Managed Disks, which are also provisioned as-is, without automatic capacity increase.
31+
With the volume hard quota change, Azure NetApp Files volumes are no longer thinly provisioned at (the maximum) 100 TiB. The volumes are provisioned at the actual configured size (quota). Also, the underlying capacity pools no longer automatically grow upon reaching full-capacity consumption. This change reflects the behavior like Azure managed disks, which are also provisioned as-is, without automatic capacity increase.
3232

3333
For example, consider an Azure NetApp Files volume configured at 1-TiB size (quota) on a 4-TiB Ultra service level capacity pool. An application is continuously writing data to the volume.
3434

articles/azure-resource-manager/management/azure-subscription-service-limits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ See the following documentation to learn more about encryption restrictions:
529529
- [Linux](/azure/virtual-machines/disk-encryption#restrictions)
530530
- [Windows](/azure/virtual-machines/disk-encryption#restrictions) virtual machines
531531

532-
### Azure Managed Disks
532+
### Azure managed disks
533533

534534
[!INCLUDE [azure-storage-limits-vm-disks-managed](~/reusable-content/ce-skilling/azure/includes/azure-storage-limits-vm-disks-managed.md)]
535535

articles/backup/azure-backup-architecture-for-sap-hana-backup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ This section provides you with an understanding about the backup process of an H
146146
147147
### Backup architecture for database instance snapshot
148148

149-
Azure Backup integrates Azure Managed Disk full or incremental snapshots with HANA snapshot commands to deliver instant backup and recovery capabilities for HANA.
149+
Azure Backup integrates Azure managed disk full or incremental snapshots with HANA snapshot commands to deliver instant backup and recovery capabilities for HANA.
150150

151151
**SAP HANA database instance snapshot backup**
152152

articles/backup/backup-architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ Azure VMs use disks to store their operating system, apps, and data. Each Azure
199199

200200
For more information about disk storage and the available disk types for VMs, see these articles:
201201

202-
- [Azure Managed Disks for Linux VMs](/azure/virtual-machines/managed-disks-overview)
202+
- [Azure managed disks for Linux VMs](/azure/virtual-machines/managed-disks-overview)
203203
- [Available disk types for VMs](/azure/virtual-machines/disks-types)
204204

205205
### Back up and restore Azure VMs with premium storage

articles/backup/backup-azure-vm-backup-faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ sections:
235235
answer: Yes. Even if you delete the VM, you can go to the corresponding backup item in the vault and [restore from a recovery point](backup-azure-arm-restore-vms.md#select-a-restore-point).
236236

237237
- question: How do I restore a VM to the same availability sets?
238-
answer: For Managed Disk Azure VMs, restoring to the availability sets is enabled by providing an option in the template while restoring as managed disks. This template has the input parameter called **Availability sets**.
238+
answer: For managed disk Azure VMs, restoring to the availability sets is enabled by providing an option in the template while restoring as managed disks. This template has the input parameter called **Availability sets**.
239239

240240
- question: How do we get faster restore performance?
241241
answer: |

articles/backup/disk-backup-overview.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Consider Azure Disk Backup in scenarios where:
5252

5353
## How the backup and restore process works
5454

55-
- The first step in configuring backup for Azure Managed Disks is creating a [Backup vault](backup-vault-overview.md). The vault gives you a consolidated view of the backups configured across different workloads. Azure Disk backup supports only Operational Tier backup. Copying of backups to the vault storage tier is not supported. So, the Backup vault storage redundancy setting (LRS/GRS) doesn't apply to the backups stored in Operational Tier.
55+
- The first step in configuring backup for Azure managed disks is creating a [Backup vault](backup-vault-overview.md). The vault gives you a consolidated view of the backups configured across different workloads. Azure Disk backup supports only Operational Tier backup. Copying of backups to the vault storage tier is not supported. So, the Backup vault storage redundancy setting (LRS/GRS) doesn't apply to the backups stored in Operational Tier.
5656

5757
- Then create a Backup policy that allows you to configure backup frequency and retention duration.
5858

@@ -97,9 +97,9 @@ So, if the policy is for *n* snapshots, you can find *n+1* snapshots at times. F
9797

9898
Azure Backup uses [incremental snapshots](/azure/virtual-machines/disks-incremental-snapshots) of the managed disk. Incremental snapshots are charged per GiB of the storage occupied by the delta changes since the last snapshot. For example, if you're using a managed disk with a provisioned size of 128 GiB, with 100 GiB used, the first incremental snapshot is billed only for the used size of 100 GiB. 20 GiB of data is added on the disk before you create the second snapshot. Now, the second incremental snapshot is billed for only 20 GiB.
9999

100-
Incremental snapshots are always stored on standard storage, irrespective of the storage type of parent-managed disks, and are charged based on the pricing of standard storage. For example, incremental snapshots of a Premium SSD-Managed Disk are stored on standard storage. By default, they are stored on ZRS in regions that support ZRS. Otherwise, they are stored on locally redundant storage (LRS). The per GiB pricing of both the options, LRS and ZRS, is the same.
100+
Incremental snapshots are always stored on standard storage, irrespective of the storage type of parent-managed disks, and are charged based on the pricing of standard storage. For example, incremental snapshots of a Premium SSD-managed disk are stored on standard storage. By default, they are stored on ZRS in regions that support ZRS. Otherwise, they are stored on locally redundant storage (LRS). The per GiB pricing of both the options, LRS and ZRS, is the same.
101101

102-
The snapshots created by Azure Backup are stored in the resource group within your Azure subscription and incur Snapshot Storage charges. For more details about the snapshot pricing, see [Managed Disk Pricing](https://azure.microsoft.com/pricing/details/managed-disks/). Because the snapshots aren't copied to the Backup Vault, Azure Backup doesn't charge a Protected Instance fee and Backup Storage cost doesn't apply.
102+
The snapshots created by Azure Backup are stored in the resource group within your Azure subscription and incur Snapshot Storage charges. For more details about the snapshot pricing, see [managed disk Pricing](https://azure.microsoft.com/pricing/details/managed-disks/). Because the snapshots aren't copied to the Backup Vault, Azure Backup doesn't charge a Protected Instance fee and Backup Storage cost doesn't apply.
103103

104104
The number of recovery points is determined by the Backup policy used to configure backups of the disk backup instances. Older block blobs are deleted according to the garbage collection process as the corresponding older recovery points are pruned.
105105

@@ -110,6 +110,6 @@ The number of recovery points is determined by the Backup policy used to configu
110110

111111
## Related content
112112

113-
- [Create a Backup policy for Azure Managed Disk using REST API](backup-azure-dataprotection-use-rest-api-create-update-disk-policy.md).
114-
- [Configure backup for Azure Managed Disk using REST API](backup-azure-dataprotection-use-rest-api-backup-disks.md).
115-
- [Restore Azure Managed Disk using REST API](backup-azure-dataprotection-use-rest-api-restore-disks.md).
113+
- [Create a Backup policy for Azure managed disk using REST API](backup-azure-dataprotection-use-rest-api-create-update-disk-policy.md).
114+
- [Configure backup for Azure managed disk using REST API](backup-azure-dataprotection-use-rest-api-backup-disks.md).
115+
- [Restore Azure managed disk using REST API](backup-azure-dataprotection-use-rest-api-restore-disks.md).

articles/backup/disk-backup-support-matrix.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Azure Disk Backup is available in all public cloud and Sovereign cloud regions.
2222

2323
## Limitations
2424

25-
- Azure Disk Backup is supported for Azure Managed Disks (Standard HDD, Standard SSD and Premium SSD, Premium SSD v2 disks, and Ultra Disks), including shared disks (Shared Premium SSDs). Unmanaged disks aren't supported.
25+
- Azure Disk Backup is supported for Azure managed disks (Standard HDD, Standard SSD and Premium SSD, Premium SSD v2 disks, and Ultra Disks), including shared disks (Shared Premium SSDs). Unmanaged disks aren't supported.
2626

2727
>[!Note]
2828
>- For Azure Disks belonging to Standard HDD, Standard SSD, and Premium SSD SKUs, you can define the backup schedule with *Hourly* frequency (of 1, 2, 4, 6, 8, or 12 hours) and *Daily* frequency.
@@ -33,11 +33,11 @@ Azure Disk Backup is available in all public cloud and Sovereign cloud regions.
3333
3434
- Azure Disk Backup supports backup of Write Accelerator disk. However, during restore the disk would be restored as a normal disk. Write Accelerated cache can be enabled on the disk after mounting it to a VM.
3535

36-
- Azure Backup provides operational (snapshot) tier backup of Azure Managed Disks with support for multiple backups per day. The backups aren't copied to the backup vault.
36+
- Azure Backup provides operational (snapshot) tier backup of Azure managed disks with support for multiple backups per day. The backups aren't copied to the backup vault.
3737

3838
- Currently, the Original-Location Recovery (OLR) option to restore by replacing existing source disks from where the backups were taken isn't supported. You can restore from recovery point to create a new disk either in the same resource group as that of the source disk from where the backups were taken or in any other resource group. This is known as Alternate-Location Recovery (ALR).
3939

40-
- Azure Backup for Managed Disks uses incremental snapshots, which are limited to 500 snapshots per disk. To allow you to take on-demand backup aside from scheduled backups, Backup policy limits the total backups to 420. Learn more about [incremental snapshot](/azure/virtual-machines/disks-incremental-snapshots#restrictions) for managed disks.
40+
- Azure Backup for managed disks uses incremental snapshots, which are limited to 500 snapshots per disk. To allow you to take on-demand backup aside from scheduled backups, Backup policy limits the total backups to 420. Learn more about [incremental snapshot](/azure/virtual-machines/disks-incremental-snapshots#restrictions) for managed disks.
4141

4242
- You can either set a maximum retention limit of 1 year or 450 disk snapshots, whichever reaches first. For example, if you have opted for a backup frequency of 12 hours, then you can retain each recovery point for maximum 225 days as the snapshot limit will be breached beyond that.
4343

@@ -82,10 +82,10 @@ Azure Disk Backup is available in all public cloud and Sovereign cloud regions.
8282

8383
## Next steps
8484

85-
[Back up Azure Managed Disks](backup-managed-disks.md).
85+
[Back up Azure managed disks](backup-managed-disks.md).
8686

8787
## Related content
8888

89-
- [Create a Backup policy for Azure Managed Disk using REST API](backup-azure-dataprotection-use-rest-api-create-update-disk-policy.md).
90-
- [Configure backup for Azure Managed Disk using REST API](backup-azure-dataprotection-use-rest-api-backup-disks.md).
91-
- [Restore Azure Managed Disk using REST API](backup-azure-dataprotection-use-rest-api-restore-disks.md).
89+
- [Create a Backup policy for Azure managed disk using REST API](backup-azure-dataprotection-use-rest-api-create-update-disk-policy.md).
90+
- [Configure backup for Azure managed disk using REST API](backup-azure-dataprotection-use-rest-api-backup-disks.md).
91+
- [Restore Azure managed disk using REST API](backup-azure-dataprotection-use-rest-api-restore-disks.md).

0 commit comments

Comments
 (0)