Merge pull request #7673 from MicrosoftDocs/main

Publish 05/24/2022 3:30 PM PT

Author: Angela Fleischmann

memdocs/intune/developer/app-wrapper-prepare-ios.md

@@ -220,6 +220,7 @@ You can use the following command line parameters with the App Wrapping Tool:
 |**-b**|(Optional) Use -b without an argument if you want the wrapped output app to have the same bundle version as the input app (not recommended). <br/><br/> Use `-b <custom bundle version>` if you want the wrapped app to have a custom CFBundleVersion. If you choose to specify a custom CFBundleVersion, it's a good idea to increment the native app's CFBundleVersion by the least significant component, like 1.0.0 -> 1.0.1. |
 |**-citrix**|(Optional) Include the Citrix XenMobile App SDK (network-only variant). You must have the [Citrix MDX Toolkit](https://docs.citrix.com/en-us/mdx-toolkit/about-mdx-toolkit.html) installed to use this option. |
 |**-f**|(Optional) `<Path to a plist file specifying arguments.>` Use this flag in front of the [plist](https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/PropertyLists/Introduction/Introduction.html) file if you choose to use the plist template to specify the rest of the IntuneMAMPackager properties like -i, -o, and -p. See Use a plist to input arguments. |
+|**-dt**|(Optional) Disable collection of Microsoft Intune client telemetry.
 
 ### Use a plist to input arguments
 
@@ -242,6 +243,7 @@ In the IntuneMAMPackager/Contents/MacOS folder, open `Parameters.plist` (a blank
 | Build String Override |String|empty| The custom CFBundleVersion of the wrapped output app|
 | Include Citrix XenMobile App SDK (network-only variant)|Boolean|false| Same as -citrix|
 | Extension Provisioning Profile Paths |Array of Strings|empty| An array of extension provisioning profiles for the app.
+| Disable Telemetry |Boolean|false| Same as -dt
 
 Run the IntuneMAMPackager with the plist as the sole argument:
 

memdocs/intune/fundamentals/licenses.md

@@ -7,7 +7,7 @@ keywords:
 author: Erikre
 ms.author: erikre
 manager: dougeby
-ms.date: 12/16/2021
+ms.date: 05/19/2021
 ms.topic: conceptual
 ms.service: microsoft-intune
 ms.subservice: fundamentals
@@ -69,14 +69,38 @@ Microsoft Endpoint Manager offers premium add-ons. Licenses for the premium add-
 ## Additional information
 
 - A Microsoft Intune user and device subscription is available as a standalone, in addition to the bundles listed above.
-- A Microsoft Intune device-only subscription is available to manage kiosks, dedicated devices, phone-room devices, IoT, and other single-use devices that don't require user-based security and management features. For more information, see [Introduction to device licenses in Microsoft Intune](/troubleshoot/mem/intune/device-licenses-introduction).
+- A Microsoft Intune device-only subscription is available to manage kiosks, dedicated devices, phone-room devices, IoT, and other single-use devices that don't require user-based security and management features. For more information, see [Device-only licenses](../fundamentals/licenses.md#device-only-licenses).
 - The appropriate Microsoft Intune license is required if a user or device benefits directly or indirectly from the Microsoft Intune service, including access to the Microsoft Intune service through a [Microsoft API](/legal/microsoft-apis/terms-of-use).
 - Intune isn't included in licenses not in the previous tables.
 
 ## Unlicensed admins
 
 For more information about giving administrators access to Microsoft Endpoint Manager without them having an Intune license, see [Unlicensed admins](unlicensed-admins.md).
 
+## Device-only licenses
+
+Microsoft Intune offers a device-only subscription service that helps organizations manage devices that aren't affiliated with specific users. 
+
+You can purchase device licenses based on your estimated usage. Microsoft Intune device licenses are applicable when a device is enrolled through any of the following methods:
+
+- [Windows Autopilot Self-Deploying mode](/windows/deployment/windows-autopilot/self-deploying)
+- [Apple Device Enrollment Program without user affinity](/mem/intune/enrollment/device-enrollment-program-enroll-ios)
+- [Apple School Manager without user affinity](/mem/intune/enrollment/apple-school-manager-set-up-ios)
+- [Apple Configurator without user affinity](/mem/intune/enrollment/apple-configurator-enroll-ios)
+- [Android Enterprise dedicated](/mem/intune/enrollment/android-kiosk-enroll)
+- [Using a device enrollment manager account](/mem/intune/enrollment/device-enrollment-manager-enroll)
+
+> [!NOTE]
+> Visit the [Microsoft Licensing](https://www.microsoft.com/licensing/default) page, or contact your account representative if you have any questions or you would like to receive the latest information about product editions, product licensing updates, volume licensing plans, and other information related to your specific use cases.
+
+### Device-only license limitations
+
+When a device is enrolled by using a device license, the following Intune functions aren't supported:
+
+- [Intune app protection policies](/mem/intune/apps/app-protection-policy)
+- [Conditional access](/mem/intune/protect/conditional-access)
+- User-based management features, such as email and calendaring
+
 ## Confirm your licenses
 
 A Microsoft Intune license is created for you when you sign up for the Intune free trial. As part of this trial, you'll also have a trial Enterprise Mobility + Security (EMS) subscription. An Enterprise Mobility + Security (EMS) subscription includes both Azure Active Directory Premium and Microsoft Intune.

memdocs/intune/remote-actions/collect-diagnostics.md

@@ -61,7 +61,7 @@ To use the *Collect diagnostics* action:
 
 ## Data collected
 
-No personal information is collected. If you've installed KB5011543 on Windows 10 or KB5011563 on Windows 11, the format of the zip file will be simpler, including a flattened structure where the logs collected are named to match the data collected, and when multiple files are collected a folder is created.  
+No personal information is collected. If you've installed [KB5011543](https://support.microsoft.com/topic/march-22-2022-kb5011543-os-builds-19042-1620-19043-1620-and-19044-1620-preview-4fe2d1c0-720f-47fe-9523-75339bc107a1) on Windows 10 or [KB5011563](https://support.microsoft.com/topic/march-28-2022-kb5011563-os-build-22000-593-preview-40df54c9-b5a9-42e5-ae1c-9a33ff91ca91) on Windows 11, the format of the zip file will be simpler, including a flattened structure where the logs collected are named to match the data collected, and when multiple files are collected a folder is created.  
 
 This list below is the same order as the diagnostic zip.  Each collection contains the following data: