Skip to content

Commit e016655

Browse files
committed
Merge branch 'main' of https://github.com/microsoftdocs/azure-docs-pr into app2
2 parents 7419d50 + 0e5ba92 commit e016655

File tree

117 files changed

+1336
-900
lines changed

Some content is hidden

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

117 files changed

+1336
-900
lines changed

.openpublishing.redirection.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7058,6 +7058,12 @@
70587058
"source_path": "articles/cyclecloud/release-notes/ccws/2025.02.06.md",
70597059
"redirect_url": "/azure/cyclecloud/release-notes/ccws/2025-02-06",
70607060
"redirect_document_id": false
7061+
},
7062+
{
7063+
"source_path": "articles/reliability/whats-new.md",
7064+
"redirect_url": "/azure/reliability/overview",
7065+
"redirect_document_id": false
70617066
}
70627067
]
70637068
}
7069+

articles/api-center/synchronize-api-management-apis.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Integrate an API Management instance to Azure API Center for automa
44
author: dlepow
55
ms.service: azure-api-center
66
ms.topic: how-to
7-
ms.date: 06/02/2025
7+
ms.date: 06/18/2025
88
ms.author: danlep
99
ms.custom: devx-track-azurecli
1010
# Customer intent: As an API program manager, I want to integrate my Azure API Management instance with my API center and synchronize API Management APIs to my inventory.
@@ -32,6 +32,7 @@ API Management APIs automatically synchronize to the API center whenever existin
3232
> [!NOTE]
3333
> * Integration of Azure API Management is currently in preview.
3434
> * There are [limits](../azure-resource-manager/management/azure-subscription-service-limits.md?toc=/azure/api-center/toc.json&bc=/azure/api-center/breadcrumb/toc.json#azure-api-center-limits) for the number of integrated API Management instances (API sources).
35+
> * An integrated API Management instance can be configured in a virtual network.
3536
> * API updates in API Management typically synchronize to your API center within minutes, but synchronization can take up to 24 hours.
3637
> * API definitions also synchronize to the API center if you select the option to include them during integration.
3738

articles/api-management/api-management-region-availability.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: dlepow
66

77
ms.service: azure-api-management
88
ms.topic: concept-article
9-
ms.date: 05/28/2025
9+
ms.date: 06/17/2025
1010
ms.author: danlep
1111
ms.custom:
1212
- references_regions
@@ -34,7 +34,7 @@ Information in the following table is updated regularly. Capacity availability i
3434
| Central India ||| | |
3535
| East Asia ||| ||
3636
| East US ||| | |
37-
| East US 2 ||| ||
37+
| East US 2 ||| ||
3838
| France Central ||| ||
3939
| Germany West Central |||||
4040
| Japan East ||| ||

articles/api-management/self-hosted-gateway-enable-dapr.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Dapr integration in API Management enables operations teams to directly expose D
1818

1919
## About Dapr
2020

21-
Dapr is a portable runtime for building stateless and stateful microservices-based applications with any language or framework. It codifies the common microservice patterns, like service discovery and invocation with build-in retry logic, publish-and-subscribe with at-least-once delivery semantics, or pluggable binding resources to ease composition using external services. Go to [dapr.io](https://dapr.io) for detailed information and instruction on how to get started with Dapr.
21+
Dapr is a portable runtime for building stateless and stateful microservices-based applications with any language or framework. It codifies the common microservice patterns, like service discovery and invocation with built-in retry logic, publish-and-subscribe with at-least-once delivery semantics, or pluggable binding resources to ease composition using external services. Go to [dapr.io](https://dapr.io) for detailed information and instruction on how to get started with Dapr.
2222

2323
## Enable Dapr support
2424

articles/azure-app-configuration/concept-experimentation.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ ms.collection: ce-skilling-ai-copilot
1313

1414
# Experimentation (preview)
1515

16-
> [!NOTE]
17-
> We appreciate the feedback we have received during the preview phases of Experimentation on Azure App Configuration, and our teams are using it to make updates to the feature. During this time, Experimentation Workspace will be temporarily unavailable.
18-
1916
Experimentation is the process of systematically testing hypotheses or changes to improve user experience or software functionality. This definition also holds true for most scientific fields including technology, where all experiments have four common steps:
2017

2118
- **Developing a hypothesis** to document the purpose of this experiment,

articles/azure-functions/durable/durable-functions-best-practice-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ As with activity functions, external events have an _at-least-once_ delivery gua
8080
8181
### Invest in stress testing
8282

83-
As with anything performance related, the ideal concurrency settings and architechture of your app ultimately depends on your application's workload. Therefore, it's recommended that users to invest in a performance testing harness that simulates their expected workload and to use it to run performance and reliability experiments for their app.
83+
As with anything performance related, the ideal concurrency settings and architecture of your app ultimately depends on your application's workload. Therefore, it's recommended that users to invest in a performance testing harness that simulates their expected workload and to use it to run performance and reliability experiments for their app.
8484

8585
### Avoid sensitive data in inputs, outputs, and exceptions
8686

articles/azure-functions/durable/quickstart-mssql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ In _local.settings.json_, assign the connection string of the Docker-based SQL s
176176

177177
### Test locally
178178

179-
Open a termimal window in your app's root folder and run `azurite start`. Azurite is the Azure Storage emulator, which is needed for running any Function app.
179+
Open a terminal window in your app's root folder and run `azurite start`. Azurite is the Azure Storage emulator, which is needed for running any Function app.
180180

181181
Open another terminal window in your app's root folder and start the Function app by running `func host start`.
182182

articles/azure-resource-manager/bicep/toc.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ items:
331331
displayName: dateTimeAdd,dateTimeFromEpoch,dateTimeToEpoch,utcNow
332332
href: bicep-functions-date.md
333333
- name: Deployment functions
334-
displayName: deployment,environment
334+
displayName: deployer,deployment,environment
335335
href: bicep-functions-deployment.md
336336
- name: File functions
337337
displayName: loadFileAsBase64,loadJsonContent,loadYamlContent,loadTextContent
@@ -340,7 +340,7 @@ items:
340340
displayName: fail
341341
href: bicep-functions-flow-control.md
342342
- name: Lambda functions
343-
displayName: filter,map,reduce,sort,toObject
343+
displayName: filter,groupBy,map,mapValue,reduce,sort,toObject
344344
href: bicep-functions-lambda.md
345345
- name: Logical functions
346346
displayName: bool
@@ -349,13 +349,13 @@ items:
349349
displayName: int,max,min
350350
href: bicep-functions-numeric.md
351351
- name: Object functions
352-
displayName: contains,empty,intersection,items,json,length,union
352+
displayName: contains,empty,intersection,items,json,length,objectKeys,shallowMerge,union
353353
href: bicep-functions-object.md
354354
- name: Parameters file functions
355355
displayName: getSecret,readEnvironmentVariable
356356
href: bicep-functions-parameters-file.md
357357
- name: Resource functions
358-
displayName: extensionResourceId,getSecret,list,pickZones,providers,reference,resourceId,subscriptionResourceId,managementGroupResourceId,tenantResourceId
358+
displayName: extensionResourceId,getSecret,listAccountSas,ListKeys,listSecrets,list,managementGroupResourceId,pickZones,providers,reference,resourceId,subscriptionResourceId,tenantResourceId,toLogicalZone,toPhysicalZone
359359
href: bicep-functions-resource.md
360360
- name: Scope functions
361361
displayName: managementGroup,resourceGroup,subscription,tenant

articles/azure-resource-manager/templates/template-functions-deployment.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Template functions - deployment
33
description: Describes the functions to use in an Azure Resource Manager template (ARM template) to retrieve deployment information.
44
ms.topic: reference
55
ms.custom: devx-track-arm-template
6-
ms.date: 02/12/2025
6+
ms.date: 06/18/2025
77
---
88

99
# Deployment functions for ARM templates
@@ -31,12 +31,13 @@ In Bicep, use the [deployer](../bicep/bicep-functions-deployment.md#deployer) fu
3131

3232
### Return value
3333

34-
This function returns the information about the current deployment principal, including tenant ID and object ID.
34+
This function returns the information about the current deployment principal, including tenant ID, object ID, and user principal name.
3535

3636
```json
3737
{
3838
"objectId": "",
39-
"tenantId": ""
39+
"tenantId": "",
40+
"userPrincipalName": ""
4041
}
4142
```
4243

@@ -63,7 +64,8 @@ The preceding example returns the following object:
6364
```json
6465
{
6566
"objectId":"aaaaaaaa-0000-1111-2222-bbbbbbbbbbbb",
66-
"tenantId":"aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e"
67+
"tenantId":"aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e",
68+
"userPrincipalName":"[email protected]"
6769
}
6870
```
6971

articles/azure-resource-manager/templates/template-functions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ Resource Manager provides several functions for working with objects.
222222
* [items](template-functions-object.md#items)
223223
* [json](template-functions-object.md#json)
224224
* [length](template-functions-object.md#length)
225-
* [objectKeys](template-functions-object.md#objectkeys)
226225
* [null](template-functions-object.md#null)
226+
* [objectKeys](template-functions-object.md#objectkeys)
227227
* [shallowMerge](template-functions-object.md#shallowmerge)
228228
* [union](template-functions-object.md#union)
229229

0 commit comments

Comments
 (0)