Merge branch 'release-intune-2206' of https://github.com/MicrosoftDocs/memdocs-pr into in2205-model-14439211

mestew · mestew · commit c48eba4d31e8 · 2022-06-23T13:13:34.000-07:00
diff --git a/memdocs/intune/enrollment/android-aosp-corporate-owned-user-associated-enroll.md b/memdocs/intune/enrollment/android-aosp-corporate-owned-user-associated-enroll.md
@@ -31,18 +31,16 @@ ms.collection: M365-identity-device-management
 
 # Set up Intune enrollment for Android (AOSP) corporate-owned user-associated devices 
 
-*This feature is in public preview.*  
+> [!IMPORTANT]
+> This feature is in [public preview](../fundamentals/public-preview.md).  
 
 Set up enrollment in Intune for corporate-owned, user-associated devices built on the Android Open Source Project (AOSP) platform. Intune offers an *Android (AOSP)* device management solution for corporate-owned Android devices that are:  
 
 * Not integrated with Google Mobile Services.
 * Intended to be used by a single user. 
 * Used exclusively for work.    
 
-This article describes how to set up Android (AOSP) device management and enroll RealWear devices for use at work. 
-
-> [!IMPORTANT]
-> This feature is in [public preview](../fundamentals/public-preview.md).   
+This article describes how to set up Android (AOSP) device management and enroll RealWear devices for use at work.  
 
 ## Prerequisites
 
@@ -83,18 +81,13 @@ Create an enrollment profile to enable enrollment on devices.
 ### Access enrollment token  
 After you create a profile, Intune generates a token that's needed for enrollment. The token appears as a QR code. During device setup, when prompted to, scan the QR code to enroll the device in Intune.   
 
-To access the token:
+To view the token as a QR code:
 
 1. Go to **Corporate-owned, user-associated devices**.
 2. From the list, select your enrollment profile. 
-2. Select **Tokens**. 
-
-Another way to find the token is:
-1. Go to **Corporate-owned, user-associated devices**.
-2. Locate your profile in the list, and then select the **More** (**...**) menu that's next to it.
-3. Select **View enrollment token**. 
+2. Select **Token**.   
 
-For devices that can't scan QR codes, you can export the enrollment profile JSON file and QR code image.  
+From the Token page, you can also export the enrollment profile JSON file.   
 
 > [!IMPORTANT]
 >- The QR code will contain any credentials provided in the profile in plain text to allow the device to successfully authenticate with the network. This is required as the user will not be able to join a network from the device.  
@@ -154,16 +147,18 @@ After you set up and assign the Android (AOSP) enrollment profiles, you can enro
 2. When the device prompts you to, scan the token's QR code. 
 
 > [!TIP]
-> To access the token in Intune, select **Devices** > **Android** > **Android enrollment** > **Corporate-owned, user-associated devices**. Select your enrollment profile, and then select **Tokens**.  
+> To access the token in Intune, select **Devices** > **Android** > **Android enrollment** > **Corporate-owned, user-associated devices**. Select your enrollment profile, and then select **Token**.  
 
-3. Follow the on-screen prompts to finish enrolling and registering the device.  
+3. Step through the on-screen prompts to finish enrolling and registering the device. The following apps are automatically installed during this time and used for enrollment: 
 
-The Microsoft Intune app and Microsoft Authenticator app automatically install and open on the device, which allows the device to be enrolled. You'll be locked in the enrollment process until it's complete.  
+    * Microsoft Intune app  
+    * Intune Company Portal app  
+    * Microsoft Authenticator app  
 
 ## After enrollment 
 
-### Update Microsoft Intune and Microsoft Authenticator  
-The Intune app automatically installs available app updates for itself and Authenticator. When an update becomes available, the Intune app closes and installs the update. The app must be closed completely to install the update.   
+### Update apps    
+The Microsoft Intune app automatically updates itself. When an app update becomes available, the Intune app closes and installs the update. The app must remain closed to install the update. The app also installs updates for Microsoft Authenticator and the Company Portal app.    
 
 ### Manage devices remotely  
 
@@ -179,8 +174,8 @@ You can take action on one device at a time. For more information about where to
 
 ## Troubleshooting  
 
-### View version of Microsoft Intune and Microsoft Authenticator apps
-To find out which version of the Microsoft Intune app or Microsoft Authenticator app is installed on a device:
+### View app versions  
+Find out which version of the Intune app or Microsoft Authenticator app is installed on a device. 
 
 1. Go to **Devices** and select the device name.    
 2. Select **Discovered apps**. 
@@ -193,7 +188,7 @@ Select **Troubleshooting + Support** from the Microsoft Endpoint Manager navigat
 * Enable troubleshooting of Android (AOSP) devices the same way you can troubleshoot other user devices. 
 
 ### Share app logs with Microsoft  
-If you experience problems with enrollment or the Microsoft Intune app, you can use the Intune app to upload and send app logs to Microsoft. After you submit the logs, you'll receive an incident ID to share with your Microsoft support person.   
+If you experience problems with enrollment or access to work resources, you can share diagnostic logs with Microsoft in the Intune app or Company Portal app. After you submit the logs, you'll receive an incident ID to share with your Microsoft support person.   
 
 ## Known limitations  
 
diff --git a/memdocs/intune/remote-actions/device-restart.md b/memdocs/intune/remote-actions/device-restart.md
@@ -7,7 +7,7 @@ keywords:
 author: Smritib17
 ms.author: smbhardwaj
 manager: dougeby
-ms.date: 02/27/2020
+ms.date: 06/13/2022
 ms.topic: how-to
 ms.service: microsoft-intune
 ms.subservice: remote-actions
@@ -48,7 +48,7 @@ The **Restart** device action causes the device you choose to be restarted (with
 
     > [!Note]  
     > This command requires a supervised device and the **Device Lock** access right. The device restarts immediately. Passcode-locked iOS/iPadOS devices don't rejoin a Wi-Fi network after restart. After restart, the device might not be able to communicate with the server.
-- macOS - Not supported
+- macOS - Supported
 - Android and Android Enterprise personally-owned work profile devices - Not supported
 
 ## Restart a device
diff --git a/memdocs/intune/remote-actions/device-shutdown.md b/memdocs/intune/remote-actions/device-shutdown.md
@@ -0,0 +1,53 @@
+---
+# required metadata
+
+title: Shut down devices with Microsoft Intune
+description: Shut down iOS/iPadOS devices using remote actions in Microsoft Intune.
+keywords:
+author: Smritib17
+ms.author: smbhardwaj
+manager: dougeby
+ms.date: 06/13/2022
+ms.topic: how-to
+ms.service: microsoft-intune
+ms.subservice: remote-actions
+ms.localizationpriority: high
+ms.technology:
+ms.assetid: c707e0c4-391a-4bad-9dfd-9a7799c48dd5
+
+# optional metadata
+
+#ROBOTS:
+#audience:
+
+ms.reviewer: coferro
+ms.suite: ems
+search.appverid: MET150
+#ms.tgt_pltfrm:
+ms.custom: intune-azure
+ms.collection: M365-identity-device-management
+---
+
+# Remotely shut down devices using Intune
+
+With the **Shut down** device action you can remotely power off devices. When you remotely shut down the device, no warning will be given to the end user.
+
+## Supported platforms
+
+ - iOS/iPadOS 10.3 and later
+ - macOS 10.13 and later
+
+> [!NOTE]
+> This command requires a supervised iOS/iPadOS device and the device shuts down immediately.  Supervision is not required for macOS devices. iOS/iPadOS devices that are Passcode-locked will not rejoin a Wi-Fi network after restarting. After restarting, the device might not be able to communicate with the server.
+
+## Shut down an iOS/iPadOS device
+
+1. Sign in to the [Microsoft Endpoint Manager admin center](https://go.microsoft.com/fwlink/?linkid=2109431).
+2. Select **Devices** > **All devices**.
+3. In the list of devices that you manage, select a device > **Shut down (supervised only)** > **Yes**.
+
+## Shut down a macOS device
+
+1. Sign in to the [Microsoft Endpoint Manager admin center](https://go.microsoft.com/fwlink/?linkid=2109431).
+2. Select **Devices** > **All devices**.
+3. In the list of devices that you manage, select a device > **Shut down** > **Yes**.
diff --git a/memdocs/intune/remote-actions/index.yml b/memdocs/intune/remote-actions/index.yml
@@ -91,6 +91,8 @@ landingContent:
             url: device-supervised-mode.md
           - text: Turn on iOS/iPadOS lost mode
             url: device-lost-mode.md
+          - text: Shutdown macOS and iOS/iPadOS devices
+            url: device-shutdown.md
           - text: Erase data from macOS device
             url: device-erase.md
           - text: Disable Activation Lock
diff --git a/memdocs/intune/remote-actions/toc.yml b/memdocs/intune/remote-actions/toc.yml
@@ -30,6 +30,8 @@ items:
       href: device-lost-mode.md
     - name: Turn on iOS/iPadOS supervised mode
       href: device-supervised-mode.md
+    - name: Shutdown macOS and iOS/iPadOS devices
+      href: device-shutdown.md
     - name: Erase macOS device
       href: device-erase.md
     - name: Disable Activation Lock
