Merge pull request #126860 from DCtheGeek/dmc-links-aad-condaccess

v-shmck · web-flow · commit 1a44b86fa5d6 · 2020-08-26T16:26:50.000-07:00
Links: AAD - Conditional Access
diff --git a/articles/active-directory/conditional-access/TOC.yml b/articles/active-directory/conditional-access/TOC.yml
@@ -119,12 +119,12 @@
   - name: Azure feedback forum
     href: https://feedback.azure.com/forums/169401-azure-active-directory
   - name: Microsoft Q&A question page
-    href: https://docs.microsoft.com/answers/topics/azure-active-directory.html
+    href: /answers/topics/azure-active-directory.html
   - name: Pricing
     href: https://azure.microsoft.com/pricing/details/active-directory/
   - name: Service updates
     href: ../fundamentals/whats-new.md
   - name: Stack Overflow
     href: https://stackoverflow.com/questions/tagged/azure-active-directory
   - name: Videos
-    href: https://azure.microsoft.com/documentation/videos/index/?services=active-directory
+    href: https://azure.microsoft.com/documentation/videos/index/?services=active-directory
diff --git a/articles/active-directory/conditional-access/best-practices.md b/articles/active-directory/conditional-access/best-practices.md
@@ -17,12 +17,12 @@ ms.collection: M365-identity-device-management
 ---
 # Best practices for Conditional Access in Azure Active Directory
 
-With [Azure Active Directory (Azure AD) Conditional Access](../active-directory-conditional-access-azure-portal.md), you can control how authorized users access your cloud apps. This article provides you with information about:
+With [Azure Active Directory (Azure AD) Conditional Access](./overview.md), you can control how authorized users access your cloud apps. This article provides you with information about:
 
 - Things you should know 
 - What it is you should avoid doing when configuring Conditional Access policies. 
 
-This article assumes that you are familiar with the concepts and the terminology outlined in [What is Conditional Access in Azure Active Directory?](../active-directory-conditional-access-azure-portal.md)
+This article assumes that you are familiar with the concepts and the terminology outlined in [What is Conditional Access in Azure Active Directory?](./overview.md)
 
 ## What's required to make a policy work?
 
@@ -151,5 +151,5 @@ For more information, see [Migrate classic policies in the Azure portal](policy-
 
 If you want to know:
 
-- How to configure a Conditional Access policy, see [Require MFA for specific apps with Azure Active Directory Conditional Access](app-based-mfa.md).
-- How to plan your Conditional Access policies, see [How to plan your Conditional Access deployment in Azure Active Directory](plan-conditional-access.md).
+- How to configure a Conditional Access policy, see [Require MFA for specific apps with Azure Active Directory Conditional Access](../authentication/tutorial-enable-azure-mfa.md).
+- How to plan your Conditional Access policies, see [How to plan your Conditional Access deployment in Azure Active Directory](plan-conditional-access.md).
diff --git a/articles/active-directory/conditional-access/block-legacy-authentication.md b/articles/active-directory/conditional-access/block-legacy-authentication.md
@@ -120,6 +120,6 @@ You can select all available grant controls for the **Other clients** condition;
 ## Next steps
 
 - [Determine impact using Conditional Access report-only mode](howto-conditional-access-report-only.md)
-- If you are not familiar with configuring Conditional Access policies yet, see [require MFA for specific apps with Azure Active Directory Conditional Access](app-based-mfa.md) for an example.
+- If you are not familiar with configuring Conditional Access policies yet, see [require MFA for specific apps with Azure Active Directory Conditional Access](../authentication/tutorial-enable-azure-mfa.md) for an example.
 - For more information about modern authentication support, see [How modern authentication works for Office 2013 and Office 2016 client apps](/office365/enterprise/modern-auth-for-office-2013-and-2016) 
-- [How to set up a multifunction device or application to send email using Office 365 and Microsoft 365](/exchange/mail-flow-best-practices/how-to-set-up-a-multifunction-device-or-application-to-send-email-using-office-3)
+- [How to set up a multifunction device or application to send email using Office 365 and Microsoft 365](/exchange/mail-flow-best-practices/how-to-set-up-a-multifunction-device-or-application-to-send-email-using-office-3)
diff --git a/articles/active-directory/conditional-access/concept-conditional-access-cloud-apps.md b/articles/active-directory/conditional-access/concept-conditional-access-cloud-apps.md
@@ -112,7 +112,7 @@ In addition to the Microsoft apps, administrators can add any Azure AD registere
 
 - Applications published through [Azure AD Application Proxy](../manage-apps/what-is-application-proxy.md)
 - [Applications added from the gallery](../manage-apps/add-application-portal.md)
-- [Custom applications not in the gallery](../manage-apps/add-non-gallery-app.md)
+- [Custom applications not in the gallery](../manage-apps/view-applications-portal.md)
 - [Legacy applications published through app delivery controllers and networks](../manage-apps/secure-hybrid-access.md)
 - Applications that use [password based single sign-on](../manage-apps/configure-password-single-sign-on-non-gallery-applications.md)
 
@@ -129,4 +129,4 @@ User actions are tasks that can be performed by a user. The only currently suppo
 - [Conditional Access: Conditions](concept-conditional-access-conditions.md)
 
 - [Conditional Access common policies](concept-conditional-access-policy-common.md)
-- [Client application dependencies](service-dependencies.md)
+- [Client application dependencies](service-dependencies.md)
diff --git a/articles/active-directory/conditional-access/concept-conditional-access-policies.md b/articles/active-directory/conditional-access/concept-conditional-access-policies.md
@@ -41,7 +41,7 @@ A policy can contain multiple [conditions](concept-conditional-access-conditions
 
 #### Sign-in risk
 
-For organizations with [Azure AD Identity Protection](../identity-protection/overview.md), the risk detections generated there can influence your Conditional Access policies.
+For organizations with [Azure AD Identity Protection](../identity-protection/overview-identity-protection.md), the risk detections generated there can influence your Conditional Access policies.
 
 #### Device platforms
 
@@ -130,4 +130,4 @@ The article [Common Conditional Access policies](concept-conditional-access-poli
 
 [Managing device compliance with Intune](/intune/device-compliance-get-started)
 
-[Microsoft Cloud App Security and Conditional Access](/cloud-app-security/proxy-intro-aad)
+[Microsoft Cloud App Security and Conditional Access](/cloud-app-security/proxy-intro-aad)
diff --git a/articles/active-directory/conditional-access/howto-conditional-access-policy-risk-user.md b/articles/active-directory/conditional-access/howto-conditional-access-policy-risk-user.md
@@ -26,7 +26,7 @@ There are two locations where this policy may be assigned. Organizations should
 1. Sign in to the **Azure portal** as a global administrator, security administrator, or Conditional Access administrator.
 1. Browse to **Azure Active Directory** > **Security** > **Conditional Access**.
 1. Select **New policy**.
-1. Give your policy a name. We recommend that organizations create a meaningful standard for the names of their policies. For more info, [set naming standards for your policies](https://docs.microsoft.com/azure/active-directory/conditional-access/plan-conditional-access#set-naming-standards-for-your-policies).
+1. Give your policy a name. We recommend that organizations create a meaningful standard for the names of their policies. For more info, [set naming standards for your policies](./plan-conditional-access.md#set-naming-standards-for-your-policies).
 1. Under **Assignments**, select **Users and groups**.
    1. Under **Include**, select **All users**.
    1. Under **Exclude**, select **Users and groups** and choose your organization's emergency access or break-glass accounts. 
@@ -63,4 +63,4 @@ There are two locations where this policy may be assigned. Organizations should
 
 [Simulate sign in behavior using the Conditional Access What If tool](troubleshoot-conditional-access-what-if.md)
 
-[What is Azure Active Directory Identity Protection?](../identity-protection/overview.md)
+[What is Azure Active Directory Identity Protection?](../identity-protection/overview-identity-protection.md)
diff --git a/articles/active-directory/conditional-access/howto-conditional-access-policy-risk.md b/articles/active-directory/conditional-access/howto-conditional-access-policy-risk.md
@@ -67,4 +67,4 @@ There are two locations where this policy may be assigned. Organizations should
 
 [Simulate sign in behavior using the Conditional Access What If tool](troubleshoot-conditional-access-what-if.md)
 
-[What is Azure Active Directory Identity Protection?](../identity-protection/overview.md)
+[What is Azure Active Directory Identity Protection?](../identity-protection/overview-identity-protection.md)
diff --git a/articles/active-directory/conditional-access/howto-conditional-access-report-only.md b/articles/active-directory/conditional-access/howto-conditional-access-report-only.md
@@ -48,8 +48,8 @@ To view the result of a report-only policy for a particular sign-in:
 
 In order to view the aggregate impact of Conditional Access policies using the new Conditional Access Insights workbook, you must integrate Azure Monitor with Azure AD and export the sign-in logs. There are two steps to set up this integration: 
 
-1. [Sign up for an Azure Monitor subscription and create a workspace](/azure/azure-monitor/learn/quick-create-workspace).
-1. [Export the Sign-in logs from Azure AD to Azure Monitor](/azure/active-directory/reports-monitoring/howto-integrate-activity-logs-with-log-analytics).
+1. [Sign up for an Azure Monitor subscription and create a workspace](../../azure-monitor/learn/quick-create-workspace.md).
+1. [Export the Sign-in logs from Azure AD to Azure Monitor](../reports-monitoring/howto-integrate-activity-logs-with-log-analytics.md).
 
 More information about Azure Monitor pricing can be found on the [Azure Monitor pricing page](https://azure.microsoft.com/pricing/details/monitor/). Resources to estimate costs, set a daily cap, or customize the data retention period, can be found in the article, [Manage usage and costs with Azure Monitor Logs](../../azure-monitor/platform/manage-cost-storage.md#estimating-the-costs-to-manage-your-environment).
 
@@ -86,4 +86,4 @@ The Conditional Access Policies dropdown is populated by querying the most recen
 
 [Conditional Access common policies](concept-conditional-access-policy-common.md)
 
-For more information about Azure AD workbooks, see the article, [How to use Azure Monitor workbooks for Azure Active Directory reports](../reports-monitoring/howto-use-azure-monitor-workbooks.md).
+For more information about Azure AD workbooks, see the article, [How to use Azure Monitor workbooks for Azure Active Directory reports](../reports-monitoring/howto-use-azure-monitor-workbooks.md).
diff --git a/articles/active-directory/conditional-access/howto-conditional-access-session-lifetime.md b/articles/active-directory/conditional-access/howto-conditional-access-session-lifetime.md
@@ -133,5 +133,5 @@ To make sure that your policy works as expected, the recommended best practice i
 
 ## Next steps
 
-* If you want to know how to configure a Conditional Access policy, see the article [Require MFA for specific apps with Azure Active Directory Conditional Access](app-based-mfa.md).
-* If you are ready to configure Conditional Access policies for your environment, see the article [Best practices for Conditional Access in Azure Active Directory](best-practices.md).
+* If you want to know how to configure a Conditional Access policy, see the article [Require MFA for specific apps with Azure Active Directory Conditional Access](../authentication/tutorial-enable-azure-mfa.md).
+* If you are ready to configure Conditional Access policies for your environment, see the article [Best practices for Conditional Access in Azure Active Directory](best-practices.md).
diff --git a/articles/active-directory/conditional-access/overview.md b/articles/active-directory/conditional-access/overview.md
@@ -97,6 +97,6 @@ Customers with [Microsoft 365 Business Premium licenses](/office365/servicedescr
 
 - [Building a Conditional Access policy piece by piece](concept-conditional-access-policies.md)
 - [Plan your Conditional Access deployment](plan-conditional-access.md)
-- [Learn about Identity Protection](../identity-protection/overview-v2.md)
+- [Learn about Identity Protection](../identity-protection/overview-identity-protection.md)
 - [Learn about Microsoft Cloud App Security](/cloud-app-security/what-is-cloud-app-security)
-- [Learn about Microsoft Intune](/intune/index)
+- [Learn about Microsoft Intune](/intune/index)
diff --git a/articles/active-directory/conditional-access/plan-conditional-access.md b/articles/active-directory/conditional-access/plan-conditional-access.md
@@ -310,7 +310,7 @@ Common use cases to require MFA access:
 
 * [By admins](howto-conditional-access-policy-admin-mfa.md)
 
-* [To specific apps](app-based-mfa.md)
+* [To specific apps](../authentication/tutorial-enable-azure-mfa.md)
 
 * [For all users](howto-conditional-access-policy-all-users-mfa.md)
 
@@ -381,18 +381,18 @@ The test plan is important to have a comparison between the expected results and
 | - | - | - |
 | [Require MFA when not at work](untrusted-networks.md)| Authorized user signs into App while on a trusted location / work| User is not prompted to MFA |
 | [Require MFA when not at work](untrusted-networks.md)| Authorized user signs into App while not on a trusted location / work| User is prompted to MFA and can sign in successfully |
-| [Require MFA (for admin)](howto-baseline-protect-administrators.md)| Global Admin signs into App| Admin is prompted to MFA |
-| [Risky sign-ins](https://docs.microsoft.com/azure/active-directory/identity-protection/howto-sign-in-risk-policy)| User signs into App using an unapproved browser| Admin is prompted to MFA |
+| [Require MFA (for admin)](../fundamentals/concept-fundamentals-security-defaults.md)| Global Admin signs into App| Admin is prompted to MFA |
+| [Risky sign-ins](../identity-protection/howto-identity-protection-configure-risk-policies.md)| User signs into App using an unapproved browser| Admin is prompted to MFA |
 | [Device management](require-managed-devices.md)| Authorized user attempts to sign in from an authorized device| Access Granted |
 | [Device management](require-managed-devices.md)| Authorized user attempts to sign in from an unauthorized device| Access blocked |
-| [Password change for risky users](https://docs.microsoft.com/azure/active-directory/identity-protection/howto-user-risk-policy)| Authorized user attempts to sign in with compromised credentials (high risk sign in)| User is prompted to change password or access is blocked based on your policy |
+| [Password change for risky users](../identity-protection/howto-identity-protection-configure-risk-policies.md)| Authorized user attempts to sign in with compromised credentials (high risk sign in)| User is prompted to change password or access is blocked based on your policy |
 
 
 ### Configure the test policy
 
 In the [Azure portal](https://portal.azure.com/), you configure CA policies under Azure Active Directory > Security > Conditional Access.
 
-If you want to learn more about how to create CA policies, see this example: [CA policy to prompt for MFA when a user signs in to the Azure portal](https://docs.microsoft.com/azure/active-directory/authentication/tutorial-enable-azure-mfa?toc=/azure/active-directory/conditional-access/toc.json&bc=/azure/active-directory/conditional-access/breadcrumb/toc.json). This quickstart helps you to:
+If you want to learn more about how to create CA policies, see this example: [CA policy to prompt for MFA when a user signs in to the Azure portal](../authentication/tutorial-enable-azure-mfa.md?bc=%2fazure%2factive-directory%2fconditional-access%2fbreadcrumb%2ftoc.json&toc=%2fazure%2factive-directory%2fconditional-access%2ftoc.json). This quickstart helps you to:
 
 * Become familiar with the user interface
 
@@ -439,7 +439,7 @@ In case you need to roll back your newly implemented policies, use one or more o
 > [!NOTE]
 >  This option should be used sparingly, only in situations where the user is trusted. The user should be added back into the policy or group as soon as possible.
 
-* **Delete the policy.** If the policy is no longer required, [delete](https://docs.microsoft.com/azure/active-directory/authentication/tutorial-enable-azure-mfa?toc=/azure/active-directory/conditional-access/toc.json&bc=/azure/active-directory/conditional-access/breadcrumb/toc.json) it.
+* **Delete the policy.** If the policy is no longer required, [delete](../authentication/tutorial-enable-azure-mfa.md?bc=%2fazure%2factive-directory%2fconditional-access%2fbreadcrumb%2ftoc.json&toc=%2fazure%2factive-directory%2fconditional-access%2ftoc.json) it.
 
 ## Manage access to cloud apps
 
@@ -498,4 +498,4 @@ Once you have collected the information, See the following resources:
 
 [Learn more about Identity Protection](../identity-protection/overview-identity-protection.md)
 
-[Manage CA policies with Microsoft Graph API](https://docs.microsoft.com/graph/api/resources/conditionalaccesspolicy?view=graph-rest-beta.md)
+[Manage CA policies with Microsoft Graph API](/graph/api/resources/conditionalaccesspolicy?view=graph-rest-beta.md)
diff --git a/articles/active-directory/conditional-access/require-managed-devices.md b/articles/active-directory/conditional-access/require-managed-devices.md
@@ -26,7 +26,7 @@ This article explains how you can configure Conditional Access policies that req
 
 Requiring managed devices for cloud app access ties **Azure AD Conditional Access** and **Azure AD device management** together. If you are not familiar with one of these areas yet, you should read the following topics, first:
 
-- **[Conditional Access in Azure Active Directory](../active-directory-conditional-access-azure-portal.md)** - This article provides you with a conceptual overview of Conditional Access and the related terminology.
+- **[Conditional Access in Azure Active Directory](./overview.md)** - This article provides you with a conceptual overview of Conditional Access and the related terminology.
 - **[Introduction to device management in Azure Active Directory](../devices/overview.md)** - This article gives you an overview of the various options you have to get devices under organizational control. 
 - For Chrome support in **Windows 10 Creators Update (version 1703)** or later, install the [Windows 10 Accounts extension](https://chrome.google.com/webstore/detail/windows-10-accounts/ppnbnpeolgkicgegkbkbjmhlideopiji). This extension is required when a Conditional Access policy requires device-specific details.
 
@@ -124,4 +124,4 @@ On Windows 7, iOS, Android, macOS, and some third-party web browsers Azure AD id
 
 ## Next steps
 
-Before configuring a device-based Conditional Access policy in your environment, you should take a look at the [best practices for Conditional Access in Azure Active Directory](best-practices.md).
+Before configuring a device-based Conditional Access policy in your environment, you should take a look at the [best practices for Conditional Access in Azure Active Directory](best-practices.md).
diff --git a/articles/active-directory/conditional-access/require-tou.md b/articles/active-directory/conditional-access/require-tou.md
@@ -23,7 +23,7 @@ Before accessing certain cloud apps in your environment, you might want to get c
 - A simple method to configure ToU
 - The option to require accepting your terms of use through a Conditional Access policy  
 
-This quickstart shows how to configure an [Azure AD Conditional Access policy](../active-directory-conditional-access-azure-portal.md) that requires a ToU to be accepted for a selected cloud app in your environment.
+This quickstart shows how to configure an [Azure AD Conditional Access policy](./overview.md) that requires a ToU to be accepted for a selected cloud app in your environment.
 
 ![Create policy](./media/require-tou/5555.png)
 
@@ -207,4 +207,4 @@ When no longer needed, delete the test user and the Conditional Access policy:
 ## Next steps
 
 > [!div class="nextstepaction"]
-> [Require MFA for specific apps](app-based-mfa.md)
+> [Require MFA for specific apps](../authentication/tutorial-enable-azure-mfa.md)
diff --git a/articles/active-directory/conditional-access/terms-of-use.md b/articles/active-directory/conditional-access/terms-of-use.md
@@ -47,7 +47,7 @@ Azure AD terms of use has the following capabilities:
 - List who has or hasn't accepted to your terms of use.
 - Assist in meeting privacy regulations.
 - Display a log of terms of use activity for compliance and audit.
-- Create and manage terms of use using [Microsoft Graph APIs](https://developer.microsoft.com/graph/docs/api-reference/beta/resources/agreement) (currently in preview).
+- Create and manage terms of use using [Microsoft Graph APIs](/graph/api/resources/agreement?view=graph-rest-beta) (currently in preview).
 
 ## Prerequisites
 
@@ -389,4 +389,4 @@ A: Terms of use utilizes the following endpoints for authentication: https://tok
 ## Next steps
 
 - [Quickstart: Require terms of use to be accepted before accessing cloud apps](require-tou.md)
-- [Best practices for Conditional Access in Azure Active Directory](best-practices.md)
+- [Best practices for Conditional Access in Azure Active Directory](best-practices.md)
diff --git a/articles/active-directory/conditional-access/troubleshoot-conditional-access-what-if.md b/articles/active-directory/conditional-access/troubleshoot-conditional-access-what-if.md
diff --git a/articles/active-directory/conditional-access/untrusted-networks.md b/articles/active-directory/conditional-access/untrusted-networks.md
diff --git a/articles/active-directory/conditional-access/what-if-tool.md b/articles/active-directory/conditional-access/what-if-tool.md

Original file line number	Diff line number	Diff line change
`@@ -67,4 +67,4 @@ There are two locations where this policy may be assigned. Organizations should`
`67`	`67`
`68`	`68`	`[Simulate sign in behavior using the Conditional Access What If tool](troubleshoot-conditional-access-what-if.md)`
`69`	`69`
`70`		`-[What is Azure Active Directory Identity Protection?](../identity-protection/overview.md)`
	`70`	`+[What is Azure Active Directory Identity Protection?](../identity-protection/overview-identity-protection.md)`