diff --git a/windows/security/threat-protection/TOC.md b/windows/security/threat-protection/TOC.md index b2ca643174..2512c59280 100644 --- a/windows/security/threat-protection/TOC.md +++ b/windows/security/threat-protection/TOC.md @@ -153,7 +153,7 @@ #### [Microsoft threat protection](windows-defender-atp/threat-protection-integration.md) ##### [Protect users, data, and devices with conditional access](windows-defender-atp/conditional-access-windows-defender-advanced-threat-protection.md) ##### [Microsoft Cloud App Security integration overview](windows-defender-atp/microsoft-cloud-app-security-integration.md) -##### [Information protection integration overview](windows-defender-atp/microsoft-information-protection-integration-overview.md) +##### [Information protection in Windows overview](windows-defender-atp/information-protection-in-windows-overview.md) @@ -324,7 +324,7 @@ #### Configure Microsoft threat protection integration ##### [Configure conditional access](windows-defender-atp/configure-conditional-access-windows-defender-advanced-threat-protection.md) ##### [Configure Microsoft Cloud App Security integration](windows-defender-atp/microsoft-cloud-app-security-config.md) -##### [Configure Microsoft information protection integration](windows-defender-atp/microsoft-information-protection-config.md) +##### [Configure information protection in Windows](windows-defender-atp/information-protection-in-windows-config.md) diff --git a/windows/security/threat-protection/windows-defender-atp/TOC.md b/windows/security/threat-protection/windows-defender-atp/TOC.md index 1f04ae02b0..6518fc83b5 100644 --- a/windows/security/threat-protection/windows-defender-atp/TOC.md +++ b/windows/security/threat-protection/windows-defender-atp/TOC.md @@ -153,8 +153,8 @@ ### [Microsoft Threat Protection](threat-protection-integration.md) #### [Protect users, data, and devices with conditional access](conditional-access-windows-defender-advanced-threat-protection.md) -#### [Microsoft Cloud App Security integration overview](microsoft-cloud-app-security-integration.md) -#### [Information protection integration overview](microsoft-information-protection-integration-overview.md) +#### [Microsoft Cloud App Security in Windows overview](microsoft-cloud-app-security-integration.md) +#### [Information protection integration overview](information-protection-in-windows-overview.md) ### [Portal overview](portal-overview-windows-defender-advanced-threat-protection.md) @@ -319,8 +319,8 @@ ### Configure Microsoft Threat Protection integration #### [Configure conditional access](configure-conditional-access-windows-defender-advanced-threat-protection.md) -#### [Configure Microsoft Cloud App Security integration](microsoft-cloud-app-security-config.md) -####[Configure Microsoft information protection integration](microsoft-information-protection-config.md) +#### [Configure Microsoft Cloud App Security in Windows](microsoft-cloud-app-security-config.md) +####[Configure information protection in WindowsS](information-protection-in-windows-config.md) ### [Configure Windows Security app settings](preferences-setup-windows-defender-advanced-threat-protection.md) diff --git a/windows/security/threat-protection/windows-defender-atp/images/atp-settings-aip.png b/windows/security/threat-protection/windows-defender-atp/images/atp-settings-aip.png new file mode 100644 index 0000000000..f66b75a274 Binary files /dev/null and b/windows/security/threat-protection/windows-defender-atp/images/atp-settings-aip.png differ diff --git a/windows/security/threat-protection/windows-defender-atp/images/office-scc-label.png b/windows/security/threat-protection/windows-defender-atp/images/office-scc-label.png new file mode 100644 index 0000000000..750bd6e459 Binary files /dev/null and b/windows/security/threat-protection/windows-defender-atp/images/office-scc-label.png differ diff --git a/windows/security/threat-protection/windows-defender-atp/microsoft-information-protection-config.md b/windows/security/threat-protection/windows-defender-atp/information-protection-in-windows-config.md similarity index 95% rename from windows/security/threat-protection/windows-defender-atp/microsoft-information-protection-config.md rename to windows/security/threat-protection/windows-defender-atp/information-protection-in-windows-config.md index f7c5f5a6ce..b6313e8436 100644 --- a/windows/security/threat-protection/windows-defender-atp/microsoft-information-protection-config.md +++ b/windows/security/threat-protection/windows-defender-atp/information-protection-in-windows-config.md @@ -13,7 +13,7 @@ ms.localizationpriority: medium ms.date: 09/18/2018 --- -# Microsoft information protection integration +# Configure information protection in Windows **Applies to:** - Windows Defender Advanced Threat Protection (Windows Defender ATP) diff --git a/windows/security/threat-protection/windows-defender-atp/microsoft-information-protection-integration-overview.md b/windows/security/threat-protection/windows-defender-atp/information-protection-in-windows-overview.md similarity index 87% rename from windows/security/threat-protection/windows-defender-atp/microsoft-information-protection-integration-overview.md rename to windows/security/threat-protection/windows-defender-atp/information-protection-in-windows-overview.md index 9f42ec4aaf..a5efc5dca2 100644 --- a/windows/security/threat-protection/windows-defender-atp/microsoft-information-protection-integration-overview.md +++ b/windows/security/threat-protection/windows-defender-atp/information-protection-in-windows-overview.md @@ -1,6 +1,6 @@ --- -title: Microsoft information protection integration with Windows Defender ATP -description: Windows Defender ATP integrates with Windows information protection to identify and protect sensitive information +title: Information protection in Windows overview +description: Learn about how information protection works in Windows to identify and protect sensitive information keywords: information, protection, dlp, wip, data, loss, prevention, protect search.product: eADQiWindows 10XVcnh ms.prod: w10 @@ -13,7 +13,7 @@ ms.localizationpriority: medium ms.date: 10/11/2018 --- -# Microsoft information protection integration overview +# Information protection in Windows overview **Applies to:** - Windows Defender Advanced Threat Protection (Windows Defender ATP) @@ -31,7 +31,11 @@ Windows Defender ATP applies two methods to discover and protect data: ## Data discovery -Windows Defender ATP automatically discovers files with Azure Information Protection (AIP) labels on Windows devices when the feature is enabled. You can enable the Azure Information Protection integration feature from Windows Defender Security Center. For more information, see [Configure advanced features](advanced-features-windows-defender-advanced-threat-protection.md). +Windows Defender ATP automatically discovers files with Azure Information Protection (AIP) labels on Windows devices when the feature is enabled. You can enable the Azure Information Protection integration feature from Windows Defender Security Center. For more information, see [Configure advanced features](advanced-features-windows-defender-advanced-threat-protection.md#azure-information-protection). + + +![Image of settings page with Azure Information Protection](images/atp-settings-aip.png) + >[!NOTE] > You'll need the appropriate license to leverage the Windows Defender ATP and Azure Information Protection integration. @@ -81,13 +85,13 @@ For data to be protected, they must first be identified through labels. Sensitiv When you create sensitivity labels, you can set the information protection functionalities that will be applied on the file. The setting that applies to Windows Defender ATP is the Data loss prevention. You'll need to turn on the Data loss prevention and select Enable Windows end point protection (DLP for devices). -[OMRI - maybe need to insert a screenshot here to make it clear?] +![Image of Office 365 Security and Compliance sensitivity label](images/office-scc-label.png) Once, the policy is set and published, Windows Defender ATP automatically enables WIP for labeled files. When a labeled file is created or modified on a Windows device, Windows Defender ATP automatically detects it and enables WIP on that file if its label corresponds with Office Security and Compliance (SCC) policy. -This functionality expands the coverage of WIP to protect files based on their label, regardless of their origin (which is how WIP decides which files need to be protected). +This functionality expands the coverage of WIP to protect files based on their label, regardless of their origin. -For more information, see [Configure Microsoft information protection integration](microsoft-information-protection-config.md). +For more information, see [Configure information protection in Windows](information-protection-in-windows-config.md). ## Related topics diff --git a/windows/security/threat-protection/windows-defender-atp/microsoft-cloud-app-security-config.md b/windows/security/threat-protection/windows-defender-atp/microsoft-cloud-app-security-config.md index b37cd582c8..1fb5dac552 100644 --- a/windows/security/threat-protection/windows-defender-atp/microsoft-cloud-app-security-config.md +++ b/windows/security/threat-protection/windows-defender-atp/microsoft-cloud-app-security-config.md @@ -10,11 +10,11 @@ ms.pagetype: security ms.author: macapara author: mjcaparas ms.localizationpriority: medium -ms.date: 09/19/2018 +ms.date: 10/19/2018 --- -# Configure Microsoft Cloud App Security integration +# Configure Microsoft Cloud App Security in Windows **Applies to:** - Windows Defender Advanced Threat Protection (Windows Defender ATP) diff --git a/windows/security/threat-protection/windows-defender-atp/microsoft-cloud-app-security-integration.md b/windows/security/threat-protection/windows-defender-atp/microsoft-cloud-app-security-integration.md index 38d365594b..322d49abea 100644 --- a/windows/security/threat-protection/windows-defender-atp/microsoft-cloud-app-security-integration.md +++ b/windows/security/threat-protection/windows-defender-atp/microsoft-cloud-app-security-integration.md @@ -10,10 +10,10 @@ ms.pagetype: security ms.author: macapara author: mjcaparas ms.localizationpriority: medium -ms.date: 09/18/2018 +ms.date: 10/18/2018 --- -# Microsoft Cloud App Security integration overview +# Microsoft Cloud App Security in Windows overview **Applies to:** - Windows Defender Advanced Threat Protection (Windows Defender ATP)