Skip to content

Commit 327900d

Browse files
committed
resolve conflicts
2 parents c0b7da3 + 593f43b commit 327900d

36 files changed

Lines changed: 911 additions & 352 deletions

articles/app-service/app-service-configure-premium-v4-tier.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ If your app runs where Premium v4 isn't available (either the deployment or the
141141

142142
When creating the plan, select the desired Premium v4 tier. This ensures the plan is in a deployment unit supporting Premium V4. Then, redeploy your application code to the new app. Even if you scale the new plan down to save costs, you can always scale back up to Premium v4 because the deployment unit supports it.
143143

144-
- Use the **Development tools** > **Clone app** page to create an App Service plan with Premium v4 in your desired region, specifying the app settings and configuration to clone.
144+
- Use the **Development tools** > **Clone app** page to create an App Service plan with Premium v4 in your desired region, specifying the app settings and configuration to clone. Refer to the [current restrictions](app-service-web-app-cloning.md#current-restrictions) for app cloning.
145145

146146
:::image type="content" source="media/app-service-configure-premium-tier/clone-app.png" alt-text="Screenshot showing how to clone your app.":::
147147

articles/artifact-signing/quickstart.md

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,23 @@ An Artifact Signing account is a logical container that holds identity validatio
117117

118118
You can create Artifact Signing resources only in Azure regions where the service is currently available. The following table lists the Azure regions that currently support Artifact Signing resources:
119119

120-
| Region | Region class fields | Endpoint URI value |
121-
| :----------------------------------- | :------------------- |:-------------------------------------|
122-
| East US | EastUS | `https://eus.codesigning.azure.net` |
123-
| West US | WestUS | `https://wus.codesigning.azure.net` |
124-
| West Central US | WestCentralUS | `https://wcus.codesigning.azure.net` |
125-
| West US 2 | WestUS2 | `https://wus2.codesigning.azure.net` |
126-
| North Europe | NorthEurope | `https://neu.codesigning.azure.net` |
127-
| West Europe | WestEurope | `https://weu.codesigning.azure.net` |
120+
| Region | Region class fields | Endpoint URI value |
121+
| :---------------- | :------------------- | :----------------------------------- |
122+
| Brazil South | BrazilSouth | `https://brs.codesigning.azure.net` |
123+
| Central US | CentralUS | `https://cus.codesigning.azure.net` |
124+
| East US | EastUS | `https://eus.codesigning.azure.net` |
125+
| Japan East | JapanEast | `https://jpe.codesigning.azure.net` |
126+
| Korea Central | KoreaCentral | `https://krc.codesigning.azure.net` |
127+
| North Central US | NorthCentralUS | `https://ncus.codesigning.azure.net` |
128+
| North Europe | NorthEurope | `https://neu.codesigning.azure.net` |
129+
| Poland Central | PolandCentral | `https://plc.codesigning.azure.net` |
130+
| South Central US | SouthCentralUS | `https://scus.codesigning.azure.net` |
131+
| Switzerland North | SwitzerlandNorth | `https://swn.codesigning.azure.net` |
132+
| West Central US | WestCentralUS | `https://wcus.codesigning.azure.net` |
133+
| West Europe | WestEurope | `https://weu.codesigning.azure.net` |
134+
| West US | WestUS | `https://wus.codesigning.azure.net` |
135+
| West US 2 | WestUS2 | `https://wus2.codesigning.azure.net` |
136+
| West US 3 | WestUS3 | `https://wus3.codesigning.azure.net` |
128137

129138
### Naming constraints for Artifact Signing accounts
130139

articles/azure-app-configuration/concept-enable-rbac.md

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,66 @@ Follow these steps to assign App Configuration Data roles to your credential.
6060
3. On the **Members** tab, follow the wizard to select the credential you're granting access to and then select **Next**.
6161
4. Finally, on the **Review + assign** tab, select **Review + assign** to assign the role.
6262

63+
## Configuring cloud-specific audience for Entra ID authentication
64+
65+
When using Entra ID and the following Azure App Configuration libraries in clouds other than Azure cloud, Azure Government, and Microsoft Azure operated by 21Vianet, an appropriate Entra ID audience must be configured to enable authentication.
66+
67+
### [.NET](#tab/dotnet)
68+
69+
The Audience for the target cloud must be configured for the following packages.
70+
71+
- Azure SDK for .NET: Azure.Data.AppConfiguration >= 1.6.0
72+
- .NET configuration provider: Microsoft.Extensions.Configuration.AzureAppConfiguration >= 8.2.0
73+
74+
In the **Azure SDK for .NET**, audience is configured by utilizing the following API calls:
75+
76+
* The ConfigurationClient constructor [accepts ConfigurationClientOptions](/dotnet/api/azure.data.appconfiguration.configurationclient.-ctor#azure-data-appconfiguration-configurationclient-ctor(system-uri-azure-core-tokencredential-azure-data-appconfiguration-configurationclientoptions))
77+
* ConfigurationClientOptions allows [Audience](/dotnet/api/azure.data.appconfiguration.configurationclientoptions.audience#azure-data-appconfiguration-configurationclientoptions-audience) to be set
78+
79+
The following code snippet demonstrates how to instantiate a configuration client with a cloud-specific audience.
80+
81+
```
82+
var configurationClient = new ConfigurationClient(
83+
myStoreEndpoint,
84+
new DefaultAzureCredential(),
85+
new ConfigurationClientOptions
86+
{
87+
Audience = "{Cloud specific audience here}"
88+
});
89+
```
90+
91+
In the **.NET configuration provider**, audience is configured by utilizing the following API calls:
92+
93+
* AzureAppConfigurationOptions exposes a [ConfigureClientOptions](/dotnet/api/microsoft.extensions.configuration.azureappconfiguration.azureappconfigurationoptions.configureclientoptions#microsoft-extensions-configuration-azureappconfiguration-azureappconfigurationoptions-configureclientoptions(system-action((azure-data-appconfiguration-configurationclientoptions)))) method
94+
95+
The following code snippet demonstrates how to add the Azure App Configuration provider into a .NET application with a cloud-specific audience.
96+
97+
```
98+
builder.AddAzureAppConfiguration(o =>
99+
{
100+
o.Connect(
101+
myStoreEndpoint,
102+
new DefaultAzureCredential());
103+
104+
o.ConfigureClientOptions(clientOptions => clientOptions.Audience = "{Cloud specific audience here}");
105+
});
106+
```
107+
108+
---
109+
110+
### Audience
111+
112+
For Azure App Configuration in the global Azure cloud, use the following audience:
113+
114+
`https://appconfig.azure.com`
115+
116+
For Azure App Configuration in the national clouds, use the applicable audience specified in the table below:
117+
118+
| **National cloud** | **Audience** |
119+
| ------------------------------------ | ----------------------------------- |
120+
| Azure Government | `https://appconfig.azure.us` |
121+
| Microsoft Azure operated by 21Vianet | `https://appconfig.azure.cn` |
122+
| Bleu | `https://appconfig.sovcloud-api.fr` |
123+
63124
## Next steps
64125
Learn how to [use managed identities to access your App Configuration store](howto-integrate-azure-managed-service-identity.md).

articles/azure-app-configuration/rest-api-authentication-azure-ad.md

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,7 @@ Before acquiring a Microsoft Entra token, you must identify what user you want t
3939

4040
Request the Microsoft Entra token with a proper audience. The audience can also be referred to as the *resource* that the token is being requested for.
4141

42-
For Azure App Configuration in the global Azure cloud, use the following audience:
43-
44-
`https://appconfig.azure.com`
45-
46-
For Azure App Configuration in the national clouds, use the applicable audience specified in the table below:
47-
48-
| **National cloud** | **Audience** |
49-
| ------------------------------------ | ----------------------------------- |
50-
| Azure Government | `https://appconfig.azure.us` |
51-
| Microsoft Azure operated by 21Vianet | `https://appconfig.azure.cn` |
52-
| Bleu | `https://appconfig.sovcloud-api.fr` |
42+
For details on which audience to use for which cloud, refer to the [audience section of the Entra ID access overview](./concept-enable-rbac.md#audience).
5343

5444
<a name='azure-ad-authority'></a>
5545

articles/backup/azure-file-share-backup-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.author: v-mallicka
1616

1717
Azure Files backup is a native cloud solution that protects your data and eliminates on-premises maintenance overheads. Azure Backup integrates with Azure File Sync, centralizing your File Share data and backups. The secure, managed backup solution supports **snapshot** and **vaulted** backups to protect your enterprise File Shares, ensuring data recovery from accidental or malicious deletion.
1818

19-
Azure Backup now offers general availability of Vaulted Backup for Azure Files (Standard tier), enabling secure, long-term protection with ransomware defense, cross-region recovery, and compliance-ready retention—all managed through a unified backup policy. For more insights, see the [Microsoft Community Hub blog](https://techcommunity.microsoft.com/blog/azurestorageblog/general-availability-vaulted-backup-for-azure-files---boost-your-data-security-a/4395344). To know the latest product enhancements and feature updates in Azure, see [Microsoft Azure Updates](https://azure.microsoft.com/updates?id=482659).
19+
Azure Backup now offers general availability of Vaulted Backup for Azure Files, enabling secure, long-term protection with ransomware defense, cross-region recovery, and compliance-ready retention—all managed through a unified backup policy. For more insights, see the [Microsoft Community Hub blog](https://techcommunity.microsoft.com/blog/azurestorageblog/general-availability-vaulted-backup-for-azure-files---boost-your-data-security-a/4395344). To know the latest product enhancements and feature updates in Azure, see [Microsoft Azure Updates](https://azure.microsoft.com/updates?id=482659).
2020

2121
## Key benefits of Azure Files backup
2222

articles/baremetal-infrastructure/workloads/nc2-on-azure/available-regions-skus.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ When planning your NC2 on Azure design, use the following table to understand wh
4848
| Germany West Central | AN36P, AN64 |
4949
| Japan East | AN36P |
5050
| North Central US | AN36P, AN64 |
51-
| Qatar Central | AN36P |
51+
| Qatar Central | AN36P, AN64 |
5252
| Southeast Asia | AN36P |
5353
| South India | AN36P |
54-
| UAE North | AN36P |
54+
| UAE North | AN36P, AN64 |
5555
| UK South | AN36P, AN64 |
5656
| West Europe | AN36P |
5757
| West US 2 | AN36 |

articles/nat-gateway/faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ sections:
6363
questions:
6464
- question: What is StandardV2 NAT Gateway?
6565
answer: |
66-
StandardV2 NAT Gateway is a new SKU offering of the Azure NAT Gateway service. StandardV2 NAT Gateway offers zone-redundancy support, enhanced data processing limits, IPv6 support, Flow logs, and increased scalability compared to the original Standard NAT Gateway. For more information, see [NAT Gateway SKUs](nat-sku.md).
66+
StandardV2 NAT Gateway is a new SKU offering of the Azure NAT Gateway service that is currently in **Public Preview**. StandardV2 NAT Gateway offers zone-redundancy support, enhanced data processing limits, IPv6 support, Flow logs, and increased scalability compared to the original Standard NAT Gateway. For more information, see [NAT Gateway SKUs](nat-sku.md).
6767
6868
- question: Can I upgrade my existing Standard NAT Gateway to StandardV2 NAT Gateway?
6969
answer: |

articles/nat-gateway/manage-nat-gateway-v2.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ ms.custom: template-how-to, devx-track-azurecli, devx-track-azurepowershell
1515

1616
Learn how to create and remove a NAT gateway resource from a virtual network subnet. A NAT gateway enables outbound connectivity for resources in an Azure Virtual Network. You can change the public IP addresses and public IP address prefixes associated with the NAT gateway changed after deployment.
1717

18+
> [!IMPORTANT]
19+
> Standard V2 SKU Azure NAT Gateway is currently in PREVIEW.
20+
> See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
21+
1822
This article explains how to manage the following aspects of NAT gateway:
1923

2024
- Create a NAT gateway and associate it with an existing subnet.

articles/nat-gateway/monitor-nat-gateway-flow-logs.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ In this article, you learn how to set up, monitor, and troubleshoot with Azure S
2020
- An Azure StandardV2 NAT Gateway resource. To learn how to create a StandardV2 NAT Gateway resource, see [Quickstart: Create a StandardV2 NAT Gateway](./quickstart-create-nat-gateway-v2.md).
2121
- An Azure Monitor Log Analytics workspace. To learn how to create a Log Analytics workspace, see [Quickstart: Create a Log Analytics workspace](/azure/azure-monitor/logs/quick-create-workspace).
2222

23+
> [!IMPORTANT]
24+
> StandardV2 Azure NAT Gateway is currently in PREVIEW.
25+
> See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
26+
2327
## Enable diagnostic settings to collect NAT gateway flow logs
2428

2529
In this section, you learn how to set up StandardV2 NAT gateway flow logs and send it to the recommended destination – Log Analytics workspace, which enables you to manage data retention and access. To learn more about the other destinations, including Azure Storage account and Azure Event Hubs, see [Diagnostic settings in Azure Monitor - Azure Monitor | Microsoft Learn.](/azure/azure-monitor/platform/diagnostic-settings)

articles/nat-gateway/nat-gateway-design.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@ ms.date: 11/04/2025
1414

1515
Review this article to familiarize yourself with considerations for designing virtual networks with NAT gateway.
1616

17+
> [!IMPORTANT]
18+
> Standard V2 SKU Azure NAT Gateway is currently in PREVIEW.
19+
> See the [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/) for legal terms that apply to Azure features that are in beta, preview, or otherwise not yet released into general availability.
20+
1721
## Connect to the internet with a NAT gateway
1822

1923
NAT Gateway is recommended for all production workloads where you need to connect to a public endpoint over the internet. Outbound connectivity takes place right away upon deployment of a NAT gateway with a subnet and at least one public IP address. No routing configurations are required to start connecting outbound with the NAT gateway. The NAT gateway becomes the subnet’s default route to the internet.

0 commit comments

Comments
 (0)