diff --git a/windows/security/index.yml b/windows/security/index.yml index d980430450..2cd3189581 100644 --- a/windows/security/index.yml +++ b/windows/security/index.yml @@ -1,3 +1,4 @@ +<<<<<<< HEAD ### YamlMime:YamlDocument documentType: LandingData @@ -274,3 +275,132 @@ sections: - html: Ransomware FAQ +======= +### YamlMime:YamlDocument +documentType: LandingData +title: Windows 10 Enterprise Security +metadata: +  document_id:  +  title: Windows 10 Enterprise Security +  description: Learn about enterprise-grade security features for Windows 10. +  keywords: protect, company, data, Windows, device, app, management, Microsoft365, e5, e3 + +  ms.localizationpriority: high + +  author: brianlic-msft +  ms.author: brianlic + +  manager: brianlic +  ms.date: 02/06/2018 + +  ms.topic: article + +  ms.devlang: na + +sections: +- items: +  - type: markdown +    text: Secure corporate data and manage risk.  +- items: +  - type: list +    style: cards +    className: cardsM +    columns: 3 +    items: +    - href: \windows\security\identity-protection\ +      html: 

Deploy secure enterprise-grade authentication and access control to protect accounts and data

+      image: +        src: https://docs.microsoft.com/media/common/i_identity-protection.svg +      title: Identity and access management +    - href: \windows\security\threat-protection\ +      html: 

Stop cyberthreats and quickly identify and respond to breaches

+      image: +        src: https://docs.microsoft.com/media/common/i_threat-protection.svg +      title: Threat protection +    - href: \windows\security\information-protection\ +      html: 

Identify and secure critical data to prevent data loss

+      image: +        src: https://docs.microsoft.com/media/common/i_information-protection.svg +      title: Information protection +- title: Windows Defender Advanced Threat Protection  +  items: +  - type: paragraph +    text: 'Windows 10 enables critical security features to protect your device right from the start.' +  - type: list +    style: cards +    className: cardsM +    columns: 3 +    items: +    - href: \windows\security\hardware-protection\how-hardware-based-containers-help-protect-windows +      html: 

Protect the boot process and maintain system integrity

+      image: +        src: https://docs.microsoft.com/media/common/i_identity-protection.svg +       +      title: Windows Defender System Guard +    - href: \windows\security\threat-protection\windows-defender-antivirus\windows-defender-antivirus-in-windows-10 +      html: 

Protect against malware management using next-generation antivirus technologies

+      image: +        src: https://docs.microsoft.com/media/common/i_threat-protection.svg +       +      title: Windows Defender Antivirus +    - href: \windows\security\information-protection\bitlocker\bitlocker-overview +      html: 

Prevent data theft from lost or stolen devices

+      image: +        src: https://docs.microsoft.com/media/common/i_information-protection.svg +       +      title: Windows Defender Application Guard +    - href: \windows\security\identity-protection\hello-for-business\hello-overview +      html: 

Give users a more personal and secure way to access their devices

+      image: +        src: https://docs.microsoft.com/media/common/i_identity-protection.svg +       +      title: Windows Hello  +       +    - href: \windows\security\threat-protection\windows-defender-application-control\windows-defender-application-control +      html: 

Lock down applications that run on a device

+      image: +        src: https://docs.microsoft.com/media/common/i_threat-protection.svg +       +      title: Windows Defender Application Control +    - href: \windows\security\information-protection\windows-information-protection\protect-enterprise-data-using-wip +      html: 

Prevent accidental data leaks from enterprise devices

+      image: +        src: https://docs.microsoft.com/media/common/i_information-protection.svg +       +      title: Windows Information Protection  +- title: Videos +  items: +  - type: markdown +    text: ">[![VIDEO](images/next-generation-windows-security-vision.png)](https://www.youtube.com/watch?v=IvZySDNfNpo)" +  - type: markdown +    text: ">[![VIDEO](images/fall-creators-update-next-gen-security.png)](https://www.youtube.com/watch?v=JDGMNFwyUg8)" +     +- title: Additional security features in Windows 10  +  items: +  - type: paragraph +    text: 'These additional security features are also built in to Windows 10 Enterprise.' +  - type: list +    style: unordered +    items: +    - html: Windows Defender Firewall +    - html: Windows Defender Exploit Guard +    - html: Windows Defender Credential Guard +    - html: Windows Defender Application Control   +    - html: Windows Defender Application Guard +    - html: Windows Defender SmartScreen   +    - html: Windows Defender Security Center +       +- title: Security Resources +  items: +  - type: list +    style: unordered +    items: +    - html: Windows Defender Security Intelligence +    - html: Microsoft Secure blog +    - html: Security Update blog +    - html: Microsoft Security Response Center (MSRC) +    - html: MSRC Blog +    - html: Ransomware FAQ +     + +>>>>>>> f4ac9773fd71d0ff69e0cbad908f99868151a6c3 diff --git a/windows/security/threat-protection/index.md b/windows/security/threat-protection/index.md index fbc9203dc3..1d26dd780e 100644 --- a/windows/security/threat-protection/index.md +++ b/windows/security/threat-protection/index.md @@ -10,10 +10,9 @@ ms.date: 02/05/2018 --- # Threat Protection -Windows Defender Advanced Threat Protection is a unified endpoint security platform using built-in security technologies working together and powered by the cloud. +Windows Defender Advanced Threat Protection (Windows Defender ATP) is a unified endpoint security suite that uses built-in security technologies working together and powered by the cloud. - -## Get Windows Defender ATP and you get #errrythanggg security +The following products in the threat protection stack make up the capabilities under the Windows Defender ATP suite: - Windows Defender Security Center - Windows Defender Antivirus @@ -23,8 +22,8 @@ Windows Defender Advanced Threat Protection is a unified endpoint security platf - Windows Firewall - Windows Defender Security Analytics -You get all these good stuff which you configure individually. You can pick and choose what you need and what you don't. When you're done with setting 'em up, you'll be rewarded with the convenience of seeing everything in once place: Windows Defender Security Center. +You can configure these products individually in a way that best suites your environment. When you're done with setting them up, your security operations team will be rewarded with the convenience of seeing everything in once place in the Windows Defender ATP portal. With these you'll get the following capabilities: