Skip to content

Commit 9edb520

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into privatelink-posh
2 parents d5af0a7 + 5f434cc commit 9edb520

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

articles/key-vault/certificates/overview-renew-certificate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,6 @@ For more information about creating a new CSR, see [Create and merge a CSR in Ke
7575
Azure Key Vault also handles autorenewal of self-signed certificates. To learn more about changing the issuance policy and updating a certificate's lifecycle attributes, see [Configure certificate autorotation in Key Vault](./tutorial-rotate-certificates.md#update-lifecycle-attributes-of-a-stored-certificate).
7676

7777
## Next steps
78-
- [Azure Key Vault certificate renewal frequently as questions](faq.yml)
78+
- [Azure Key Vault certificate renewal frequently asked questions](faq.yml)
7979
- [Integrate Key Vault with DigiCert certificate authority](how-to-integrate-certificate-authority.md)
8080
- [Tutorial: Configure certificate autorotation in Key Vault](tutorial-rotate-certificates.md)

articles/mysql/flexible-server/concepts-customer-managed-key.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.topic: conceptual
1414

1515
[!INCLUDE[applies-to-mysql-flexible-server](../includes/applies-to-mysql-flexible-server.md)]
1616

17-
With data encryption with customer-managed keys for Azure Database for MySQL - Flexible Server Preview, you can bring your own key (BYOK) for data protection at rest and implement separation of duties for managing keys and data. With customer managed keys (CMKs), the customer is responsible for and ultimately controls the key lifecycle management (key creation, upload, rotation, deletion), key usage permissions, and auditing operations on keys.
17+
With data encryption with customer-managed keys for Azure Database for MySQL - Flexible Server, you can bring your own key (BYOK) for data protection at rest and implement separation of duties for managing keys and data. With customer managed keys (CMKs), the customer is responsible for and ultimately controls the key lifecycle management (key creation, upload, rotation, deletion), key usage permissions, and auditing operations on keys.
1818

1919
## Benefits
2020

@@ -139,7 +139,7 @@ For Azure Database for MySQL flexible server, the support for encryption of data
139139

140140
## Next steps
141141

142-
- [Data encryption with Azure CLI (Preview)](how-to-data-encryption-cli.md)
143-
- [Data encryption with Azure portal (Preview)](how-to-data-encryption-portal.md)
142+
- [Data encryption with Azure CLI](how-to-data-encryption-cli.md)
143+
- [Data encryption with Azure portal](how-to-data-encryption-portal.md)
144144
- [Security in encryption rest](../../security/fundamentals/encryption-atrest.md)
145-
- [Active Directory authentication (Preview)](concepts-azure-ad-authentication.md)
145+
- [Active Directory authentication](concepts-azure-ad-authentication.md)

articles/mysql/flexible-server/how-to-data-encryption-cli.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.topic: how-to
1414

1515
[!INCLUDE[applies-to-mysql-flexible-server](../includes/applies-to-mysql-flexible-server.md)]
1616

17-
This tutorial shows you how to set up and manage data encryption for your Azure Database for MySQL - Flexible Server using Azure CLI preview.
17+
This tutorial shows you how to set up and manage data encryption for your Azure Database for MySQL - Flexible Server using Azure CLI.
1818

1919
In this tutorial, you learn how to:
2020

@@ -254,5 +254,5 @@ The params **identityUri** and **primaryKeyUri** are the resource ID of the user
254254

255255
## Next steps
256256

257-
- [Customer managed keys data encryption (Preview)](concepts-customer-managed-key.md)
258-
- [Data encryption with Azure portal (Preview)](how-to-data-encryption-portal.md)
257+
- [Customer managed keys data encryption](concepts-customer-managed-key.md)
258+
- [Data encryption with Azure portal](how-to-data-encryption-portal.md)

articles/mysql/flexible-server/how-to-data-encryption-portal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,5 @@ After your Azure Database for MySQL flexible server is encrypted with a customer
9595
9696
## Next steps
9797

98-
- [Customer managed keys data encryption (Preview)](concepts-customer-managed-key.md)
99-
- [Data encryption with Azure CLI (Preview)](how-to-data-encryption-cli.md)
98+
- [Customer managed keys data encryption](concepts-customer-managed-key.md)
99+
- [Data encryption with Azure CLI](how-to-data-encryption-cli.md)

0 commit comments

Comments
 (0)