Skip to content

Commit d5c723b

Browse files
roygararoygara
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into cmkGA
2 parents 372fc59 + b5fb335 commit d5c723b

9 files changed

+16
-15
lines changed

‎articles/mysql/concepts-azure-ad-authentication.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Active Directory authentication - Azure Database for MySQL - Single Server
3-
description: Learn about the concepts of Azure Active Directory for authentication with Azure Database for MySQL - Single Server
2+
title: Active Directory authentication - Azure Database for MySQL
3+
description: Learn about the concepts of Azure Active Directory for authentication with Azure Database for MySQL
44
author: lfittl-msft
55
ms.author: lufittl
66
ms.service: mysql

‎articles/mysql/concepts-data-encryption-mysql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Azure Database for MySQL data encryption with a customer-managed key
2+
title: Data encryption with customer-managed key - Azure Database for MySQL
33
description: Azure Database for MySQL data encryption with a customer-managed key enables you to Bring Your Own Key (BYOK) for data protection at rest. It also allows organizations to implement separation of duties in the management of keys and data.
44
author: kummanish
55
ms.author: manishku

‎articles/mysql/howto-configure-sign-in-azure-ad-authentication.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Use Azure Active Directory - Azure Database for MySQL - Single Server
3-
description: Learn about how to set up Azure Active Directory (Azure AD) for authentication with Azure Database for MySQL - Single Server
2+
title: Use Azure Active Directory - Azure Database for MySQL
3+
description: Learn about how to set up Azure Active Directory (Azure AD) for authentication with Azure Database for MySQL
44
author: lfittl-msft
55
ms.author: lufittl
66
ms.service: mysql

‎articles/mysql/howto-data-encryption-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Data encryption for Azure Database for MySQL by using the Azure portal
2+
title: Data encryption - Azure portal - Azure Database for MySQL
33
description: Learn how to set up and manage data encryption for your Azure Database for MySQL by using the Azure portal.
44
author: kummanish
55
ms.author: manishku

‎articles/mysql/howto-data-encryption-troubleshoot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Troubleshoot data encryption in Azure Database for MySQL
2+
title: Troubleshoot data encryption - Azure Database for MySQL
33
description: Learn how to troubleshoot data encryption in Azure Database for MySQL
44
author: kummanish
55
ms.author: manishku

‎articles/postgresql/concepts-data-encryption-postgresql.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Azure Database for PostgreSQL Single server data encryption with a customer-managed key
2+
title: Data encryption with customer-managed key - Azure Database for PostgreSQL - Single server
33
description: Azure Database for PostgreSQL Single server data encryption with a customer-managed key enables you to Bring Your Own Key (BYOK) for data protection at rest. It also allows organizations to implement separation of duties in the management of keys and data.
44
author: kummanish
55
ms.author: manishku
@@ -27,9 +27,9 @@ Key Vault is a cloud-based, external key management system. It's highly availabl
2727
Data encryption for Azure Database for PostgreSQL Single server provides the following benefits:
2828

2929
* Data-access is fully controlled by you by the ability to remove the key and making the database inaccessible
30-
* Full control over the key-lifecycle, including rotation of the key to align with corporate policies
31-
* Central management and organization of keys in Azure Key Vault
32-
* Ability to implement separation of duties between security officers, and DBA and system administrators
30+
* Full control over the key-lifecycle, including rotation of the key to align with corporate policies
31+
* Central management and organization of keys in Azure Key Vault
32+
* Ability to implement separation of duties between security officers, and DBA and system administrators
3333

3434
## Terminology and description
3535

‎articles/postgresql/howto-data-encryption-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Data encryption for Azure Database for PostgreSQL Single server by using the Azure portal
2+
title: Data encryption - Azure portal - for Azure Database for PostgreSQL - Single server
33
description: Learn how to set up and manage data encryption for your Azure Database for PostgreSQL Single server by using the Azure portal.
44
author: kummanish
55
ms.author: manishku

‎articles/postgresql/howto-data-encryption-troubleshoot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Troubleshoot data encryption in Azure Database for PostgreSQL - Single Server
2+
title: Troubleshoot data encryption - Azure Database for PostgreSQL - Single Server
33
description: Learn how to troubleshoot the data encryption on your Azure Database for PostgreSQL - Single Server
44
author: kummanish
55
ms.author: manishku

‎articles/virtual-network/nat-gateway-resource.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ ms.devlang: na
1313
ms.topic: overview
1414
ms.tgt_pltfrm: na
1515
ms.workload: infrastructure-services
16-
ms.date: 03/04/2020
16+
ms.date: 03/12/2020
1717
ms.author: allensu
1818
---
1919

20-
# Designing virtual networks with NAT gateway resources (Public Preview)
20+
# Designing virtual networks with NAT gateway resources
2121

2222
NAT gateway resources are part of [Virtual Network NAT](nat-overview.md) and provide outbound Internet connectivity for one or more subnets of a virtual network. The subnet of the virtual network states which NAT gateway will be used. NAT provides source network address translation (SNAT) for a subnet. NAT gateway resources specify which static IP addresses virtual machines use when creating outbound flows. Static IP addresses come from public IP address resources, public IP prefix resources, or both. A NAT gateway resource can use up to 16 static IP addresses from either.
2323

@@ -349,6 +349,7 @@ We want to know how we can improve the service. Propose and vote on what we shou
349349
- [Azure CLI](./quickstart-create-nat-gateway-cli.md)
350350
- [PowerShell](./quickstart-create-nat-gateway-powershell.md)
351351
- [Portal](./quickstart-create-nat-gateway-portal.md)
352+
- [Template](./quickstart-create-nat-gateway-template.md)
352353
* Learn about NAT gateway resource API
353354
- [REST API](https://docs.microsoft.com/rest/api/virtualnetwork/natgateways)
354355
- [Azure CLI](https://docs.microsoft.com/cli/azure/network/nat/gateway?view=azure-cli-latest)

0 commit comments

Comments
 (0)