Skip to content

Commit cf52290

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into pr/296761
2 parents 77de77b + 81fbc47 commit cf52290

File tree

95 files changed

+149
-240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+149
-240
lines changed

articles/active-directory-b2c/partner-eid-me.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ You can add more identity claims that eID-Me supports.
250250
2. Find the `BuildingBlocks` element.
251251

252252
> [!NOTE]
253-
> Find supported eID-Me identity claims lists on [OID repository](https://oid-rep.orange-labs.fr/get/1.3.6.1.4.1.50715) with OIDC identifiers on [well-known/openid-configuration](https://eid-me.bluink.ca/.well-known/openid-configuration).
253+
> Find supported eID-Me identity claims lists on [OID repository](https://oid-base.com/get/1.3.6.1.4.1.12356.101.2.0.1102) with OIDC identifiers on [well-known/openid-configuration](https://eid-me.bluink.ca/.well-known/openid-configuration).
254254
255255
```xml
256256
<BuildingBlocks>

articles/api-management/inject-vnet-v2.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: dlepow
55
ms.author: danlep
66
ms.service: azure-api-management
77
ms.topic: how-to
8-
ms.date: 11/18/2024
8+
ms.date: 03/20/2025
99
---
1010

1111
# Inject an Azure API Management instance in a private virtual network - Premium v2 tier
@@ -14,6 +14,9 @@ ms.date: 11/18/2024
1414

1515
This article guides you through the requirements to inject your Azure API Management Premium v2 (preview) instance in a virtual network.
1616

17+
> [!NOTE]
18+
> The Premium v2 tier is currently in limited preview. To sign up, fill [this form](https://aka.ms/premiumv2).
19+
1720
> [!NOTE]
1821
> To inject a classic Developer or Premium tier instance in a virtual network, the requirements and configuration are different. [Learn more](virtual-network-injection-resources.md).
1922
@@ -54,7 +57,7 @@ If you want to enable *public* inbound access to an API Management instance in t
5457

5558
### Network security group
5659

57-
A network security group must be associated with the subnet.
60+
A network security group must be associated with the subnet. No specific rules are required. To set up a network security group, see [Create a network security group](../virtual-network/manage-network-security-group.md).
5861

5962
### Subnet delegation
6063

articles/api-management/integrate-vnet-outbound.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: dlepow
55
ms.author: danlep
66
ms.service: azure-api-management
77
ms.topic: how-to
8-
ms.date: 11/18/2024
8+
ms.date: 03/20/2025
99
---
1010

1111
# Integrate an Azure API Management instance with a private virtual network for outbound connections
@@ -48,7 +48,7 @@ If you want to inject a Premium v2 API Management instance into a virtual networ
4848

4949
### Network security group
5050

51-
A network security group must be associated with the subnet.
51+
A network security group must be associated with the subnet. No specific rules are required. To set up a network security group, see [Create a network security group](../virtual-network/manage-network-security-group.md).
5252

5353
### Subnet delegation
5454

articles/app-service/configure-language-python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.reviewer: astay
77
ms.author: msangapu
88
author: msangapu-msft
99
ms.devlang: python
10-
ms.custom: mvc, devx-track-python, devx-track-azurecli, mode-other, py-fresh-zinc, linux-related-content
10+
ms.custom: mvc, devx-track-python, devx-track-azurecli, mode-other, py-fresh-zinc, linux-related-content, innovation-engine
1111
adobe-target: true
1212
---
1313

articles/azure-netapp-files/configure-customer-managed-keys.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: b-ahibbard
66
ms.service: azure-netapp-files
77
ms.topic: how-to
88
ms.custom: references_regions, devx-track-azurecli, devx-track-azurepowershell
9-
ms.date: 01/28/2025
9+
ms.date: 03/21/2025
1010
ms.author: anfdocs
1111
---
1212

@@ -31,7 +31,6 @@ The following diagram demonstrates how customer-managed keys work with Azure Net
3131
* To create a volume using customer-managed keys, you must select the *Standard* network features. You can't use customer-managed key volumes with volume configured using Basic network features. Follow instructions in to [Set the Network Features option](configure-network-features.md#set-the-network-features-option) in the volume creation page.
3232
* For increased security, you can select the **Disable public access** option within the network settings of your key vault. When selecting this option, you must also select **Allow trusted Microsoft services to bypass this firewall** to permit the Azure NetApp Files service to access your encryption key.
3333
* Customer-managed keys support automatic Managed System Identity (MSI) certificate renewal. If your certificate is valid, you don't need to manually update it.
34-
* Applying Azure network security groups on the private link subnet to Azure Key Vault isn't supported for Azure NetApp Files customer-managed keys. Network security groups don't affect connectivity to Private Link unless `Private endpoint network policy` is enabled on the subnet. It's _required_ to keep this option disabled.
3534
* If Azure NetApp Files fails to create a customer-managed key volume, error messages are displayed. For more information, see [Error messages and troubleshooting](#error-messages-and-troubleshooting).
3635
* Do not make any changes to the underlying Azure Key Vault or Azure Private Endpoint after creating a customer-managed keys volume. Making changes can make the volumes inaccessible.
3736
* Azure NetApp Files supports the ability to [transition existing volumes from platform-managed keys (PMK) to customer-managed keys (CMK) without data migration](#transition-volumes). This provides flexibility with the encryption key lifecycle (renewals, rotations) and extra security for regulated industry requirements.

articles/azure-netapp-files/configure-network-features.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Two settings are available for network features:
2020
* ***Standard***
2121
This setting enables VNet features for the volume.
2222

23-
If you need higher IP limits or VNet features such as [network security groups (NSGs)](../virtual-network/network-security-groups-overview.md), [user-defined routes](../virtual-network/virtual-networks-udr-overview.md#user-defined), or additional connectivity patterns, you should set **Network Features** to *Standard*.
23+
If you need higher IP limits or VNet features such as [network security groups (NSGs)](../virtual-network/network-security-groups-overview.md), [user-defined routes](../virtual-network/virtual-networks-udr-overview.md#user-defined), or additional connectivity patterns, set **Network Features** to *Standard*.
2424

2525
* ***Basic***
2626
This setting provides reduced IP limits (<1000) and no additional VNet features for the volumes.

articles/azure-netapp-files/data-plane-security.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ Private endpoints are specialized network interfaces that facilitate a secure an
146146

147147
### Network security groups (NSGs)
148148

149-
NSGs are collections of security rules that govern inbound and outbound traffic to network interfaces, virtual machines (VMs), and subnets within Azure. These rules are instrumental in defining the access controls and traffic patterns within your network. NSGs are only supported when using the Standard network feature in Azure NetApp Files.
149+
NSGs are collections of security rules that govern inbound and outbound traffic to network interfaces, virtual machines (VMs), and subnets within Azure. These rules are instrumental in defining the access controls and traffic patterns within your network. NSGs are only supported when using Standard network features in Azure NetApp Files.
150150

151151
#### Security benefits
152152

articles/azure-netapp-files/default-individual-user-group-quotas-introduction.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ services: azure-netapp-files
55
author: b-hchen
66
ms.service: azure-netapp-files
77
ms.topic: conceptual
8-
ms.date: 02/23/2023
8+
ms.date: 03/21/2025
99
ms.author: anfdocs
1010
---
1111
# Understand default and individual user and group quotas
@@ -110,7 +110,7 @@ In the following scenario, users `user4` and `user5` are members of `group2`. Th
110110
:::image type="content" source="./media/default-individual-user-group-quotas-introduction/exceed-disk-quota.png" alt-text="Example showing a scenario of exceeding disk quota.":::
111111

112112
> [!IMPORTANT]
113-
> For quota reporting to work, the client needs access to port 4049/UDP on the Azure NetApp Files volumes’ storage endpoint. When using NSGs with standard network features on the Azure NetApp Files delegated subnet, make sure that access is enabled.
113+
> For quota reporting to work, the client needs access to port 4049/UDP on the Azure NetApp Files volumes’ storage endpoint. When using NSGs with Standard network features on the Azure NetApp Files delegated subnet, ensure access is enabled.
114114
115115
## Next steps
116116

articles/azure-vmware/configure-external-identity-source-nsx-t.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ You can set up NSX to use an external Lightweight Directory Access Protocol (LDA
5858
| **Port** | Leave the default secure LDAP port. |
5959
| **Enabled** | Leave as **Yes**. |
6060
| **Use Start TLS** | Required only if you use standard (unsecured) LDAP. |
61-
| **Bind Identity** | Use your account that has domain Administrator permissions. For example, `<[email protected]>`. |
61+
| **Bind Identity** | Use your account that has read permissions to directory. For example, `<[email protected]>`. |
6262
| **Password** | Enter the password for the LDAP server. This password is the one that you use with the example `<[email protected]>` account. |
6363
| **Certificate** | Leave empty (see step 6). |
6464

articles/backup/backup-azure-database-postgresql.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,5 +182,5 @@ Azure Backup service creates a job for scheduled backups or if you trigger on-de
182182

183183
## Next steps
184184

185-
- [Azure Backup pricing information for PostgreSQ](https://azure.microsoft.com/pricing/details/backup/)
186-
- [Troubleshoot PostgreSQL database backup by using Azure Backup](backup-azure-database-postgresql-troubleshoot.md)
185+
- [Azure Backup pricing information for PostgreSQL](https://azure.microsoft.com/pricing/details/backup/)
186+
- [Troubleshoot PostgreSQL database backup by using Azure Backup](backup-azure-database-postgresql-troubleshoot.md)

0 commit comments

Comments
 (0)