Merge pull request #7749 from vinaypamnani-msft/vp-csp-system

Update System and ADMX_DataCollection CSP

windows/client-management/change-history-for-mdm-documentation.md

@@ -3,7 +3,7 @@ title: Change history for MDM documentation
 description: This article lists new and updated articles for Mobile Device Management.
 author: vinaypamnani-msft
 ms.author: vinpa
-ms.reviewer: 
+ms.reviewer:
 manager: aaroncz
 ms.topic: article
 ms.prod: windows-client
@@ -46,7 +46,7 @@ As of November 2020 This page will no longer be updated. This article lists new
 
 |New or updated article | Description|
 |--- | ---|
-|[Policy CSP - System](mdm/policy-csp-system.md)|Added the following new policy settings:<br>  - System/AllowDesktopAnalyticsProcessing <br>- System/AllowMicrosoftManagedDesktopProcessing <br> - System/AllowUpdateComplianceProcessing<br> - System/AllowWUfBCloudProcessing <br> <br><br>Updated the following policy setting:<br>-  <a href="mdm/policy-csp-system.md#system-allowcommercialdatapipeline" id="system-allowcommercialdatapipeline">System/AllowCommercialDataPipeline</a> <br>|
+|[Policy CSP - System](mdm/policy-csp-system.md)|Added the following new policy settings:<br>  - System/AllowDesktopAnalyticsProcessing <br>- System/AllowMicrosoftManagedDesktopProcessing <br> - System/AllowUpdateComplianceProcessing<br> - System/AllowWUfBCloudProcessing <br> <br><br>Updated the following policy setting:<br>-  <a href="mdm/policy-csp-system.md#allowcommercialdatapipeline" id="system-allowcommercialdatapipeline">System/AllowCommercialDataPipeline</a> <br>|
 
 ## June 2020
 

windows/client-management/mdm/policies-in-policy-csp-supported-by-hololens-1st-gen-commercial-suite.md

@@ -1,7 +1,7 @@
 ---
 title: Policies in Policy CSP supported by HoloLens (1st gen) Commercial Suite
 description: Learn the policies in Policy CSP supported by HoloLens (1st gen) Commercial Suite.
-ms.reviewer: 
+ms.reviewer:
 manager: aaroncz
 ms.author: vinpa
 ms.topic: article
@@ -48,8 +48,8 @@ ms.date: 09/17/2019
 - [Settings/AllowDateTime](policy-csp-settings.md#settings-allowdatetime)
 - [Settings/AllowVPN](policy-csp-settings.md#settings-allowvpn)
 - [Speech/AllowSpeechModelUpdate](policy-csp-speech.md#speech-allowspeechmodelupdate)
-- [System/AllowLocation](policy-csp-system.md#system-allowlocation)
+- [System/AllowLocation](policy-csp-system.md#allowlocation)
-- [System/AllowTelemetry](policy-csp-system.md#system-allowtelemetry)
+- [System/AllowTelemetry](policy-csp-system.md#allowtelemetry)
 - [Update/AllowAutoUpdate](policy-csp-update.md#update-allowautoupdate)
 - [Update/AllowUpdateService](policy-csp-update.md#update-allowupdateservice)
 - [Update/RequireDeferUpgrade](policy-csp-update.md#update-requiredeferupgrade)

windows/client-management/mdm/policies-in-policy-csp-supported-by-hololens-1st-gen-development-edition.md

@@ -1,7 +1,7 @@
 ---
 title: Policies in Policy CSP supported by HoloLens (1st gen) Development Edition
 description: Learn about the policies in Policy CSP supported by HoloLens (1st gen) Development Edition.
-ms.reviewer: 
+ms.reviewer:
 manager: aaroncz
 ms.author: vinpa
 ms.topic: article
@@ -46,8 +46,8 @@ ms.date: 07/18/2019
 - [Settings/AllowDateTime](policy-csp-settings.md#settings-allowdatetime)
 - [Settings/AllowVPN](policy-csp-settings.md#settings-allowvpn)
 - [Speech/AllowSpeechModelUpdate](policy-csp-speech.md#speech-allowspeechmodelupdate)
-- [System/AllowTelemetry](policy-csp-system.md#system-allowtelemetry)
+- [System/AllowTelemetry](policy-csp-system.md#allowtelemetry)
-- [System/AllowLocation](policy-csp-system.md#system-allowlocation)
+- [System/AllowLocation](policy-csp-system.md#allowlocation)
 - [Update/AllowAutoUpdate](policy-csp-update.md#update-allowautoupdate)
 - [Update/AllowUpdateService](policy-csp-update.md#update-allowupdateservice)
 - [Update/RequireUpdateApproval](policy-csp-update.md#update-requireupdateapproval)

windows/client-management/mdm/policies-in-policy-csp-supported-by-hololens2.md

@@ -1,7 +1,7 @@
 ---
 title: Policies in Policy CSP supported by HoloLens 2
 description: Learn about the policies in Policy CSP supported by HoloLens 2.
-ms.reviewer: 
+ms.reviewer:
 manager: aaroncz
 ms.author: vinpa
 ms.topic: article
@@ -104,10 +104,10 @@ ms.date: 08/01/2022
 - [Storage/ConfigStorageSenseCloudContentDehydrationThreshold](policy-csp-storage.md#storage-configstoragesensecloudcontentdehydrationthreshold) <sup>12</sup>
 - [Storage/ConfigStorageSenseDownloadsCleanupThreshold](policy-csp-storage.md#storage-configstoragesensedownloadscleanupthreshold) <sup>12</sup>
 - [Storage/ConfigStorageSenseGlobalCadence](policy-csp-storage.md#storage-configstoragesenseglobalcadence) <sup>12</sup>
-- [System/AllowCommercialDataPipeline](policy-csp-system.md#system-allowcommercialdatapipeline)
+- [System/AllowCommercialDataPipeline](policy-csp-system.md#allowcommercialdatapipeline)
-- [System/AllowLocation](policy-csp-system.md#system-allowlocation)
+- [System/AllowLocation](policy-csp-system.md#allowlocation)
-- [System/AllowStorageCard](policy-csp-system.md#system-allowstoragecard)
+- [System/AllowStorageCard](policy-csp-system.md#allowstoragecard)
-- [System/AllowTelemetry](policy-csp-system.md#system-allowtelemetry)
+- [System/AllowTelemetry](policy-csp-system.md#allowtelemetry)
 - [TimeLanguageSettings/ConfigureTimeZone](./policy-csp-timelanguagesettings.md#timelanguagesettings-configuretimezone) <sup>9</sup>
 - [Update/ActiveHoursEnd](./policy-csp-update.md#update-activehoursend) <sup>9</sup>
 - [Update/ActiveHoursMaxRange](./policy-csp-update.md#update-activehoursmaxrange) <sup>9</sup>

windows/client-management/mdm/policies-in-policy-csp-supported-by-surface-hub.md

@@ -64,9 +64,9 @@ ms.date: 07/22/2020
 - [DeliveryOptimization/DOPercentageMaxDownloadBandwidth](policy-csp-deliveryoptimization.md#deliveryoptimization-dopercentagemaxdownloadbandwidth)
 - [Desktop/PreventUserRedirectionOfProfileFolders](policy-csp-desktop.md#desktop-preventuserredirectionofprofilefolders)
 - [RestrictedGroups/ConfigureGroupMembership](policy-csp-restrictedgroups.md#restrictedgroups-configuregroupmembership)
-- [System/AllowLocation](policy-csp-system.md#system-allowlocation)
+- [System/AllowLocation](policy-csp-system.md#allowlocation)
-- [System/AllowStorageCard](policy-csp-system.md#system-allowstoragecard)
+- [System/AllowStorageCard](policy-csp-system.md#allowstoragecard)
-- [System/AllowTelemetry](policy-csp-system.md#system-allowtelemetry)
+- [System/AllowTelemetry](policy-csp-system.md#allowtelemetry)
 - [TextInput/AllowIMELogging](policy-csp-textinput.md#textinput-allowimelogging)
 - [TextInput/AllowIMENetworkAccess](policy-csp-textinput.md#textinput-allowimenetworkaccess)
 - [TextInput/AllowInputPanel](policy-csp-textinput.md#textinput-allowinputpanel)

windows/client-management/mdm/policies-in-policy-csp-that-can-be-set-using-eas.md

@@ -1,7 +1,7 @@
 ---
 title: Policies in Policy CSP that can be set using Exchange Active Sync (EAS)
 description: Learn about the policies in Policy CSP that can be set using Exchange Active Sync (EAS).
-ms.reviewer: 
+ms.reviewer:
 manager: aaroncz
 ms.author: vinpa
 ms.topic: article
@@ -30,8 +30,8 @@ ms.date: 07/18/2019
 - [DeviceLock/PreventLockScreenSlideShow](policy-csp-devicelock.md#devicelock-preventlockscreenslideshow)
 - [Search/AllowSearchToUseLocation](policy-csp-search.md#search-allowsearchtouselocation)
 - [Security/RequireDeviceEncryption](policy-csp-security.md#security-requiredeviceencryption)
-- [System/AllowStorageCard](policy-csp-system.md#system-allowstoragecard)
+- [System/AllowStorageCard](policy-csp-system.md#allowstoragecard)
-- [System/TelemetryProxy](policy-csp-system.md#system-telemetryproxy)
+- [System/TelemetryProxy](policy-csp-system.md#telemetryproxy)
 - [Wifi/AllowInternetSharing](policy-csp-wifi.md#wifi-allowinternetsharing)
 - [Wifi/AllowWiFi](policy-csp-wifi.md#wifi-allowwifi)
 

windows/client-management/mdm/policy-csp-admx-datacollection.md

@@ -1,92 +1,95 @@
 ---
-title: Policy CSP - ADMX_DataCollection
+title: ADMX_DataCollection Policy CSP
-description: Learn about the Policy CSP - ADMX_DataCollection.
+description: Learn more about the ADMX_DataCollection Area in Policy CSP.
+author: vinaypamnani-msft
+manager: aaroncz
 ms.author: vinpa
+ms.date: 01/09/2023
 ms.localizationpriority: medium
-ms.topic: article
 ms.prod: windows-client
 ms.technology: itpro-manage
-author: vinaypamnani-msft
+ms.topic: reference
-ms.date: 12/01/2020
-ms.reviewer: 
-manager: aaroncz
 ---
 
+<!-- Auto-Generated CSP Document -->
+
+<!-- ADMX_DataCollection-Begin -->
 # Policy CSP - ADMX_DataCollection
 
-<hr/>
-
-<!--Policies-->
-## ADMX_DataCollection policies
-
 > [!TIP]
-> This is an ADMX-backed policy and requires a special SyncML format to enable or disable. For details, see [Understanding ADMX-backed policies](../understanding-admx-backed-policies.md).
+> This CSP contains ADMX-backed policies which require a special SyncML format to enable or disable. You must specify the data type in the SyncML as &lt;Format&gt;chr&lt;/Format&gt;. For details, see [Understanding ADMX-backed policies](./understanding-admx-backed-policies.md).
 >
-> You must specify the data type in the SyncML as &lt;Format&gt;chr&lt;/Format&gt;. For an example SyncML, refer to [Enabling a policy](../understanding-admx-backed-policies.md#enabling-a-policy).
+> The payload of the SyncML must be XML-encoded; for this XML encoding, there are a variety of online encoders that you can use. To avoid encoding the payload, you can use CDATA if your MDM supports it.  For more information, see [CDATA Sections](http://www.w3.org/TR/REC-xml/#sec-cdata-sect).
->
-> The payload of the SyncML must be XML-encoded; for this XML encoding, there are a variety of online encoders that you can use. To avoid encoding the payload, you can use CDATA if your MDM supports it. For more information, see [CDATA Sections](http://www.w3.org/TR/REC-xml/#sec-cdata-sect).
 
-<dl>
+<!-- ADMX_DataCollection-Editable-Begin -->
-  <dd>
+<!-- Add any additional information about this policy here. Anything outside this section will get overwritten. -->
-    <a href="#admx-datacollection-commercialidpolicy">ADMX_DataCollection/CommercialIdPolicy</a>
+<!-- ADMX_DataCollection-Editable-End -->
-  </dd>
-</dl>
 
+<!-- CommercialIdPolicy-Begin -->
+## CommercialIdPolicy
 
-<hr/>
+<!-- CommercialIdPolicy-Applicability-Begin -->
+| Scope | Editions | Applicable OS |
+|:--|:--|:--|
+| :heavy_check_mark: Device <br> :x: User | :x: Home <br> :heavy_check_mark: Pro <br> :heavy_check_mark: Enterprise <br> :heavy_check_mark: Education <br> :heavy_check_mark: Windows SE | :heavy_check_mark: Windows 10, version 2004 [10.0.19041.1202] and later <br> :heavy_check_mark: Windows 10, version 2009 [10.0.19042.1202] and later <br> :heavy_check_mark: Windows 10, version 21H1 [10.0.19043.1202] and later <br> :heavy_check_mark: Windows 11, version 21H2 [10.0.22000] and later |
+<!-- CommercialIdPolicy-Applicability-End -->
 
-<!--Policy-->
+<!-- CommercialIdPolicy-OmaUri-Begin -->
-<a href="" id="admx-datacollection-commercialidpolicy"></a>**ADMX_DataCollection/CommercialIdPolicy**
+```Device
+./Device/Vendor/MSFT/Policy/Config/ADMX_DataCollection/CommercialIdPolicy
+```
+<!-- CommercialIdPolicy-OmaUri-End -->
 
-<!--SupportedSKUs-->
+<!-- CommercialIdPolicy-Description-Begin -->
+<!-- Description-Source-ADMX -->
+This policy setting defines the identifier used to uniquely associate this device's diagnostic data data as belonging to a given organization. If your organization is participating in a program that requires this device to be identified as belonging to your organization then use this setting to provide that identification. The value for this setting will be provided by Microsoft as part of the onboarding process for the program.
 
-|Edition|Windows 10|Windows 11|
+- If you disable or do not configure this policy setting, then Microsoft will not be able to use this identifier to associate this machine and its diagnostic data data with your organization.
-|--- |--- |--- |
+<!-- CommercialIdPolicy-Description-End -->
-|Home|No|No|
-|Pro|Yes|Yes|
-|Windows SE|No|Yes|
-|Business|Yes|Yes|
-|Enterprise|Yes|Yes|
-|Education|Yes|Yes|
 
-<!--/SupportedSKUs-->
+<!-- CommercialIdPolicy-Editable-Begin -->
-<hr/>
+<!-- Add any additional information about this policy here. Anything outside this section will get overwritten. -->
+> [!IMPORTANT]
+> Starting with the January 2023 preview cumulative update, this policy is no longer supported to configure the processor option. For more information, see [Changes to Windows diagnostic data collection](/windows/privacy/changes-to-windows-diagnostic-data-collection#significant-changes-coming-to-the-windows-diagnostic-data-processor-configuration).
+<!-- CommercialIdPolicy-Editable-End -->
 
-<!--Scope-->
+<!-- CommercialIdPolicy-DFProperties-Begin -->
-[Scope](./policy-configuration-service-provider.md#policy-scope):
+**Description framework properties**:
 
-> [!div class = "checklist"]
+| Property name | Property value |
-> * Device
+|:--|:--|
+| Format | chr (string) |
+| Access Type | Add, Delete, Get, Replace |
+<!-- CommercialIdPolicy-DFProperties-End -->
 
-<hr/>
+<!-- CommercialIdPolicy-AdmxBacked-Begin -->
+> [!TIP]
+> This is an ADMX-backed policy and requires SyncML format for configuration. For an example of SyncML format, refer to [Enabling a policy](./understanding-admx-backed-policies.md#enabling-a-policy).
 
-<!--/Scope-->
+**ADMX mapping**:
-<!--Description-->
-This policy setting defines the identifier used to uniquely associate this device’s telemetry data as belonging to a given organization.
 
-If your organization is participating in a program that requires this device to be identified as belonging to your organization, then use this setting to provide that identification. The value for this setting will be provided by Microsoft as part of the onboarding process for the program.
+| Name | Value |
+|:--|:--|
+| Name | CommercialIdPolicy |
+| Friendly Name | Configure the Commercial ID |
+| Location | Computer Configuration |
+| Path | WindowsComponents > Data Collection and Preview Builds |
+| Registry Key Name | Software\Policies\Microsoft\Windows\DataCollection |
+| ADMX File Name | DataCollection.admx |
+<!-- CommercialIdPolicy-AdmxBacked-End -->
 
-If you disable or don't configure this policy setting, then Microsoft won't be able to use this identifier to associate this machine and its telemetry data with your organization.
+<!-- CommercialIdPolicy-Examples-Begin -->
+<!-- Add any examples for this policy here. Examples outside this section will get overwritten. -->
+<!-- CommercialIdPolicy-Examples-End -->
 
-<!--/Description-->
+<!-- CommercialIdPolicy-End -->
 
+<!-- ADMX_DataCollection-CspMoreInfo-Begin -->
+<!-- Add any additional information about this CSP here. Anything outside this section will get overwritten. -->
+<!-- ADMX_DataCollection-CspMoreInfo-End -->
 
-<!--ADMXBacked-->
+<!-- ADMX_DataCollection-End -->
-ADMX Info:
--   GP Friendly name: *Configure the Commercial ID*
--   GP name: *CommercialIdPolicy*
--   GP path: *Windows Components\Data Collection and Preview Builds*
--   GP ADMX file name: *DataCollection.admx*
 
-<!--/ADMXBacked-->
+## Related articles
-<!--/Policy-->
-<hr/>
 
-> [!NOTE]
+[Policy configuration service provider](policy-configuration-service-provider.md)
-> These policies are for upcoming release.
-
-<!--/Policies-->
-
-## Related topics
-
-[ADMX-backed policies in Policy CSP](./policies-in-policy-csp-admx-backed.md)