Skip to content

Commit

Permalink
Merge branch 'master' into Cern-MSfBcontent
Browse files Browse the repository at this point in the history
  • Loading branch information
cmcatee-MSFT committed May 6, 2020
2 parents 58d82a4 + d156e42 commit 8c2aa19
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ author: dansimp
ms.prod: ie11
ms.assetid: da659ff5-70d5-4852-995e-4df67c4871dd
ms.reviewer:
audience: itpromanager: dansimp
audience: itpro
manager: dansimp
ms.author: dansimp
title: Add multiple sites to the Enterprise Mode site list using a file and the Enterprise Mode Site List Manager (schema v.2) (Internet Explorer 11 for IT Pros)
ms.sitesec: library
Expand Down Expand Up @@ -62,15 +63,15 @@ Each XML file must include:

The following is an example of what your XML file should look like when you’re done adding your sites. For more info about how to create your XML file, see [Enterprise Mode schema v.2 guidance](enterprise-mode-schema-version-2-guidance.md).

```
```xml
<site-list version="205">
<!--- File creation header --->
<!-- File creation header -->
<created-by>
<tool>EnterpriseSitelistManager</tool>
<version>10240</version>
<date-created>20150728.135021</date-created>
</created-by>
<!--- Begin Site List --->
<!-- Begin Site List -->
<site url="www.cpandl.com">
<compat-mode>IE8Enterprise</compat-mode>
<open-in>MSEdge</open-in>
Expand Down Expand Up @@ -119,4 +120,3 @@ After you’ve added all of your sites to the tool and saved the file to XML, yo




4 changes: 2 additions & 2 deletions windows/client-management/mdm/reclaim-seat-from-user.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: Reclaim seat from user
description: The Reclaim seat from user operation returns reclaimed seats for a user in the Micosoft Store for Business.
description: The Reclaim seat from user operation returns reclaimed seats for a user in the Microsoft Store for Business.
ms.assetid: E2C3C899-D0AD-469A-A319-31A420472A4C
ms.reviewer:
manager: dansimp
Expand All @@ -14,7 +14,7 @@ ms.date: 09/18/2017

# Reclaim seat from user

The **Reclaim seat from user** operation returns reclaimed seats for a user in the Micosoft Store for Business.
The **Reclaim seat from user** operation returns reclaimed seats for a user in the Microsoft Store for Business.

## Request

Expand Down
2 changes: 1 addition & 1 deletion windows/privacy/windows-10-and-privacy-compliance.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ Windows 10, version 1803 and later, allows users to change their diagnostic data

#### 2.3.7 Diagnostic data: Managing device-based data delete

Windows 10, version 1809 and later, allows a user to delete diagnostic data collected from their device by going into **Settings** > **Privacy** > **Diagnostic & feedback** and clicking the **Delete** button. An IT administrator can also delete diagnostic data for a device using the [Clear-WindowsDiagnosticData](https://docs.microsoft.com/powershell/module/windowsdiagnosticdata/Clear-WindowsDiagnosticData?view=win10-ps) PowerShell cmdlet script.
Windows 10, version 1803 and later, allows a user to delete diagnostic data collected from their device by going into **Settings** > **Privacy** > **Diagnostic & feedback** and clicking the **Delete** button. An IT administrator can also delete diagnostic data for a device using the [Clear-WindowsDiagnosticData](https://docs.microsoft.com/powershell/module/windowsdiagnosticdata/Clear-WindowsDiagnosticData?view=win10-ps) PowerShell cmdlet script.

An administrator can disable a user’s ability to delete their device’s diagnostic data by setting the Group Policy: **Computer Configuration** > **Administrative Templates** > **Windows Components** > **Data Collection and Preview Builds** > **Disable deleting diagnostic data** or the MDM policy `DisableDeviceDelete`.

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 8c2aa19

Please sign in to comment.