Skip to content

Commit 6f03bad

Browse files
committed
Merge branch 'master' of https://github.com/microsoftdocs/azure-docs-pr into akv-throt
2 parents 8fc2ca9 + b8df964 commit 6f03bad

File tree

44 files changed

+449
-358
lines changed

Some content is hidden

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

44 files changed

+449
-358
lines changed

articles/active-directory/authentication/active-directory-certificate-based-authentication-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ This topic:
3333

3434
To configure certificate-based authentication, the following statements must be true:
3535

36-
- Certificate-based authentication (CBA) is only supported for Federated environments for browser applications or native clients using modern authentication (ADAL). The one exception is Exchange Active Sync (EAS) for Exchange Online (EXO), which can be used for federated and managed accounts.
36+
- Certificate-based authentication (CBA) is only supported for Federated environments for browser applications, native clients using modern authentication (ADAL), or MSAL libraries. The one exception is Exchange Active Sync (EAS) for Exchange Online (EXO), which can be used for federated and managed accounts.
3737
- The root certificate authority and any intermediate certificate authorities must be configured in Azure Active Directory.
3838
- Each certificate authority must have a certificate revocation list (CRL) that can be referenced via an internet-facing URL.
3939
- You must have at least one certificate authority configured in Azure Active Directory. You can find related steps in the [Configure the certificate authorities](#step-2-configure-the-certificate-authorities) section.

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,14 @@ Enabled by Azure AD Identity Protection - This method uses the Azure AD Identity
3838

3939
User accounts in Azure Multi-Factor Authentication have the following three distinct states:
4040

41+
> [!IMPORTANT]
42+
> Enabling Azure MFA through a Conditional Access policy will not change the state of the user. Do not be alarmed users appear disabled. Conditional Access does not change the state. **Organizations should not enable or enforce users if they are utilizing Conditional Access policies.**
43+
4144
| Status | Description | Non-browser apps affected | Browser apps affected | Modern authentication affected |
42-
|:---:|:---:|:---:|:--:|:--:|
43-
| Disabled |The default state for a new user not enrolled in Azure MFA. |No |No |No |
44-
| Enabled |The user has been enrolled in Azure MFA, but has not registered. They receive a prompt to register the next time they sign in. |No. They continue to work until the registration process is completed. | Yes. After the session expires, Azure MFA registration is required.| Yes. After the access token expires, Azure MFA registration is required. |
45-
| Enforced |The user has been enrolled and has completed the registration process for Azure MFA. |Yes. Apps require app passwords. |Yes. Azure MFA is required at login. | Yes. Azure MFA is required at login. |
45+
|:---:| --- |:---:|:--:|:--:|
46+
| Disabled | The default state for a new user not enrolled in Azure MFA. | No | No | No |
47+
| Enabled | The user has been enrolled in Azure MFA, but has not registered. They receive a prompt to register the next time they sign in. | No. They continue to work until the registration process is completed. | Yes. After the session expires, Azure MFA registration is required.| Yes. After the access token expires, Azure MFA registration is required. |
48+
| Enforced | The user has been enrolled and has completed the registration process for Azure MFA. | Yes. Apps require app passwords. | Yes. Azure MFA is required at login. | Yes. Azure MFA is required at login. |
4649

4750
A user's state reflects whether an admin has enrolled them in Azure MFA, and whether they completed the registration process.
4851

articles/active-directory/manage-apps/configure-admin-consent-workflow.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ To approve requests, a reviewer must be a global administrator, cloud applicatio
2929

3030
To enable the admin consent workflow and choose reviewers:
3131

32-
1. Sign in to the[Azure portal](https://portal.azure.com)as a global administrator.
33-
2. Click**All services**at the top of the left-hand navigation menu. The**Azure Active Directory Extension**opens.
34-
3. In the filter search box, type"**Azure Active Directory**"and select **theAzure Active Directory**item.
35-
4. From the navigation menu, click**Enterprise applications**.
32+
1. Sign in to the [Azure portal](https://portal.azure.com) as a global administrator.
33+
2. Click **All services** at the top of the left-hand navigation menu. The **Azure Active Directory Extension** opens.
34+
3. In the filter search box, type "**Azure Active Directory**" and select **the Azure Active Directory** item.
35+
4. From the navigation menu, click **Enterprise applications**.
3636
5. Under **Manage**, select **User settings**.
3737
6. Under **Admin consent requests (Preview)**, set **Users can request admin consent to apps they are unable to consent to** to **Yes**.
3838

@@ -70,10 +70,10 @@ After the admin consent workflow is enabled, users can request admin approval fo
7070

7171
To review the admin consent requests and take action:
7272

73-
1. Sign in to the[Azure portal](https://portal.azure.com)as one of the registered reviewers of the admin consent workflow.
74-
2. Select **All services**at the top of the left-hand navigation menu. The**Azure Active Directory Extension**opens.
75-
3. In the filter search box, type"**Azure Active Directory**"and select the**Azure Active Directory**item.
76-
4. From the navigation menu, click**Enterprise applications**.
73+
1. Sign in to the [Azure portal](https://portal.azure.com) as one of the registered reviewers of the admin consent workflow.
74+
2. Select **All services** at the top of the left-hand navigation menu. The **Azure Active Directory Extension** opens.
75+
3. In the filter search box, type "**Azure Active Directory**" and select the **Azure Active Directory** item.
76+
4. From the navigation menu, click **Enterprise applications**.
7777
5. Under **Activity**, select **Admin consent requests (Preview)**.
7878

7979
> [!NOTE]
@@ -116,12 +116,12 @@ The table below outlines the scenarios and audit values available for the admin
116116

117117
|Scenario |Audit Service |Audit Category |Audit Activity |Audit Actor |Audit log limitations |
118118
|---------|---------|---------|---------|---------|---------|
119-
|Admin enabling the consent request workflow   |Access Reviews |UserManagement |Create governance policy template |App context   |Currently you cannot find the user context   |
120-
|Admin disablingtheconsentrequest workflow |Access Reviews |UserManagement |Delete governance policy template |App context   |Currently you cannot find the user context |
121-
|Admin updating the consent workflow configurations   |Access Reviews |UserManagement |Update governance policy template |App context   |Currently you cannot find the user context |
122-
|End user creating anadmin consentrequestfor anapp |Access Reviews |Policy |Createrequest |App context   |Currently you cannot find the user context |
123-
|Reviewers approving anadmin consentrequest |Access Reviews |UserManagement |Approve all requests in business flow |App context   |Currentlyyou cannot find the user context or the app ID that was granted admin consent. |
124-
|Reviewers denying an admin consentrequest |Access Reviews |UserManagement |Approve all requests in business flow |App context   |Currentlyyou cannot find the user context of the actor that denied an admin consent request |
119+
|Admin enabling the consent request workflow |Access Reviews |UserManagement |Create governance policy template |App context |Currently you cannot find the user context |
120+
|Admin disabling the consent request workflow |Access Reviews |UserManagement |Delete governance policy template |App context |Currently you cannot find the user context |
121+
|Admin updating the consent workflow configurations |Access Reviews |UserManagement |Update governance policy template |App context |Currently you cannot find the user context |
122+
|End user creating an admin consent request for an app |Access Reviews |Policy |Create request |App context |Currently you cannot find the user context |
123+
|Reviewers approving an admin consent request |Access Reviews |UserManagement |Approve all requests in business flow |App context |Currently you cannot find the user context or the app ID that was granted admin consent. |
124+
|Reviewers denying an admin consent request |Access Reviews |UserManagement |Approve all requests in business flow |App context | Currently you cannot find the user context of the actor that denied an admin consent request |
125125

126126
## FAQ
127127

articles/azure-resource-manager/deployment-manager-tutorial-health-check.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Use Azure Deployment Manager with templates
3-
description: Use Resource Manager templates with Azure Deployment Manager to deploy Azure resources.
2+
title: Use Azure Deployment Manager health check
3+
description: Use health check to safely deploy Azure resources with Azure Deployment Manager.
44
author: mumian
55
ms.date: 10/09/2019
66
ms.topic: tutorial

articles/azure-resource-manager/deployment-manager-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: Use Azure Deployment Manager with Resource Manager templates | Microsoft Docs
3-
description: Use Resource Manager templates with Azure Deployment Manager to deploy Azure resources.
2+
title: Use Azure Deployment Manager to deploy templates
3+
description: Learn how to use Resource Manager templates with Azure Deployment Manager to deploy Azure resources.
44
author: mumian
55
ms.date: 11/21/2019
66
ms.topic: tutorial

articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/cpp/linux.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ ms.author: wolfma
1414

1515
## Prerequisites
1616

17-
Before you get started, make sure to:
17+
Before you get started:
1818

1919
> [!div class="checklist"]
2020
> * [Create an Azure Speech Resource](../../../../get-started.md)
2121
> * [Setup your development environment](../../../../quickstarts/setup-platform.md?tabs=linux)
2222
> * [Create an empty sample project](../../../../quickstarts/create-project.md?tabs=linux)
23+
> * Make sure that you have access to a microphone for audio capture
2324
2425
## Add sample code
2526

articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/cpp/macos.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ ms.author: wolfma
1414

1515
## Prerequisites
1616

17-
Before you get started, make sure to:
17+
Before you get started:
1818

1919
> [!div class="checklist"]
2020
> * [Create an Azure Speech Resource](../../../../get-started.md)
2121
> * [Setup your development environment](../../../../quickstarts/setup-platform.md?tabs=macos)
2222
> * [Create an empty sample project](../../../../quickstarts/create-project.md?tabs=macos)
23+
> * Make sure that you have access to a microphone for audio capture
2324
2425
## Add sample code
2526

articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/cpp/windows.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ ms.author: wolfma
1414

1515
## Prerequisites
1616

17-
Before you get started, make sure to:
17+
Before you get started:
1818

1919
> [!div class="checklist"]
2020
> * [Create an Azure Speech Resource](../../../../get-started.md)
2121
> * [Setup your development environment](../../../../quickstarts/setup-platform.md?tabs=windows)
2222
> * [Create an empty sample project](../../../../quickstarts/create-project.md?tabs=windows)
23+
> * Make sure that you have access to a microphone for audio capture
2324
2425
## Add sample code
2526

articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/csharp/dotnet.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ ms.author: erhopf
1414

1515
## Prerequisites
1616

17-
Before you get started, make sure to:
17+
Before you get started:
1818

1919
> [!div class="checklist"]
2020
> * [Create an Azure Speech Resource](../../../../get-started.md)
2121
> * [Setup your development environment](../../../../quickstarts/setup-platform.md?tabs=dotnet)
2222
> * [Create an empty sample project](../../../../quickstarts/create-project.md?tabs=dotnet)
23+
> * Make sure that you have access to a microphone for audio capture
2324
2425
## Open your project in Visual Studio
2526

articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/csharp/unity.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@ ms.author: erhopf
1818
1919
## Prerequisites
2020

21-
Before you get started, make sure to:
21+
Before you get started:
2222

2323
> [!div class="checklist"]
2424
> * [Create an Azure Speech Resource](../../../../get-started.md)
2525
> * [Setup your development environment](../../../../quickstarts/setup-platform.md?tabs=unity)
2626
> * [Create an empty sample project](../../../../quickstarts/create-project.md?tabs=unity)
27+
> * Make sure that you have access to a microphone for audio capture
28+
2729
If you've already done this, great. Let's keep going.
2830

2931
## Create a Unity project

0 commit comments

Comments
 (0)