revert yaml

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: <p>Give users a more personal and secure way to access their devices</p>
@@ -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: <p>Identity Protection and Privileged Identity Management</p>
@@ -275,132 +238,3 @@ sections:
     - html: <a href="https://www.microsoft.com/wdsi/threats/ransomware">Ransomware FAQ</a>
     
 
-=======
-###<23>YamlMime:YamlDocument
-documentType:<3A>LandingData
-title:<3A>Windows<77>10<31>Enterprise<73>Security
-metadata:
-<EFBFBD><EFBFBD>document_id:<3A>
-<EFBFBD><EFBFBD>title:<3A>Windows<77>10<31>Enterprise<73>Security
-<EFBFBD><EFBFBD>description:<3A>Learn<72>about<75>enterprise-grade<64>security<74>features<65>for<6F>Windows<77>10.
-<EFBFBD><EFBFBD>keywords:<3A>protect,<2C>company,<2C>data,<2C>Windows,<2C>device,<2C>app,<2C>management,<2C>Microsoft365,<2C>e5,<2C>e3
- 
-<EFBFBD><EFBFBD>ms.localizationpriority:<3A>high
- 
-<EFBFBD><EFBFBD>author:<3A>brianlic-msft
-<EFBFBD><EFBFBD>ms.author:<3A>brianlic
- 
-<EFBFBD><EFBFBD>manager:<3A>brianlic
-<EFBFBD><EFBFBD>ms.date:<3A>02/06/2018
- 
-<EFBFBD><EFBFBD>ms.topic:<3A>article
- 
-<EFBFBD><EFBFBD>ms.devlang:<3A>na
- 
-sections:
--<2D>items:
-<EFBFBD><EFBFBD>-<2D>type:<3A>markdown
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>text:<3A>Secure<72>corporate<74>data<74>and<6E>manage<67>risk.<2E>
--<2D>items:
-<EFBFBD><EFBFBD>-<2D>type:<3A>list
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>style:<3A>cards
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>className:<3A>cardsM
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>columns:<3A>3
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>items:
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>href:<3A>\windows\security\identity-protection\
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>html:<3A><p>Deploy<6F>secure<72>enterprise-grade<64>authentication<6F>and<6E>access<73>control<6F>to<74>protect<63>accounts<74>and<6E>data</p>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>image:
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>src:<3A>https://docs.microsoft.com/media/common/i_identity-protection.svg
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>title:<3A>Identity<74>and<6E>access<73>management
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>href:<3A>\windows\security\threat-protection\
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>html:<3A><p>Stop<6F>cyberthreats<74>and<6E>quickly<6C>identify<66>and<6E>respond<6E>to<74>breaches</p>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>image:
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>src:<3A>https://docs.microsoft.com/media/common/i_threat-protection.svg
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>title:<3A>Threat<61>protection
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>href:<3A>\windows\security\information-protection\
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>html:<3A><p>Identify<66>and<6E>secure<72>critical<61>data<74>to<74>prevent<6E>data<74>loss</p>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>image:
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>src:<3A>https://docs.microsoft.com/media/common/i_information-protection.svg
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>title:<3A>Information<6F>protection
--<EFBFBD>title:<3A>Windows<77>Defender<65>Advanced<65>Threat<61>Protection<6F>
-<EFBFBD><EFBFBD>items:
-<EFBFBD><EFBFBD>-<2D>type:<3A>paragraph
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>text:<3A>'Windows<77>10<31>enables<65>critical<61>security<74>features<65>to<74>protect<63>your<75>device<63>right<68>from<6F>the<68>start.'
-<EFBFBD><EFBFBD>-<2D>type:<3A>list
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>style:<3A>cards
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>className:<3A>cardsM
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>columns:<3A>3
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>items:
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>href:<3A>\windows\security\hardware-protection\how-hardware-based-containers-help-protect-windows
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>html:<3A><p>Protect<63>the<68>boot<6F>process<73>and<6E>maintain<69>system<65>integrity</p>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>image:
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>src:<3A>https://docs.microsoft.com/media/common/i_identity-protection.svg
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>title:<3A>Windows<77>Defender<65>System<65>Guard
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>href:<3A>\windows\security\threat-protection\windows-defender-antivirus\windows-defender-antivirus-in-windows-10
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>html:<3A><p>Protect<63>against<73>malware<72>management<6E>using<6E>next-generation<6F>antivirus<75>technologies</p>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>image:
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>src:<3A>https://docs.microsoft.com/media/common/i_threat-protection.svg
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>title:<3A>Windows<77>Defender<65>Antivirus
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>href:<3A>\windows\security\information-protection\bitlocker\bitlocker-overview
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>html:<3A><p>Prevent<6E>data<74>theft<66>from<6F>lost<73>or<6F>stolen<65>devices</p>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>image:
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>src:<3A>https://docs.microsoft.com/media/common/i_information-protection.svg
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>title:<3A>Windows<77>Defender<65>Application<6F>Guard
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>href:<3A>\windows\security\identity-protection\hello-for-business\hello-overview
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>html:<3A><p>Give<76>users<72>a<EFBFBD>more<72>personal<61>and<6E>secure<72>way<61>to<74>access<73>their<69>devices</p>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>image:
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>src:<3A>https://docs.microsoft.com/media/common/i_identity-protection.svg
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>title:<3A>Windows<77>Hello<6C>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>href:<3A>\windows\security\threat-protection\windows-defender-application-control\windows-defender-application-control
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>html:<3A><p>Lock<63>down<77>applications<6E>that<61>run<75>on<6F>a<EFBFBD>device</p>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>image:
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>src:<3A>https://docs.microsoft.com/media/common/i_threat-protection.svg
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>title:<3A>Windows<77>Defender<65>Application<6F>Control
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>href:<3A>\windows\security\information-protection\windows-information-protection\protect-enterprise-data-using-wip
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>html:<3A><p>Prevent<6E>accidental<61>data<74>leaks<6B>from<6F>enterprise<73>devices</p>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>image:
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>src:<3A>https://docs.microsoft.com/media/common/i_information-protection.svg
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>title:<3A>Windows<77>Information<6F>Protection<6F>
--<EFBFBD>title:<3A>Videos
-<EFBFBD><EFBFBD>items:
-<EFBFBD><EFBFBD>-<2D>type:<3A>markdown
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>text:<3A>">[![VIDEO](images/next-generation-windows-security-vision.png)](https://www.youtube.com/watch?v=IvZySDNfNpo)"
-<EFBFBD><EFBFBD>-<2D>type:<3A>markdown
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>text:<3A>">[![VIDEO](images/fall-creators-update-next-gen-security.png)](https://www.youtube.com/watch?v=JDGMNFwyUg8)"
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
--<EFBFBD>title:<3A>Additional<61>security<74>features<65>in<69>Windows<77>10<31>
-<EFBFBD><EFBFBD>items:
-<EFBFBD><EFBFBD>-<2D>type:<3A>paragraph
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>text:<3A>'These<73>additional<61>security<74>features<65>are<72>also<73>built<6C>in<69>to<74>Windows<77>10<31>Enterprise.'
-<EFBFBD><EFBFBD>-<2D>type:<3A>list
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>style:<3A>unordered
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>items:
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>html:<3A><a<>href="/windows/security/identity-protection/windows-firewall/windows-firewall-with-advanced-security">Windows<77>Defender<65>Firewall</a>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>html:<3A><a<>href="/windows/security/threat-protection/windows-defender-exploit-guard/windows-defender-exploit-guard">Windows<77>Defender<65>Exploit<69>Guard</a>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>html:<3A><a<>href="/windows/security/identity-protection/credential-guard/credential-guard">Windows<77>Defender<65>Credential<61>Guard</a>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>html:<3A><a<>href="/windows/security/threat-protection/windows-defender-application-control/windows-defender-application-control">Windows<77>Defender<65>Application<6F>Control</a><3E><>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>html:<3A><a<>href="/windows/security/threat-protection/windows-defender-application-guard/wd-app-guard-overview">Windows<77>Defender<65>Application<6F>Guard</a>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>html:<3A><a<>href="/windows/security/threat-protection/windows-defender-smartscreen/windows-defender-smartscreen-overview">Windows<77>Defender<65>SmartScreen</a><3E><>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>html:<3A><a<>href="/windows/security/threat-protection/windows-defender-security-center/windows-defender-security-center">Windows<77>Defender<65>Security<74>Center</a>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
--<EFBFBD>title:<3A>Security<74>Resources
-<EFBFBD><EFBFBD>items:
-<EFBFBD><EFBFBD>-<2D>type:<3A>list
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>style:<3A>unordered
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>items:
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>html:<3A><a<>href="https://www.microsoft.com/wdsi">Windows<77>Defender<65>Security<74>Intelligence</a>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>html:<3A><a<>href="https://cloudblogs.microsoft.com/microsoftsecure/">Microsoft<66>Secure<72>blog</a>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>html:<3A><a<>href="https://portal.msrc.microsoft.com/">Security<74>Update<74>blog</a>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>html:<3A><a<>href="https://technet.microsoft.com/security/dn440717.aspx(d=robot)">Microsoft<66>Security<74>Response<73>Center<65>(MSRC)</a>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>html:<3A><a<>href="https://blogs.technet.microsoft.com/msrc/">MSRC<52>Blog</a>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>html:<3A><a<>href="https://www.microsoft.com/wdsi/threats/ransomware">Ransomware<72>FAQ</a>
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
- 
->>>>>>> f4ac9773fd71d0ff69e0cbad908f99868151a6c3