Skip to content

Commit 7efb2a6

Browse files
authored
Merge pull request #93166 from MicrosoftDocs/master
Merge Master to Live, 3 AM
2 parents 8e27127 + 780de6e commit 7efb2a6

File tree

137 files changed

+1447
-2380
lines changed

Some content is hidden

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

137 files changed

+1447
-2380
lines changed

.openpublishing.redirection.json

Lines changed: 140 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -34674,130 +34674,220 @@
3467434674
"redirect_document_id": true
3467534675
},
3467634676
{
34677-
"source_path": "articles/active-directory/active-directory-conditional-access-baseline-protection.md",
34678-
"redirect_url": "/azure/active-directory/conditional-access/baseline-protection",
34677+
"source_path": "articles/active-directory/identity-protection/overview-v2.md",
34678+
"redirect_url": "/azure/active-directory/identity-protection/overview-identity-protection",
3467934679
"redirect_document_id": true
3468034680
},
3468134681
{
34682-
"source_path": "articles/active-directory/active-directory-conditional-access-locations.md",
34683-
"redirect_url": "/azure/active-directory/conditional-access/location-condition",
34682+
"source_path": "articles/active-directory/identity-protection/overview.md",
34683+
"redirect_url": "/azure/active-directory/identity-protection/overview-identity-protection",
34684+
"redirect_document_id": false
34685+
},
34686+
{
34687+
"source_path": "articles/active-directory/identity-protection/quickstart-sign-in-risk-policy.md",
34688+
"redirect_url": "/azure/active-directory/identity-protection/overview-identity-protection",
34689+
"redirect_document_id": false
34690+
},
34691+
{
34692+
"source_path": "articles/active-directory/identity-protection/howto-mfa-policy.md",
34693+
"redirect_url": "/azure/active-directory/identity-protection/howto-identity-protection-configure-mfa-policy",
3468434694
"redirect_document_id": true
3468534695
},
3468634696
{
34687-
"source_path": "articles/active-directory/active-directory-conditional-access-whatif.md",
34688-
"redirect_url": "/azure/active-directory/conditional-access/what-if-tool",
34697+
"source_path": "articles/active-directory/identity-protection/howto-sign-in-risk-policy.md",
34698+
"redirect_url": "/azure/active-directory/identity-protection/howto-identity-protection-configure-risk-policies",
34699+
"redirect_document_id": false
34700+
},
34701+
{
34702+
"source_path": "articles/active-directory/identity-protection/howto-user-risk-policy.md",
34703+
"redirect_url": "/azure/active-directory/identity-protection/howto-identity-protection-configure-risk-policies",
34704+
"redirect_document_id": false
34705+
},
34706+
{
34707+
"source_path": "articles/active-directory/identity-protection/howto-close-active-risk-events.md",
34708+
"redirect_url": "/azure/active-directory/identity-protection/howto-identity-protection-remediate-unblock",
3468934709
"redirect_document_id": true
3469034710
},
3469134711
{
34692-
"source_path": "articles/active-directory/active-directory-conditional-faqs.md",
34693-
"redirect_url": "/azure/active-directory/conditional-access/faqs",
34712+
"source_path": "articles/active-directory/identity-protection/howto-unblock-user.md",
34713+
"redirect_url": "/azure/active-directory/identity-protection/howto-identity-protection-remediate-unblock",
34714+
"redirect_document_id": false
34715+
},
34716+
{
34717+
"source_path": "articles/active-directory/identity-protection/playbook.md",
34718+
"redirect_url": "/azure/active-directory/identity-protection/howto-identity-protection-simulate-risk",
3469434719
"redirect_document_id": true
3469534720
},
3469634721
{
34697-
"source_path": "articles/active-directory/active-directory-conditional-access-migration.md",
34698-
"redirect_url": "/azure/active-directory/conditional-access/policy-migration",
34722+
"source_path": "articles/active-directory/identity-protection/faqs.md",
34723+
"redirect_url": "/azure/active-directory/identity-protection/troubleshooting-identity-protection-faq",
34724+
"redirect_document_id": false
34725+
},
34726+
{
34727+
"source_path": "articles/active-directory/identity-protection/security-overview.md",
34728+
"redirect_url": "/azure/active-directory/identity-protection/concept-identity-protection-security-overview",
3469934729
"redirect_document_id": true
3470034730
},
3470134731
{
34702-
"source_path": "articles/active-directory/active-directory-conditional-access-migration-mfa.md",
34703-
"redirect_url": "/azure/active-directory/conditional-access/policy-migration-mfa",
34732+
"source_path": "articles/active-directory/identity-protection/howto-investigate-risk.md",
34733+
"redirect_url": "/azure/active-directory/identity-protection/howto-identity-protection-investigate-risk",
3470434734
"redirect_document_id": true
3470534735
},
3470634736
{
34707-
"source_path": "articles/active-directory/active-directory-conditional-access-technical-reference.md",
34708-
"redirect_url": "/azure/active-directory/conditional-access/technical-reference",
34737+
"source_path": "articles/active-directory/identity-protection/howto-provide-risk-event-feedback.md",
34738+
"redirect_url": "/azure/active-directory/identity-protection/howto-identity-protection-risk-feedback",
3470934739
"redirect_document_id": true
3471034740
},
3471134741
{
34712-
"source_path": "articles/active-directory/active-directory-conditional-access-untrusted-networks.md",
34713-
"redirect_url": "/azure/active-directory/conditional-access/untrusted-networks",
34742+
"source_path": "articles/active-directory/identity-protection/howto-configure-risk-policies.md",
34743+
"redirect_url": "/azure/active-directory/identity-protection/howto-identity-protection-configure-risk-policies",
3471434744
"redirect_document_id": true
3471534745
},
3471634746
{
34717-
"source_path": "articles/active-directory/active-directory-conditional-access-policy-connected-applications.md",
34718-
"redirect_url": "/azure/active-directory/conditional-access/require-managed-devices",
34747+
"source_path": "articles/active-directory/identity-protection/known-issues.md",
34748+
"redirect_url": "/azure/active-directory/identity-protection/troubleshooting-identity-protection-faq",
3471934749
"redirect_document_id": true
3472034750
},
3472134751
{
34722-
"source_path": "articles/active-directory/active-directory-conditional-access-azure-portal.md",
34723-
"redirect_url": "/azure/active-directory/conditional-access/overview",
34752+
"source_path": "articles/active-directory/identity-protection/graph-get-started.md",
34753+
"redirect_url": "/azure/active-directory/identity-protection/howto-identity-protection-graph-api",
3472434754
"redirect_document_id": true
3472534755
},
3472634756
{
34727-
"source_path": "articles/active-directory/active-directory-conditional-access-azure-portal-get-started.md",
34728-
"redirect_url": "/azure/active-directory/conditional-access/app-based-mfa",
34757+
"source_path": "articles/active-directory/identity-protection/risk-events-reference.md",
34758+
"redirect_url": "/azure/active-directory/identity-protection/concept-identity-protection-risks",
3472934759
"redirect_document_id": true
3473034760
},
3473134761
{
34732-
"source_path": "articles/active-directory/conditional-access/howto-baseline-protect-administrators.md",
34733-
"redirect_url": "/azure/active-directory/conditional-access/concept-baseline-protection",
34762+
"source_path": "articles/active-directory/identity-protection/glossary.md",
34763+
"redirect_url": "/azure/active-directory/identity-protection/reference-identity-protection-glossary",
34764+
"redirect_document_id": true
34765+
},
34766+
{
34767+
"source_path": "articles/active-directory/active-directory-identityprotection-enable.md",
34768+
"redirect_url": "/azure/active-directory/identity-protection/overview-identity-protection",
3473434769
"redirect_document_id": false
3473534770
},
3473634771
{
34737-
"source_path": "articles/active-directory/conditional-access/howto-baseline-protect-azure.md",
34738-
"redirect_url": "/azure/active-directory/conditional-access/concept-baseline-protection",
34772+
"source_path": "articles/active-directory/active-directory-identity-protection-faqs.md",
34773+
"redirect_url": "/azure/active-directory/identity-protection/troubleshooting-identity-protection-faq",
3473934774
"redirect_document_id": false
3474034775
},
3474134776
{
34742-
"source_path": "articles/active-directory/conditional-access/howto-baseline-protect-end-users.md",
34743-
"redirect_url": "/azure/active-directory/conditional-access/concept-baseline-protection",
34777+
"source_path": "articles/active-directory/active-directory-identityprotection-flows.md",
34778+
"redirect_url": "/azure/active-directory/identity-protection/concept-identity-protection-user-experience",
3474434779
"redirect_document_id": false
3474534780
},
3474634781
{
34747-
"source_path": "articles/active-directory/conditional-access/howto-baseline-protect-legacy-auth.md",
34748-
"redirect_url": "/azure/active-directory/conditional-access/concept-baseline-protection",
34782+
"source_path": "articles/active-directory/active-directory-identityprotection-glossary.md",
34783+
"redirect_url": "/azure/active-directory/identity-protection/reference-identity-protection-glossary",
3474934784
"redirect_document_id": false
3475034785
},
3475134786
{
34752-
"source_path": "articles/active-directory/active-directory-identityprotection-enable.md",
34753-
"redirect_url": "/azure/active-directory/identity-protection/enable",
34787+
"source_path": "articles/active-directory/active-directory-identityprotection-graph-getting-started.md",
34788+
"redirect_url": "/azure/active-directory/identity-protection/howto-identity-protection-graph-api",
34789+
"redirect_document_id": false
34790+
},
34791+
{
34792+
"source_path": "articles/active-directory/active-directory-identityprotection-unblock-howto.md",
34793+
"redirect_url": "/azure/active-directory/identity-protection/howto-identity-protection-remediate-unblock",
34794+
"redirect_document_id": false
34795+
},
34796+
{
34797+
"source_path": "articles/active-directory/active-directory-identityprotection-notifications.md",
34798+
"redirect_url": "/azure/active-directory/identity-protection/howto-identity-protection-configure-notifications",
34799+
"redirect_document_id": false
34800+
},
34801+
{
34802+
"source_path": "articles/active-directory/active-directory-identityprotection-playbook.md",
34803+
"redirect_url": "/azure/active-directory/identity-protection/howto-identity-protection-simulate-risk",
34804+
"redirect_document_id": false
34805+
},
34806+
{
34807+
"source_path": "articles/active-directory/active-directory-identityprotection-vulnerabilities.md",
34808+
"redirect_url": "/azure/active-directory/identity-protection/concept-identity-protection-risks",
34809+
"redirect_document_id": false
34810+
},
34811+
{
34812+
"source_path": "articles/active-directory/active-directory-identityprotection.md",
34813+
"redirect_url": "/azure/active-directory/identity-protection/overview-identity-protection",
34814+
"redirect_document_id": false
34815+
},
34816+
{
34817+
"source_path": "articles/active-directory/active-directory-conditional-access-baseline-protection.md",
34818+
"redirect_url": "/azure/active-directory/conditional-access/baseline-protection",
3475434819
"redirect_document_id": true
3475534820
},
3475634821
{
34757-
"source_path": "articles/active-directory/active-directory-identity-protection-faqs.md",
34758-
"redirect_url": "/azure/active-directory/identity-protection/faqs",
34822+
"source_path": "articles/active-directory/active-directory-conditional-access-locations.md",
34823+
"redirect_url": "/azure/active-directory/conditional-access/location-condition",
3475934824
"redirect_document_id": true
3476034825
},
3476134826
{
34762-
"source_path": "articles/active-directory/active-directory-identityprotection-flows.md",
34763-
"redirect_url": "/azure/active-directory/identity-protection/flows",
34827+
"source_path": "articles/active-directory/active-directory-conditional-access-whatif.md",
34828+
"redirect_url": "/azure/active-directory/conditional-access/what-if-tool",
3476434829
"redirect_document_id": true
3476534830
},
3476634831
{
34767-
"source_path": "articles/active-directory/active-directory-identityprotection-glossary.md",
34768-
"redirect_url": "/azure/active-directory/identity-protection/glossary",
34832+
"source_path": "articles/active-directory/active-directory-conditional-faqs.md",
34833+
"redirect_url": "/azure/active-directory/conditional-access/faqs",
3476934834
"redirect_document_id": true
3477034835
},
3477134836
{
34772-
"source_path": "articles/active-directory/active-directory-identityprotection-graph-getting-started.md",
34773-
"redirect_url": "/azure/active-directory/identity-protection/graph-get-started",
34837+
"source_path": "articles/active-directory/active-directory-conditional-access-migration.md",
34838+
"redirect_url": "/azure/active-directory/conditional-access/policy-migration",
3477434839
"redirect_document_id": true
3477534840
},
3477634841
{
34777-
"source_path": "articles/active-directory/active-directory-identityprotection-unblock-howto.md",
34778-
"redirect_url": "/azure/active-directory/identity-protection/howto-unblock-user",
34842+
"source_path": "articles/active-directory/active-directory-conditional-access-migration-mfa.md",
34843+
"redirect_url": "/azure/active-directory/conditional-access/policy-migration-mfa",
3477934844
"redirect_document_id": true
3478034845
},
3478134846
{
34782-
"source_path": "articles/active-directory/active-directory-identityprotection-notifications.md",
34783-
"redirect_url": "/azure/active-directory/identity-protection/notifications",
34847+
"source_path": "articles/active-directory/active-directory-conditional-access-technical-reference.md",
34848+
"redirect_url": "/azure/active-directory/conditional-access/technical-reference",
3478434849
"redirect_document_id": true
3478534850
},
3478634851
{
34787-
"source_path": "articles/active-directory/active-directory-identityprotection-playbook.md",
34788-
"redirect_url": "/azure/active-directory/identity-protection/playbook",
34852+
"source_path": "articles/active-directory/active-directory-conditional-access-untrusted-networks.md",
34853+
"redirect_url": "/azure/active-directory/conditional-access/untrusted-networks",
3478934854
"redirect_document_id": true
3479034855
},
3479134856
{
34792-
"source_path": "articles/active-directory/active-directory-identityprotection-vulnerabilities.md",
34793-
"redirect_url": "/azure/active-directory/identity-protection/vulnerabilities",
34857+
"source_path": "articles/active-directory/active-directory-conditional-access-policy-connected-applications.md",
34858+
"redirect_url": "/azure/active-directory/conditional-access/require-managed-devices",
3479434859
"redirect_document_id": true
3479534860
},
3479634861
{
34797-
"source_path": "articles/active-directory/active-directory-identityprotection.md",
34798-
"redirect_url": "/azure/active-directory/identity-protection/overview",
34862+
"source_path": "articles/active-directory/active-directory-conditional-access-azure-portal.md",
34863+
"redirect_url": "/azure/active-directory/conditional-access/overview",
3479934864
"redirect_document_id": true
3480034865
},
34866+
{
34867+
"source_path": "articles/active-directory/active-directory-conditional-access-azure-portal-get-started.md",
34868+
"redirect_url": "/azure/active-directory/conditional-access/app-based-mfa",
34869+
"redirect_document_id": true
34870+
},
34871+
{
34872+
"source_path": "articles/active-directory/conditional-access/howto-baseline-protect-administrators.md",
34873+
"redirect_url": "/azure/active-directory/conditional-access/concept-baseline-protection",
34874+
"redirect_document_id": false
34875+
},
34876+
{
34877+
"source_path": "articles/active-directory/conditional-access/howto-baseline-protect-azure.md",
34878+
"redirect_url": "/azure/active-directory/conditional-access/concept-baseline-protection",
34879+
"redirect_document_id": false
34880+
},
34881+
{
34882+
"source_path": "articles/active-directory/conditional-access/howto-baseline-protect-end-users.md",
34883+
"redirect_url": "/azure/active-directory/conditional-access/concept-baseline-protection",
34884+
"redirect_document_id": false
34885+
},
34886+
{
34887+
"source_path": "articles/active-directory/conditional-access/howto-baseline-protect-legacy-auth.md",
34888+
"redirect_url": "/azure/active-directory/conditional-access/concept-baseline-protection",
34889+
"redirect_document_id": false
34890+
},
3480134891
{
3480234892
"source_path": "articles/active-directory/active-directory-conditional-access-conditions.md",
3480334893
"redirect_url": "/azure/active-directory/conditional-access/conditions",

articles/active-directory/authentication/concept-authentication-passwordless.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ The following providers offer FIDO2 security keys of different form factors that
7373
| HID | [https://www.hidglobal.com/contact-us](https://www.hidglobal.com/contact-us) |
7474
| Ensurity | [https://www.ensurity.com/contact](https://www.ensurity.com/contact) |
7575
| eWBM | [https://www.ewbm.com/page/sub1_5](https://www.ewbm.com/page/sub1_5) |
76+
| AuthenTrend | [https://authentrend.com/about-us/#pg-35-3](https://authentrend.com/about-us/#pg-35-3) |
7677

7778
If you are a vendor and want to get your device on this list, contact [[email protected]](mailto:[email protected]).
7879

articles/active-directory/conditional-access/app-sign-in-risk.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ If you don't have an Azure subscription, create a [free account](https://azure.m
3131
To complete the scenario in this tutorial, you need:
3232

3333
- **Access to an Azure AD Premium P2 edition** - While Conditional Access is an Azure AD Premium P1 capability, you need a P2 edition because the scenario in this quickstart requires Identity Protection.
34-
- **Identity Protection** - The scenario in this quickstart requires Identity Protection to be enabled. If you don't know how to enable Identity Protection, see [Enabling Azure Active Directory Identity Protection](../identity-protection/enable.md).
34+
- **Identity Protection** - The scenario in this quickstart requires Identity Protection to be enabled. If you don't know how to enable Identity Protection, see [Enabling Azure Active Directory Identity Protection](../identity-protection/overview-identity-protection.md).
3535
- **Tor Browser** - The [Tor Browser](https://www.torproject.org/projects/torbrowser.html.en) is designed to help you preserve your privacy online. Identity Protection detects a sign-in from a Tor Browser as sign-ins from anonymous IP addresses, which have a medium risk level. For more information, see [Azure Active Directory risk detections](../reports-monitoring/concept-risk-events.md).
3636
- **A test account called Alain Charon** - If you don't know how to create a test account, see [Add cloud-based users](../fundamentals/add-users-azure-active-directory.md#add-a-new-user).
3737

articles/active-directory/conditional-access/plan-conditional-access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Planning your Conditional Access deployment is critical to make sure you achieve
2121

2222
## What you should know
2323

24-
Think of Conditional Access as a framework that allows you to control access to your organization’s apps and resources, instead of a stand-alone feature. Consequently, some Conditional Access settings require additional features to be configured. For example, you can configure a policy that responds to a specific [sign-in risk level](../identity-protection/howto-sign-in-risk-policy.md#what-is-the-sign-in-risk-policy). However, a policy that is based on a sign-in risk level requires [Azure Active Directory identity protection](../identity-protection/overview.md) to be enabled.
24+
Think of Conditional Access as a framework that allows you to control access to your organization’s apps and resources, instead of a stand-alone feature. Consequently, some Conditional Access settings require additional features to be configured. For example, you can configure a policy that responds to a specific [sign-in risk level](../identity-protection/howto-identity-protection-configure-risk-policies.md). However, a policy that is based on a sign-in risk level requires [Azure Active Directory identity protection](../identity-protection/overview-identity-protection.md) to be enabled.
2525

2626
If additional features are required, you might also need to get related licenses. For example, while Conditional Access is Azure AD Premium P1 feature, identity protection requires an Azure AD Premium P2 license.
2727

0 commit comments

Comments
 (0)