Skip to content

Commit e4fc887

Browse files
authored
Merge pull request #112410 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 22c4e81 + 506bed4 commit e4fc887

File tree

6 files changed

+14
-16
lines changed

6 files changed

+14
-16
lines changed

articles/active-directory/authentication/howto-mfa-mfasettings.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ Configure the _fraud alert_ feature so that your users can report fraudulent att
9595
### View fraud reports
9696

9797
1. Sign in to the [Azure portal](https://portal.azure.com).
98-
2. Select **Azure Active Directory** > **Sign-ins**. The fraud report is now part of the standard Azure AD Sign-ins report.
99-
98+
2. Select **Azure Active Directory** > **Sign-ins** > **Authentication Details**. The fraud report is now part of the standard Azure AD Sign-ins report and it will show in the **"Result Detail"** as MFA denied, Fraud Code Entered.
99+
100100
## Notifications
101101

102-
Configure email addresses here for users who will receive fraud alert emails.
102+
Configure email addresses here for users who will receive fraud alert emails in **Azure Active Directory** > **Security** > **Multi-Factor Authentication** > **Notifications**.
103103

104104
![Notification fraud alert email sample](./media/howto-mfa-mfasettings/multi-factor-authentication-fraud-alert-email.png)
105105

articles/azure-signalr/signalr-concept-internals.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@ ms.author: zhshang
99
---
1010
# Azure SignalR Service internals
1111

12-
Azure SignalR Service is built on top of ASP.NET Core SignalR framework. It also supports ASP.NET SignalR as a preview feature.
12+
Azure SignalR Service is built on top of ASP.NET Core SignalR framework. It also supports ASP.NET SignalR by reimplementing ASP.NET SignalR's data protocol on top of the ASP.NET Core framework.
1313

14-
> To support ASP.NET SignalR, Azure SignalR Service reimplements ASP.NET SignalR's data protocol on top of the ASP.NET Core framework
15-
16-
You can easily migrate a local ASP.NET Core SignalR application to work with SignalR Service, with a few lines of code change.
14+
You can easily migrate a local ASP.NET Core SignalR application or ASP.NET SignalR application to work with SignalR Service, with a few lines of code change.
1715

1816
The diagram below describes the typical architecture when you use the SignalR Service with your application server.
1917

@@ -83,4 +81,4 @@ At this point, the application server receives an event with information from th
8381
SignalR service transmits data from the client to the pairing application server. And data from the application server will be sent to the mapped clients.
8482
8583
As you can see, the Azure SignalR Service is essentially a logical transport layer between application server and clients. All persistent connections are offloaded to SignalR Service.
86-
Application server only needs to handle the business logic in hub class, without worrying about client connections.
84+
Application server only needs to handle the business logic in hub class, without worrying about client connections.

articles/data-factory/create-shared-self-hosted-integration-runtime-powershell.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Grant permission to the data factory that needs to access the self-hosted integr
170170
```powershell
171171
New-AzRoleAssignment `
172172
-ObjectId $factory.Identity.PrincipalId ` #MSI of the Data Factory with which it needs to be shared
173-
-RoleDefinitionId 'b24988ac-6180-42a0-ab88-20f7382dd24c' ` #This is the Contributor role
173+
-RoleDefinitionName 'Contributor' `
174174
-Scope $SharedIR.Id
175175
```
176176

@@ -197,7 +197,7 @@ To revoke the access of a data factory from the shared integration runtime, run
197197
```powershell
198198
Remove-AzRoleAssignment `
199199
-ObjectId $factory.Identity.PrincipalId `
200-
-RoleDefinitionId 'b24988ac-6180-42a0-ab88-20f7382dd24c' `
200+
-RoleDefinitionName 'Contributor' `
201201
-Scope $SharedIR.Id
202202
```
203203

articles/event-grid/secure-webhook-delivery.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ else
9999
100100
New-AzureADServiceAppRoleAssignment -Id $myApp.AppRoles[0].Id -ResourceId $myServicePrincipal.ObjectId -ObjectId $eventGridSP.ObjectId -PrincipalId $eventGridSP.ObjectId
101101
102-
Write-Host "My Azure AD Tenant Id" + $myTenantId
103-
Write-Host "My Azure AD Application Id" + $myAzureADApplicationObjectId
104-
Write-Host "My Azure AD Application ($myApp.ObjectId): " + $myApp.ObjectId
105-
Write-Host "My Azure AD Application's Roles"
102+
Write-Host "My Azure AD Tenant Id: $myTenantId"
103+
Write-Host "My Azure AD Application Id: $($myApp.AppId)"
104+
Write-Host "My Azure AD Application ObjectId: $($myApp.ObjectId)"
105+
Write-Host "My Azure AD Application's Roles: "
106106
Write-Host $myApp.AppRoles
107107
```
108108

articles/virtual-network/create-vm-accelerated-networking-cli.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ The following distributions are supported out of the box from the Azure Gallery:
5454
### Supported VM instances
5555
Accelerated Networking is supported on most general purpose and compute-optimized instance sizes with 2 or more vCPUs. These supported series are: D/DSv2 and F/Fs
5656

57-
On instances that support hyperthreading, Accelerated Networking is supported on VM instances with 4 or more vCPUs. Supported series are: D/Dsv3, E/Esv3, Fsv2, Lsv2, Ms/Mms and Ms/Mmsv2.
57+
On instances that support hyperthreading, Accelerated Networking is supported on VM instances with 4 or more vCPUs. Supported series are: D/Dsv3, D/Dsv4, E/Esv3, Ea/Easv4, Fsv2, Lsv2, Ms/Mms and Ms/Mmsv2.
5858

5959
For more information on VM instances, see [Linux VM sizes](../virtual-machines/linux/sizes.md?toc=%2fazure%2fvirtual-network%2ftoc.json).
6060

articles/virtual-network/create-vm-accelerated-networking-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The following distributions are supported out of the box from the Azure Gallery:
4545
### Supported VM instances
4646
Accelerated Networking is supported on most general purpose and compute-optimized instance sizes with 2 or more vCPUs. These supported series are: D/DSv2 and F/Fs
4747

48-
On instances that support hyperthreading, Accelerated Networking is supported on VM instances with 4 or more vCPUs. Supported series are: D/Dsv3, E/Esv3, Fsv2, Lsv2, Ms/Mms and Ms/Mmsv2.
48+
On instances that support hyperthreading, Accelerated Networking is supported on VM instances with 4 or more vCPUs. Supported series are: D/Dsv3, D/Dsv4, E/Esv3, Ea/Easv4, Fsv2, Lsv2, Ms/Mms and Ms/Mmsv2.
4949

5050
For more information on VM instances, see [Windows VM sizes](../virtual-machines/windows/sizes.md?toc=%2fazure%2fvirtual-network%2ftoc.json).
5151

0 commit comments

Comments
 (0)