Skip to content

Commit 6c80f8a

Browse files
committed
Merge branch 'main' into release-durable-task
2 parents 5f71948 + 64c0d38 commit 6c80f8a

167 files changed

Lines changed: 1724 additions & 1423 deletions

File tree

Some content is hidden

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

articles/active-directory-b2c/partner-onfido.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ REST API settings:
113113
#### Upload your files
114114

115115
1. Store the UI folder files in your blob container.
116-
2. [Use Azure Storage Explorer to manage Azure Managed Disks](/azure/virtual-machines/disks-use-storage-explorer-managed-disks) and access permissions.
116+
2. [Use Azure Storage Explorer to manage Azure managed disks](/azure/virtual-machines/disks-use-storage-explorer-managed-disks) and access permissions.
117117

118118
### Configure Azure AD B2C
119119

articles/application-gateway/json-web-token-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.date: 11/18/2025
1111

1212
# JSON Web Token (JWT) validation in Azure Application Gateway (preview)
1313

14-
[Azure Application Gateway](/azure/application-gateway/) validates JSON Web Tokens (JWTs) issued by [Microsoft Entra ID](https://docs.azure.cn/en-us/entra/fundamentals/what-is-entra) (formerly Azure Active Directory) in incoming HTTPS requests. This capability provides first-hop authentication enforcement for web APIs or any protected resource without requiring custom code in your backend applications.
14+
[Azure Application Gateway](/azure/application-gateway/) validates JSON Web Tokens (JWTs) issued by [Microsoft Entra ID](/entra/fundamentals/what-is-entra) (formerly Azure Active Directory) in incoming HTTPS requests. This capability provides first-hop authentication enforcement for web APIs or any protected resource without requiring custom code in your backend applications.
1515

1616
This capability verifies the integrity and authenticity of tokens in incoming requests. It then determines whether to allow or deny access before forwarding traffic to backend services. Upon successful validation, the gateway injects the `x-msft-entra-identity` header into the request and forwards it to the backend. Downstream applications can then securely consume verified identity information.
1717

articles/azure-functions/functions-cli-samples.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ title: Azure CLI samples for Azure Functions
33
description: Find links to bash scripts for Azure Functions that use the Azure CLI. Learn how to create a function app that allows integration and deployment.
44
ms.assetid: 577d2f13-de4d-40d2-9dfc-86ecc79f3ab0
55
ms.topic: sample
6-
ms.date: 02/27/2026
6+
ms.date: 04/01/2026
77
ms.custom: mvc, devx-track-azurecli, seo-azure-cli
88
keywords: functions, azure cli samples, azure cli examples, azure cli code samples
99
---
1010

1111
# Azure CLI Samples
1212

13-
These end-to-end Azure CLI scripts are provided to help you learn how to provision and manage the Azure resources required by Azure Functions. You must use the [Azure Functions Core Tools](functions-run-local.md) to create actual Azure Functions code projects from the command line on your local computer and deploy code to these Azure resources. For a complete end-to-end example of developing and deploying from the command line using both Core Tools and the Azure CLI, see one of these language-specific command line quickstarts:
13+
These end-to-end Azure CLI scripts help you learn how to create and manage the Azure resources required by Azure Functions. You must use the [Azure Functions Core Tools](functions-run-local.md) to create actual Azure Functions code projects from the command line on your local computer and deploy code to these Azure resources. For a complete end-to-end example of developing and deploying from the command line using both Core Tools and the Azure CLI, see one of these language-specific command line quickstarts:
1414

1515
+ [C#](how-to-create-function-azure-cli.md?pivots=programming-language-csharp)
1616
+ [Java](how-to-create-function-azure-cli.md?pivots=programming-language-java)
@@ -30,13 +30,18 @@ The following table includes links to bash scripts that you can use to create an
3030
| [create-function-app-premium-plan.sh](https://github.com/Azure-Samples/azure-cli-samples/tree/master/azure-functions/create-function-app-premium-plan) | Creates a function app in a Premium (Elastic Premium) plan. |
3131
| [create-function-app-app-service-plan.sh](https://github.com/Azure-Samples/azure-cli-samples/tree/master/azure-functions/create-function-app-app-service-plan) | Creates a function app in a dedicated App Service plan. |
3232

33-
| Connect to services | Description|
33+
| Connect to services | Description |
3434
|---|---|
3535
| [create-function-app-connect-to-storage-account.sh](https://github.com/Azure-Samples/azure-cli-samples/tree/master/azure-functions/create-function-app-connect-to-storage) | Creates a function app in a Flex Consumption plan and connects it to a storage account using managed identity. |
3636
| [create-function-app-connect-to-cosmos-db.sh](https://github.com/Azure-Samples/azure-cli-samples/tree/master/azure-functions/create-function-app-connect-to-cosmos-db) | Creates a function app in a Flex Consumption plan and connects it to Azure Cosmos DB using managed identity and RBAC. |
3737
| [connect-azure-openai-resources.sh](https://github.com/Azure-Samples/azure-cli-samples/tree/master/azure-functions/connect-azure-openai-resources) | Creates a function app in a Flex Consumption plan and connects it to Azure OpenAI using managed identity. |
3838
| [functions-cli-mount-files-storage-linux.sh](https://github.com/Azure-Samples/azure-cli-samples/tree/master/azure-functions/functions-cli-mount-files-storage-linux) | Creates a Linux function app and mounts an Azure Files share, which lets you leverage existing data or machine learning models in your functions. |
3939

40-
| Deploy code | Description|
40+
| Secure networking | Description |
41+
|---|---|
42+
| [create-function-app-vnet-storage.sh](https://github.com/Azure-Samples/azure-cli-samples/tree/master/azure-functions/create-function-app-vnet-storage) | Creates a function app in a Flex Consumption plan with VNet integration and restricts the storage account behind private endpoints so it's only accessible from inside the virtual network. |
43+
| [create-function-app-private-endpoint.sh](https://github.com/Azure-Samples/azure-cli-samples/tree/master/azure-functions/create-function-app-private-endpoint) | Creates a function app in a Flex Consumption plan with an inbound private endpoint, restricting the function app's HTTP endpoints to only be callable from inside the virtual network. |
44+
45+
| Deploy code | Description |
4146
|---|---|
4247
| [deploy-function-app-with-function-github-continuous.sh](https://github.com/Azure-Samples/azure-cli-samples/tree/master/azure-functions/deploy-function-app-with-function-github-continuous) | Creates a function app in a Consumption plan and deploys code from a public GitHub repository. |

articles/azure-government/azure-secure-isolation-guidance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ The DEK, encrypted with the KEK, is stored separately and only an entity with ac
772772
For [Windows VMs](/azure/virtual-machines/windows/disk-encryption-faq), Azure Disk encryption selects the encryption method in BitLocker based on the version of Windows, for example, XTS-AES 256 bit for Windows Server 2012 or greater. These crypto modules are FIPS 140 validated as part of the Microsoft [Windows FIPS validation program](/windows/security/threat-protection/fips-140-validation#modules-used-by-windows-server). For [Linux VMs](/azure/virtual-machines/linux/disk-encryption-faq), Azure Disk encryption uses the decrypt default of aes-xts-plain64 with a 256-bit volume master key that is FIPS 140 validated as part of DM-Crypt validation obtained by suppliers of Linux IaaS VM images in Microsoft Azure Marketplace.
773773

774774
##### *Server-side encryption for managed disks*
775-
[Azure Managed Disks](/azure/virtual-machines/managed-disks-overview) are block-level storage volumes that are managed by Azure and used with Azure Windows and Linux virtual machines. They simplify disk management for Azure IaaS VMs by handling storage account management transparently for you. Azure Managed Disks automatically encrypt your data by default using [256-bit AES encryption](/azure/virtual-machines/disk-encryption) that is FIPS 140 validated. For encryption key management, you have the following choices:
775+
[Azure managed disks](/azure/virtual-machines/managed-disks-overview) are block-level storage volumes that are managed by Azure and used with Azure Windows and Linux virtual machines. They simplify disk management for Azure IaaS VMs by handling storage account management transparently for you. Azure managed disks automatically encrypt your data by default using [256-bit AES encryption](/azure/virtual-machines/disk-encryption) that is FIPS 140 validated. For encryption key management, you have the following choices:
776776

777777
- [Platform-managed keys](/azure/virtual-machines/disk-encryption#platform-managed-keys) is the default choice that provides transparent data encryption at rest for managed disks whereby keys are managed by Microsoft.
778778
- [Customer-managed keys](/azure/virtual-machines/disk-encryption#customer-managed-keys) enables you to have control over your own keys that can be imported into or generated inside Azure Key Vault or Managed HSM. This approach relies on two sets of keys as described previously: DEK and KEK. DEK encrypts the data using an AES-256 based encryption and is in turn encrypted by an RSA KEK that is stored in Azure Key Vault or Managed HSM.

articles/azure-government/documentation-government-product-roadmap.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
title: Azure Government product General Availability (GA) roadmap
33
description: Overview of Azure Government product General Availability (GA) by authorization level
44
ms.service: azure-government
5-
ms.topic: feature-availability
5+
ms.topic: conceptual
66
ms.author: russellkirk
77
author: krussell09
88
recommendations: false
9-
ms.date: 03/19/2026
9+
ms.date: 04/02/2026
1010
---
1111
# Microsoft Azure Government Product General Availability(GA) Roadmap
1212

@@ -54,7 +54,7 @@ For comprehensive information about compliance in Azure Government clouds, see [
5454
| Application Gateway | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: |
5555
|       Application Gateway v2 | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: |
5656
| Automation | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: |
57-
|       Change Tracking | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | Forecasted |
57+
|       Change Tracking | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: |
5858
| Azure Advisor | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: |
5959
| Azure AI Search | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: |
6060
|       AI Enrichment | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: |
@@ -67,7 +67,7 @@ For comprehensive information about compliance in Azure Government clouds, see [
6767
| Azure Automanage Machine Configuration | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | Planned |
6868
| Azure Bastion | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: |
6969
| Azure Bot Service | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | Planned | n/a |
70-
| Azure Cloud HSM | n/a | n/a | n/a | Forecasted |
70+
| Azure Cloud HSM | Planned | n/a | n/a | Forecasted |
7171
| Azure Cosmos DB | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: |
7272
| Azure Data Box | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: |
7373
|       Data Box | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: | :::image alt-text="GA" type="content" source="media/check-mark.svg" border="false"::: |

articles/azure-netapp-files/azacsnap-preview.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This article provides a guide on setup and usage of the new features in preview
1818
The preview features provided with AzAcSnap 11 are:
1919

2020
- Azure NetApp Files backup
21-
- Azure Managed Disks
21+
- Azure managed disks
2222

2323
> [!NOTE]
2424
> Previews are provided "as is," "with all faults," and "as available," and are excluded from the service-level agreements and may not be covered by customer support.
@@ -51,7 +51,7 @@ You can also enable this feature by using `azacsnap -c configure --configuration
5151

5252
For more information about this feature, see [Configure the Azure Application Consistent Snapshot tool](azacsnap-cmd-ref-configure.md).
5353

54-
## Azure Managed Disks
54+
## Azure managed disks
5555

5656
Microsoft provides many storage options for deploying databases such as SAP HANA. For details about some of these options, see [Azure Storage types for SAP workload](/azure/virtual-machines/workloads/sap/planning-guide-storage). There's also a [cost-conscious solution with Azure premium storage](/azure/virtual-machines/workloads/sap/hana-vm-premium-ssd-v1#cost-conscious-solution-with-azure-premium-storage).
5757

@@ -62,13 +62,13 @@ AzAcSnap can take application-consistent database snapshots when you deploy it o
6262
6363
Here's the architecture at a high level:
6464

65-
1. Attach Azure Managed Disks to the VM by using the Azure portal.
65+
1. Attach Azure managed disks to the VM by using the Azure portal.
6666
1. Create a logical volume from these managed disks.
6767
1. Mount the logical volume to a Linux directory.
6868
1. Enable communication in the same way as for Azure NetApp Files in the [AzAcSnap installation](azacsnap-configure-storage.md?tabs=azure-netapp-files#enable-communication-with-storage).
6969
1. Install and configure AzAcSnap.
7070

71-
For more information about using Azure Managed Disks as a storage back end, see [Configure the Azure Application Consistent Snapshot tool](azacsnap-cmd-ref-configure.md).
71+
For more information about using Azure managed disks as a storage back end, see [Configure the Azure Application Consistent Snapshot tool](azacsnap-cmd-ref-configure.md).
7272

7373
### Example configuration file
7474

@@ -168,7 +168,7 @@ The storage hierarchy looks like the following example for SAP HANA:
168168
VG Size 1023.99 GiB
169169
```
170170

171-
- Physical volumes (attached Azure Managed Disks):
171+
- Physical volumes (attached Azure managed disks):
172172

173173
```bash
174174
pvdisplay
@@ -197,17 +197,17 @@ The storage hierarchy looks like the following example for SAP HANA:
197197
PV UUID RNCylW-F3OG-G93c-1XL3-W6pw-M0XB-2mYFGV
198198
```
199199

200-
Installing and setting up the Azure VM and Azure Managed Disks in this way follows Microsoft guidance to create Logical Volume Manager (LVM) stripes of the managed disks on the VM.
200+
Installing and setting up the Azure VM and Azure managed disks in this way follows Microsoft guidance to create Logical Volume Manager (LVM) stripes of the managed disks on the VM.
201201

202-
With the Azure VM set up as prescribed, AzAcSnap can take snapshots of Azure Managed Disks. The snapshot operations are similar to those for other storage back ends that AzAcSnap supports; for example, Azure NetApp Files or Azure Large Instances (bare metal). Because AzAcSnap communicates with Azure Resource Manager to take snapshots, it also needs a service principal with the correct permissions to take managed disk snapshots.
202+
With the Azure VM set up as prescribed, AzAcSnap can take snapshots of Azure managed disks. The snapshot operations are similar to those for other storage back ends that AzAcSnap supports; for example, Azure NetApp Files or Azure Large Instances (bare metal). Because AzAcSnap communicates with Azure Resource Manager to take snapshots, it also needs a service principal with the correct permissions to take managed disk snapshots.
203203

204204
This capability allows customers to test AzAcSnap on a smaller system and scale up to Azure NetApp Files and/or Azure Large Instances (bare metal).
205205

206-
Supported `azacsnap` command functionality with Azure Managed Disks is `configure`, `test`, `backup`, `delete`, and `details`, but not yet `restore`.
206+
Supported `azacsnap` command functionality with Azure managed disks is `configure`, `test`, `backup`, `delete`, and `details`, but not yet `restore`.
207207

208-
### Restore from an Azure Managed Disk snapshot
208+
### Restore from an Azure managed disk snapshot
209209

210-
Although `azacsnap` is currently missing the `-c restore` option for Azure Managed Disks, it's possible to restore manually as follows:
210+
Although `azacsnap` is currently missing the `-c restore` option for Azure managed disks, it's possible to restore manually as follows:
211211

212212
1. Create disks from the snapshots via the Azure portal.
213213

articles/azure-netapp-files/azure-government.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ All [Azure NetApp Files features](whats-new.md) available on Azure public cloud
2828
| Customer-managed keys with managed Hardware Security Module | Generally available | No |
2929
| Elastic zone-redundant storage service level | Preview | No |
3030
| File access logs | Generally available | [Partial support](manage-file-access-logs.md#supported-regions) |
31+
| Storage with cool access enhancement for Premium and Ultra service levels | Preview | No |
3132

3233
## Portal access
3334

0 commit comments

Comments
 (0)