deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-06-15 10:23:37 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fixed merge conflict

Browse Source
This commit is contained in:
Patti Short
2018-07-31 14:54:13 -07:00
parent c48d2d1519 d9ed64c05b
commit 6a8c4115fa
77 changed files with 2028 additions and 1632 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
browsers/edge/includes/configure-browser-telemetry-for-m365-analytics-include.md
View File

@ -19,11 +19,20 @@
|Enabled |3 |3 |Send both intranet and Internet history | |
---
<<<<<<< HEAD
>>You can find this policy and the related policies in the following location of the Group Policy Editor:
>>
>>**_Computer Configuration\\Administrative Templates\\Windows Components\\Data Collection and Preview Builds\\_**
>><ul><li>Allow Telemetry = Enabled, _Enhanced_</li><li>Configure the Commercial ID = String of the Commercial ID</li><li>Configure collection of browsing data for Microsoft 365 Analytics</li></ul>
=======
>>You can find this setting in the following location of the Group Policy Editor:
>>
>>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;**_Computer Configuration\\Administrative Templates\\Windows Components\\Data Collection and Preview Builds\\_**
>[!IMPORTANT]
>For this policy to work, enable the Allow Telemetry policy with the _Enhanced_ option and enable the Configure the Commercial ID policy by providing the Commercial ID.
>>>>>>> d9ed64c05b90318b610f2f9214605443099f9927
### ADMX info and settings
@ -51,4 +60,4 @@
- Configure the Commercial ID: Define the Commercial ID used to associate the device's telemetry data as belonging to a given organization.
<hr>
<hr>