Merge pull request #98774 from MicrosoftDocs/master

Merge Master to Live, 3 AM

Author: PMEds28

.openpublishing.redirection.json

@@ -39798,6 +39798,11 @@
       "redirect_url": "/azure/cognitive-services/Custom-Vision-Service/home",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/cognitive-services/Custom-Vision-Service/move-your-project-to-azure.md",
+      "redirect_url": "/azure/cognitive-services/Custom-Vision-Service/home",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/data-catalog/data-catalog-prerequisites.md",
       "redirect_url": "/azure/data-catalog/data-catalog-get-started",

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

@@ -74,7 +74,7 @@ For more information, see [how to require managed devices for cloud app access w
 
 ### Hybrid Azure AD joined device
 
-Requiring a Hybrid Azure AD joined device is another option you have to configure device-based Conditional Access policies. This requirement refers to Windows desktops, laptops, and enterprise tablets that are joined to an on-premises Active Directory. If this option is selected, your Conditional Access policy grants access to access attempts made with devices that are joined to your on-premises Active Directory and your Azure Active Directory.  
+Requiring a hybrid Azure AD joined device is another option you have to configure device-based Conditional Access policies. This requirement refers to Windows desktops, laptops, and enterprise tablets that are joined to an on-premises Active Directory. If this option is selected, your Conditional Access policy grants access to access attempts made with devices that are joined to your on-premises Active Directory and your Azure Active Directory. Mac devices do not support hybrid Azure AD join.
 
 For more information, see [set up Azure Active Directory device-based Conditional Access policies](require-managed-devices.md).
 

articles/active-directory/devices/overview.md

@@ -57,7 +57,10 @@ Devices in Azure AD can be managed using Mobile Device Management (MDM) tools li
 
 ## Resource access
 
-Registering and joining give your users Seamless Sign-on (SSO) to cloud resources and administrators the ability to apply Conditional Access policies to those resources. 
+Registering and joining devices to Azure AD gives your users Seamless Sign-on (SSO) to cloud resources. This process also allows administrators the ability to apply Conditional Access policies to resources based on the device they are accessed from. 
+
+> [!NOTE]
+> Device-based Conditional Access policies require either hybrid Azure AD joined devices or compliant Azure AD joined or Azure AD registered devices.
 
 Devices that are Azure AD joined or hybrid Azure AD joined benefit from SSO to your organization's on-premises resources as well as cloud resources. More information can be found in the article, [How SSO to on-premises resources works on Azure AD joined devices](azuread-join-sso.md).
 

articles/active-directory/manage-apps/application-provisioning-config-how-to.md

@@ -18,6 +18,7 @@ ms.author: mimart
 ms.reviewer: asteen
 
 ms.collection: M365-identity-device-management
+ROBOTS: NOINDEX
 ---
 
 # How to configure user provisioning to an Azure AD Gallery application

articles/active-directory/manage-apps/check-status-user-account-provisioning.md

@@ -50,8 +50,8 @@ From here, you can access both the provisioning progress bar and the provisionin
 The [provisioning progress bar](application-provisioning-when-will-provisioning-finish-specific-user.md#view-the-provisioning-progress-bar) is visible in the **Provisioning** tab for given application. It is located in the **Current Status** section underneath **Settings**, and shows the status of the current initial or incremental cycle. This section also shows:
 
 * The total number of users and/groups that have been synchronized and are currently in scope for provisioning between the source system and the target system.
-* The last time the synchronization was run. Synchronizations typically occur every 20-40 minutes, after an [initial cycle](user-provisioning.md#what-happens-during-provisioning) has completed.
-* Whether or not an [initial cycle](user-provisioning.md#what-happens-during-provisioning) has been completed.
+* The last time the synchronization was run. Synchronizations typically occur every 20-40 minutes, after an [initial cycle](how-provisioning-works.md#provisioning-cycles-initial-and-incremental) has completed.
+* Whether or not an [initial cycle](how-provisioning-works.md#provisioning-cycles-initial-and-incremental) has been completed.
 * Whether or not the provisioning process has been placed in quarantine, and what the reason for the quarantine status is (for example, failure to communicate with target system due to invalid admin credentials).
 
 The **Current Status** should be the first place admins look to check on the operational health of the provisioning job.

articles/active-directory/manage-apps/configure-automatic-user-provisioning-portal.md

@@ -12,15 +12,18 @@ ms.devlang: na
 ms.topic: conceptual
 ms.tgt_pltfrm: na
 ms.workload: identity
-ms.date: 04/01/2019
+ms.date: 11/25/2019
 ms.author: mimart
 ms.reviewer: arvinh
 
 ms.collection: M365-identity-device-management
 ---
 # Managing user account provisioning for enterprise apps in the Azure portal
 
-This article describes how to use the [Azure portal](https://portal.azure.com) to manage automatic user account provisioning and de-provisioning for applications that support it. To learn more about automatic user account provisioning and how it works, see [Automate User Provisioning and Deprovisioning to SaaS Applications with Azure Active Directory](user-provisioning.md).
+This article describes the general steps for managing automatic user account provisioning and de-provisioning for applications that support it. *User account provisioning* is the act of creating, updating, and/or disabling user account records in an application’s local user profile store. Most cloud and SaaS applications store the users role and permissions in the user's own local user profile store, and presence of such a user record in the user's local store is *required* for single sign-on and access to work. To learn more about automatic user account provisioning, see [Automate User Provisioning and Deprovisioning to SaaS Applications with Azure Active Directory](user-provisioning.md).
+
+> [!IMPORTANT]
+> Azure Active Directory (Azure AD) has a gallery that contains thousands of pre-integrated applications that are enabled for automatic provisioning with Azure AD. You should start by finding the provisioning setup tutorial specific to your application in the [List of tutorials on how to integrate SaaS apps with Azure Active Directory](https://azure.microsoft.com/documentation/articles/active-directory-saas-tutorial-list/). You'll likely find step-by-step guidance for configuring both the app and Azure AD to create the provisioning connection.
 
 ## Finding your apps in the portal