Fixed conflict

windows/deploy/mbr-to-gpt.md

@@ -29,7 +29,9 @@ You can use MBR2GPT to perform the following:
 
 You can use MBR2GPT to convert an MBR disk with BitLocker-encrypted volumes as long as protection has been suspended. To resume BitLocker after conversion, you will need to delete the existing protectors and recreate them.
 
-The MBR2GPT tool can convert operating system disks that have earlier versions of Windows installed, such as Windows 10 versions 1507, 1511, and 1607. However, you must run the tool while booted into Windows 10 version 1703 or later, and perform an offline conversion.
+The MBR2GPT tool can convert operating system disks that have earlier versions of Windows 10 installed, such as versions 1507, 1511, and 1607. However, you must run the tool while booted into Windows 10 version 1703 or later, and perform an offline conversion.
+
+Offline conversion of system disks with earlier versions of Windows installed, such as Windows 7, 8, or 8.1 are not officially supported. The recommended method to convert these disks is to upgrade the operating system to Windows 10 first, then perform the MBR to GPT conversion.
 
 >[!IMPORTANT]
 >After the disk has been converted to GPT partition style, the firmware must be reconfigured to boot in UEFI mode. <BR>Make sure that your device supports UEFI before attempting to convert the disk.

windows/keep-secure/app-behavior-with-wip.md

@@ -13,7 +13,7 @@ localizationpriority: high
 # Unenlightened and enlightened app behavior while using Windows Information Protection (WIP)
 **Applies to:**
 
-- Windows 10, version 1607 and later
+- Windows 10, version 1607
 - Windows 10 Mobile
 
 Windows Information Protection (WIP) classifies apps into two categories: enlightened and unenlightened. Enlighted apps can differentiate between corporate and personal data, correctly determining which to protect based on internal policies. Corporate data is encrypted on the managed device and attempts to copy/paste or share this information with non-corporate apps or people will fail. Unenlightened apps, when marked as corporate-managed, consider all data corporate and encrypt everything by default.

windows/keep-secure/create-and-verify-an-efs-dra-certificate.md

@@ -13,9 +13,8 @@ localizationpriority: high
 # Create and verify an Encrypting File System (EFS) Data Recovery Agent (DRA) certificate
 **Applies to:**
 
-
 -   Windows 10, version 1703
--   Windows 10 Mobile
+-   Windows 10 Mobile, version 1703
 
 If you don’t already have an EFS DRA certificate, you’ll need to create and extract one from your system before you can use Windows Information Protection (WIP), formerly known as enterprise data protection (EDP), in your organization. For the purposes of this section, we’ll use the file name EFSDRA; however, this name can be replaced with anything that makes sense to you.
 

windows/keep-secure/enlightened-microsoft-apps-and-wip.md

@@ -15,7 +15,7 @@ localizationpriority: high
 
 **Applies to:**
 
--   Windows 10, version 1607 and later
+-   Windows 10, version 1607
 -   Windows 10 Mobile
 
 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 allowed apps list.

windows/keep-secure/guidance-and-best-practices-wip.md

@@ -14,7 +14,7 @@ localizationpriority: high
 # General guidance and best practices for Windows Information Protection (WIP)
 **Applies to:**
 
--   Windows 10, version 1607 and later
+-   Windows 10, version 1607
 -   Windows 10 Mobile
 
 This section includes info about the enlightened Microsoft apps, including how to add them to your allowed apps list in Microsoft Intune. It also includes some testing scenarios that we recommend running through with Windows Information Protection (WIP).

windows/keep-secure/overview-create-wip-policy.md

@@ -13,7 +13,7 @@ localizationpriority: high
 # Create a Windows Information Protection (WIP) policy
 **Applies to:**
 
--   Windows 10, version 1607 and later
+-   Windows 10, version 1607
 -   Windows 10 Mobile
 
 Microsoft Intune and System Center Configuration Manager helps you create and deploy your enterprise data protection (WIP) policy, including letting you choose your protected apps, your WIP-protection level, and how to find enterprise data on the network.

windows/keep-secure/protect-enterprise-data-using-wip.md

@@ -14,7 +14,7 @@ localizationpriority: high
 # Protect your enterprise data using Windows Information Protection (WIP)
 **Applies to:**
 
--   Windows 10, version 1607 and later
+-   Windows 10, version 1607
 -   Windows 10 Mobile
 
 >Learn more about what features and functionality are supported in each Windows edition at [Compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare).

windows/keep-secure/recommended-network-definitions-for-wip.md

@@ -14,7 +14,7 @@ localizationpriority: high
 
 **Applies to:**
 
--   Windows 10, version 1607 and later
+-   Windows 10, version 1607
 -   Windows 10 Mobile
 
 >Learn more about what features and functionality are supported in each Windows edition at [Compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare).

windows/keep-secure/testing-scenarios-for-wip.md

@@ -14,7 +14,7 @@ localizationpriority: high
 # Testing scenarios for Windows Information Protection (WIP)
 **Applies to:**
 
--   Windows 10, version 1607 and later
+-   Windows 10, version 1607
 -   Windows 10 Mobile
 
 We've come up with a list of suggested testing scenarios that you can use to test Windows Information Protection (WIP) in your company.

windows/keep-secure/using-owa-with-wip.md

@@ -13,7 +13,7 @@ localizationpriority: high
 # Using Outlook Web Access with Windows Information Protection (WIP)
 **Applies to:**
 
--   Windows 10, version 1607 and later
+-   Windows 10, version 1607
 -   Windows 10 Mobile
 
 >Learn more about what features and functionality are supported in each Windows edition at [Compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare).

windows/keep-secure/wip-app-enterprise-context.md

@@ -13,7 +13,7 @@ localizationpriority: high
 # Determine the Enterprise Context of an app running in Windows Information Protection (WIP)
 **Applies to:**
 
--   Windows 10, version 1607 and later
+-   Windows 10, version 1607
 -   Windows 10 Mobile
 
 >Learn more about what features and functionality are supported in each Windows edition at [Compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare).