Skip to content

Commit 85740aa

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into tcpfw
2 parents ec71341 + 81fbc47 commit 85740aa

File tree

69 files changed

+24
-139
lines changed

Some content is hidden

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

69 files changed

+24
-139
lines changed

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/confidential-computing/confidential-enclave-nodes-aks-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.subservice: azure-confidential-computing
77
ms.topic: quickstart
88
ms.date: 11/06/2023
99
ms.author: ananyagarg
10-
ms.custom: devx-track-azurecli, mode-api
10+
ms.custom: devx-track-azurecli, mode-api, innovation-engine
1111
---
1212

1313
# Quickstart: Deploy an AKS cluster with confidential computing Intel SGX agent nodes by using the Azure CLI

articles/event-grid/publish-iot-hub-events-to-logic-apps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
22
title: Tutorial - Use IoT Hub events to trigger Azure Logic Apps
33
description: This tutorial shows how to use the event routing service of Azure Event Grid, create automated processes to perform Azure Logic Apps actions based on IoT Hub events.
4-
author: kgremban
4+
author: SoniaLopezBravo
55
ms.service: azure-iot-hub
66
ms.topic: tutorial
77
ms.date: 09/14/2020
8-
ms.author: kgremban
8+
ms.author: sonialopez
99
ms.custom: devx-track-azurecli
1010
---
1111

articles/iot-dps/concepts-custom-allocation.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ title: Using custom allocation policies with Azure DPS
33
titleSuffix: Azure IoT Hub Device Provisioning Service
44
description: Understand how custom allocation policies enable provisioning to multiple IoT hubs with the Azure IoT Hub Device Provisioning Service (DPS)
55
author: SoniaLopezBravo
6-
76
ms.author: sonialopez
87
ms.date: 09/09/2022
98
ms.topic: concept-article

articles/iot-dps/concepts-deploy-at-scale.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ title: Best practices for large-scale IoT deployments
33
titleSuffix: Azure IoT Hub Device Provisioning Service
44
description: Best practices, patterns, and sample code you can use to help with large-scale deployments of Azure IoT Hub and Device Provisioning Service.
55
author: SoniaLopezBravo
6-
76
ms.author: sonialopez
87
ms.service: azure-iot-hub
98
ms.topic: concept-article

articles/iot-dps/concepts-device-reprovision.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ title: Device lifecycle and reprovisioning concepts
33
titleSuffix: Azure IoT Hub Device Provisioning Service
44
description: Describes device reprovisioning concepts and policies for the Azure IoT Hub Device Provisioning Service (DPS)
55
author: SoniaLopezBravo
6-
76
ms.author: sonialopez
87
ms.date: 04/16/2021
98
ms.topic: concept-article

0 commit comments

Comments
 (0)