diff --git a/windows/security/index.yml b/windows/security/index.yml index 2cd3189581..1d3125f917 100644 --- a/windows/security/index.yml +++ b/windows/security/index.yml @@ -1,4 +1,3 @@ -<<<<<<< HEAD ### YamlMime:YamlDocument documentType: LandingData @@ -79,7 +78,7 @@ sections: title: Information protection -- title: Security features built in to Windows 10 +- title: Windows Defender Advanced Threat Protection items: @@ -127,24 +126,6 @@ sections: title: BitLocker -- title: Security features in Microsoft 365 E3 - - items: - - - type: paragraph - - text: 'Windows 10 Enterprise provides the foundation for Microsoft 365 E3 and a secure modern workplace.' - - - type: list - - style: cards - - className: cardsM - - columns: 3 - - items: - - href: \windows\security\identity-protection\hello-for-business\hello-overview html:

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

@@ -175,24 +156,6 @@ sections: title: Windows Information Protection -- title: Security features in Microsoft 365 E5 - - items: - - - type: paragraph - - text: 'Get all of the protection from Microsoft 365 E3 security, plus these cloud-based security features to help you defend against even the most advanced threats.' - - - type: list - - style: cards - - className: cardsM - - columns: 3 - - items: - - href: https://docs.microsoft.com/azure/active-directory/active-directory-identityprotection html:

Identity Protection and Privileged Identity Management

@@ -275,132 +238,3 @@ 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