Skip to content

Commit 85af13f

Browse files
authored
Merge pull request #298441 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 852cb7f + f5cd62e commit 85af13f

File tree

7 files changed

+15
-6
lines changed

7 files changed

+15
-6
lines changed

articles/api-management/api-management-howto-api-inspector.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Detailed steps follow.
9797
9898
```json
9999
{
100-
"credentialsExpireAfter": PT1H,
100+
"credentialsExpireAfter": "PT1H",
101101
"apiId": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
102102
"purposes": ["tracing"]
103103
}

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ Use the symbolic name to reference the module in another part of the Bicep file.
6565

6666
The path can be either a local file or a file in a registry. The local file can be either a Bicep file or an ARM template for JSON. For more information, see [Path to a module](#path-to-a-module).
6767

68-
The `name` property is required. It becomes the name of the nested deployment resource in the generated template.
68+
The `name` property is optional. It becomes the name of the nested deployment resource in the generated template. If no name is provided, a GUID will be generated as the name for the nested deployment resource.
6969

70-
If a module with a static name is deployed concurrently to the same scope, there's the potential for one deployment to interfere with the output from the other deployment. For example, if two Bicep files use the same module with the same static name (`examplemodule`) and are targeted to the same resource group, one deployment might show the wrong output. If you're concerned about concurrent deployments to the same scope, give your module a unique name.
70+
If a module with a static name is deployed concurrently to the same scope, there's the potential for one deployment to interfere with the output from the other deployment. For example, if two Bicep files use the same module with the same static name (`examplemodule`) and are targeted to the same resource group, one deployment might show the wrong output. If you're concerned about concurrent deployments to the same scope, give your module a unique name. Another way to ensure unique module names is to leave out the `name` property, an unique module name will be generated automatically.
7171

7272
The following example concatenates the deployment name to the module name. If you provide a unique name for the deployment, the module name is also unique.
7373

@@ -78,6 +78,14 @@ module stgModule 'storageAccount.bicep' = {
7878
}
7979
```
8080

81+
Not providing any module name is also valid. A GUID will be generate as the module name.
82+
83+
```bicep
84+
module stgModule 'storageAccount.bicep' = {
85+
scope: resourceGroup('demoRG')
86+
}
87+
```
88+
8189
If you need to *specify a scope* that's different than the scope for the main file, add the scope property. For more information, see [Set module scope](#set-module-scope).
8290

8391
```bicep
2.56 KB
Loading

articles/dev-box/how-to-customize-devbox-azure-image-builder.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ To use VM Image Builder with Azure Compute Gallery, make sure you have an existi
223223
"customize": [
224224
{
225225
"type": "PowerShell",
226-
"name": "Install Choco and Vscode",
226+
"name": "Install Choco and VS Code",
227227
"inline": [
228228
"Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))",
229229
"choco install -y vscode"

articles/logic-apps/workflow-definition-language-functions-reference.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3397,6 +3397,7 @@ parseDateTime('20/10/2014', 'fr-fr') // Returns '2014-10-20T00:00:00.0000000'.
33973397
parseDateTime('20 octobre 2010', 'fr-FR') // Returns '2010-10-20T00:00:00.0000000'.
33983398
parseDateTime('martes 20 octubre 2020', 'es-es') // Returns '2020-10-20T00:00:00.0000000'.
33993399
parseDateTime('21052019', 'fr-fr', 'ddMMyyyy') // Returns '2019-05-21T00:00:00.0000000'.
3400+
parseDateTime('20190521', 'fr-fr', 'yyyyMMdd') // Returns '2019-05-21T00:00:00.0000000'.
34003401
parseDateTime('10/20/2014 15h', 'en-US', 'MM/dd/yyyy HH\h') // Returns '2014-10-20T15:00:00.0000000'.
34013402
```
34023403

articles/virtual-desktop/app-attach-setup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ In order to use MSIX app attach in Azure Virtual Desktop, you need to meet the p
6666
::: zone pivot="app-attach"
6767
- An SMB file share in the same Azure region as your session hosts. All session hosts in the host pool must have *read* access with their computer account. This file share is used to store your application images. For more information on the requirements for the file share, see [File share](app-attach-overview.md#file-share).
6868

69-
- To use Azure Files when your session hosts joined to Microsoft Entra ID, you need to assign the [Reader and Data Access](../role-based-access-control/built-in-roles.md#reader-and-data-access) Azure role-based access control (RBAC) role to both the **Azure Virtual Desktop** and **Azure Virtual Desktop ARM Provider** service principals. This RBAC role assignment allows your session hosts to access the storage account using access keys or Microsoft Entra.
69+
- To use Azure Files when your session hosts joined to Microsoft Entra ID, you need to assign the [Reader and Data Access](../role-based-access-control/built-in-roles.md#reader-and-data-access) Azure role-based access control (RBAC) role to both the **Azure Virtual Desktop** and **Azure Virtual Desktop ARM Provider** service principals. This RBAC role assignment allows your session hosts to access the storage account using access keys or Microsoft Entra. The storage account must be in the same subscription as the VMs you are using for your session hosts.
7070

7171
- To learn how to assign an Azure RBAC role to the Azure Virtual Desktop service principals, see [Assign RBAC roles to the Azure Virtual Desktop service principals](service-principal-assign-roles.md). In a future update, you won't need to assign the **Azure Virtual Desktop ARM Provider** service principal.
7272
::: zone-end

articles/virtual-network/ip-services/default-outbound-access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ az network vnet subnet update --resource-group rgname --name subnetname --vnet-n
164164

165165
* To activate or update virtual machine operating systems, such as Windows, an explicit outbound connectivity method is required.
166166

167-
* In configurations using a User Defined Route (UDR) with a default route (0/0) that sends traffic to an upstream firewall/network virtual appliance, any traffic that bypasses this route (for example, to Service Tagged destinations) breaks in a Private subnet.
167+
* In configurations using a User Defined Route (UDR) with a default route (0.0.0.0/0) that sends traffic to an upstream firewall/network virtual appliance, any traffic that bypasses this route (for example, to Service Tagged destinations) breaks in a Private subnet.
168168

169169
* Private Subnets are not applicable to delegated or managed subnets used for hosting PaaS services. In these scenarios, outbound connectivity is managed by the individual service.
170170

0 commit comments

Comments
 (0)