Merge pull request #8664 from MicrosoftDocs/main

Publish main to live on 10/4 @ 10:30 am

Author: v-stsavell

memdocs/intune/enrollment/enrollment-notifications.md

@@ -0,0 +1,126 @@
+---
+# required metadata
+
+title: Set up enrollment notifications in Intune
+titleSuffix: Microsoft Intune
+description: Set up enrollment notifications in Intune for employees or students. 
+keywords:
+author: Lenewsad
+ms.author: lanewsad
+manager: dougeby
+ms.date: 10/01/2022
+ms.topic: how-to
+ms.service: microsoft-intune
+ms.subservice: enrollment
+ms.localizationpriority: high
+ms.technology:
+ms.assetid: 
+
+# optional metadata
+
+#ROBOTS:
+#audience:
+
+ms.reviewer: maholdaa  
+ms.suite: ems
+search.appverid: MET150
+#ms.tgt_pltfrm:
+ms.custom: intune-azure 
+ms.collection: M365-identity-device-management
+---
+
+# Set up enrollment notifications   
+
+> [!IMPORTANT]
+> This feature is in public preview. For more information, see [Public preview in Microsoft Intune](../fundamentals/public-preview.md).  
+
+[!INCLUDE [azure_portal](../includes/azure_portal.md)]
+
+Set up enrollment notifications in Microsoft Intune to notify employees of newly enrolled devices. You can create a custom message for employees and include information in the notification about how to report an unrecognized device. 
+
+Intune delivers enrollment notifications via email or push notification. You can apply your tenant's branding and customization settings to email notifications. 
+
+Enrollment notifications work on devices running:  
+
+* Android  
+* iOS/iPadOS
+* macOS 
+* Windows 10/11 
+
+This article describes how to create enrollment notifications in the Microsoft Endpoint Manager admin center.  
+
+## Example  
+The following example image shows what an enrollment notification looks like to a device user.  
+
+> [!div class="mx-imgBorder"] 
+> ![Example image of an enrollment notification configured in Intune, notifying the recipient that a device named *Nia's iPhone" was enrolled, and includes HTML elements such as bolded font and a hyperlink, device details, contact information, and privacy statement.](./media/enrollment-notifications/enrollment-notification-message.png)  
+
+## Prerequisites  
+To create an enrollment notification, you must: 
+
+* Be a Global Administrator or Intune Administrator. 
+* [Configure branding and customization settings](../apps/company-portal-app.md) in **Tenant administration** > **Customization**.  
+
+Enrollment notifications only work with user-driven enrollment methods.   
+
+## You should know  
+Email notifications appear in the user's inbox. Push notifications appear in the Intune Company Portal apps for iOS/iPadOS, macOS, and Android.  Enrollment push notifications aren't supported in the Company Portal for Windows, so they'll never appear there.  
+
+## Create an enrollment notification  
+
+> [!TIP]
+> Use the built-in HTML editor to format and style email notifications. Intune supports the following HTML tags: `<a>`, `<strong>`, `<b>`, `<u>`, `<ol>`, `<ul>`, `<li>`, `<p>`, `<br>`, `<code>`, `<table>`, `<tbody>`, `<tr>`, `<td>`, `<thead>`, and`<th>`. It also supports the `href` attribute for hyperlinks.  
+
+1. Sign in to the [Microsoft Endpoint Manager admin center](https://go.microsoft.com/fwlink/?linkid=2109431).  
+2. Go to **Devices** > **Enroll device** and select the platform you're creating notifications for. Your options:  
+   * **Windows enrollment**  
+   * **Apple enrollment**  
+   * **Android enrollment**    
+3. Select **Enrollment notifications (preview)**.  
+4. Select **Create notification**. For Apple and Android notifications, select the OS platform you're configuring the notifications for. 
+
+    Your options for Apple enrollment are:  
+      * **iOS Notifications**  
+      * **macOS Notifications**  
+
+   Your options for Android enrollment are:  
+      * **Android Enterprise Notifications**  
+      * **Android device administrator Notifications**  
+5. In **Basics**, configure the following settings:  
+    * **Name**: Enter a descriptive name for the notification. Name your notifications so you can easily identify them later.  
+    * **Description**: Enter a description for the notification. This setting is optional, but recommended.  
+6. Select **Next**.  
+7. In **Notification settings**, configure the notification messages. 
+
+    The options for push notifications are:  
+    * **Send Push Notification**: Flip the switch **On** to enable and create a push notification.
+    * **Subject**: Enter the subject of the enrollment notification.  
+    * **Message**: Enter your message, explaining the purpose of the notification. The character limit is 2000.  
+
+    The options for email notifications are:  
+      * **Send Email Notification**: Flip the switch **On** to enable and create an email notification.   
+      * **Subject**: Enter the subject of the enrollment notification.  
+      * **Message**: Enter your message. The character limit is 2000.  
+      * **Raw HTML editor**: Flip the switch **On** to enable HTML formatting.  
+
+    The options for branding and customization are:  
+
+    * **Show company logo**: Flip the switch **On** to make your organization's logo visible in the email header. This option becomes available after you've configured Company Portal branding in your tenant.   
+    * **Show device details**: Flip the switch **On** to make the following device details visible in the footer of the email:  
+         * Device name  
+         * Model  
+         * OS  
+         * OS version  
+         * Serial number  
+    * **Show company name**: Flip the switch **On** to make your organization's name visible in the footer of the email. The tenant value is automatically populated.  
+    * **Show contact information**: Flip the switch **On** to show your organization's contact information. The tenant value is automatically populated.  
+    * **Show Company portal website link**: Flip the switch **On** to show a link to the Company Portal website. The tenant value is automatically populated. 
+8. Select **Next**. 
+9. Optionally, assign a scope tag, like `US-NC IT Team` or `JohnGlenn_ITDepartment`, to limit management of the notification to specific IT groups. Then select **Next**.  
+10. In **Assignments**, select the users or groups receiving the notification. 
+
+    Optionally, you can apply assignment filters. For more information about using filters on enrollment policies like this one, see [Supported filter properties](../enrollment/create-device-platform-restrictions.md#supported-filter-properties). Assignment filters are available for Windows and Apple enrollments.     
+11. Select **Next**. 
+12. In **Review + create**, review the notification details, and then select **Create**.  
+
+Enrollment notifications are sent out to assigned groups when enrollment is triggered. Return to **Enrollment notifications (preview)** to view and edit notifications, or change priority level. 

memdocs/intune/enrollment/media/enrollment-notifications/enrollment-notification-message.png

@@ -46,6 +46,8 @@ items:
   - name: Require multi-factor authentication  
     href: multi-factor-authentication.md
     displayName: mfa; multifactor   
+  - name: Set up enrollment notifications 
+    href: enrollment-notifications.md   
   - name: Set up Windows enrollment
     items:
     - name: Windows enrollment methods

memdocs/intune/enrollment/toc.yml

@@ -8,7 +8,7 @@ keywords:
 author: ErikjeMS 
 ms.author: erikje
 manager: dougeby
-ms.date: 07/14/2022
+ms.date: 10/4/2022
 ms.topic: reference
 ms.service: cloudpc
 ms.subservice: 
@@ -60,6 +60,10 @@ To help in your readiness and planning, this page lists Windows 365 Business upd
 
 Admins will be able to set a toggle that automatically enrolls new Cloud PCs in to Microsoft Endpoint Manager.
 
+### Admins can restore a Cloud PC to a previous state for a user<!--40784300-->
+
+Windows 365 Business admins will be able to restore a Cloud PC to a previous state on behalf of the user. [For more information about restoring Cloud PCs, see](/restore-overview).
+
 <!--***********************************************-->
 <!--## End user experience-->
 

windows-365/business/in-development.md

@@ -56,15 +56,6 @@ To help in your readiness and planning, this page lists Windows 365 updates and
 <!-- ***********************************************-->
 <!--## App management-->
 
-<!--***********************************************-->
-## Device management
-
-### Admins can restore a Cloud PC to a previous state for a user<!--40784300-->
-Windows 365 Business admins will be able to restore a Cloud PC to a previous state on behalf of the user. [For more information about restoring Cloud PCs, see](/restore-overview).
-
-### New setting to easily enroll Business Cloud PCs in Microsoft Endpoint Manager<!--40009143-->
-
-Admins will be able to set a toggle that automatically enrolls new Cloud PCs in to Microsoft Endpoint Manager.
 
 <!-- ***********************************************-->
 <!--## Device provisioning-->

windows-365/enterprise/in-development.md

@@ -30,7 +30,7 @@ ms.collection: M365-identity-device-management
 
 # What is Windows 365 Government?
 
-Windows 365 Government is cloud-based service that automatically creates virtual machines (Cloud PCs) for US government users. This service spans across a regulated US Government Community Cloud (GCC) and a public facing cloud. It meets federal, state, and local US government needs to securely stream Windows apps, data, content, and settings on Cloud PCs from regulated clouds to any device at any time.
+Windows 365 Government is a cloud-based service that automatically creates virtual machines (Cloud PCs) for US government users. This service spans across a regulated US Government Community Cloud (GCC) and a public facing cloud. It meets federal, state, and local US government needs to securely stream Windows apps, data, content, and settings on Cloud PCs from regulated clouds to any device at any time.
 
 Windows 365 Government customers are government agencies or public entities that qualify to use services hosted in GCC and GCC High. The services in the GCC and GCC High clouds must meet specific requirements and pass rigorous audit reviews before customers are allowed to use them.
 

windows-365/enterprise/introduction-windows-365-government.md

@@ -7,7 +7,7 @@ keywords:
 author: ErikjeMS  
 ms.author: erikje
 manager: dougeby
-ms.date: 08/03/2022
+ms.date: 09/27/2022
 ms.topic: conceptual
 ms.service: cloudpc
 ms.subservice:
@@ -45,9 +45,11 @@ To protect and maintain enrolled devices, Windows 365 processes and copies data
 
 ## Windows 365 data storage
 
-Depending on a tenant's region and preference, Windows 365 stores its customer content in Azure regions in North America, Europe, or Asia Pacific. Customer content, data and storage associated with the Cloud PC lives in the Azure region that the Cloud PC is provisioned in. For Windows 365 Enterprise, the region is defined in the [Azure network connection's (ANC)](azure-network-connections.md) **Virtual network** setting.  Windows 365 Business stores customer data in the Azure region of the Cloud PC itself.
+Depending on a tenant's region and preference, Windows 365 stores its customer content in Azure regions in North America, Europe, or Asia Pacific. Cloud PC virtual disk, customer content, data and storage associated with the Cloud PC lives in the Azure region that the Cloud PC is [provisioned](provisioning.md) in. For Windows 365 Enterprise, the region is defined in the [Azure network connection's](azure-network-connections.md) (ANC) **Virtual network** setting. Windows 365 Business stores customer data in the Azure region of the Cloud PC itself.
 
-Windows 365 stores service-generated metadata in Azure data centers in North America, Europe, or Asia Pacific, as defined by the tenant's country. This storage is mapped based on Microsoft Online tenant's country to the nearest region.
+To manage the Cloud PC, certain data relating to the Cloud PC (like the machine’s name, diagnostic data, and service-generated data) is stored in Azure data centers in North America, Europe, or Asia Pacific, as defined by the tenant's country. This storage is mapped based on Microsoft Online tenant's country to the nearest region.
+
+Other customer data, diagnostic data, or service-generated data may be collected by [Azure Virtual Desktop](/azure/virtual-desktop/data-locations) or [Intune](/mem/intune/protect/privacy-personal-data) because Windows 365 depends on these services.
 
 For more information on where your data is located, see:
 

windows-365/enterprise/privacy-personal-data.md

@@ -61,6 +61,8 @@ Resizing isn’t supported for Cloud PCs provisioned through group-based license
 
 Resizing is only supported for Gen 2 Cloud PCs. If you try resizing a Gen 1 Cloud PC, the resize will no start and you will be notified that this happened due to the user having a Gen 1 Cloud PC. Reprovision the Gen 1 Cloud PC to convert it to a Gen 2 Cloud PC
 
+Downsizing from a 8vCPU core Cloud PC that supports nested virtualization will disable nested virtualization support. Nested virtualization is only supported on 8vCPU core Cloud PCs. 
+
 ## Resize a Cloud PC
 
 1. Contact your end users and have them save their work and sign out. Resizing automatically disconnects the user from their session and any unsaved work might be lost. Therefore, it's best to coordinate any resizing with the user before you begin.