mirror of
https://github.com/MicrosoftDocs/windows-itpro-docs.git
synced 2025-06-19 12:23:37 +00:00
Merge remote-tracking branch 'refs/remotes/origin/master' into wsfb-7661230
This commit is contained in:
Trudy Hakala
BIN
windows/deploy/images/check_blu.png
Normal file
BIN
windows/deploy/images/check_blu.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
@ -17,17 +17,22 @@ author: greg-lindsay
|
||||
|
||||
With Windows 10, you can quickly upgrade from one edition of Windows 10 to another, provided the upgrade path is supported. For information on what edition of Windows 10 is right for you, see [Compare Windows 10 Editions](http://go.microsoft.com/fwlink/p/?LinkID=690882). For a comprehensive list of all possible upgrade paths to Windows 10, see [Windows 10 upgrade paths](windows-10-upgrade-paths.md).
|
||||
|
||||
The following table shows the methods and paths available to change the edition of Windows 10 that is running on your computer.
|
||||
The following table shows the methods and paths available to change the edition of Windows 10 that is running on your computer. **Note**: The reboot requirement for upgrading from Pro to Enterprise was removed in version 1607.
|
||||
|
||||
X = unsupported <BR>
|
||||
✔ (green) = supported; reboot required<BR>
|
||||
✔ (blue) = supported; no reboot required.
|
||||
|
||||
|
||||
|Method |Home > Pro |Home > Education |Pro > Education |Pro > Enterprise |Ent > Education |Mobile > Mobile Enterprise |
|
||||
|-------|-----------|-----------------|----------------|-----------------|----------------|--------|
|
||||
| Using mobile device management (MDM) | | | | | | |
|
||||
| Using a provisioning package | | | | | | |
|
||||
| Using a command-line tool | | | | | | |
|
||||
| Entering a product key manually | | | | | | |
|
||||
| Using mobile device management (MDM) | | | | | | |
|
||||
| Using a provisioning package | | | | | | |
|
||||
| Using a command-line tool | | | | | | |
|
||||
| Entering a product key manually | | | | | | |
|
||||
| Purchasing a license from the Windows Store | | | | | | |
|
||||
|
||||
**Note**<br>Each desktop edition in the table also has an N and KN edition. These editions have had media-related functionality removed. Devices with N or KN editions installed can be upgraded to corresponding N or KN editions using the same methods.
|
||||
>**Note**: Each desktop edition in the table also has an N and KN edition. These editions have had media-related functionality removed. Devices with N or KN editions installed can be upgraded to corresponding N or KN editions using the same methods.
|
||||
|
||||
## Upgrade using mobile device management (MDM)
|
||||
- To upgrade desktop editions of Windows 10 using MDM, you'll need to enter the product key for the upgraded edition in the **UpgradeEditionWithProductKey** policy setting of the **WindowsLicensing** CSP. For more info, see [WindowsLicensing CSP](http://go.microsoft.com/fwlink/p/?LinkID=690907).
|
||||
|
||||
@ -80,7 +80,7 @@ The final step to making your VPN configuration work with WIP, is to link your t
|
||||
|
||||
3. Type a name (required) and an optional description for your policy into the **Name** and **Description** boxes.
|
||||
|
||||
|
||||
|
||||
|
||||
4. In the **OMA-URI Settings** area, click **Add** to add your **WIPModeID** info.
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
---
|
||||
title: List of enlightened Microsoft apps for use with Windows Information Protection(WIP) (Windows 10)
|
||||
title: List of enlightened Microsoft apps for use with Windows Information Protection (WIP) (Windows 10)
|
||||
description: Learn the difference between enlightened and unenlightened apps, and then review the list of enlightened apps provided by Microsoft along with the text you will need to use to add them to your Protected Apps list.
|
||||
ms.assetid: 17c85ea3-9b66-4b80-b511-8f277cb4345f
|
||||
keywords: WIP, Windows Information Protection, EDP, Enterprise Data Protection
|
||||
|
||||
@ -18,7 +18,7 @@ author: eross-msft
|
||||
|
||||
With the increase of employee-owned devices in the enterprise, there’s also an increasing risk of accidental data leak through apps and services, like email, social media, and the public cloud, which are outside of the enterprise’s control. For example, when an employee sends the latest engineering pictures to their personal email account, copies and pastes product info into a tweet, or saves an in-progress sales report to their public cloud storage.
|
||||
|
||||
Windows Information Protection (WIP) helps to protect against this potential data leakage without otherwise interfering with the employee experience. EDP also helps to protect enterprise apps and data against accidental data leak on enterprise-owned devices and personal devices that employees bring to work without requiring changes to your environment or other apps. Finally, another data protection technology, Azure Rights Management also works alongside EDP to extend data protection for data that leaves the device, such as when email attachments are sent from an enterprise aware version of a rights management mail client.
|
||||
Windows Information Protection (WIP) helps to protect against this potential data leakage without otherwise interfering with the employee experience. WIP also helps to protect enterprise apps and data against accidental data leak on enterprise-owned devices and personal devices that employees bring to work without requiring changes to your environment or other apps. Finally, another data protection technology, Azure Rights Management also works alongside WIP to extend data protection for data that leaves the device, such as when email attachments are sent from an enterprise aware version of a rights management mail client.
|
||||
|
||||
## Prerequisites
|
||||
You’ll need this software to run WIP in your enterprise:
|
||||
@ -28,7 +28,7 @@ You’ll need this software to run WIP in your enterprise:
|
||||
|Windows 10, version 1607 | Microsoft Intune<br>-OR-<br>System Center Configuration Manager<br>-OR-<br>Your current company-wide 3rd party mobile device management (MDM) solution. For info about 3rd party MDM solutions, see the documentation that came with your product. If your 3rd party MDM does not have UI support for the policies, refer to the [EnterpriseDataProtection CSP](https://msdn.microsoft.com/en-us/library/windows/hardware/mt697634.aspx) documentation.|
|
||||
|
||||
## How WIP works
|
||||
EDP helps address your everyday challenges in the enterprise. Including:
|
||||
WIP helps address your everyday challenges in the enterprise. Including:
|
||||
|
||||
- Helping to prevent enterprise data leaks, even on employee-owned devices that can't be locked down.
|
||||
|
||||
@ -46,7 +46,7 @@ You can set WIP to 1 of 4 protection and management modes:
|
||||
|Block |WIP looks for inappropriate data sharing practices and stops the employee from completing the action. This can include sharing enterprise data to non-enterprise-protected apps in addition to sharing enterprise data between apps or attempting to share outside of your organization’s network.|
|
||||
|Override |WIP looks for inappropriate data sharing, warning employees if they do something deemed potentially unsafe. However, this management mode lets the employee override the policy and share the data, logging the action to your audit log, accessible through the [Reporting CSP](http://go.microsoft.com/fwlink/p/?LinkID=746459). |
|
||||
|Silent |WIP runs silently, logging inappropriate data sharing, without blocking anything that would’ve been prompted for employee interaction while in Override mode. Unallowed actions, like apps inappropriately trying to access a network resource or WIP-protected data, are still blocked.|
|
||||
|Off |WIP is turned off and doesn't help to protect or audit your data.<p>After you turn off EDP, an attempt is made to decrypt any closed EDP-tagged files on the locally attached drives. |
|
||||
|Off |WIP is turned off and doesn't help to protect or audit your data.<p>After you turn off WIP, an attempt is made to decrypt any closed WIP-tagged files on the locally attached drives. |
|
||||
<p>**Note**<br>For more info about setting your WIP-protection modes, see either [Create a Windows Information Protection (WIP) policy using Intune](create-wip-policy-using-intune.md) or [Create and deploy a Windows Information Protection (WIP) policy using Configuration Manager](create-wip-policy-using-sccm.md), depending on your management solution.
|
||||
|
||||
## Why use WIP?
|
||||
|
||||
Reference in New Issue
Block a user