Skip to content

Commit acaadae

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into varund-jul
2 parents 0abd95b + c869dea commit acaadae

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

articles/cosmos-db/online-backup-and-restore.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,14 @@ There are two backup modes:
2929
3030
For Azure Synapse Link enabled accounts, analytical store data isn't included in the backups and restores. When Azure Synapse Link is enabled, Azure Cosmos DB will continue to automatically take backups of your data in the transactional store at a scheduled backup interval. Within an analytical store, automatic backup and restore of your data isn't supported at this time.
3131

32+
## Immutability of Cosmos DB backups
33+
Cosmos DB backups are completely managed by the platform. Actions like restore, update backup retention or redundancy change are controlled via permission model managed by database account administrator. Cosmos DB backups are not exposed to any human actors, customers or any other module for listing, deletion, or disabling of backups. The backups are encrypted and stored in storage accounts secured by rotating certificate-based access. These backups are only accessed by restore module to restore specific backup nondestructively when a customer initiates a restore. These actions are logged and audited regularly. Backups kept under retention policy are:
34+
* Not alterable (no modifications are permitted to the backups).
35+
* Not allowed to be re-encrypted.
36+
* Not allowed to be deleted.
37+
* Not allowed to be disabled
38+
Customers who chose [CMK (customer managed key)](how-to-setup-customer-managed-keys.md), their data and backup have protection through envelope encryption."
39+
3240
## Frequently asked questions
3341

3442
### Can I restore from an account A in subscription S1 to account B in a subscription S2?

articles/vpn-gateway/create-routebased-vpn-gateway-powershell.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Learn how to create a route-based virtual network gateway for a VPN
55
author: cherylmc
66
ms.service: vpn-gateway
77
ms.topic: how-to
8-
ms.date: 03/12/2024
8+
ms.date: 05/07/2024
99
ms.author: cherylmc
1010
ms.custom: devx-track-azurepowershell
1111
---
@@ -88,7 +88,7 @@ $vnet | Set-AzVirtualNetwork
8888

8989
## <a name="PublicIP"></a>Request a public IP address
9090

91-
A VPN gateway must have an allocated public IP address. When you create a connection to a VPN gateway, this is the IP address that you specify. Use the following example to request a public IP address:
91+
A VPN gateway must have an allocated public IP address. When you create a connection to a VPN gateway, this is the IP address that you specify. Use the following example to request a public IP address. Note that if you want to create a VPN gateway using the Basic gateway SKU, use the following values when requesting a public IP address: `-AllocationMethod Dynamic -Sku Basic`.
9292

9393
```azurepowershell-interactive
9494
$gwpip = New-AzPublicIpAddress -Name "VNet1GWIP" -ResourceGroupName "TestRG1" -Location "EastUS" -AllocationMethod Static

articles/vpn-gateway/point-to-site-about.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ ms.author: cherylmc
1313

1414
A Point-to-Site (P2S) VPN gateway connection lets you create a secure connection to your virtual network from an individual client computer. A P2S connection is established by starting it from the client computer. This solution is useful for telecommuters who want to connect to Azure VNets from a remote location, such as from home or a conference. P2S VPN is also a useful solution to use instead of S2S VPN when you have only a few clients that need to connect to a VNet. This article applies to the [Resource Manager deployment model](../azure-resource-manager/management/deployment-models.md).
1515

16+
> [!NOTE]
17+
> Point-to-site configurations require a route-based VPN type. For more information about VPN types, see [About VPN Gateway settings](vpn-gateway-about-vpn-gateway-settings.md#vpntype).
18+
1619
## <a name="protocol"></a>What protocol does P2S use?
1720

1821
Point-to-site VPN can use one of the following protocols:

0 commit comments

Comments
 (0)