Skip to content

Commit 0381646

Browse files
authored
Merge pull request #202633 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 e2f03bd + 2afb503 commit 0381646

File tree

6 files changed

+38
-14
lines changed

6 files changed

+38
-14
lines changed

articles/active-directory/devices/howto-vm-sign-in-azure-ad-windows.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ Now that you've created the VM, you need to configure Azure RBAC policy to deter
164164
- **Virtual Machine User Login**: Users with this role assigned can log in to an Azure virtual machine with regular user privileges.
165165

166166
> [!NOTE]
167-
> To allow a user to log in to the VM over RDP, you must assign either the Virtual Machine Administrator Login or Virtual Machine User Login role. An Azure user with the Owner or Contributor roles assigned for a VM do not automatically have privileges to log in to the VM over RDP. This is to provide audited separation between the set of people who control virtual machines versus the set of people who can access virtual machines.
167+
> To allow a user to log in to the VM over RDP, you must assign either the Virtual Machine Administrator Login or Virtual Machine User Login role to the Resource Group containing the VM and its associated Virtual Network, Network Interface, Public IP Address or Load Balancer resources. An Azure user with the Owner or Contributor roles assigned for a VM do not automatically have privileges to log in to the VM over RDP. This is to provide audited separation between the set of people who control virtual machines versus the set of people who can access virtual machines.
168168
169169
There are multiple ways you can configure role assignments for VM:
170170

@@ -178,6 +178,8 @@ There are multiple ways you can configure role assignments for VM:
178178

179179
To configure role assignments for your Azure AD enabled Windows Server 2019 Datacenter VMs:
180180

181+
1. Select the **Resource Group** containing the VM and its associated Virtual Network, Network Interface, Public IP Address or Load Balancer resource.
182+
181183
1. Select **Access control (IAM)**.
182184

183185
1. Select **Add** > **Add role assignment** to open the Add role assignment page.
@@ -197,12 +199,12 @@ The following example uses [az role assignment create](/cli/azure/role/assignmen
197199

198200
```AzureCLI
199201
$username=$(az account show --query user.name --output tsv)
200-
$vm=$(az vm show --resource-group myResourceGroup --name myVM --query id -o tsv)
202+
$rg=$(az group show --resource-group myResourceGroup --query id -o tsv)
201203
202204
az role assignment create \
203205
--role "Virtual Machine Administrator Login" \
204206
--assignee $username \
205-
--scope $vm
207+
--scope $rg
206208
```
207209

208210
> [!NOTE]

articles/azure-arc/kubernetes/tutorial-akv-secrets-provider.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,16 +244,19 @@ You should see output similar to the example below.
244244

245245
Next, specify the Azure Key Vault to use with your connected cluster. If you don't already have one, create a new Key Vault by using the following commands. Keep in mind that the name of your Key Vault must be globally unique.
246246

247-
```azurecli
248-
az keyvault create -n $AZUREKEYVAULT_NAME -g $AKV_RESOURCE_GROUP -l $AZUREKEYVAULT_LOCATION
249247

250-
Next, set the following environment variables:
248+
Set the following environment variables:
251249

252250
```azurecli-interactive
253251
export AKV_RESOURCE_GROUP=<resource-group-name>
254252
export AZUREKEYVAULT_NAME=<AKV-name>
255253
export AZUREKEYVAULT_LOCATION=<AKV-location>
256254
```
255+
Next, run the following command
256+
257+
```azurecli
258+
az keyvault create -n $AZUREKEYVAULT_NAME -g $AKV_RESOURCE_GROUP -l $AZUREKEYVAULT_LOCATION
259+
```
257260

258261
Azure Key Vault can store keys, secrets, and certificates. For this example, you can set a plain text secret called `DemoSecret` by using the following command:
259262

@@ -293,7 +296,7 @@ Currently, the Secrets Store CSI Driver on Arc-enabled clusters can be accessed
293296
apiVersion: secrets-store.csi.x-k8s.io/v1
294297
kind: SecretProviderClass
295298
metadata:
296-
name: akvprovider-demo
299+
name: akvprovider-demo
297300
spec:
298301
provider: azure
299302
parameters:
@@ -412,4 +415,4 @@ For more information about resolving common issues, see the open source troubles
412415
## Next steps
413416

414417
- Want to try things out? Get started quickly with an [Azure Arc Jumpstart scenario](https://aka.ms/arc-jumpstart-akv-secrets-provider) using Cluster API.
415-
- Learn more about [Azure Key Vault](../../key-vault/general/overview.md).
418+
- Learn more about [Azure Key Vault](../../key-vault/general/overview.md).

articles/cognitive-services/language-service/conversational-language-understanding/concepts/data-formats.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ CLU offers the option to upload your utterance directly to the project rather th
116116
"intent": "{intent}",
117117
"entities": [
118118
{
119-
"entityName": "{entity}",
119+
"category": "{entity}",
120120
"offset": 19,
121121
"length": 10
122122
}
@@ -129,12 +129,12 @@ CLU offers the option to upload your utterance directly to the project rather th
129129
"intent": "{intent}",
130130
"entities": [
131131
{
132-
"entityName": "{entity}",
132+
"category": "{entity}",
133133
"offset": 20,
134134
"length": 10
135135
},
136136
{
137-
"entityName": "{entity}",
137+
"category": "{entity}",
138138
"offset": 31,
139139
"length": 5
140140
}

articles/cognitive-services/language-service/question-answering/tutorials/active-learning.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ Once the import of the test file is complete, active learning suggestions can be
5353
> [!div class="mx-imgBorder"]
5454
> [ ![Screenshot with review suggestions page displayed.]( ../media/active-learning/review-suggestions.png) ]( ../media/active-learning/review-suggestions.png#lightbox)
5555
56+
> [!NOTE]
57+
> Active learning suggestions are not real time. There is an approximate delay of 30 minutes before the suggestions can show on this pane. This delay is to ensure that we balance the high cost involved for real time updates to the index and service performance.
58+
5659
We can now either accept these suggestions or reject them using the options on the menu bar to **Accept all suggestions** or **Reject all suggestions**.
5760

5861
Alternatively, to accept or reject individual suggestions, select the checkmark (accept) symbol or trash can (reject) symbol that appears next to individual questions in the **Review suggestions** page.

articles/communication-services/how-tos/calling-sdk/includes/dominant-speaker/dominant-speaker-web.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const dominantSpeakersChangedHandler = () => {
3333
// Get the most up to date list of dominant speakers
3434
let dominantSpeakers = callDominantSpeakersApi.dominantSpeakers;
3535
};
36-
callDominantSpeakersApi.api(Features.CallDominantSpeakers).on('dominantSpeakersChanged', dominantSpeakersChangedHandler);
36+
callDominantSpeakersApi.on('dominantSpeakersChanged', dominantSpeakersChangedHandler);
3737
```
3838
#### Handle the Dominant Speaker's video streams
3939

articles/web-application-firewall/ag/application-gateway-waf-configuration.md

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Exclusions can be configured to apply to a specific set of WAF rules, to ruleset
7272
7373
### Per-rule exclusions
7474

75-
You can configure an exclusion for a specific rule, group of rules, or rule set. You must specify the rule or rules that the exclusion applies to. You also need to specify the request attribute that should be excluded from the WAF evaluation.
75+
You can configure an exclusion for a specific rule, group of rules, or rule set. You must specify the rule or rules that the exclusion applies to. You also need to specify the request attribute that should be excluded from the WAF evaluation. To exclude a complete group of rules, only provide the `ruleGroupName` parameter, the `rules` parameter is only useful when you want to limit the exclusion to specific rules of a group.
7676

7777
Per-rule exclusions are available when you use the OWASP (CRS) ruleset version 3.2 or later.
7878

@@ -168,6 +168,14 @@ resource wafPolicy 'Microsoft.Network/ApplicationGatewayWebApplicationFirewallPo
168168
ruleGroups: [
169169
{
170170
ruleGroupName: 'REQUEST-942-APPLICATION-ATTACK-SQLI'
171+
rules: [
172+
{
173+
ruleId: '942150'
174+
}
175+
{
176+
ruleId: '942410'
177+
}
178+
]
171179
}
172180
]
173181
}
@@ -206,7 +214,15 @@ resource wafPolicy 'Microsoft.Network/ApplicationGatewayWebApplicationFirewallPo
206214
"ruleSetVersion": "3.2",
207215
"ruleGroups": [
208216
{
209-
"ruleGroupName": "REQUEST-942-APPLICATION-ATTACK-SQLI"
217+
"ruleGroupName": "REQUEST-942-APPLICATION-ATTACK-SQLI",
218+
"rules": [
219+
{
220+
"ruleId": "942150"
221+
},
222+
{
223+
"ruleId": "942410"
224+
}
225+
]
210226
}
211227
]
212228
}

0 commit comments

Comments
 (0)