Skip to content

Commit b29d6e2

Browse files
Merge pull request #312355 from MicrosoftDocs/main
Auto Publish – main to live - 2026-02-26 12:00 UTC
2 parents 2bce9ec + 0384ff5 commit b29d6e2

159 files changed

Lines changed: 417 additions & 376 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/manage-file-access-logs.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ Availability for file access log is limited to the following regions:
9393
- East US 2
9494
- France Central
9595
- Germany North
96+
- Israel Central
9697
- Italy North
9798
- Japan East
9899
- Japan West

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
@@ -527,7 +527,7 @@ See the following documentation to learn more about encryption restrictions:
527527
- [Linux](/azure/virtual-machines/disk-encryption#restrictions)
528528
- [Windows](/azure/virtual-machines/disk-encryption#restrictions) virtual machines
529529

530-
### Azure-managed virtual machine disks
530+
### Azure Managed Disks
531531

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

articles/azure-vmware/set-up-backup-server-for-azure-vmware-solution.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Ensure that you [configure networking for your VMware private cloud in Azure](tu
6969

7070
### Determine the size of the VM
7171

72-
Use the [MABS Capacity Planner](https://www.microsoft.com/en-us/download/details.aspx?id=54301) to determine the correct VM size. Based on your inputs, the capacity planner gives you the required memory size and CPU core count. Use this information to choose the appropriate Azure VM size. The capacity planner also provides total disk size required for the VM along with the required disk IOPS. We recommend using a standard SSD disk for the VM. By pooling more than one SSD, you can achieve the required IOPS.
72+
Use the [MABS Capacity Planner](https://www.microsoft.com/en-us/download/details.aspx?id=54301) to determine the correct VM size. Based on your inputs, the capacity planner gives you the required memory size and CPU core count. Use this information to choose the appropriate Azure VM size. The capacity planner also provides total disk size required for the VM along with the required disk IOPS. We recommend using a Standard SSD for the VM. By pooling more than one SSD, you can achieve the required IOPS.
7373

7474
Follow the instructions in the [Create your first Windows VM in the Azure portal](/azure/virtual-machines/windows/quick-create-portal) tutorial. You created the VM in the virtual network that you created in the previous step. Start with a gallery image of Windows Server 2019 Datacenter to run the Azure Backup Server.
7575

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ This section provides you with an understanding about the backup process of an H
7373

7474
1. Once SAP HANA Backup Engine/Backint receives the backup request, it prepares the SAP HANA database for a backup by creating a save point, and moving data to underlying storage volumes.
7575

76-
1. Backint then executes the read operation from the underlying data volumes – the index server and XS engine for the Tenant database and name server for the SYSTEMDB. Premium SSD disks can provide optimal I/O throughput for the backup streaming operation. However, using uncached disks with M64Is can provide higher speeds.
76+
1. Backint then executes the read operation from the underlying data volumes – the index server and XS engine for the Tenant database and name server for the SYSTEMDB. Premium SSDs can provide optimal I/O throughput for the backup streaming operation. However, using uncached disks with M64Is can provide higher speeds.
7777

7878
1. To stream the backup data, Backint creates up to three pipes, which directly write to Recovery Services vault of Azure Backup.
7979

@@ -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: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,18 +187,18 @@ Azure VMs use disks to store their operating system, apps, and data. Each Azure
187187

188188
- VHDs are stored as page blobs in standard or premium storage accounts in Azure:
189189
- **Standard storage:** Reliable, low-cost disk support for VMs running workloads that aren't sensitive to latency. Standard storage can use standard solid-state drive (SSD) disks or standard hard disk drive (HDD) disks.
190-
- **Premium storage:** High-performance disk support. Uses premium SSD disks.
190+
- **Premium storage:** High-performance disk support. Uses Premium SSDs.
191191
- There are different performance tiers for disks:
192-
- **Standard HDD disk:** Backed by HDDs, and used for cost-effective storage.
193-
- **Standard SSD disk:** Combines elements of premium SSD disks and standard HDD disks. Offers more consistent performance and reliability than HDD, but still cost-effective.
194-
- **Premium SSD disk:** Backed by SSDs, and provides high-performance and low-latency for VMs that are running I/O-intensive workloads.
192+
- **Standard HDD:** Backed by HDDs, and used for cost-effective storage.
193+
- **Standard SSD:** Combines elements of Premium SSDs and Standard HDDs. Offers more consistent performance and reliability than HDD, but still cost-effective.
194+
- **Premium SSD:** Backed by SSDs, and provides high-performance and low-latency for VMs that are running I/O-intensive workloads.
195195
- Disks can be managed or unmanaged:
196196
- **Unmanaged disks:** Traditional type of disks used by VMs. For these disks, you create your own storage account and specify it when you create the disk. You then need to figure out how to maximize storage resources for your VMs.
197197
- **Managed disks:** Azure creates and manages the storage accounts for you. You specify the disk size and performance tier, and Azure creates managed disks for you. As you add disks and scale VMs, Azure handles the storage accounts.
198198

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

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

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

articles/backup/backup-azure-arm-restore-vms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ To begin using the feature, read the [Before You Begin section](./backup-create-
227227
To see if CRR is enabled, follow the instructions in [Configure Cross Region Restore](backup-create-rs-vault.md#set-cross-region-restore).
228228

229229
>[!Note]
230-
>Cross-region restore is currently not supported for machines running on Ultra disks. [Learn more about Ultra disk backup supportability](backup-support-matrix-iaas.md#ultra-disk-backup).
230+
>Cross-region restore is currently not supported for machines running on Ultra Disks. [Learn more about Ultra Disk backup supportability](backup-support-matrix-iaas.md#ultra-disk-backup).
231231
232232
### View backup items in secondary region
233233

0 commit comments

Comments
 (0)