Skip to content

Commit 380ea58

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into scheduling-and-troubleshoot-tracking-and-dsc
2 parents f5361e7 + 2e0815d commit 380ea58

File tree

330 files changed

+2781
-2466
lines changed

Some content is hidden

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

330 files changed

+2781
-2466
lines changed

.openpublishing.redirection.json

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,10 @@
727727
"redirect_url": "/azure/cognitive-services/personalizer/how-to-manage-model",
728728
"redirect_document_id": false
729729
},
730-
730+
{
731+
"source_path": "articles/cognitive-services/LUIS/luis-boundaries.md",
732+
"redirect_url": "/azure/cognitive-services/LUIS/luis-limits"
733+
},
731734
{
732735
"source_path": "articles/cognitive-services/LUIS/luis-migration-api-authoring.md",
733736
"redirect_url": "/azure/cognitive-services/LUIS/luis-migration-authoring-entities",
@@ -2339,6 +2342,11 @@
23392342
"redirect_url": "/azure/cosmos-db/analytics-usecases",
23402343
"redirect_document_id": false
23412344
},
2345+
{
2346+
"source_path": "articles/cosmos-db/multi-master-benefits.md",
2347+
"redirect_url": "/azure/cosmos-db/conflict-resolution-policies",
2348+
"redirect_document_id": false
2349+
},
23422350
{
23432351
"source_path": "articles/cosmos-db/sql-api-python-application.md",
23442352
"redirect_url": "/azure/cosmos-db/create-sql-api-python",
@@ -14098,6 +14106,11 @@
1409814106
"redirect_url": "/azure/architecture/patterns/valet-key",
1409914107
"redirect_document_id": false
1410014108
},
14109+
{
14110+
"source_path": "articles/event-hubs/event-hubs-api-overview.md",
14111+
"redirect_url": "/azure/event-hubs/event-hubs-samples",
14112+
"redirect_document_id": false
14113+
},
1410114114
{
1410214115
"source_path": "articles/event-hubs/event-hubs-archive-overview.md",
1410314116
"redirect_url": "/azure/event-hubs/event-hubs-capture-overview",
@@ -14158,11 +14171,21 @@
1415814171
"redirect_url": "/azure/event-hubs/event-hubs-dotnet-standard-getstarted-send",
1415914172
"redirect_document_id": false
1416014173
},
14174+
{
14175+
"source_path": "articles/event-hubs/event-hubs-dotnet-framework-api-overview.md",
14176+
"redirect_url": "/azure/event-hubs/event-hubs-dotnet-framework-getstarted-send",
14177+
"redirect_document_id": false
14178+
},
1416114179
{
1416214180
"source_path": "articles/event-hubs/event-hubs-dotnet-framework-getstarted-receive-eph.md",
1416314181
"redirect_url": "/azure/event-hubs/event-hubs-dotnet-framework-getstarted-send",
1416414182
"redirect_document_id": false
1416514183
},
14184+
{
14185+
"source_path": "articles/event-hubs/event-hubs-dotnet-standard-api-overview.md",
14186+
"redirect_url": "/azure/event-hubs/event-hubs-dotnet-standard-getstarted-send",
14187+
"redirect_document_id": false
14188+
},
1416614189
{
1416714190
"source_path": "articles/event-hubs/event-hubs-dotnet-standard-getstarted-receive-eph.md",
1416814191
"redirect_url": "/azure/event-hubs/event-hubs-dotnet-standard-getstarted-send",
@@ -14228,6 +14251,11 @@
1422814251
"redirect_url": "/azure/event-hubs/authorize-access-azure-active-directory",
1422914252
"redirect_document_id": false
1423014253
},
14254+
{
14255+
"source_path": "articles/event-hubs/event-hubs-spark-connector.md",
14256+
"redirect_url": "/azure/event-hubs/event-hubs-kafka-spark-tutorial",
14257+
"redirect_document_id": false
14258+
},
1423114259
{
1423214260
"source_path": "articles/event-hubs/event-hubs-tutorial-virtual-networks-firewalls.md",
1423314261
"redirect_url": "/azure/event-hubs/event-hubs-service-endpoints",
@@ -17828,6 +17856,11 @@
1782817856
"redirect_url": "/azure/synapse-analytics/sql-data-warehouse/performance-tuning-ordered-cci",
1782917857
"redirect_document_id": true
1783017858
},
17859+
{
17860+
"source_path": "articles/synapse-analytics/apache-spark-notebook-create-spark-use-sql.md",
17861+
"redirect_url": "/azure/synapse-analytics/quickstart-apache-spark-notebook",
17862+
"redirect_document_id": true
17863+
},
1783117864
{
1783217865
"source_path": "articles/sql-database/sql-database-auditing-get-started.md",
1783317866
"redirect_url": "/azure/sql-database/sql-database-auditing",

articles/active-directory-domain-services/secure-remote-vm-access.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ The RD environment deployment contains a number of steps. The existing RD deploy
5757

5858
1. Sign in to VMs created for the RD environment with an account that's part of the *Azure AD DC Administrators* group, such as *contosoadmin*.
5959
1. To create and configure RDS, use the existing [Remote Desktop environment deployment guide][deploy-remote-desktop]. Distribute the RD server components across your Azure VMs as desired.
60+
* Specific to Azure AD DS - when you configure RD licensing, set it to **Per Device** mode, not **Per User** as noted in the deployment guide.
6061
1. If you want to provide access using a web browser, [set up the Remote Desktop web client for your users][rd-web-client].
6162

6263
With RD deployed into the Azure AD DS managed domain, you can manage and use the service as you would with an on-premises AD DS domain.

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/active-directory/authentication/howto-mfa-reporting.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,19 @@ First, ensure that you have the [MSOnline V1 PowerShell module](https://docs.mic
125125

126126
Identify users who have registered for MFA using the PowerShell that follows. This set of commands excludes disabled users since these accounts cannot authenticate against Azure AD.
127127

128-
```Get-MsolUser -All | Where-Object {$.StrongAuthenticationMethods -ne $null -and $.BlockCredential -eq $False} | Select-Object -Property UserPrincipalName```
128+
```powershell
129+
Get-MsolUser -All | Where-Object {$._StrongAuthenticationMethods -ne $null -and $._BlockCredential -eq $False} | Select-Object -Property UserPrincipalName
130+
```
129131

130132
Identify users who have not registered for MFA using the PowerShell that follows. This set of commands excludes disabled users since these accounts cannot authenticate against Azure AD.
131133

132-
```Get-MsolUser -All | Where-Object {$.StrongAuthenticationMethods.Count -eq 0 -and $.BlockCredential -eq $False} | Select-Object -Property UserPrincipalName```
134+
```powershell
135+
Get-MsolUser -All | Where-Object {$._StrongAuthenticationMethods.Count -eq 0 -and $._BlockCredential -eq $False} | Select-Object -Property UserPrincipalName
136+
```
133137

134138
Identify users and output methods registered.
135139

136-
```PowerShell
140+
```powershell
137141
Get-MsolUser -All | Select-Object @{N='UserPrincipalName';E={$_.UserPrincipalName}},
138142
139143
@{N='MFA Status';E={if ($_.StrongAuthenticationRequirements.State){$_.StrongAuthenticationRequirements.State} else {"Disabled"}}},

0 commit comments

Comments
 (0)