Merge pull request #7082 from MicrosoftDocs/main

Publish 03/22/2022, 10:30 AM

Author: Thomas Raya

memdocs/configmgr/develop/core/servers/console/console-extension-deployment.md

@@ -27,6 +27,9 @@ The deployment of a typical Configuration Manager extension has to account for a
 |Nodes|%ProgramFiles%\Microsoft Endpoint Manager\AdminConsole\bin for the assembly<br /><br /> %*ProgramFiles*%Microsoft Endpoint Manager\AdminConsole\XmlStorage\Extensions\Nodes for the node XML files|  
 |ManagementClasses|%ProgramFiles%\Microsoft Endpoint Manager\AdminConsole\bin for the assembly<br /><br /> %ProgramFiles%Microsoft Endpoint Manager\AdminConsole\XmlStorage\Extensions\ManagementClasses for the management classes XML files|  
 
+ > [!IMPORTANT]
+> Placing your assemblies and dependencies in the %ProgramFiles%\Microsoft Endpoint Manager\AdminConsole\bin folder may create conflicts with other console extensions and prevent your extension from loading.
+ 
  You must also perform the following tasks during installing and uninstalling actions.  
 
 ## Custom Actions  

memdocs/intune/remote-actions/device-restart.md

@@ -40,7 +40,7 @@ The **Restart** device action causes the device you choose to be restarted (with
 - Windows - Supported on Windows 8.1 and later
     > [!Note] 
     > Windows attempts to show the user a message with the following text: "Your device administrator has scheduled a reboot." The message is shown when the 5 minute restart counter is started. Restart of Windows devices immediately requires push notifications via Windows Notification Services (WNS). 
-    > For more information on WNS, see [Network Endpoint Requirements](../fundamentals/intune-endpoints.md#windows-push-notification-services-wns).
+    > For more information on WNS, see [Network Endpoint Requirements](/mem/intune/fundamentals/intune-endpoints#windows-push-notification-services-wns).
 - Android Enterprise dedicated devices - Supported on Android 8.0 and later
 - Android Enterprise fully managed devices - Supported on Android 8.0 and later
 - Android Enterprise corporate-owned with work profile devices - Not supported 
@@ -59,4 +59,4 @@ The **Restart** device action causes the device you choose to be restarted (with
 
 ## Next steps
 
-- To see the status of the **Restart** device action, select **Devices** > **Device actions**.
+- To see the status of the **Restart** device action, select **Devices** > **Device actions**.

windows-365/enterprise/identity-authentication.md

@@ -43,10 +43,14 @@ A device can also have an identity which is determined by its join type to Azure
 
 ## Identity types
 
-There are two identity types:
+There are three identity types:
 
 - **[Hybrid identity](/azure/active-directory/hybrid/whatis-hybrid-identity)**: Users or devices that are created in on-premises Windows Server Active Directory, then synchronized to Azure AD.
 - **Cloud-only identity**: Users or devices that are created and only exist in Azure AD.
+- **[External identity](/azure/active-directory/external-identities/identity-providers)**: Users who are created and managed outside of your Azure AD tenant but are invited in to your Azure AD tenant to access your organization's resources.
+
+>[!NOTE]
+>Windows 365 does not support external identities.
 
 ## Device join types