Skip to content

Commit 592493c

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents ae6d350 + 500fd00 commit 592493c

File tree

103 files changed

+1592
-931
lines changed

Some content is hidden

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

103 files changed

+1592
-931
lines changed

articles/api-management/azure-openai-emit-token-metric-policy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ The `azure-openai-emit-token-metric` policy sends custom metrics to Application
5959
| ----------- | --------------------------------------------------------------------------------- | -------- |
6060
| dimension | Add one or more of these elements for each dimension included in the metric. | Yes |
6161

62-
### dimension attributes
62+
### Dimension attributes
6363

6464
| Attribute | Description | Required | Default value |
6565
| --------- | -------------------------- | ------------------ | -------------- |
@@ -77,7 +77,7 @@ The `azure-openai-emit-token-metric` policy sends custom metrics to Application
7777
### Usage notes
7878

7979
* This policy can be used multiple times per policy definition.
80-
* You can configure at most 10 custom dimensions for this policy.
80+
* You can configure at most 5 custom dimensions for this policy.
8181
* This policy can optionally be configured when adding an API from the Azure OpenAI Service using the portal.
8282
* Where available, values in the usage section of the response from the Azure OpenAI Service API are used to determine token metrics.
8383
* Certain Azure OpenAI endpoints support streaming of responses. When `stream` is set to `true` in the API request to enable streaming, token metrics are estimated.

articles/api-management/emit-metric-policy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ The `emit-metric` policy sends custom metrics in the specified format to Applica
5252
| ----------- | --------------------------------------------------------------------------------- | -------- |
5353
| dimension | Add one or more of these elements for each dimension included in the custom metric. | Yes |
5454

55-
### dimension attributes
55+
### Dimension attributes
5656

5757
| Attribute | Description | Required | Default value |
5858
| --------- | -------------------------- | ------------------ | -------------- |
@@ -69,7 +69,7 @@ The `emit-metric` policy sends custom metrics in the specified format to Applica
6969

7070
### Usage notes
7171

72-
* You can configure at most 10 custom dimensions for this policy.
72+
* You can configure at most 5 custom dimensions for this policy.
7373

7474
## Example
7575

articles/api-management/llm-emit-token-metric-policy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ The `llm-emit-token-metric` policy sends custom metrics to Application Insights
5858
| ----------- | --------------------------------------------------------------------------------- | -------- |
5959
| dimension | Add one or more of these elements for each dimension included in the metric. | Yes |
6060

61-
### dimension attributes
61+
### Dimension attributes
6262

6363
| Attribute | Description | Required | Default value |
6464
| --------- | -------------------------- | ------------------ | -------------- |
@@ -77,7 +77,7 @@ The `llm-emit-token-metric` policy sends custom metrics to Application Insights
7777
### Usage notes
7878

7979
* This policy can be used multiple times per policy definition.
80-
* You can configure at most 10 custom dimensions for this policy.
80+
* You can configure at most 5 custom dimensions for this policy.
8181
* Where available, values in the usage section of the response from the LLM API are used to determine token metrics.
8282
* Certain LLM endpoints support streaming of responses. When `stream` is set to `true` in the API request to enable streaming, token metrics are estimated.
8383

articles/azure-maps/tutorial-create-store-locator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ This section lists the Azure Maps features that are demonstrated in the Contoso
5959
* A store logo on the header
6060
* A map that supports panning and zooming
6161
* A **My Location** button to search over the user's current location.
62-
* A Page layout that adjusts based on the width of the devices screen
62+
* A Page layout that adjusts based on the width of the device's screen
6363
* A search box and a search button
6464

6565
### Functionality features

articles/azure-netapp-files/backup-requirements-considerations.md

Lines changed: 3 additions & 1 deletion
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: concept-article
8-
ms.date: 01/27/2025
8+
ms.date: 07/28/2025
99
ms.author: anfdocs
1010
ms.custom:
1111
- build-2025
@@ -51,6 +51,8 @@ Azure NetApp Files backup in a region can only protect an Azure NetApp Files vol
5151

5252
* If you need to delete a parent resource group or subscription that contains backups, you should delete any backups first. Deleting the resource group or subscription doesn't delete the backups.
5353

54+
* If the volume reaches its maximum quota, backup creation can fail depending on the quantity of data changes to the volume. If the backup fails, increase the size of the volume then wait for the next scheduled backup.
55+
5456
## Next steps
5557

5658
* [Understand Azure NetApp Files backup](backup-introduction.md)

articles/azure-resource-manager/bicep/deployment-script-develop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Develop a deployment script in Bicep
33
description: Learn how to develop a deployment script within a Bicep file or store one externally as a separate file.
44
ms.custom: devx-track-bicep
55
ms.topic: conceptual
6-
ms.date: 09/26/2024
6+
ms.date: 07/25/2025
77
---
88

99
# Develop a deployment script in Bicep

articles/azure-resource-manager/bicep/file.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Bicep file structure and syntax
33
description: Understand how to use declarative syntax to understand the structure and properties of Bicep files.
44
ms.topic: conceptual
55
ms.custom: devx-track-bicep
6-
ms.date: 03/25/2025
6+
ms.date: 07/25/2025
77
---
88

99
# Bicep file structure and syntax
@@ -68,7 +68,7 @@ param location string = resourceGroup().location
6868
6969
var uniqueStorageName = '${storagePrefix}${uniqueString(resourceGroup().id)}'
7070
71-
resource stg 'Microsoft.Storage/storageAccounts@2023-04-01' = {
71+
resource stg 'Microsoft.Storage/storageAccounts@2025-01-01' = {
7272
name: uniqueStorageName
7373
location: location
7474
sku: {
@@ -168,7 +168,7 @@ var uniqueStorageName = '${storagePrefix}${uniqueString(resourceGroup().id)}'
168168
Apply this variable wherever you need the complex expression.
169169

170170
```bicep
171-
resource stg 'Microsoft.Storage/storageAccounts@2023-04-01' = {
171+
resource stg 'Microsoft.Storage/storageAccounts@2025-01-01' = {
172172
name: uniqueStorageName
173173
```
174174

@@ -195,7 +195,7 @@ param storageAccountConfig storageAccountConfigType = {
195195
sku: 'Standard_LRS'
196196
}
197197
198-
resource storageAccount 'Microsoft.Storage/storageAccounts@2023-04-01' = {
198+
resource storageAccount 'Microsoft.Storage/storageAccounts@2025-01-01' = {
199199
name: storageAccountConfig.name
200200
location: location
201201
sku: {
@@ -228,7 +228,7 @@ Use the `resource` keyword to define a resource to deploy. Your resource declara
228228
The resource declaration includes the resource type and API version. Within the body of the resource declaration, include properties that are specific to the resource type.
229229

230230
```bicep
231-
resource stg 'Microsoft.Storage/storageAccounts@2023-04-01' = {
231+
resource stg 'Microsoft.Storage/storageAccounts@2025-01-01' = {
232232
name: uniqueStorageName
233233
location: location
234234
sku: {
@@ -250,7 +250,7 @@ Some resources have a parent/child relationship. You can define a child resource
250250
The following example shows how to define a child resource within a parent resource. It contains a storage account with a child resource (file service) that's defined within the storage account. The file service also has a child resource (share) that's defined within it.
251251

252252
```bicep
253-
resource storage 'Microsoft.Storage/storageAccounts@2023-04-01' = {
253+
resource storage 'Microsoft.Storage/storageAccounts@2025-01-01' = {
254254
name: 'examplestorage'
255255
location: resourceGroup().location
256256
kind: 'StorageV2'
@@ -271,7 +271,7 @@ resource storage 'Microsoft.Storage/storageAccounts@2023-04-01' = {
271271
The next example shows how to define a child resource outside of the parent resource. You use the parent property to identify a parent/child relationship. The same three resources are defined.
272272

273273
```bicep
274-
resource storage 'Microsoft.Storage/storageAccounts@2023-04-01' = {
274+
resource storage 'Microsoft.Storage/storageAccounts@2025-01-01' = {
275275
name: 'examplestorage'
276276
location: resourceGroup().location
277277
kind: 'StorageV2'
@@ -373,15 +373,15 @@ Spaces and tabs are ignored when you author Bicep files.
373373
Bicep is newline sensitive. For example:
374374

375375
```bicep
376-
resource sa 'Microsoft.Storage/storageAccounts@2023-04-01' = if (newOrExisting == 'new') {
376+
resource sa 'Microsoft.Storage/storageAccounts@2025-01-01' = if (newOrExisting == 'new') {
377377
...
378378
}
379379
```
380380

381381
Can't be written as:
382382

383383
```bicep
384-
resource sa 'Microsoft.Storage/storageAccounts@2023-04-01' =
384+
resource sa 'Microsoft.Storage/storageAccounts@2025-01-01' =
385385
if (newOrExisting == 'new') {
386386
...
387387
}
@@ -397,7 +397,7 @@ The following example shows a single-line comment.
397397

398398
```bicep
399399
// This is your primary NIC.
400-
resource nic1 'Microsoft.Network/networkInterfaces@2023-11-01' = {
400+
resource nic1 'Microsoft.Network/networkInterfaces@2024-07-01' = {
401401
...
402402
}
403403
```

articles/azure-resource-manager/bicep/install.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Install Bicep tools
33
description: Learn how to install tools to set up Bicep development and deployment environments.
44
ms.topic: how-to
5-
ms.date: 03/25/2025
5+
ms.date: 07/25/2025
66
ms.custom: devx-track-azurepowershell, devx-track-azurecli, devx-track-bicep
77
---
88

@@ -49,19 +49,20 @@ To see the settings:
4949

5050
1. From the `View` menu, select `Extensions`.
5151
1. Select `Bicep` from the list of extensions.
52-
1. Select the `FEATURE CONTRIBUTIONS` tab:
52+
1. Select the `FEATURE` tab.
53+
1. Select **Settings**.
5354

5455
:::image type="content" source="./media/install/bicep-extension-feature-contributions-settings.png" alt-text="Screenshot of Bicep extension settings.":::
5556

5657
The Bicep extension has these settings and default values:
5758

5859
| ID | Default value | Description |
5960
|-----|-------------|---------|
60-
| bicep.decompileOnPaste | true | Automatically convert pasted JSON values, Azure Resource Manager JSON templates (ARM templates,) or resources from an ARM template into Bicep (use Undo to revert). For more information, see the [Paste JSON as Bicep command](./visual-studio-code.md#paste-json-as-bicep-command).|
61+
| bicep.completions.getAllAccessibleAzureContainerRegistries | false | When completing 'br:' module references, query Azure for all container registries accessible to the user (may be slow). If this option is off, only registries configured under moduleAliases in bicepconfig.json will be listed. |
62+
| bicep.decompileOnPaste | true | Automatically convert pasted JSON values, JSON ARM templates or resources from a JSON ARM template into Bicep (use Undo to revert).|
6163
| bicep.enableOutputTimestamps | true | Prepend each line displayed in the Bicep Operations output channel with a timestamp. |
62-
| bicep.suppressedWarnings | | Warnings that are being suppressed because a 'Don't show again' button was pressed. Remove items to reset.|
6364
| bicep.enableSurveys | true | Enable occasional surveys to collect feedback that helps us improve the Bicep extension. |
64-
| bicep.completions.getAllAccessibleAzureContainerRegistries | false | When completing 'br:' module references, query Azure for all container registries accessible to the user (might be slow). If this option is off, only registries configured under [moduleAliases](./bicep-config-modules.md#aliases-for-modules) in [_bicepconfig.json_ files](./bicep-config.md) will be listed. |
65+
| bicep.suppressedWarnings | | Warnings that are being suppressed because a 'Don't show again' button was pressed. Remove items to reset.|
6566
| bicep.trace.server | off | Configure tracing of messages sent to the Bicep language server. |
6667

6768
To configure the settings:
7.06 KB
Loading
2.61 KB
Loading

0 commit comments

Comments
 (0)