Merge pull request #3014 from MicrosoftDocs/master

OOB - Updating landing pages
This commit is contained in:
Dani Halfin
2020-06-05 19:04:05 -07:00
committed by GitHub
6 changed files with 213 additions and 220 deletions

View File

@ -14728,7 +14728,7 @@
},
{
"source_path": "windows/privacy/manage-windows-endpoints.md",
"redirect_url": "https://docs.microsoft.com/windows/privacy/manage-windows-1809-endpoints",
"redirect_url": "https://docs.microsoft.com/windows/privacy/manage-windows-2004-endpoints",
"redirect_document_id": true
},
{

View File

@ -1,156 +1,191 @@
### YamlMime:YamlDocument
documentType: LandingData
### YamlMime:Hub
title: Windows Privacy
summary: Get ready for General Data Protection Regulation (GDPR) by viewing and configuring Windows diagnostic data in your organization.
brand: m365
metadata:
document_id:
title: Windows Privacy
description: Learn about how privacy is managed in Windows.
keywords: Windows 10, Windows Server, Windows Server 2016, privacy, GDPR, compliance, endpoints
services: windows
ms.product: windows
ms.topic: hub-page # Required
ms.collection: M365-security-compliance
author: danihalfin
ms.author: daniha
manager: dansimp
ms.date: 02/21/2019 #Required; mm/dd/yyyy format.
ms.localizationpriority: high
author: danihalfin
ms.author: daniha
ms.date: 04/25/2018
ms.topic: conceptual
audience: ITPro
manager: dansimp
ms.collection: M365-security-compliance
ms.devlang: na
sections:
- items:
- type: markdown
text: Get ready for General Data Protection Regulation (GDPR) by viewing and configuring Windows diagnostic data in your organization.
- items:
- type: list
style: cards
className: cardsM
columns: 3
items:
- href: \windows\privacy\gdpr-it-guidance
html: <p>Learn about GDPR and how Microsoft helps you get started towards compliance</p>
image:
src: https://docs.microsoft.com/media/common/i_advanced.svg
title: Start with GDPR basics
- href: \windows\privacy\configure-windows-diagnostic-data-in-your-organization
html: <p>Make informed decisions about how you can configure diagnostic data in your organization</p>
image:
src: https://docs.microsoft.com/media/common/i_filter.svg
title: Configure Windows diagnostic data
- href: \windows\privacy\diagnostic-data-viewer-overview
html: <p>Review the Windows diagnostic data sent to Microsoft by device in your organization</p>
image:
src: https://docs.microsoft.com/media/common/i_investigate.svg
title: View Windows diagnostic data
- title: Understand Windows diagnostic data in Windows 10
# highlightedContent section (optional)
# Maximum of 8 items
highlightedContent:
# itemType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new
items:
# Card
- title: Start with GDPR basics
itemType: get-started
url: gdpr-it-guidance.md
# Card
- title: Configure Windows diagnostic data
itemType: how-to-guide
url: configure-windows-diagnostic-data-in-your-organization.md
# Card
- title: View Windows diagnostic data
itemType: how-to-guide
url: diagnostic-data-viewer-overview.md
- type: paragraph
# productDirectory section (optional)
productDirectory:
title: Understand Windows diagnostic data in Windows 10
summary: For the latest Windows 10 version, learn more about what Windows diagnostic data is collected at various diagnostics levels.
items:
# Card
- title: Basic level events and fields
# imageSrc should be square in ratio with no whitespace
imageSrc: https://docs.microsoft.com/media/common/i_extend.svg
summary: Learn more about basic Windows diagnostic data events and fields collected.
url: basic-level-windows-diagnostic-events-and-fields.md
# Card
- title: Enhanced level events and fields
imageSrc: https://docs.microsoft.com/media/common/i_delivery.svg
summary: Learn more about Windows diagnostic data events and fields used by Windows Analytics.
url: enhanced-diagnostic-data-windows-analytics-events-and-fields.md
# Card
- title: Full level data categories
imageSrc: https://docs.microsoft.com/media/common/i_get-started.svg
summary: Learn more about all Windows diagnostic data collected.
url: windows-diagnostic-data.md
text: 'For the latest Windows 10 version, learn more about what Windows diagnostic data is collected at various diagnostics levels.'
# conceptualContent section (optional)
# conceptualContent:
# # itemType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | sample | tutorial | video | whats-new
# title: sectiontitle # < 60 chars (optional)
# summary: sectionsummary # < 160 chars (optional)
# items:
# # Card
# - title: cardtitle1
# links:
# - url: file1.md OR https://docs.microsoft.com/file1
# itemType: itemType
# text: linktext1
# - url: file2.md OR https://docs.microsoft.com/file2
# itemType: itemType
# text: linktext2
# - url: file3.md OR https://docs.microsoft.com/file3
# itemType: itemType
# text: linktext3
# # footerLink (optional)
# footerLink:
# url: filefooter.md OR https://docs.microsoft.com/filefooter
# text: See more
# # Card
# - title: cardtitle2
# links:
# - url: file1.md OR https://docs.microsoft.com/file1
# itemType: itemType
# text: linktext1
# - url: file2.md OR https://docs.microsoft.com/file2
# itemType: itemType
# text: linktext2
# - url: file3.md OR https://docs.microsoft.com/file3
# itemType: itemType
# text: linktext3
# # footerLink (optional)
# footerLink:
# url: filefooter.md OR https://docs.microsoft.com/filefooter
# text: See more
# # Card
# - title: cardtitle3
# links:
# - url: file1.md OR https://docs.microsoft.com/file1
# itemType: itemType
# text: linktext1
# - url: file2.md OR https://docs.microsoft.com/file2
# itemType: itemType
# text: linktext2
# - url: file3.md OR https://docs.microsoft.com/file3
# itemType: itemType
# text: linktext3
# # footerLink (optional)
# footerLink:
# url: filefooter.md OR https://docs.microsoft.com/filefooter
# text: See more
- type: list
# # tools section (optional)
# tools:
# title: sectiontitle # < 60 chars (optional)
# summary: sectionsummary # < 160 chars (optional)
# items:
# # Card
# - title: cardtitle1
# # imageSrc should be square in ratio with no whitespace
# imageSrc: ./media/index/image1.svg OR https://docs.microsoft.com/media/logos/image1.svg
# url: file1.md
# # Card
# - title: cardtitle2
# imageSrc: ./media/index/image2.svg OR https://docs.microsoft.com/media/logos/image2.svg
# url: file2.md
# # Card
# - title: cardtitle3
# imageSrc: ./media/index/image3.svg OR https://docs.microsoft.com/media/logos/image3.svg
# url: file3.md
style: cards
# additionalContent section (optional)
# Card with summary style
# additionalContent:
# # Supports up to 3 sections
# sections:
# - title: sectiontitle # < 60 chars (optional)
# summary: sectionsummary # < 160 chars (optional)
# items:
# # Card
# - title: cardtitle1
# summary: cardsummary1
# url: file1.md OR https://docs.microsoft.com/file1
# # Card
# - title: cardtitle2
# summary: cardsummary2
# url: file1.md OR https://docs.microsoft.com/file2
# # Card
# - title: cardtitle3
# summary: cardsummary3
# url: file1.md OR https://docs.microsoft.com/file3
# # footer (optional)
# footer: "footertext [linktext](https://docs.microsoft.com/footerfile)"
className: cardsM
columns: 3
items:
- href: \windows\privacy\basic-level-windows-diagnostic-events-and-fields
html: <p>Learn more about basic Windows diagnostic data events and fields collected</p>
image:
src: https://docs.microsoft.com/media/common/i_extend.svg
title: Basic level events and fields
- href: \windows\privacy\enhanced-diagnostic-data-windows-analytics-events-and-fields
html: <p>Learn more about Windows diagnostic data events and fields used by Windows Analytics</p>
image:
src: https://docs.microsoft.com/media/common/i_delivery.svg
title: Enhanced level events and fields
- href: \windows\privacy\windows-diagnostic-data
html: <p>Learn more about all Windows diagnostic data collected</p>
image:
src: https://docs.microsoft.com/media/common/i_get-started.svg
title: Full level data categories
- items:
- type: list
style: cards
className: cardsL
items:
- title: View and manage Windows 10 connection endpoints
html: <p><a class="barLink" href="/windows/privacy/manage-windows-endpoints">Manage Windows 10 connection endpoints</a></p>
<p><a class="barLink" href="/windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services">Manage connections from Windows to Microsoft services</a></p>
- title: Additional resources
html: <p><a class="barLink" href="https://www.microsoft.com/en-us/trustcenter/cloudservices/windows10">Windows 10 on Trust Center</a></p>
<p><a class="barLink" href="https://docs.microsoft.com/microsoft-365/compliance/gdpr">GDPR on Microsoft 365 Compliance solutions</a></p>
<p><a class="barLink" href="https://servicetrust.microsoft.com/ViewPage/GDPRGetStarted">Support for GDPR Accountability on Service Trust Portal</a></p>
# additionalContent section (optional)
# Card with links style
additionalContent:
# Supports up to 3 sections
sections:
- items:
# Card
- title: More Windows privacy
links:
- text: "Windows 10 & Privacy Compliance: A Guide for IT and Compliance Professionals"
url: Windows-10-and-privacy-compliance.md
- text: Windows 10 personal data services configuration
url: windows-personal-data-services-configuration.md
- text: Beginning your GDPR journey for Windows 10
url: gdpr-win10-whitepaper.md
# Card
- title: View and manage Windows 10 connection endpoints
links:
- text: Manage Windows 10 connection endpoints
url: manage-windows-endpoints.md
- text: Manage connection endpoints for non-Enterprise editions of Windows 10
url: windows-endpoints-2004-non-enterprise-editions.md
- text: Manage connections from Windows to Microsoft services
url: manage-connections-from-windows-operating-system-components-to-microsoft-services.md
# Card
- title: Additional resources
links:
- text: Windows 10 on Trust Center
url: https://www.microsoft.com/en-us/trustcenter/cloudservices/windows10
- text: GDPR on Microsoft 365 Compliance solutions
url: https://docs.microsoft.com/microsoft-365/compliance/gdpr
- text: Support for GDPR Accountability on Service Trust Portal
url: https://servicetrust.microsoft.com/ViewPage/GDPRGetStarted
# footer (optional)
# footer: "footertext [linktext](https://docs.microsoft.com/footerfile)"

View File

@ -1,80 +1,38 @@
### YamlMime:YamlDocument
### YamlMime:Hub
documentType: LandingData
title: Windows 10 Enterprise Security
title: Windows 10 Enterprise Security # < 60 chars
summary: Secure corporate data and manage risk. # < 160 chars
# brand: aspnet | azure | dotnet | dynamics | m365 | ms-graph | office | power-bi | power-platform | sql | sql-server | vs | visual-studio | windows | xamarin
brand: windows
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
title: Windows 10 Enterprise Security # Required; page title displayed in search results. Include the brand. < 60 chars.
description: Learn about enterprise-grade security features for Windows 10. # Required; article description that is displayed in search results. < 160 chars.
services: windows
ms.product: windows
ms.topic: hub-page # Required
ms.collection: M365-security-compliance # Optional; Remove if no collection is used.
author: danihalfin #Required; your GitHub user alias, with correct capitalization.
ms.author: daniha #Required; microsoft alias of author; optional team alias.
ms.date: 01/08/2018 #Required; mm/dd/yyyy format.
ms.localizationpriority: high
author: brianlic-msft
ms.author: brianlic
manager: brianlic
ms.date: 08/01/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: <p>Deploy secure enterprise-grade authentication and access control to protect accounts and data</p>
image:
src: https://docs.microsoft.com/media/common/i_identity-protection.svg
title: Identity and access management
- href: \windows\security\threat-protection\
html: <p>Stop cyberthreats and quickly identify and respond to breaches</p>
image:
src: https://docs.microsoft.com/media/common/i_threat-protection.svg
title: Threat protection
- href: \windows\security\information-protection\
html: <p>Identify and secure critical data to prevent data loss</p>
image:
src: https://docs.microsoft.com/media/common/i_information-protection.svg
title: Information protection
# productDirectory section (optional)
productDirectory:
items:
# Card
- title: Identity and access management
# imageSrc should be square in ratio with no whitespace
imageSrc: https://docs.microsoft.com/media/common/i_identity-protection.svg
summary: Deploy secure enterprise-grade authentication and access control to protect accounts and data
url: ./identity-protection/index.md
# Card
- title: Threat protection
imageSrc: https://docs.microsoft.com/media/common/i_threat-protection.svg
summary: Stop cyberthreats and quickly identify and respond to breaches
url: ./threat-protection/index.md
# Card
- title: Information protection
imageSrc: https://docs.microsoft.com/media/common/i_information-protection.svg
summary: Identify and secure critical data to prevent data loss
url: ./information-protection/index.md

View File

@ -31,7 +31,7 @@ While the features will not block or prevent apps, scripts, or files from being
To find the audited entries, go to **Applications and Services** > **Microsoft** > **Windows** > **Windows Defender** > **Operational**.
You can use Windows Defender Advanced Threat Protection to get greater details for each event, especially for investigating attack surface reduction rules. Using the Microsoft Defender ATP console lets you [investigate issues as part of the alert timeline and investigation scenarios](../microsoft-defender-atp/investigate-alerts.md).
You can use Microsoft Defender Advanced Threat Protection to get greater details for each event, especially for investigating attack surface reduction rules. Using the Microsoft Defender ATP console lets you [investigate issues as part of the alert timeline and investigation scenarios](../microsoft-defender-atp/investigate-alerts.md).
This topic provides links that describe how to enable the audit functionality for each feature and how to view events in the Windows Event Viewer.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 65 KiB

View File

@ -95,7 +95,7 @@ below to onboard systems with Configuration Manager.
![Image of Microsoft Endpoint Configuration Manager wizard](images/configmgr-criteria.png)
7. Keep criterion type as **simple value**, choose where as **Operating System - build number**, operator as **is equal to** and value **10240** and click on **OK**.
7. Keep criterion type as **simple value**, choose where as **Operating System - build number**, operator as **is greater than or equal to** and value **14393** and click on **OK**.
![Image of Microsoft Endpoint Configuration Manager wizard](images/configmgr-simple-value.png)