diff --git a/windows/threat-protection/TOC.md b/windows/threat-protection/TOC.md
index 85d2429812..dc2e70068a 100644
--- a/windows/threat-protection/TOC.md
+++ b/windows/threat-protection/TOC.md
@@ -2,6 +2,8 @@
## [Windows Defender Security Center](windows-defender-security-center\windows-defender-security-center.md)
## [Windows Defender Advanced Threat Protection](windows-defender-atp\windows-defender-advanced-threat-protection.md)
### [Minimum requirements](windows-defender-atp\minimum-requirements-windows-defender-advanced-threat-protection.md)
+### [Validate licensing and complete setup](windows-defender-atp\licensing-windows-defender-advanced-threat-protection.md)
+#### [Troubleshoot onboarding and error messages](windows-defender-atp\troubleshoot-onboarding-error-messages-windows-defender-advanced-threat-protection.md)
### [Preview features](windows-defender-atp\preview-windows-defender-advanced-threat-protection.md)
### [Data storage and privacy](windows-defender-atp\data-storage-privacy-windows-defender-advanced-threat-protection.md)
### [Assign user access to the portal](windows-defender-atp\assign-portal-access-windows-defender-advanced-threat-protection.md)
@@ -237,16 +239,18 @@
###[Frequently Asked Questions - Windows Defender Application Guard](windows-defender-application-guard\faq-wd-app-guard.md)
## [Protect your enterprise data using Windows Information Protection (WIP)](windows-information-protection\protect-enterprise-data-using-wip.md)
-### [Create a Windows Information Protection (WIP) policy](windows-information-protection\overview-create-wip-policy.md)
+### [Create a Windows Information Protection (WIP) policy using Microsoft Intune](windows-information-protection\overview-create-wip-policy.md)
#### [Create a Windows Information Protection (WIP) policy using the classic console for Microsoft Intune](windows-information-protection\create-wip-policy-using-intune.md)
##### [Deploy your Windows Information Protection (WIP) policy using the classic console for Microsoft Intune](windows-information-protection\deploy-wip-policy-using-intune.md)
##### [Associate and deploy a VPN policy for Windows Information Protection (WIP) using the classic console for Microsoft Intune](windows-information-protection\create-vpn-and-wip-policy-using-intune.md)
-#### [Create a Windows Information Protection (WIP) with enrollment policy using the Azure portal for Microsoft Intune](windows-information-protection\create-wip-policy-using-intune-azure.md)
+#### [Create a Windows Information Protection (WIP) with MDM using the Azure portal for Microsoft Intune](windows-information-protection\create-wip-policy-using-intune-azure.md)
##### [Deploy your Windows Information Protection (WIP) policy using the Azure portal for Microsoft Intune](windows-information-protection\deploy-wip-policy-using-intune-azure.md)
##### [Associate and deploy a VPN policy for Windows Information Protection (WIP) using the Azure portal for Microsoft Intune](windows-information-protection\create-vpn-and-wip-policy-using-intune-azure.md)
+#### [Create a Windows Information Protection (WIP) policy with MAM using the Azure portal for Microsoft Intune](windows-information-protection\create-wip-policy-using-mam-intune-azure.md)
+### [Create a Windows Information Protection (WIP) policy using System Center Configuration Manager](windows-information-protection\overview-create-wip-policy-sccm.md)
#### [Create and deploy a Windows Information Protection (WIP) policy using System Center Configuration Manager](windows-information-protection\create-wip-policy-using-sccm.md)
-#### [Create and verify an Encrypting File System (EFS) Data Recovery Agent (DRA) certificate](windows-information-protection\create-and-verify-an-efs-dra-certificate.md)
-#### [Determine the Enterprise Context of an app running in Windows Information Protection (WIP)](windows-information-protection\wip-app-enterprise-context.md)
+### [Create and verify an Encrypting File System (EFS) Data Recovery Agent (DRA) certificate](windows-information-protection\create-and-verify-an-efs-dra-certificate.md)
+### [Determine the Enterprise Context of an app running in Windows Information Protection (WIP)](windows-information-protection\wip-app-enterprise-context.md)
### [Mandatory tasks and settings required to turn on Windows Information Protection (WIP)](windows-information-protection\mandatory-settings-for-wip.md)
### [Testing scenarios for Windows Information Protection (WIP)](windows-information-protection\testing-scenarios-for-wip.md)
### [Limitations while using Windows Information Protection (WIP)](windows-information-protection\limitations-with-wip.md)
diff --git a/windows/threat-protection/change-history-for-threat-protection.md b/windows/threat-protection/change-history-for-threat-protection.md
index f89c5ecee5..18996780d2 100644
--- a/windows/threat-protection/change-history-for-threat-protection.md
+++ b/windows/threat-protection/change-history-for-threat-protection.md
@@ -11,6 +11,11 @@ author: brianlic-msft
# Change history for threat protection
This topic lists new and updated topics in the [Threat protection](index.md) documentation.
+## October 2017
+|New or changed topic |Description |
+|---------------------|------------|
+|[Create a Windows Information Protection (WIP) policy with MAM using the Azure portal for Microsoft Intune](windows-information-protection\create-wip-policy-using-mam-intune-azure.md)|New topic for MAM using the Azure portal.|
+
## June 2017
|New or changed topic |Description |
|---------------------|------------|
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-O365-admin-portal-customer.png b/windows/threat-protection/windows-defender-atp/images/atp-O365-admin-portal-customer.png
new file mode 100644
index 0000000000..c4a23269f5
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-O365-admin-portal-customer.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-azure-license-icon.png b/windows/threat-protection/windows-defender-atp/images/atp-azure-license-icon.png
new file mode 100644
index 0000000000..3bf8b08a0a
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-azure-license-icon.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-billing-licenses.png b/windows/threat-protection/windows-defender-atp/images/atp-billing-licenses.png
new file mode 100644
index 0000000000..0a08e0c3d9
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-billing-licenses.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-billing-subscriptions.png b/windows/threat-protection/windows-defender-atp/images/atp-billing-subscriptions.png
new file mode 100644
index 0000000000..8951659d17
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-billing-subscriptions.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-data-retention-policy.png b/windows/threat-protection/windows-defender-atp/images/atp-data-retention-policy.png
new file mode 100644
index 0000000000..7b9454924e
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-data-retention-policy.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-final-onboard-endpoints-warning-before-atp-access.png b/windows/threat-protection/windows-defender-atp/images/atp-final-onboard-endpoints-warning-before-atp-access.png
new file mode 100644
index 0000000000..bf39e4b81e
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-final-onboard-endpoints-warning-before-atp-access.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-final-preference-setup.png b/windows/threat-protection/windows-defender-atp/images/atp-final-preference-setup.png
new file mode 100644
index 0000000000..9533a07777
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-final-preference-setup.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-geographic-location-setup.png b/windows/threat-protection/windows-defender-atp/images/atp-geographic-location-setup.png
new file mode 100644
index 0000000000..18e8861973
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-geographic-location-setup.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-industry-information.png b/windows/threat-protection/windows-defender-atp/images/atp-industry-information.png
new file mode 100644
index 0000000000..e53106da3e
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-industry-information.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-licensing-azure-portal.png b/windows/threat-protection/windows-defender-atp/images/atp-licensing-azure-portal.png
new file mode 100644
index 0000000000..3a93764966
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-licensing-azure-portal.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-no-subscriptions-found.png b/windows/threat-protection/windows-defender-atp/images/atp-no-subscriptions-found.png
new file mode 100644
index 0000000000..24b6aee777
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-no-subscriptions-found.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-not-authorized-to-access-portal.png b/windows/threat-protection/windows-defender-atp/images/atp-not-authorized-to-access-portal.png
new file mode 100644
index 0000000000..020eeac764
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-not-authorized-to-access-portal.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-onboard-endpoints-WDATP-portal-border-test.png b/windows/threat-protection/windows-defender-atp/images/atp-onboard-endpoints-WDATP-portal-border-test.png
new file mode 100644
index 0000000000..8a88c16936
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-onboard-endpoints-WDATP-portal-border-test.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-onboard-endpoints-WDATP-portal.png b/windows/threat-protection/windows-defender-atp/images/atp-onboard-endpoints-WDATP-portal.png
new file mode 100644
index 0000000000..83e81a51cd
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-onboard-endpoints-WDATP-portal.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-onboard-endpoints-run-detection-test.png b/windows/threat-protection/windows-defender-atp/images/atp-onboard-endpoints-run-detection-test.png
new file mode 100644
index 0000000000..02cc1bbc0f
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-onboard-endpoints-run-detection-test.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-onboard-endpoints.png b/windows/threat-protection/windows-defender-atp/images/atp-onboard-endpoints.png
new file mode 100644
index 0000000000..36d21b5ebe
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-onboard-endpoints.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-organization-size.png b/windows/threat-protection/windows-defender-atp/images/atp-organization-size.png
new file mode 100644
index 0000000000..e7e69034f0
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-organization-size.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-portal-welcome-screen.png b/windows/threat-protection/windows-defender-atp/images/atp-portal-welcome-screen.png
new file mode 100644
index 0000000000..fda9bac914
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-portal-welcome-screen.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-preview-experience.png b/windows/threat-protection/windows-defender-atp/images/atp-preview-experience.png
new file mode 100644
index 0000000000..8055212471
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-preview-experience.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-setup-complete.png b/windows/threat-protection/windows-defender-atp/images/atp-setup-complete.png
new file mode 100644
index 0000000000..8ca66b33cc
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-setup-complete.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-setup-incomplete.png b/windows/threat-protection/windows-defender-atp/images/atp-setup-incomplete.png
new file mode 100644
index 0000000000..554c69e2a6
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-setup-incomplete.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-setup-permissions-wdatp-portal.png b/windows/threat-protection/windows-defender-atp/images/atp-setup-permissions-wdatp-portal.png
new file mode 100644
index 0000000000..6b88b46227
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-setup-permissions-wdatp-portal.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-subscription-expired.png b/windows/threat-protection/windows-defender-atp/images/atp-subscription-expired.png
new file mode 100644
index 0000000000..7a6c15ebbb
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-subscription-expired.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/atp-windows-cloud-instance-creation.png b/windows/threat-protection/windows-defender-atp/images/atp-windows-cloud-instance-creation.png
new file mode 100644
index 0000000000..990f12c3c8
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/atp-windows-cloud-instance-creation.png differ
diff --git a/windows/threat-protection/windows-defender-atp/images/licensing-windows-defender-advanced-threat-protection.png b/windows/threat-protection/windows-defender-atp/images/licensing-windows-defender-advanced-threat-protection.png
new file mode 100644
index 0000000000..5e14e15378
Binary files /dev/null and b/windows/threat-protection/windows-defender-atp/images/licensing-windows-defender-advanced-threat-protection.png differ
diff --git a/windows/threat-protection/windows-defender-atp/licensing-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/licensing-windows-defender-advanced-threat-protection.md
new file mode 100644
index 0000000000..bd79cd3231
--- /dev/null
+++ b/windows/threat-protection/windows-defender-atp/licensing-windows-defender-advanced-threat-protection.md
@@ -0,0 +1,137 @@
+---
+title: Validate licensing provisioning and complete Windows Defender ATP set up
+description: Validating licensing provisioning, setting up initial preferences, and completing the user set up for Windows Defender Advanced Threat Protection portal.
+keywords: license, licensing, account, set up, validating licensing, windows defender atp
+search.product: eADQiWindows 10XVcnh
+ms.prod: w10
+ms.mktglfcycl: deploy
+ms.sitesec: library
+ms.pagetype: security
+ms.author: v-tanewt
+author: tbit0001
+ms.localizationpriority: high
+ms.date: 09/10/2017
+---
+# Validate licensing provisioning and complete set up for Windows Defender ATP
+
+**Applies to:**
+
+- Windows 10 Enterprise
+- Windows 10 Education
+- Windows 10 Pro
+- Windows 10 Pro Education
+- Windows Defender Advanced Threat Protection (Windows Defender ATP)
+
+[!include[Prerelease information](prerelease.md)]
+
+>Want to experience Windows Defender ATP? [Sign up for a free trial.](https://www.microsoft.com/en-us/WindowsForBusiness/windows-atp?ocid=docs-wdatp-validatelicense-abovefoldlink)
+
+## Check license state
+
+Checking for the license state and whether it got properly provisioned, can be done through the **Office 365 admin center** or through the **Microsoft Azure portal**.
+
+ 1. In the **Office 365 admin center** navigate to **Billing** > **Subscriptions**.
+
+ - On the screen you will see all the provisioned licenses and their current **Status**.
+
+ 
+
+ 2. To view your licenses go to the **Microsoft Azure portal** and navigate to the [Microsoft Azure portal license section](https://portal.azure.com/#blade/Microsoft_AAD_IAM/LicensesMenuBlade/Products).
+
+ 
+
+## Cloud Service Provider validation
+
+To gain access into which licenses are provisioned to your company, and to check the state of the licenses, go to the **Office 365 admin center**.
+
+1. From the **Partner portal**, click on the **Administer services > Office 365**.
+
+2. Clicking on the **Partner portal** link will leverage the **Admin on behalf** option and will give you access to the customer **Office 365 admin center**.
+
+ 
+
+## Access the Windows Defender ATP portal for the first time
+
+When accessing the [Windows Defender ATP portal](https://SecurityCenter.Windows.com) for the first time there will be a set up wizard that will guide you through some initial steps. At the end of the set up wizard there will be a dedicated cloud instance of Windows Defender ATP created.
+
+1. Each time you access the portal you will need to validate that you are authorized to access the product. Only if you are not authorized will This **Set up your permissions** step will only be available if you are not currently authorized to access the product.
+
+ 
+
+ Once the authorization step is completed the **Welcome** screen will be displayed.
+
+2. The **Welcome** screen will provide some details as to what is about to occur during the set up wizard.
+
+ 
+
+ You will need to set up your preferences for the Windows Defender ATP portal.
+
+3. When onboarding the service for the first time, you can choose to store your data in the Microsoft Azure datacenters in Europe or The United States. Once configured, you cannot change the location where your data is stored. This provides a convenient way to minimize compliance risk by actively selecting the geographic locations where your data will reside. Microsoft will not transfer the data from the specified geolocation.
+
+ > [!WARNING]
+ > This option cannot be changed without completely offboarding from Windows Defender ATP and completing a new enrollment process.
+
+ 
+
+4. Windows Defender ATP will store data up to a period of 6 months in your cloud instance, however, you have the option to set the data retention period for a shorter timeframe during this step of the set up process.
+
+ > [!NOTE]
+ > This option can be changed at a later time.
+
+ 
+
+5. You will need to indicate the size of your organization based on an estimate of the number of employees currently employed.
+
+ > [!NOTE]
+ > The **organization size** question is not related to how many licenses were purchased for your organization. It is used by the service to optimize the creation of the data cluster for your organization.
+
+ 
+
+6. The customer industry information is helpful in collecting data for the Windows Security Team, and while optional, would be useful if completed.
+
+ > [!NOTE]
+ > This option can be changed at a later time.
+
+ 
+
+7. Learn about new features in the Windows Defender ATP preview release and be among the first to try upcoming features by turning on **Preview features**.
+
+ You'll have access to upcoming features which you can provide feedback on to help improve the overall experience before features are generally available.
+
+ - Toggle the setting between On and Off to choose **Preview features**.
+
+ > [!NOTE]
+ > This option can be changed at a later time.
+
+ 
+
+8. You will receive a warning notifying you that you won't be able to change some of your preferences once you click **Continue**.
+
+ > [!NOTE]
+ > Some of these options can be changed at a later time in the Windows Defender ATP portal.
+
+ 
+
+9. A dedicated cloud instance of the Windows Defender ATP portal is being created at this time. This step will take an average of 5 minutes to complete.
+
+ 
+
+10. You are almost done. Before you can start using Windows Defender ATP you'll need to:
+
+ - [Onboard endpoints and setup access](https://technet.microsoft.com/en-us/itpro/windows/keep-secure/configure-endpoints-windows-defender-advanced-threat-protection)
+
+ - Run detection test (optional)
+
+ 
+
+ > [!IMPORTANT]
+ > If you click **Start using Windows Defender ATP** before onboarding endpoints you will receive the following notification:
+ >
+
+11. After onboarding endpoints you can click **Start using Windows Defender ATP**. You will now launch Windows Defender ATP for the first time.
+
+ 
+
+## Related topics
+- [Onboard and set up Windows Defender Advanced Threat Protection](onboard-configure-windows-defender-advanced-threat-protection.md)
+- [Troubleshoot onboarding process and error messages](troubleshoot-onboarding-error-messages-windows-defender-advanced-threat-protection.md)
\ No newline at end of file
diff --git a/windows/threat-protection/windows-defender-atp/troubleshoot-onboarding-error-messages-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/troubleshoot-onboarding-error-messages-windows-defender-advanced-threat-protection.md
new file mode 100644
index 0000000000..6bfdddc1a8
--- /dev/null
+++ b/windows/threat-protection/windows-defender-atp/troubleshoot-onboarding-error-messages-windows-defender-advanced-threat-protection.md
@@ -0,0 +1,69 @@
+---
+title: Troubleshoot onboarding issues and error messages
+description: Troubleshoot onboarding issues and error message while completing setup of Windows Defender Advanced Threat Protection.
+keywords: troubleshoot, troubleshooting, Azure Active Directory, onboarding, error message, error messages, windows defender atp
+search.product: eADQiWindows 10XVcnh
+ms.prod: w10
+ms.mktglfcycl: deploy
+ms.sitesec: library
+ms.pagetype: security
+ms.author: v-tanewt
+author: tbit0001
+ms.localizationpriority: high
+ms.date: 09/10/2017
+---
+
+## Troubleshoot onboarding and error messages
+
+**Applies to:**
+
+- Windows 10 Enterprise
+- Windows 10 Education
+- Windows 10 Pro
+- Windows 10 Pro Education
+- Windows Defender Advanced Threat Protection (Windows Defender ATP)
+
+[!include[Prerelease information](prerelease.md)]
+
+>Want to experience Windows Defender ATP? [Sign up for a free trial.](https://www.microsoft.com/en-us/WindowsForBusiness/windows-atp?ocid=docs-wdatp-troublshootonboarding-abovefoldlink)
+
+You might need to troubleshoot the Windows Defender ATP onboarding process if you encounter issues.
+This page provides detailed steps to troubleshoot onboarding issues that might occur when setting up your Windows Defender ATP service.
+
+If you receive an error message, the Windows Defender ATP portal will provide detailed explanation on what the issue is and relevant links will be supplied.
+
+## No subscriptions found
+
+If while accessing the Windows Defender ATP portal you get a **No subscriptions found** message, it means the Azure Active Directory (AAD) used to login the user to the portal, does not have a Windows Defender ATP license.
+
+Potential reasons:
+- The Windows E5 and Office E5 licenses are separate licenses.
+- The license was purchased but not provisioned to this AAD instance.
+ - It could be a license provisioning issue.
+ - It could be you inadvertently provisioned the license to a different Microsoft AAD than the one used for authentication into the service.
+
+For both cases you should contact Microsoft support at [General Windows Defender ATP Support](https://support.microsoft.com/en-us/getsupport?wf=0&tenant=ClassicCommercial&oaspworkflow=start_1.0.0.0&locale=en-us&supportregion=en-us&pesid=16055&ccsid=636419533611396913) or
+[Volume license support](https://www.microsoft.com/licensing/servicecenter/Help/Contact.aspx).
+
+
+
+## Your subscription has expired
+
+If while accessing the Windows Defender ATP portal you get a **Your subscription has expired** message, your online service subscription has expired. Windows Defender ATP subscription, like any other online service subscription, has an expiration date.
+
+You can choose to renew or extend the license at any point in time. When accessing the portal after the expiration date a **Your subscription has expired** message will be presented with an option to download the endpoint offboarding package, should you choose to not renew the license.
+
+> [!NOTE]
+> For security reasons, the package used to offboard endpoints will expire 30 days after the date it was downloaded. Expired offboarding packages sent to an endpoint will be rejected. When downloading an offboarding package you will be notified of the packages expiry date and it will also be included in the package name.
+
+
+
+## You are not authorized to access the portal
+
+If you receive a **You are not authorized to access the portal**, be aware that Windows Defender ATP is a security monitoring, incident investigation and response product, and as such, access to it is restricted and controlled by the user.
+For more information see, [**Assign user access to the portal**](https://docs.microsoft.com/en-us/windows/threat-protection/windows-defender-atp/assign-portal-access-windows-defender-advanced-threat-protection).
+
+
+
+## Related topics
+- [Validating licensing provisioning and completing setup for Windows Defender ATP](licensing-windows-defender-advanced-threat-protection.md)
\ No newline at end of file
diff --git a/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune-azure.md b/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune-azure.md
index 7ce9d2ae5d..8cf5020f32 100644
--- a/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune-azure.md
+++ b/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune-azure.md
@@ -1,6 +1,6 @@
---
-title: Create a Windows Information Protection (WIP) with enrollment policy using the Azure portal for Microsoft Intune (Windows 10)
-description: Microsoft Intune helps you create and deploy your Windows Information Protection (WIP) policy, including letting you choose your protected apps, your WIP-protection level, and how to find enterprise data on the network.
+title: Create a Windows Information Protection (WIP) policy with MDM using the Azure portal for Microsoft Intune (Windows 10)
+description: The Azure portal for Microsoft Intune helps you create and deploy your Windows Information Protection (WIP) policy, supporting mobile device management (MDM), to let you choose your protected apps, your WIP-protection level, and how to find enterprise data on the network.
ms.prod: w10
ms.mktglfcycl: explore
ms.sitesec: library
@@ -9,7 +9,7 @@ author: eross-msft
ms.localizationpriority: medium
---
-# Create a Windows Information Protection (WIP) with enrollment policy using the Azure portal for Microsoft Intune
+# Create a Windows Information Protection (WIP) policy with MDM using the Azure portal for Microsoft Intune
**Applies to:**
@@ -19,7 +19,7 @@ ms.localizationpriority: medium
Microsoft Intune helps you create and deploy your Windows Information Protection (WIP) policy, including letting you choose your allowed apps, your WIP-protection level, and how to find enterprise data on the network.
>[!Important]
->This topic covers creating a Windows Information Protection (WIP) policy for organizations already managing devices by using Mobile Device Management (MDM) solutions. If your organization uses a mobile application management (MAM) solution to deploy your WIP policy to Intune apps without managing devices, you must follow the instructions in the [Create and deploy Windows Information Protection (WIP) app protection policy with Intune](https://docs.microsoft.com/en-us/intune/deploy-use/create-windows-information-protection-policy-with-intune) topic.
+>This topic covers creating a Windows Information Protection (WIP) policy for organizations already managing devices by using Mobile Device Management (MDM) solutions. If your organization uses a mobile application management (MAM) solution to deploy your WIP policy to Intune apps without managing devices, you must follow the instructions in the [Create a Windows Information Protection (WIP) policy with MAM using the Azure portal for Microsoft Intune](create-wip-policy-using-mam-intune-azure.md) topic.
## Add a WIP policy
After you’ve set up Intune for your organization, you must create a WIP-specific policy.
diff --git a/windows/threat-protection/windows-information-protection/create-wip-policy-using-mam-intune-azure.md b/windows/threat-protection/windows-information-protection/create-wip-policy-using-mam-intune-azure.md
new file mode 100644
index 0000000000..f268c002e9
--- /dev/null
+++ b/windows/threat-protection/windows-information-protection/create-wip-policy-using-mam-intune-azure.md
@@ -0,0 +1,650 @@
+---
+title: Create a Windows Information Protection (WIP) policy with MAM using the Azure portal for Microsoft Intune (Windows 10)
+description: The Azure portal for Microsoft Intune helps you create and deploy your Windows Information Protection (WIP) policy, supporting mobile application management (MAM), to let you choose your protected apps, your WIP-protection level, and how to find enterprise data on the network.
+ms.prod: w10
+ms.mktglfcycl: explore
+ms.sitesec: library
+ms.pagetype: security
+author: eross-msft
+ms.author: lizross
+ms.date: 10/12/2017
+localizationpriority: medium
+---
+
+# Create a Windows Information Protection (WIP) policy with MAM using the Azure portal for Microsoft Intune
+
+**Applies to:**
+
+- Windows 10, version 1703 and later
+- Windows 10 Mobile, version 1703 and later (except Microsoft Azure Rights Management, which is only available on the desktop)
+
+By using Microsoft Intune with Mobile application management (MAM), organizations can take advantage of Azure Active Directory (Azure AD) and the app protection policy feature to keep employees from logging in with personal credentials and accessing corporate data. Additionally, MAM solutions can help your enterprise do the following for mobile apps:
+
+- Configure, update, and deploy mobile apps to employees
+- Control what your employees can do with enterprise data, such as copying, pasting, and saving
+- Keep enterprise data separate from your employee's personal data
+- Remove enterprise data from employee's devices
+- Report on mobile app inventory and track usage
+
+>[!NOTE]
+>This topic covers creating a Windows Information Protection (WIP) policy for organizations using a mobile application management (MAM) solution to deploy your WIP policy to Intune apps without device enrollment. If you are already managing devices by using a Mobile Device Management (MDM) solution, you must follow the instructions in the [Create a Windows Information Protection (WIP) with enrollment policy using the Azure portal for Microsoft Intune](create-wip-policy-using-intune-azure.md) topic.
+
+## Prerequisites to using MAM with Windows Information Protection (WIP)
+Before you can create your WIP policy with MAM, you must first set up your MAM provider. For more info about how to do this, see the [Get ready to configure app protection policies for Windows 10](https://docs.microsoft.com/en-us/intune-classic/deploy-use/get-ready-to-configure-app-protection-policies-for-windows-10) topic.
+
+Additionally, you must have an [Azure AD Premium license](https://docs.microsoft.com/en-us/azure/active-directory/active-directory-licensing-what-is) and be running at least Windows 10, version 1703 on your device.
+
+>[!Important]
+>WIP doesn't support multi-identity. Only one managed identity can exist at a time.
+
+## Add a WIP policy
+After you’ve set up Intune for your organization, you must create a WIP-specific policy.
+
+**To add a WIP policy**
+1. Open the Azure portal and click the **Intune service** from the sidebar.
+
+ The Microsoft Intune Overview blade appears.
+
+2. Click **Mobile apps**, click **App protection policies**, and then click **Add a policy**.
+
+ 
+
+3. In the **Add a policy** blade, fill out the fields:
+
+ - **Name.** Type a name (required) for your new policy.
+
+ - **Description.** Type an optional description.
+
+ - **Platform.** Choose **Windows 10** to create your MAM policy for desktop client devices.
+
+ - **Enrollment state.** Choose **Without enrollment** as the enrollment state for your policy.
+
+ 
+
+ >[!Important]
+ >Choosing **Without enrollment** only applies for organizations using MAM. If you're using MDM, you must use these instructions, [Create a Windows Information Protection (WIP) policy with MDM using the Azure portal for Microsoft Intune](create-wip-policy-using-intune-azure.md), instead.
+
+4. Click **Create**.
+
+ The policy is created and appears in the table on the **Mobile apps - App protection policies** blade.
+
+ >[!NOTE]
+ >Optionally, you can also add your apps and set your settings from the **Add a policy** blade, but for the purposes of this documentation, we recommend instead that you create the policy first, and then use the subsequent menus that become available.
+
+## Add apps to your Allowed apps list
+During the policy-creation process in Intune, you can choose the apps you want to give access to your enterprise data through WIP. Apps included in this list can protect data on behalf of the enterprise and are restricted from copying or moving enterprise data to unprotected apps.
+
+The steps to add your apps are based on the type of template being applied. You can add a recommended app, a store app (also known as a Universal Windows Platform (UWP) app), or a signed Windows desktop app. You can also import a list of approved apps or add exempt apps.
+
+>[!Important]
+>Enlightened apps are expected to prevent enterprise data from going to unprotected network locations and to avoid encrypting personal data. On the other hand, WIP-unaware apps might not respect the corporate network boundary, and WIP-unaware apps will encrypt all files they create or modify. This means that they could encrypt personal data and cause data loss during the revocation process.
Care must be taken to get a support statement from the software provider that their app is safe with WIP before adding it to your **Allowed apps** list. If you don’t get this statement, it’s possible that you could experience app compatibility issues due to an app losing the ability to access a necessary file after revocation.
+
+### Add a Recommended app to your Allowed apps list
+For this example, we’re going to add a few recommended apps to the **Allowed apps** list.
+
+**To add a recommended app**
+1. From the **Mobile apps - App protection policies** blade, click the name of your policy, and then click **Allowed apps** from the menu that appears.
+
+ The **Allowed apps** blade appears, showing you any apps that are already included in the list for this policy.
+
+ 
+
+2. From the **Allowed apps** blade, click **Add apps**.
+
+ The **Add apps** blade appears, showing you all **Recommended apps**.
+
+ 
+
+3. Select each app you want to access your enterprise data, and then click **OK**.
+
+ The **Allowed apps** blade updates to show you your selected apps.
+
+ 
+
+4. Click **Save** to save the **Allowed apps** list to your policy.
+
+### Add a Store app to your Allowed apps list
+For this example, we’re going to add Microsoft Power BI, a Windows store app, to the **Allowed apps** list.
+
+**To add a Store app**
+1. From the **Mobile apps - App protection policies** blade, click the name of your policy, and then click **Allowed apps** from the menu that appears.
+
+ The **Allowed apps** blade appears, showing you any apps that are already included in the list for this policy.
+
+2. From the **Allowed apps** blade, click **Add apps**.
+
+3. On the **Add apps** blade, click **Store apps** from the dropdown list.
+
+4. Type the friendly name of the app, the publisher info, and the product name. For this example, the **Publisher** is `CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US` and the **Product name** is `Microsoft.MicrosoftPowerBIForWindows`.
+
+5. After you’ve entered the info into the fields, click **OK** to add the app to your **Allowed apps** list, and then click **Save** to save the **Allowed apps** list to your policy.
+
+ >[!NOTE]
+ >To add multiple Store apps at the same time, you can click the menu **(…)** at the end of the app row, and continue to add more apps. When you’re done, click **OK**.
+
+ 
+
+#### Find the Name, Publisher, and Product name for Store apps
+If you don't know the publisher or product name for your Store app, you can find them for both desktop devices and Windows 10 Mobile phones by following these steps.
+
+**To find the publisher and product name values for Store apps without installing them**
+1. Go to the [Microsoft Store for Business](https://go.microsoft.com/fwlink/p/?LinkID=722910) website, and find your app. For example, *Microsoft Power BI*.
+
+2. Copy the ID value from the app URL. For example, Microsoft Power BI ID URL is https://www.microsoft.com/en-us/store/p/microsoft-power-bi/9nblgggzlxn1, and you'd copy the ID value, `9nblgggzlxn1`.
+
+3. In a browser, run the Microsoft Store for Business portal web API, to return a JavaScript Object Notation (JSON) file that includes the publisher and product name values. For example, run https://bspmts.mp.microsoft.com/v1/public/catalog/Retail/Products/9nblgggzlxn1/applockerdata, where `9nblgggzlxn1` is replaced with your ID value.
+
+ The API runs and opens a text editor with the app details.
+
+ ```json
+ {
+ "packageIdentityName": "Microsoft.MicrosoftPowerBIForWindows",
+ "publisherCertificateName": "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
+ }
+ ```
+
+4. Copy the `publisherCertificateName` value into the **Publisher** box and copy the `packageIdentityName` value into the **Name** box of the **Add apps** blade.
+
+ >[!Important]
+ >The JSON file might also return a windowsPhoneLegacyId value for both the **Publisher Name** and **Product Name** boxes. This means that you have an app that’s using a XAP package and that you must set the **Product Name** as windowsPhoneLegacyId, and set the **Publisher Name** as CN= followed by the windowsPhoneLegacyId.
For example:
+ {
+
+**To find the publisher and product name values for apps installed on Windows 10 mobile phones**
+1. If you need to add mobile apps that aren't distributed through the Microsoft Store for Business, you must use the **Windows Device Portal** feature.
+
+ >[!NOTE]
+ >Your PC and phone must be on the same wireless network.
+
+2. On the Windows Phone, go to **Settings**, choose **Update & security**, and then choose **For developers**.
+
+3. In the **For developers** screen, turn on **Developer mode**, turn on **Device Discovery**, and then turn on **Device Portal**.
+
+4. Copy the URL in the **Device Portal** area into your device's browser, and then accept the SSL certificate.
+
+5. In the **Device discovery** area, press **Pair**, and then enter the PIN into the website from the previous step.
+
+6. On the **Apps** tab of the website, you can see details for the running apps, including the publisher and product names.
+
+7. Start the app for which you're looking for the publisher and product name values.
+
+8. Copy the `publisherCertificateName` value and paste it into the **Publisher Name** box and the `packageIdentityName` value into the **Product Name** box of Intune.
+
+ >[!Important]
+ >The JSON file might also return a windowsPhoneLegacyId value for both the **Publisher Name** and **Product Name** boxes. This means that you have an app that’s using a XAP package and that you must set the **Product Name** as windowsPhoneLegacyId, and set the **Publisher Name** as CN= followed by the windowsPhoneLegacyId.
"windowsPhoneLegacyId": "ca05b3ab-f157-450c-8c49-a1f127f5e71d",
}
For example:
+ {
+
+### Add a Desktop app to your Allowed apps list
+For this example, we’re going to add WordPad, a Desktop app, to the **Allowed apps** list.
+
+**To add a Desktop app**
+1. From the **Mobile apps - App protection policies** blade, click the name of your policy, and then click **Allowed apps** from the menu that appears.
+
+ The **Allowed apps** blade appears, showing you any apps that are already included in the list for this policy.
+
+2. From the **Allowed apps** blade, click **Add apps**.
+
+3. On the **Add apps** blade, click **Desktop apps** from the dropdown list.
+
+ The blade changes to show boxes for you to add the following, based on the results you want returned:
+
+
"windowsPhoneLegacyId": "ca05b3ab-f157-450c-8c49-a1f127f5e71d",
}
Field | +Manages | +
---|---|
All fields marked as “*” | +All files signed by any publisher. (Not recommended) | +
Name | +A friendly name for your app. You can't use this field by itself. However, you can use it in conjunction with any of the other fields. | +
Publisher (required) only | +Filling out this field, gives you all files signed by the named publisher. This might be useful if your company is the publisher and signer of internal line-of-business apps. This is a required field and must be filled out whether by itself or in conjunction with other fields. |
+
Publisher (required) and Product name only | +If you only fill out these fields, you’ll get all files for the specified product, signed by the named publisher. | +
Publisher (required), Product name, and File only | +If you only fill out these fields, you’ll get any version of the named file or package for the specified product, signed by the named publisher. | +
Publisher (required), Product name, File, and Min version only | +If you only fill out these fields, you’ll get the specified version or newer releases of the named file or package for the specified product, signed by the named publisher. This option is recommended for enlightened apps that weren't previously enlightened. |
+
Publisher (required), Product name, File, and Max version only | +If you only fill out these fields, you’ll get the specified version or older releases of the named file or package for the specified product, signed by the named publisher. | +
All fields completed | +If you fill out all fields, you’ll get the specified version of the named file or package for the specified product, signed by the named publisher. | +
Boundary type | +Value format | +Description | +
---|---|---|
Cloud Resources | +With proxy: contoso.sharepoint.com,contoso.internalproxy1.com| contoso.visualstudio.com,contoso.internalproxy2.com Without proxy: contoso.sharepoint.com|contoso.visualstudio.com |
+ Specify the cloud resources to be treated as corporate and protected by WIP. For each cloud resource, you may also optionally specify a proxy server from your Internal proxy servers list to route traffic for this cloud resource. Be aware that all traffic routed through your Internal proxy servers is considered enterprise. If you have multiple resources, you must separate them using the "|" delimiter. If you don’t use proxy servers, you must also include the "," delimiter just before the "|". For example: URL <,proxy>|URL <,proxy> .Important In some cases, such as when an app connects directly to a cloud resource through an IP address, Windows can’t tell whether it’s attempting to connect to an enterprise cloud resource or to a personal site. In this case, Windows blocks the connection by default. To stop Windows from automatically blocking these connections, you can add the /*AppCompat*/ string to the setting. For example: URL <,proxy>|URL <,proxy>|/*AppCompat*/ .When using this string, we recommend that you also turn on [Azure Active Directory Conditional Access](https://docs.microsoft.com/en-us/azure/active-directory/active-directory-conditional-access), using the Domain joined or marked as compliant option, which blocks apps from accessing any enterprise cloud resources that are protected by conditional access. |
+
Network domain names | +corp.contoso.com,region.contoso.com | +Starting with Windows 10, version 1703, this field is optional. Specify the DNS suffixes used in your environment. All traffic to the fully-qualified domains appearing in this list will be protected. If you have multiple resources, you must separate them using the "," delimiter. |
+
Proxy servers | +proxy.contoso.com:80;proxy2.contoso.com:443 | +Specify the proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you’re connecting to are enterprise resources. This list shouldn’t include any servers listed in your Internal proxy servers list. Internal proxy servers must be used only for WIP-protected (enterprise) traffic. If you have multiple resources, you must separate them using the ";" delimiter. |
+
Internal proxy servers | +contoso.internalproxy1.com;contoso.internalproxy2.com | +Specify the internal proxy servers your devices will go through to reach your cloud resources. Using this server type indicates that the cloud resources you’re connecting to are enterprise resources. This list shouldn’t include any servers listed in your Proxy servers list. Proxy servers must be used only for non-WIP-protected (non-enterprise) traffic. If you have multiple resources, you must separate them using the ";" delimiter. |
+
IPv4 ranges | +**Starting IPv4 Address:** 3.4.0.1 **Ending IPv4 Address:** 3.4.255.254 **Custom URI:** 3.4.0.1-3.4.255.254, 10.0.0.1-10.255.255.254 |
+ Starting with Windows 10, version 1703, this field is optional. Specify the addresses for a valid IPv4 value range within your intranet. These addresses, used with your Network domain names, define your corporate network boundaries. If you have multiple ranges, you must separate them using the "," delimiter. |
+
IPv6 ranges | +**Starting IPv6 Address:** 2a01:110:: **Ending IPv6 Address:** 2a01:110:7fff:ffff:ffff:ffff:ffff:ffff **Custom URI:** 2a01:110:7fff:ffff:ffff:ffff:ffff:ffff, fd00::-fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff |
+ Starting with Windows 10, version 1703, this field is optional. Specify the addresses for a valid IPv6 value range within your intranet. These addresses, used with your Network domain names, define your corporate network boundaries. If you have multiple ranges, you must separate them using the "," delimiter. |
+
Neutral resources | +sts.contoso.com,sts.contoso2.com | +Specify your authentication redirection endpoints for your company. These locations are considered enterprise or personal, based on the context of the connection before the redirection. If you have multiple resources, you must separate them using the "," delimiter. |
+
This setting has different behavior for mobile devices and desktops. + + - **On mobile devices.** When an employee reaches the value set here, the device is wiped of corporate data. + + - **On desktop devices.** When an employee reaches the value set here, the desktop is put into BitLocker recovery mode, instead of being wiped. You must have BitLocker installed on the device or this setting is ignored. + + - **Maximum amount of time (in minutes) allowed after the device is idle that will cause the device to become PIN or password locked.** Enter a numerical value for how many days can pass before a PIN must be changed. If you enter a value of 0, the device never becomes PIN or password locked while idle. + + >[!NOTE] + >You can set this value to be anything; however, it can't be longer than the time specified by the **Settings** app. If you exceed the maximum timeout value, this setting is ignored. + + +## Deploy your policy +After you’ve created your policy, you'll need to deploy it to your employees. MAM is deployed to users and not devices. + +**To deploy your policy** + +1. On the **Mobile apps - App protection policies** pane, click your newly-created policy, click **Assignments** from the menu that appears, and then click **Select groups**. + + A list of user groups, made up of all of the security groups in your Azure Active Directory, appear in the **Add user group** pane. + +2. Choose the group you want your policy to apply to, and then click **Select** to deploy the policy. + + The policy is deployed to the selected group. + +  + +## Related topics + +- [Implement server-side support for mobile application management on Windows](https://docs.microsoft.com/en-us/windows/client-management/mdm/implement-server-side-mobile-application-management) + +- [Microsoft Intune - Mobile Application Management (MAM) standalone blog post](https://blogs.technet.microsoft.com/cbernier/2016/01/05/microsoft-intune-mobile-application-management-mam-standalone/) + +- [MAM-supported apps](https://www.microsoft.com/en-us/cloud-platform/microsoft-intune-apps) + +- [General guidance and best practices for Windows Information Protection (WIP)](guidance-and-best-practices-wip.md) + +- [Deploy your Windows Information Protection (WIP) policy](deploy-wip-policy-using-intune.md) + +- [How to collect Windows Information Protection (WIP) audit event logs](collect-wip-audit-event-logs.md) \ No newline at end of file diff --git a/windows/threat-protection/windows-information-protection/images/wip-azure-access-options.png b/windows/threat-protection/windows-information-protection/images/wip-azure-access-options.png new file mode 100644 index 0000000000..e759e45f28 Binary files /dev/null and b/windows/threat-protection/windows-information-protection/images/wip-azure-access-options.png differ diff --git a/windows/threat-protection/windows-information-protection/images/wip-azure-add-desktop-apps.png b/windows/threat-protection/windows-information-protection/images/wip-azure-add-desktop-apps.png index f2aafb0c41..1d1aff1a0c 100644 Binary files a/windows/threat-protection/windows-information-protection/images/wip-azure-add-desktop-apps.png and b/windows/threat-protection/windows-information-protection/images/wip-azure-add-desktop-apps.png differ diff --git a/windows/threat-protection/windows-information-protection/images/wip-azure-add-policy.png b/windows/threat-protection/windows-information-protection/images/wip-azure-add-policy.png new file mode 100644 index 0000000000..8b81622c1a Binary files /dev/null and b/windows/threat-protection/windows-information-protection/images/wip-azure-add-policy.png differ diff --git a/windows/threat-protection/windows-information-protection/images/wip-azure-add-store-apps.png b/windows/threat-protection/windows-information-protection/images/wip-azure-add-store-apps.png index de20f46e37..b31efa417c 100644 Binary files a/windows/threat-protection/windows-information-protection/images/wip-azure-add-store-apps.png and b/windows/threat-protection/windows-information-protection/images/wip-azure-add-store-apps.png differ diff --git a/windows/threat-protection/windows-information-protection/images/wip-azure-add-user-groups.png b/windows/threat-protection/windows-information-protection/images/wip-azure-add-user-groups.png index ab17d13baf..08afdf96b5 100644 Binary files a/windows/threat-protection/windows-information-protection/images/wip-azure-add-user-groups.png and b/windows/threat-protection/windows-information-protection/images/wip-azure-add-user-groups.png differ diff --git a/windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-efsdra.png b/windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-efsdra.png index 71594dd252..59e2071bd8 100644 Binary files a/windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-efsdra.png and b/windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-efsdra.png differ diff --git a/windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-network-autodetect.png b/windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-network-autodetect.png index 3b709bbc46..517c4a4ad3 100644 Binary files a/windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-network-autodetect.png and b/windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-network-autodetect.png differ diff --git a/windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-network.png b/windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-network.png index 7daf9d9760..ff743d4e05 100644 Binary files a/windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-network.png and b/windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-network.png differ diff --git a/windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-optional.png b/windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-optional.png index 9f1bc57abc..7775888473 100644 Binary files a/windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-optional.png and b/windows/threat-protection/windows-information-protection/images/wip-azure-advanced-settings-optional.png differ diff --git a/windows/threat-protection/windows-information-protection/images/wip-azure-allowed-apps-with-apps.png b/windows/threat-protection/windows-information-protection/images/wip-azure-allowed-apps-with-apps.png index a72f225ec1..05398cb29d 100644 Binary files a/windows/threat-protection/windows-information-protection/images/wip-azure-allowed-apps-with-apps.png and b/windows/threat-protection/windows-information-protection/images/wip-azure-allowed-apps-with-apps.png differ diff --git a/windows/threat-protection/windows-information-protection/images/wip-azure-portal-addpolicy-mam.png b/windows/threat-protection/windows-information-protection/images/wip-azure-portal-addpolicy-mam.png new file mode 100644 index 0000000000..3142b31f51 Binary files /dev/null and b/windows/threat-protection/windows-information-protection/images/wip-azure-portal-addpolicy-mam.png differ diff --git a/windows/threat-protection/windows-information-protection/images/wip-azure-portal-start-mam.png b/windows/threat-protection/windows-information-protection/images/wip-azure-portal-start-mam.png new file mode 100644 index 0000000000..aa0184a2c6 Binary files /dev/null and b/windows/threat-protection/windows-information-protection/images/wip-azure-portal-start-mam.png differ diff --git a/windows/threat-protection/windows-information-protection/images/wip-azure-required-settings-corp-identity.png b/windows/threat-protection/windows-information-protection/images/wip-azure-required-settings-corp-identity.png index c2274ee1e8..7332236129 100644 Binary files a/windows/threat-protection/windows-information-protection/images/wip-azure-required-settings-corp-identity.png and b/windows/threat-protection/windows-information-protection/images/wip-azure-required-settings-corp-identity.png differ diff --git a/windows/threat-protection/windows-information-protection/images/wip-azure-required-settings-protection-mode.png b/windows/threat-protection/windows-information-protection/images/wip-azure-required-settings-protection-mode.png index a1e3ed0c57..d2aa8feb83 100644 Binary files a/windows/threat-protection/windows-information-protection/images/wip-azure-required-settings-protection-mode.png and b/windows/threat-protection/windows-information-protection/images/wip-azure-required-settings-protection-mode.png differ diff --git a/windows/threat-protection/windows-information-protection/overview-create-wip-policy-sccm.md b/windows/threat-protection/windows-information-protection/overview-create-wip-policy-sccm.md new file mode 100644 index 0000000000..015b3ebccd --- /dev/null +++ b/windows/threat-protection/windows-information-protection/overview-create-wip-policy-sccm.md @@ -0,0 +1,26 @@ +--- +title: Create a Windows Information Protection (WIP) policy using System Center Configuration Manager (Windows 10) +description: 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. +ms.assetid: d2059e74-94bd-4e54-ab59-1a7b9b52bdc6 +ms.prod: w10 +ms.mktglfcycl: explore +ms.sitesec: library +ms.pagetype: security +author: eross-msft +ms.localizationpriority: medium +--- + +# Create a Windows Information Protection (WIP) policy using System Center Configuration Manager +**Applies to:** + +- Windows 10, version 1607 and later +- Windows 10 Mobile, version 1607 and later + +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. + +## In this section +|Topic |Description | +|------|------------| +|[Create and deploy a Windows Information Protection (WIP) policy using System Center Configuration Manager](create-wip-policy-using-sccm.md) |System Center Configuration Manager helps you create and deploy your WIP policy, including letting you choose your protected apps, your WIP-protection level, and how to find enterprise data on the network. | +|[Create and verify an Encrypting File System (EFS) Data Recovery Agent (DRA) certificate](create-and-verify-an-efs-dra-certificate.md) |Steps to create, verify, and perform a quick recovery using a Encrypting File System (EFS) Data Recovery Agent (DRA) certificate. | +|[Determine the Enterprise Context of an app running in Windows Information Protection (WIP)](wip-app-enterprise-context.md) |Use the Task Manager to determine whether an app is considered work, personal or exempt by Windows Information Protection (WIP). | \ No newline at end of file diff --git a/windows/threat-protection/windows-information-protection/overview-create-wip-policy.md b/windows/threat-protection/windows-information-protection/overview-create-wip-policy.md index 6dcd047747..1f70f60d1c 100644 --- a/windows/threat-protection/windows-information-protection/overview-create-wip-policy.md +++ b/windows/threat-protection/windows-information-protection/overview-create-wip-policy.md @@ -1,5 +1,5 @@ --- -title: Create a Windows Information Protection (WIP) policy (Windows 10) +title: Create a Windows Information Protection (WIP) policy using Microsoft Intune (Windows 10) description: 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. ms.assetid: d2059e74-94bd-4e54-ab59-1a7b9b52bdc6 ms.prod: w10 @@ -10,22 +10,19 @@ author: eross-msft ms.localizationpriority: medium --- -# Create a Windows Information Protection (WIP) policy +# Create a Windows Information Protection (WIP) policy using Microsoft Intune **Applies to:** - Windows 10, version 1607 and later - Windows 10 Mobile, version 1607 and later -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. +Microsoft Intune 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. ## In this section |Topic |Description | |------|------------| +|[Create a Windows Information Protection (WIP) policy with MDM using the Azure portal for Microsoft Intune](create-wip-policy-using-intune-azure.md)|Details about how to use the Azure portal for Microsoft Intune to create and deploy your WIP policy with MDM, including letting you choose your protected apps, your WIP-protection level, and how to find enterprise data on the network. | +|[Create a Windows Information Protection (WIP) policy with MAM using the Azure portal for Microsoft Intune](create-wip-policy-using-mam-intune-azure.md)|Details about how to use the Azure portal for Microsoft Intune to create your WIP policy with MDM, including letting you choose your protected apps, your WIP-protection level, and how to find enterprise data on the network.| |[Create a Windows Information Protection (WIP) policy using the classic console for Microsoft Intune](create-wip-policy-using-intune.md) |Details about how to use the classic console for Microsoft Intune to create and deploy your WIP policy, including letting you choose your protected apps, your WIP-protection level, and how to find enterprise data on the network. | -|[Create a Windows Information Protection (WIP) with enrollment policy using the Azure portal for Microsoft Intune](create-wip-policy-using-intune-azure.md)|Details about how to use the Azure portal for Microsoft Intune to create and deploy your WIP policy, including letting you choose your protected apps, your WIP-protection level, and how to find enterprise data on the network. | -|[Create and deploy a Windows Information Protection (WIP) policy using System Center Configuration Manager](create-wip-policy-using-sccm.md) |System Center Configuration Manager helps you create and deploy your WIP policy, including letting you choose your protected apps, your WIP-protection level, and how to find enterprise data on the network. | |[Create and verify an Encrypting File System (EFS) Data Recovery Agent (DRA) certificate](create-and-verify-an-efs-dra-certificate.md) |Steps to create, verify, and perform a quick recovery using a Encrypting File System (EFS) Data Recovery Agent (DRA) certificate. | -|[Determine the Enterprise Context of an app running in Windows Information Protection (WIP)](wip-app-enterprise-context.md) |Use the Task Manager to determine whether an app is considered work, personal or exempt by Windows Information Protection (WIP). | - ->[!NOTE] ->Help to make this topic better by providing us with edits, additions, and feedback. For info about how to contribute to this topic, see [Contributing to TechNet content](https://github.com/Microsoft/windows-itpro-docs/blob/master/CONTRIBUTING.md). \ No newline at end of file +|[Determine the Enterprise Context of an app running in Windows Information Protection (WIP)](wip-app-enterprise-context.md) |Use the Task Manager to determine whether an app is considered work, personal or exempt by Windows Information Protection (WIP). | \ No newline at end of file