Skip to content

Commit d982352

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into diskBilling
2 parents 5f6287f + 4071e69 commit d982352

8 files changed

+11
-11
lines changed

articles/backup/backup-azure-mysql-flexible-server-about.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Overview - retention of Azure Database for MySQL - Flexible Server for long term by using Azure Backup
33
description: This article provides an overview of Azure Database for MySQL - Flexible Server retention for long term.
44
ms.topic: overview
5-
ms.date: 02/16/2024
5+
ms.date: 03/08/2024
66
ms.service: backup
77
ms.custom: engagement-fy23
88
author: AbhishekMallick-MS

articles/backup/backup-azure-mysql-flexible-server-restore.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Restore the Azure Database for MySQL - Flexible Server by using Azure Backup
33
description: Learn how to restore the Azure Database for MySQL - Flexible Server.
44
ms.topic: how-to
5-
ms.date: 02/16/2024
5+
ms.date: 03/08/2024
66
author: AbhishekMallick-MS
77
ms.author: v-abhmallick
88
---

articles/backup/backup-azure-mysql-flexible-server-support-matrix.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Support matrix for Azure Database for MySQL - Flexible Server retention for long term by using Azure Backup
33
description: Provides a summary of support settings and limitations when backing up Azure Database for MySQL - Flexible Server.
44
ms.topic: conceptual
5-
ms.date: 02/16/2024
5+
ms.date: 03/08/2024
66
ms.custom: references_regions
77
ms.service: backup
88
author: AbhishekMallick-MS

articles/backup/backup-azure-mysql-flexible-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Back up the Azure Database for MySQL - Flexible Server by using Azure Backup
33
description: Learn how to back up the Azure Database for MySQL - Flexible Server.
44
ms.topic: how-to
5-
ms.date: 02/16/2024
5+
ms.date: 03/08/2024
66
author: AbhishekMallick-MS
77
ms.author: v-abhmallick
88
---

articles/backup/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ metadata:
1212
ms.topic: landing-page
1313
author: AbhishekMallick-MS
1414
ms.author: v-abhmallick
15-
ms.date: 02/16/2024
15+
ms.date: 03/08/2024
1616

1717
# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
1818

articles/backup/whats-new.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: What's new in Azure Backup
33
description: Learn about the new features in the Azure Backup service.
44
ms.topic: conceptual
5-
ms.date: 02/16/2024
5+
ms.date: 03/08/2024
66
ms.service: backup
77
ms.custom:
88
- ignite-2023
@@ -19,7 +19,7 @@ You can learn more about the new releases by bookmarking this page or by [subscr
1919
## Updates summary
2020

2121

22-
- February 2024
22+
- March 2024
2323
- [Support for long-term Retention for Azure Database for MySQL - Flexible Server (preview)](#support-for-long-term-retention-for-azure-database-for-mysql---flexible-server-preview)
2424
- January 2024
2525
- [Cross Region Restore support for PostgreSQL by using Azure Backup is now generally available](#cross-region-restore-support-for-postgresql-by-using-azure-backup-is-now-generally-available)

articles/key-vault/general/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Access to a key vault requires proper authentication and authorization before a
4141

4242
Authentication is done via Microsoft Entra ID. Authorization may be done via Azure role-based access control (Azure RBAC) or Key Vault access policy. Azure RBAC can be used for both management of the vaults and to access data stored in a vault, while key vault access policy can only be used when attempting to access data stored in a vault.
4343

44-
Azure Key Vaults may be either software-protected or, with the Azure Key Vault Premium tier, hardware-protected by hardware security modules (HSMs). Software-protected keys, secrets, and certificates are safeguarded by Azure, using industry-standard algorithms and key lengths. For situations where you require added assurance, you can import or generate keys in HSMs that never leave the HSM boundary. Azure Key Vault uses nCipher HSMs, which are [Federal Information Processing Standards 140 validated](/azure/key-vault/keys/about-keys#compliance). You can use HSM vendor provided tools to move a key from your HSM to Azure Key Vault.
44+
Azure Key Vaults may be either software-protected or, with the Azure Key Vault Premium tier, hardware-protected by hardware security modules (HSMs). Software-protected keys, secrets, and certificates are safeguarded by Azure, using industry-standard algorithms and key lengths. For situations where you require added assurance, you can import or generate keys in HSMs that never leave the HSM boundary. Azure Key Vault uses [Federal Information Processing Standard 140 validated HSMs](/azure/key-vault/keys/about-keys#compliance). You can use HSM vendor provided tools to move a key from your HSM to Azure Key Vault.
4545

4646
Finally, Azure Key Vault is designed so that Microsoft doesn't see or extract your data.
4747

articles/key-vault/keys/about-keys-details.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ For more information on JWK objects, see [JSON Web Key (JWK)](https://tools.ietf
109109

110110
Key vault key auto-rotation can be set by configuring key auto-rotation policy. It is only available on Key Vault resource.
111111

112-
- **Get Rotation Policy**: Retrieve rotation policy configuration
113-
- **Set Rotation Policy**: Set rotation policy configuration
112+
- **Get Rotation Policy**: Retrieve rotation policy configuration.
113+
- **Set Rotation Policy**: Set rotation policy configuration.
114114

115115
## Key attributes
116116

@@ -126,7 +126,7 @@ There are more read-only attributes that are included in any response that inclu
126126
- *updated*: IntDate, optional. The *updated* attribute indicates when this version of the key was updated. The value is null for keys that were last updated prior to the addition of this attribute. Its value MUST be a number containing an IntDate value.
127127
- *hsmPlatform*: string, optional. The underlying HSM Platform that is protecting a key.
128128
- A hsmPlatform value of 2 means the key is protected by our latest FIPS 140 Level 3 validated HSM platform.
129-
- A hsmPlatform value of 1 means the key is protected by our previous FIPS 140 Level 2 HSM platform using nCipher HSMs.
129+
- A hsmPlatform value of 1 means the key is protected by our previous FIPS 140 Level 2 validated HSM platform.
130130
- A hsmPlatform value of 0 means the key is protected by a FIPS 140 Level 1 HSM software cryptographic module.
131131
- if this is not set by a Managed HSM pool, it is protected by our latest FIPS 140 Level 3 validated HSM platform.
132132

0 commit comments

Comments
 (0)