Merge pull request #49060 from MicrosoftDocs/master

8/15 AM Publish

Author: huypub

.openpublishing.redirection.json

@@ -2880,6 +2880,12 @@
             "redirect_url": "/azure/automation/automation-create-runas-account",
             "redirect_document_id": false
         },
+        {
+            "source_path": "articles/automation/automation-invoke-runbook-from-omsla-alert.md",
+            "redirect_url": "/azure/automation/automation-create-alert-triggered-runbook",
+            "redirect_document_id": false
+        },
+        
         {
             "source_path": "articles/automation/automation-migrate-account-subscription.md",
             "redirect_url": "/azure/azure-resource-manager/resource-group-move-resources",
@@ -27218,6 +27224,22 @@
             "source_path": "articles/active-directory/active-directory-conditional-access-controls.md",
             "redirect_url": "/azure/active-directory/conditional-access/controls",
             "redirect_document_id": true
+        },
+		{
+            "source_path": "articles/active-directory/active-directory-conditional-access-device-policies.md",
+            "redirect_url": "/azure/active-directory/conditional-access/overview",
+            "redirect_document_id": false
+        },
+		{
+            "source_path": "articles/active-directory/active-directory-conditional-access-mam.md",
+            "redirect_url": "/azure/active-directory/conditional-access/app-based-conditional-access",
+            "redirect_document_id": true
+        },
+		{
+            "source_path": "articles/active-directory/active-directory-conditional-access-no-modern-authentication.md",
+            "redirect_url": "/azure/active-directory/conditional-access/conditional-access-for-exo-and-spo",
+            "redirect_document_id": true
         }
+
     ]
 }

articles/active-directory/TOC.md

@@ -414,7 +414,6 @@
 ##### [Location conditions](conditional-access/location-condition.md)
 ##### [Controls](conditional-access/controls.md)
 ##### [What if tool](conditional-access/what-if-tool.md)
-##### [Understand device policies for Office 365 services](active-directory-conditional-access-device-policies.md)
 #### How-to guides
 ##### [Best practices](conditional-access/best-practices.md)
 ##### [Require MFA for access attempts from untrusted networks](conditional-access/untrusted-networks.md)
@@ -423,7 +422,7 @@
 ##### [Require terms of use for users and apps](active-directory-tou.md)
 ##### [Migrate classic policies](conditional-access/policy-migration.md)
 ##### [Set up VPN connectivity](https://docs.microsoft.com/windows-server/remote/remote-access/vpn/always-on-vpn/deploy/always-on-vpn-deploy)
-##### [Set up SharePoint and Exchange Online](active-directory-conditional-access-no-modern-authentication.md)
+##### [Set up SharePoint and Exchange Online](conditional-access/conditional-access-for-exo-and-spo.md)
 ##### [Remediation](active-directory-conditional-access-device-remediation.md)
 #### [Reference](conditional-access/technical-reference.md)
 ##### [Technical reference](conditional-access/technical-reference.md)

articles/active-directory/active-directory-conditional-access-device-policies.md

@@ -172,7 +172,7 @@ Remote Desktop connection authorization policies (RD CAPs) specify the requireme
 
   ![Remote Desktop Services](./media/howto-mfa-nps-extension-rdg/image8.png)
 
-3. In the RD Gateway Manger, right-click **\[Server Name\] (Local)**, and click **Properties**.
+3. In the RD Gateway Manager, right-click **\[Server Name\] (Local)**, and click **Properties**.
 
   ![Server Name](./media/howto-mfa-nps-extension-rdg/image9.png)
 

articles/active-directory/authentication/howto-mfa-nps-extension-rdg.md

@@ -14,15 +14,15 @@ ms.devlang: na
 ms.topic: article
 ms.tgt_pltfrm: na
 ms.workload: identity
-ms.date: 04/17/2018
+ms.date: 08/15/2018
 ms.author: markvi
 ms.reviewer: calebb
 
 ---
 
-# Set up SharePoint Online and Exchange Online for Azure Active Directory conditional access 
+# How To: Set up SharePoint Online and Exchange Online for Azure Active Directory conditional access 
 
-With [Azure Active Directory (Azure AD) conditional access](active-directory-conditional-access-azure-portal.md), you can control how users access your cloud apps. If you want to use conditional access to control access to SharePoint and Exchange online, you need to:
+With [Azure Active Directory (Azure AD) conditional access](overview.md), you can control how users access your cloud apps. If you want to use conditional access to control access to SharePoint and Exchange online, you need to:
 
 - Review whether your conditional access scenario is supported
 - Prevent client apps from bypassing the enforcement of your conditional access policies.   
@@ -75,23 +75,23 @@ While Exchange Active Sync supports modern authentication, there are some limita
 
 - You can only configure the device platforms condition  
 
-    ![Device platforms](./media/active-directory-conditional-access-no-modern-authentication/05.png)
+    ![Device platforms](./media/conditional-access-for-exo-and-spo/05.png)
 
 - Setting the multi-factor authentication requirement is not supported  
 
-    ![Conditional access](./media/active-directory-conditional-access-no-modern-authentication/01.png)
+    ![Conditional access](./media/conditional-access-for-exo-and-spo/01.png)
 
 To effectively protect access to Exchange Online from Exchange ActiveSync, you can:
 
 - Configure a supported conditional access policy by following these steps:
 
     a. Select just **Office 365 Exchange Online** as cloud app.  
 
-    ![Conditional access](./media/active-directory-conditional-access-no-modern-authentication/04.png)
+    ![Conditional access](./media/conditional-access-for-exo-and-spo/04.png)
 
     b. Select **Exchange Active Sync** as **client app**, and then select **Apply policy only to supported platforms**.  
 
-    ![Device platforms](./media/active-directory-conditional-access-no-modern-authentication/03.png)
+    ![Device platforms](./media/conditional-access-for-exo-and-spo/03.png)
 
 - Block Exchange ActiveSync by using Active Directory Federation Services (AD FS) rules.
 
@@ -179,7 +179,7 @@ By applying the following three rules:
 
 ## Next steps
 
-For more information, see [What is conditional access in Azure Active Directory](active-directory-conditional-access-azure-portal.md).
+For more information, see [What is conditional access in Azure Active Directory](overview.md).
 
 For instructions about configuring claim rules, see [Configure Claim Rules](https://docs.microsoft.com/windows-server/identity/ad-fs/operations/configure-claim-rules).