Skip to content

Commit d16b7d2

Browse files
authored
Merge pull request #48555 from MicrosoftDocs/master
8/8 PM Publish
2 parents 914f51e + 3ac35b2 commit d16b7d2

File tree

398 files changed

+3928
-1452
lines changed

Some content is hidden

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

398 files changed

+3928
-1452
lines changed

.openpublishing.redirection.json

Lines changed: 84 additions & 170 deletions
Large diffs are not rendered by default.

articles/active-directory-b2c/manage-user-access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ The following steps describe how you can manage terms of use:
102102
You can capture terms of use acceptance under the following scenarios:
103103

104104
- A new user is signing up. The terms of use are displayed, and the acceptance result is stored.
105-
- A user is signing in who has previously accepted the latest or active terms of agreement. The terms of use are not displayed.
105+
- A user is signing in who has previously accepted the latest or active terms of use. The terms of use are not displayed.
106106
- A user is signing in who has not already accepted the latest or active terms of use. The terms of use are displayed, and the acceptance result is stored.
107107
- A user is signing in who has already accepted an older version of the terms of use, which are now updated to the latest version. The terms of use are displayed, and the acceptance result is stored.
108108

articles/active-directory/TOC.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,8 @@
435435
#### [iOS](active-directory-certificate-based-authentication-ios.md)
436436
#### [Get started](active-directory-certificate-based-authentication-get-started.md)
437437

438-
### [Azure AD Identity Protection](active-directory-identityprotection.md)
438+
### Azure AD Identity Protection
439+
#### [Overview](identity-protection/overview.md)
439440
#### [Enable](identity-protection/enable.md)
440441
#### [Detect vulnerabilities](identity-protection/vulnerabilities.md)
441442
#### [Risk events](active-directory-identity-protection-risk-events.md)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Before you start, make sure you have the following prerequisites:
2727

2828
**Enabled by conditional access policy** - This method is discussed in this article. It is the most flexible means to enable two-step verification for your users. Enabling using conditional access policy only works for Azure MFA in the cloud and is a premium feature of Azure AD.
2929

30-
Enabled by Azure AD Identity Protection - This method uses the Azure AD Identity Protection risk policy to require two-step verification based only on sign-in risk for all cloud applications. This method requires Azure Active Directory P2 licensing. More information on this method can be found in [Azure Active Directory Identity Protection](../active-directory-identityprotection.md#risky-sign-ins)
30+
Enabled by Azure AD Identity Protection - This method uses the Azure AD Identity Protection risk policy to require two-step verification based only on sign-in risk for all cloud applications. This method requires Azure Active Directory P2 licensing. More information on this method can be found in [Azure Active Directory Identity Protection](../identity-protection/overview.md#risky-sign-ins).
3131

3232
Enabled by changing user state - This is the traditional method for requiring two-step verification. It works with both Azure MFA in the cloud and Azure MFA Server. Using this method requires users to perform two-step verification **every time** they sign in and overrides conditional access policies. More information on this method can be found in [How to require two-step verification for a user](howto-mfa-userstates.md)
3333

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ You can take one of two approaches for requiring two-step verification. The firs
2727

2828
Enabled by conditional access policy - This is the most flexible means to enable two-step verification for your users. Enabling using conditional access policy only works for Azure MFA in the cloud and is a premium feature of Azure AD. More information on this method can be found in [Deploy cloud-based Azure Multi-Factor Authentication](howto-mfa-getstarted.md).
2929

30-
Enabled by Azure AD Identity Protection - This method uses the Azure AD Identity Protection risk policy to require two-step verification based only on sign-in risk for all cloud applications. This method requires Azure Active Directory P2 licensing. More information on this method can be found in [Azure Active Directory Identity Protection](../active-directory-identityprotection.md#risky-sign-ins)
30+
Enabled by Azure AD Identity Protection - This method uses the Azure AD Identity Protection risk policy to require two-step verification based only on sign-in risk for all cloud applications. This method requires Azure Active Directory P2 licensing. More information on this method can be found in [Azure Active Directory Identity Protection](../identity-protection/overview.md#risky-sign-ins)
3131

3232
> [!Note]
3333
> More information about licenses and pricing can be found on the [Azure AD](https://azure.microsoft.com/pricing/details/active-directory/

articles/active-directory/devices/hybrid-azuread-join-managed-domains.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.workload: identity
1414
ms.tgt_pltfrm: na
1515
ms.devlang: na
1616
ms.topic: article
17-
ms.date: 07/31/2018
17+
ms.date: 08/08/2018
1818
ms.author: markvi
1919
ms.reviewer: sandeo
2020

@@ -155,8 +155,6 @@ To successfully complete hybrid Azure AD join of your Windows down-level devices
155155

156156
- `https://device.login.microsoftonline.com`
157157

158-
- `https://device.login.microsoftonline.com`
159-
160158
- `https://autologon.microsoftazuread-sso.com`.
161159

162160
Additionally, you need to enable **Allow updates to status bar via script** in the user’s local intranet zone.

articles/active-directory/identity-protection/howto-unblock-user.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ To unblock a suspicious sign-in, you have the following options:
4848
## Unblocking accounts at risk
4949
To unblock an account at risk, you have the following options:
5050

51-
1. **Reset password** - You can reset the user's password. For more information, see [manual secure password reset](../active-directory-identityprotection.md#manual-secure-password-reset).
52-
2. **Dismiss all risk events** - The user risk policy blocks a user if the configured user risk level for blocking access has been reached. You can reduce a user's risk level by manually closing reported risk events. For more information, see [closing risk events manually](../active-directory-identityprotection.md#closing-risk-events-manually).
51+
1. **Reset password** - You can reset the user's password. For more information, see [manual secure password reset](overview.md#manual-secure-password-reset).
52+
2. **Dismiss all risk events** - The user risk policy blocks a user if the configured user risk level for blocking access has been reached. You can reduce a user's risk level by manually closing reported risk events. For more information, see [closing risk events manually](overview.md#closing-risk-events-manually).
5353
3. **Exclude from policy** - If you think that the current configuration of your sign-in policy is causing issues for specific users, you can exclude the users from it. For more information, see [Azure Active Directory Identity Protection](../active-directory-identityprotection.md).
5454
4. **Disable policy** - If you think that your policy configuration is causing issues for all your users, you can disable the policy. For more information, see [Azure Active Directory Identity Protection](../active-directory-identityprotection.md).
5555

0 commit comments

Comments
 (0)