Merge branch 'main' into danbrown-privacy-configure

.openpublishing.redirection.json

@@ -742,12 +742,12 @@
     },
     {
       "source_path": "windows/security/threat-protection/security-policy-settings/microsoft-network-client-digitally-sign-communications-if-server-agrees.md",
-      "redirect_url": "/windows/security/threat-protection/security-policy-settings/smbv1-microsoft-network-client-digitally-sign-communications-if-server-agrees",
+      "redirect_url": "/windows/security/threat-protection/security-policy-settings/microsoft-network-client-digitally-sign-communications-always",
       "redirect_document_id": false
     },
     {
       "source_path": "windows/security/threat-protection/security-policy-settings/microsoft-network-server-digitally-sign-communications-if-client-agress.md",
-      "redirect_url": "/windows/security/threat-protectionsecurity-policy-settings/smbv1-microsoft-network-server-digitally-sign-communications-if-client-agrees",
+      "redirect_url": "/windows/security/threat-protection/security-policy-settings/microsoft-network-server-digitally-sign-communications-always",
       "redirect_document_id": false
     },
     {
@@ -3447,7 +3447,7 @@
     },
     {
       "source_path": "windows/device-security/security-policy-settings/microsoft-network-client-digitally-sign-communications-if-server-agrees.md",
-      "redirect_url": "/windows/security/threat-protection/security-policy-settings/microsoft-network-client-digitally-sign-communications-if-server-agrees",
+      "redirect_url": "/windows/security/threat-protection/security-policy-settings/microsoft-network-client-digitally-sign-communications-always",
       "redirect_document_id": false
     },
     {
@@ -3472,7 +3472,7 @@
     },
     {
       "source_path": "windows/device-security/security-policy-settings/microsoft-network-server-digitally-sign-communications-if-client-agrees.md",
-      "redirect_url": "/windows/security/threat-protection/security-policy-settings/microsoft-network-server-digitally-sign-communications-if-client-agrees",
+      "redirect_url": "/windows/security/threat-protection/security-policy-settings/microsoft-network-server-digitally-sign-communications-always",
       "redirect_document_id": false
     },
     {
@@ -12392,12 +12392,12 @@
     },
     {
       "source_path": "windows/keep-secure/microsoft-network-client-digitally-sign-communications-always.md",
-      "redirect_url": "/windows/device-security/security-policy-settings/microsoft-network-client-digitally-sign-communications-always",
+      "redirect_url": "/windows/security/threat-protection/security-policy-settings/microsoft-network-client-digitally-sign-communications-always",
       "redirect_document_id": false
     },
     {
       "source_path": "windows/keep-secure/microsoft-network-client-digitally-sign-communications-if-server-agrees.md",
-      "redirect_url": "/windows/device-security/security-policy-settings/microsoft-network-client-digitally-sign-communications-if-server-agrees",
+      "redirect_url": "/windows/security/threat-protection/security-policy-settings/microsoft-network-client-digitally-sign-communications-always",
       "redirect_document_id": false
     },
     {
@@ -12417,12 +12417,12 @@
     },
     {
       "source_path": "windows/keep-secure/microsoft-network-server-digitally-sign-communications-always.md",
-      "redirect_url": "/windows/device-security/security-policy-settings/microsoft-network-server-digitally-sign-communications-always",
+      "redirect_url": "/windows/security/threat-protection/security-policy-settings/microsoft-network-server-digitally-sign-communications-always",
       "redirect_document_id": false
     },
     {
       "source_path": "windows/keep-secure/microsoft-network-server-digitally-sign-communications-if-client-agrees.md",
-      "redirect_url": "/windows/device-security/security-policy-settings/microsoft-network-server-digitally-sign-communications-if-client-agrees",
+      "redirect_url": "/windows/security/threat-protection/security-policy-settings/microsoft-network-server-digitally-sign-communications-always",
       "redirect_document_id": false
     },
     {
@@ -20294,6 +20294,46 @@
       "source_path": "windows/security/identity-protection/hello-for-business/reset-security-key.md",
       "redirect_url": "/azure/active-directory/authentication/howto-authentication-passwordless-security-key",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md",
+      "redirect_url": "/windows/configuration/provisioning-packages/provision-pcs-with-apps",
+      "redirect_document_id": true
+    },
+    {
+      "source_path": "windows/configuration/cortana-at-work/cortana-at-work-crm.md",
+      "redirect_url": "/windows/resources",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/configuration/cortana-at-work/cortana-at-work-powerbi.md",
+      "redirect_url": "/windows/resources",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/configuration/manage-wifi-sense-in-enterprise.md",
+      "redirect_url": "/windows/resources",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/security/threat-protection/security-policy-settings/smbv1-microsoft-network-client-digitally-sign-communications-always.md",
+      "redirect_url": "/windows/security/threat-protection/security-policy-settings/microsoft-network-client-digitally-sign-communications-always",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/security/threat-protection/security-policy-settings/smbv1-microsoft-network-client-digitally-sign-communications-if-server-agrees.md",
+      "redirect_url": "/windows/security/threat-protection/security-policy-settings/microsoft-network-client-digitally-sign-communications-always",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/security/threat-protection/security-policy-settings/smbv1-microsoft-network-server-digitally-sign-communications-always.md",
+      "redirect_url": "/windows/security/threat-protection/security-policy-settings/microsoft-network-server-digitally-sign-communications-always",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "windows/security/threat-protection/security-policy-settings/smbv1-microsoft-network-server-digitally-sign-communications-if-client-agrees.md",
+      "redirect_url": "/windows/security/threat-protection/security-policy-settings/microsoft-network-server-digitally-sign-communications-always",
+      "redirect_document_id": false
     }
   ]
-}
+}

education/includes/education-content-updates.md

@@ -0,0 +1,26 @@
+<!-- This file is generated automatically each week. Changes made to this file will be overwritten.-->
+
+
+
+## Week of January 09, 2023
+
+
+| Published On |Topic title | Change |
+|------|------------|--------|
+| 1/12/2023 | [Configure federation between Google Workspace and Azure AD](/education/windows/configure-aad-google-trust) | added |
+
+
+## Week of December 19, 2022
+
+
+| Published On |Topic title | Change |
+|------|------------|--------|
+| 12/22/2022 | [Windows 11 SE Overview](/education/windows/windows-11-se-overview) | modified |
+
+
+## Week of December 12, 2022
+
+
+| Published On |Topic title | Change |
+|------|------------|--------|
+| 12/13/2022 | [Configure Stickers for Windows 11 SE](/education/windows/edu-stickers) | modified |

education/windows/windows-11-se-overview.md

@@ -81,7 +81,7 @@ The following applications can also run on Windows 11 SE, and can be deployed us
 
 | Application                               | Supported version | App Type | Vendor                                    |
 |-------------------------------------------|-------------------|----------|-------------------------------------------|
-| `3d builder`                              | `18.0.1931.0`     | Win32    | `Microsoft`                               |
+| `3d builder`                              | 18.0.1931.0       | Win32    | `Microsoft`                               |
 | `Absolute Software Endpoint Agent`        | 7.20.0.1          | Win32    | `Absolute Software Corporation`           |
 | `AirSecure`                               | 8.0.0             | Win32    | `AIR`                                     |
 | `Alertus Desktop`                         | 5.4.48.0          | Win32    | `Alertus technologies`                    |
@@ -97,6 +97,7 @@ The following applications can also run on Windows 11 SE, and can be deployed us
 | `DRC INSIGHT Online Assessments`          | 12.0.0.0          | `Store`  | `Data recognition Corporation`            |
 | `Duo from Cisco`                          | 3.0.0             | Win32    | `Cisco`                                   |
 | `e-Speaking Voice and Speech recognition` | 4.4.0.8           | Win32    | `e-speaking`                              |
+| `EasyReader`                              | 10.0.3.481        | Win32    | `Dolphin Computer Access`                 |
 | `Epson iProjection`                       | 3.31              | Win32    | `Epson`                                   |
 | `eTests`                                  | 4.0.25            | Win32    | `CASAS`                                   |
 | `FortiClient`                             | 7.2.0.4034+       | Win32    | `Fortinet`                                |
@@ -107,6 +108,7 @@ The following applications can also run on Windows 11 SE, and can be deployed us
 | `Illuminate Lockdown Browser`             | 2.0.5             | Win32    | `Illuminate Education`                    |
 | `Immunet`                                 | 7.5.8.21178       | Win32    | `Immunet`                                 |
 | `Impero Backdrop Client`                  | 4.4.86            | Win32    | `Impero Software`                         |
+| `IMT Lazarus`                             | 2.86.0            | Win32    | `IMTLazarus`                              |
 | `Inspiration 10`                          | 10.11             | Win32    | `TechEdology Ltd`                         |
 | `JAWS for Windows`                        | 2022.2112.24      | Win32    | `Freedom Scientific`                      |
 | `Kite Student Portal`                     | 9.0.0.0           | Win32    | `Dynamic Learning Maps`                   |
@@ -133,11 +135,12 @@ The following applications can also run on Windows 11 SE, and can be deployed us
 | `Remote Desktop client (MSRDC)`           | 1.2.3213.0        | Win32    | `Microsoft`                               |
 | `Remote Help`                             | 4.0.1.13          | Win32    | `Microsoft`                               |
 | `Respondus Lockdown Browser`              | 2.0.9.03          | Win32    | `Respondus`                               |
-| `Safe Exam Browser`                       | 3.3.2.413         | Win32    | `Safe Exam Browser`                       |
+| `Safe Exam Browser`                       | 3.4.1.505         | Win32    | `Safe Exam Browser`                       |
 | `Senso.Cloud`                             | 2021.11.15.0      | Win32    | `Senso.Cloud`                             |
 | `Smoothwall Monitor`                      | 2.8.0             | Win32    | `Smoothwall Ltd`                          |
 | `SuperNova Magnifier & Screen Reader`     | 21.02             | Win32    | `Dolphin Computer Access`                 |
 | `SuperNova Magnifier & Speech`            | 21.02             | Win32    | `Dolphin Computer Access`                 |
+|`TX Secure Browser`                        | 15.0.0            | Win32    | `Cambium Development`
 | `VitalSourceBookShelf`                    | 10.2.26.0         | Win32    | `VitalSource Technologies Inc`            |
 | `Winbird`                                 | 19                | Win32    | `Winbird Co., Ltd.`                       |
 | `WordQ`                                   | 5.4.23            | Win32    | `Mathetmots`                              |

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-enrollment-of-windows-devices.md

@@ -285,13 +285,13 @@ The deep link used for connecting your device to work will always use the follow
 > [!NOTE]
 > AWA and Azure Active Directory-joined values for mode are only supported on Windows 10, version 1709 and later. 
 
-
 ### Connect to MDM using a deep link
 
 > [!NOTE]
-> Deep links only work with Internet Explorer or Microsoft Edge browsers. When connecting to MDM using a deep link, the URI you should use is:
-> **ms-device-enrollment:?mode=mdm** 
-> **ms-device-enrollment:?mode=mdm&username=someone@example.com&servername=<`https://example.server.com`>**
+> Deep links only work with Internet Explorer or Microsoft Edge browsers. Examples of URI's that may be used to connect to MDM using a deep link:
+> 
+> - **ms-device-enrollment:?mode=mdm**
+> - **ms-device-enrollment:?mode=mdm&username=`someone@example.com`&servername=`https://example.server.com`**
 
 To connect your devices to MDM using deep links:
 
@@ -303,6 +303,9 @@ To connect your devices to MDM using deep links:
 
       ![using enrollment deeplink in email.](images/deeplinkenrollment1.png)
 
+      > [!NOTE]
+      > Ensure that your email filters do not block deep links.
+
     - IT admins can also add this link to an internal web page that users refer to enrollment instructions.
 
 2.  After you select the link or run it, Windows 10 launches the enrollment app in a special mode that only allows MDM enrollments (similar to the Enroll into device management option in Windows 10, version 1511).

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/AllowTelemetry](policy-csp-system.md#system-allowtelemetry)
+- [System/AllowLocation](policy-csp-system.md#allowlocation)
+- [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/AllowLocation](policy-csp-system.md#system-allowlocation)
+- [System/AllowTelemetry](policy-csp-system.md#allowtelemetry)
+- [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/AllowLocation](policy-csp-system.md#system-allowlocation)
-- [System/AllowStorageCard](policy-csp-system.md#system-allowstoragecard)
-- [System/AllowTelemetry](policy-csp-system.md#system-allowtelemetry)
+- [System/AllowCommercialDataPipeline](policy-csp-system.md#allowcommercialdatapipeline)
+- [System/AllowLocation](policy-csp-system.md#allowlocation)
+- [System/AllowStorageCard](policy-csp-system.md#allowstoragecard)
+- [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/AllowStorageCard](policy-csp-system.md#system-allowstoragecard)
-- [System/AllowTelemetry](policy-csp-system.md#system-allowtelemetry)
+- [System/AllowLocation](policy-csp-system.md#allowlocation)
+- [System/AllowStorageCard](policy-csp-system.md#allowstoragecard)
+- [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/TelemetryProxy](policy-csp-system.md#system-telemetryproxy)
+- [System/AllowStorageCard](policy-csp-system.md#allowstoragecard)
+- [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
-description: Learn about the Policy CSP - ADMX_DataCollection.
+title: ADMX_DataCollection Policy CSP
+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.date: 12/01/2020
-ms.reviewer: 
-manager: aaroncz
+ms.topic: reference
 ---
 
+<!-- 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>
-  <dd>
-    <a href="#admx-datacollection-commercialidpolicy">ADMX_DataCollection/CommercialIdPolicy</a>
-  </dd>
-</dl>
+<!-- ADMX_DataCollection-Editable-Begin -->
+<!-- Add any additional information about this policy here. Anything outside this section will get overwritten. -->
+<!-- ADMX_DataCollection-Editable-End -->
 
+<!-- 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-->
-<a href="" id="admx-datacollection-commercialidpolicy"></a>**ADMX_DataCollection/CommercialIdPolicy**
+<!-- CommercialIdPolicy-OmaUri-Begin -->
+```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|
-|--- |--- |--- |
-|Home|No|No|
-|Pro|Yes|Yes|
-|Windows SE|No|Yes|
-|Business|Yes|Yes|
-|Enterprise|Yes|Yes|
-|Education|Yes|Yes|
+- 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 -->
 
-<!--/SupportedSKUs-->
-<hr/>
+<!-- CommercialIdPolicy-Editable-Begin -->
+<!-- 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-->
-[Scope](./policy-configuration-service-provider.md#policy-scope):
+<!-- CommercialIdPolicy-DFProperties-Begin -->
+**Description framework properties**:
 
-> [!div class = "checklist"]
-> * Device
+| Property name | Property value |
+|:--|:--|
+| 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-->
-<!--Description-->
-This policy setting defines the identifier used to uniquely associate this device’s telemetry data as belonging to a given organization.
+**ADMX mapping**:
 
-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 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*
+<!-- ADMX_DataCollection-End -->
 
-<!--/ADMXBacked-->
-<!--/Policy-->
-<hr/>
+## Related articles
 
-> [!NOTE]
-> These policies are for upcoming release.
-
-<!--/Policies-->
-
-## Related topics
-
-[ADMX-backed policies in Policy CSP](./policies-in-policy-csp-admx-backed.md)
+[Policy configuration service provider](policy-configuration-service-provider.md)

windows/configuration/cortana-at-work/cortana-at-work-crm.md

@@ -1,59 +0,0 @@
----
-title: Set up and test Cortana with Microsoft Dynamics CRM (Preview feature) in Windows
-description: How to set up Cortana to give salespeople insights on important CRM activities, including sales leads, accounts, and opportunities.
-ms.prod: windows-client
-author: aczechowski
-ms.localizationpriority: medium
-ms.author: aaroncz
-ms.date: 10/05/2017
-ms.reviewer: 
-manager: dougeby
-ms.technology: itpro-configure
----
-
-# Set up and test Cortana with Microsoft Dynamics CRM (Preview feature) in your organization
-
-Cortana integration is a Preview feature that's available for your test or dev environment, starting with the CRM Online 2016 Update. If you decide to use this Preview feature, you'll need to turn in on and accept the license terms. After that, your salespeople will get proactive insights from Cortana on important CRM activities, including sales leads, accounts, and opportunities; presenting the most relevant information at any given time. This information can even include getting company-specific news that surfaces when the person is meeting with a representative from another company.
-
->[!NOTE]
->For more info about Dynamics CRM integration, how to turn on Cortana, and how to provide feedback, see [Preview feature: Set up Cortana integration](https://go.microsoft.com/fwlink/p/?LinkId=746819).
-
-![Cortana at work, showing the sales data pulled from Dynamics CRM.](../images/cortana-crm-screen.png)
-
-## Turn on Cortana with Dynamics CRM in your organization
-You must be a CRM administrator to turn on and use Preview features. For more info about what Preview features are and how to use them, see [What are Preview features and how do I enable them](/dynamics365/marketing/marketing-preview-features).
-
-**To turn on Cortana with Dynamics CRM**
-
-1. Go to **Settings**, and then click **Administration**.
-
-2. Choose **System Settings**, and then click the **Previews** tab.
-
-3. Read the license terms, and if you agree, select the **I’ve read and agree to the license terms** check box.
-
-4. For each preview feature you want to enable, click **Yes**.
-
-## Turn on Cortana with Dynamics CRM on your employees’ devices
-You must tell your employees to turn on Cortana, before they’ll be able to use it with Dynamics CRM.
-
-**To turn on local Cortana with Dynamics CRM**
-
-1. Click on the **Cortana** search box in the taskbar, and then click the **Notebook** icon.
-
-2. Click on **Connected Services**, click **Dynamics CRM**, and then click **Connect**.
-
-    ![Cotana at work, showing how to turn on the connected services for Dynamics CRM.](../images/cortana-connect-crm.png)
-
-    The employee can also disconnect by clicking **Disconnect** from the **Dynamics CRM** screen.
-
-## Turn off Cortana with Dynamics CRM
-Cortana can only access data in Dynamics CRM when it’s turned on. If you don’t want Cortana to access your corporate data, you can turn it off.
-
-**To turn off Cortana with Dynamics CRM**
-1. Go to **Settings**, and then click **Administration**.
-
-2. Choose **System Settings**, and then click the **Previews** tab.
-
-3. Click **No** for **Cortana**.
-
-    All Dynamics CRM functionality related to Cortana is turned off in your organization.

windows/configuration/cortana-at-work/cortana-at-work-powerbi.md

@@ -1,139 +0,0 @@
----
-title: Set up and test Cortana for Power BI in your organization (Windows)
-description: How to integrate Cortana with Power BI to help your employees get answers directly from your key business data.
-ms.prod: windows-client
-author: aczechowski
-ms.localizationpriority: medium
-ms.author: aaroncz
-ms.date: 10/05/2017
-ms.reviewer: 
-manager: dougeby
-ms.technology: itpro-configure
----
-
-# Set up and test Cortana for Power BI in your organization
-
->[!IMPORTANT]
->Cortana for Power BI is deprecated and will not be available in future releases. This topic is provided as a reference for previous versions only.
-
-Integration between Cortana and Power BI shows how Cortana can work with custom business analytics solutions to enable you to get answers directly from your key business data, including introducing new features that let you create custom Cortana “answers” using the full capabilities of Power BI Desktop.
-
->[!Note]
->Cortana for Power BI is currently only available in English. For more info about Cortana and Power BI, see [Use Power BI to create a custom Answer Page for Cortana](https://powerbi.microsoft.com/documentation/powerbi-service-cortana-desktop-entity-cards/).
-
-## Before you begin
-To use this walkthrough, you’ll need:
-
-- **Windows 10 or Windows 11**. You’ll need your PC to be running at least Windows 10, version 1703 or later, or Windows 11.
-
-- **Cortana**. You need to have Cortana turned on and be logged into your account.
-
-- **Power BI account with data**. You can use an existing Power BI account, or else you can get a trial account by signing up at http://powerbi.com. Just make sure that either way, you enter some data that you can use.
-
-- **Azure Active Directory (Azure AD)/Work or School account**. You can use the account that you created for Office 365, or you can create a new one while you’re establishing your Power BI account. If you choose to use Azure AD, you must connect your Azure AD account to your Windows account.
-
-    **To connect your account to Windows**
-    
-    a. Open **Windows Settings**, click **Accounts**, click **Access work or school**, and then in the **Connect to work or school** section, click **Connect**.
-    
-    b. Follow the instructions to add your Azure Active Directory (Azure AD) account to Windows.
-
-## Set up your test environment for Cortana for Power BI
-Before you can start this testing scenario, you must first set up your test environment and data, and then you must turn on and set up Cortana to connect and work with Power BI.
-
-**To set up your test environment with Cortana and Power BI**
-
-1. Go to http://powerbi.com and sign-in with the same O365 credentials you used in the Set up and use Cortana with Office 365 topic.
-
-2. Expand the left rail by clicking the **Show the navigation pane** icon.
-
-    ![Cortana at work, showing the navigation expand icon in Power BI.](../images/cortana-powerbi-expand-nav.png)
-
-3. Click **Get Data** from the left-hand navigation in Power BI.
-
-    ![Cortana at work, showing the Get Data link.](../images/cortana-powerbi-getdata.png)
-
-4. Click **Samples** from the **Content Pack Library** area of the **Get Data** screen.
-
-    ![Cortana at work, showing Samples link](../images/cortana-powerbi-getdata-samples.png)
-
-5. Click **Retail Analysis Sample**, and then click **Connect**.
-
-    ![Cortana at work, showing the Samples link.](../images/cortana-powerbi-retail-analysis-sample.png)
- 
-    The sample data is imported and you’re returned to the **Power BI** screen.
-
-6. Click **Dashboards** from the left pane of the **Power BI** screen, and then click **Retail Analysis Sample**.
-
-    ![Cortana at work, showing a dashboard view of the sample data.](../images/cortana-powerbi-retail-analysis-dashboard.png)    
- 
-7. In the upper right-hand menu, click the **Settings** icon, and then click **Settings**.
-
-    ![Cortana at work, showing where to find the Settings option.](../images/cortana-powerbi-settings.png) 
-
-8. Click the **Datasets** tab, and then pick the **Retail Analysis Sample** dataset from the list.
-
-9. Click **Q&A and Cortana**, check the **Allow Cortana to access this dataset** box, and then click **Apply**.
-
-    ![Cortana at work, showing where to find the dataset options.](../images/cortana-powerbi-retail-analysis-dataset.png)
-
-    >[!NOTE]
-    >It can take up to 30 minutes for a new dataset to appear for Power BI and Cortana. Logging in and out of Windows, or otherwise restarting Cortana, causes the new content to appear immediately.<p>If you enable a dataset for Cortana, and that dataset is part of a content pack you own, you’ll need to re-publish for your colleagues to also use it with Cortana.
-
-## Create a custom Answer Page for Cortana
-You must create special reports, known as _Answer Pages_, to display the most commonly asked answers in Cortana. For example, if you want Cortana to quickly show sales data to your employees, you can create a 2016 sales data Answer Page that shows sales data, with various pivots, in Cortana.
-
-After you’ve finished creating your Answer Page, you can continue to the included testing scenarios.
-
->[!NOTE]
->It can take up to 30 minutes for a custom Answer Page to appear for Power BI and Cortana. Logging in and out of Windows, or otherwise restarting Cortana, causes the new content to appear immediately.
-
-**To create a custom sales data Answer Page for Cortana**
-1. In Power BI, click **My Workspace**, click **Create**, and then click **Report**.
-
-    ![Cortana at work, showing where to create the new report.](../images/cortana-powerbi-create-report.png)
- 
-2. In the **Create Report** screen, click the **Retail Analysis Sample**, and then click **Create**.
-
-    A blank report page appears.
-
-3. In the **Visualizations** pane, click the paint roller icon, expand **Page Size**, and then pick **Cortana** from the **Type** drop-down list.
-
-    ![Cortana at work, showing the Visualizations options.](../images/cortana-powerbi-pagesize.png)
-
-4. In the **Fields** pane, click to expand **Sales**, expand **This year sales**, and then add both **Value** and **Goal**.
-
-    ![Cortana at work, showing the Field options.](../images/cortana-powerbi-field-selection.png)
- 
-    The automatically generated graph is added to your blank report. You have the option to change colors, add borders, add additional visualizations, and modify this page so that it answers the question about sales data as precisely, and in as custom a way, as you want. You just need to make sure that it all stays within the page borders.
-
-5. In the **Visualizations** pane, click the paint roller icon again, expand **Page Information**, type _Sales data 2016_ into the **Name** box, turn on **Q&A**, and then add alternate report names (separated by commas) into the text box.
-
-    The alternate names help Cortana to know what questions to look for and when to show this report. To also improve your results, you should avoid using the names of your report columns.
-
-    ![Cortana at work, showing the page info for your specific report.](../images/cortana-powerbi-report-qna.png)
-    
-6. Click **File**, click **Save as**, and save the report as _Sales data 2016_. 
-
-    Because this is part of the Retail Analysis Sample, it will automatically be included as part of the dataset you included for Cortana. However, you will still need to log in and out of Windows, or otherwise restart Cortana, before the new content appears.
-
-## Test Scenario: Use Cortana to show info from Power BI in your organization
-Now that you’ve set up your device, you can use Cortana to show your info from within Power BI.
-
-**To use Cortana with Power BI**
-1. Click on the **Cortana** icon in the taskbar, and then click in the **Search** bar.
-
-2. Type _This year in sales_.
-
-    Cortana shows you the available results.
-
-    ![Cortana at work, showing the best matches based on the Power BI data.](../images/cortana-powerbi-search.png)
- 	 
-3. In the **Power BI** area, click **This year in sales – in Retail Analysis Sample**.
-
- 	Cortana returns your custom report.
-
-    ![Cortana at work, showing your custom report from Power BI.](../images/cortana-powerbi-myreport.png)
- 	 
->[!NOTE]
->For more info about how to connect your own data, build your own custom Power BI cards and Answer Pages for Cortana, and how to share the cards with everyone in your organization, see [Use Power BI to create a custom Answer Page for Cortana](https://powerbi.microsoft.com/documentation/powerbi-service-cortana-desktop-entity-cards/).