From a7f517d4bec03fe990f804d04aede259960f922a Mon Sep 17 00:00:00 2001 From: Dani Halfin Date: Tue, 2 Jun 2020 18:49:00 -0700 Subject: [PATCH 1/7] testing 1 2 3 --- windows/privacy/index.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/privacy/index.yml b/windows/privacy/index.yml index 8d5740bc52..fe5b89eda0 100644 --- a/windows/privacy/index.yml +++ b/windows/privacy/index.yml @@ -1,4 +1,4 @@ -### YamlMime:YamlDocument +### YamlMime:Hub documentType: LandingData From 459d69216fc2c3c37beaadd121cbd2636f283d08 Mon Sep 17 00:00:00 2001 From: Dani Halfin Date: Tue, 2 Jun 2020 20:10:04 -0700 Subject: [PATCH 2/7] updating hub page --- windows/privacy/index.yml | 306 ++++++++++++++++++++------------------ 1 file changed, 165 insertions(+), 141 deletions(-) diff --git a/windows/privacy/index.yml b/windows/privacy/index.yml index fe5b89eda0..c8309a41a9 100644 --- a/windows/privacy/index.yml +++ b/windows/privacy/index.yml @@ -1,156 +1,180 @@ ### YamlMime:Hub -documentType: LandingData - 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 + 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:

Learn about GDPR and how Microsoft helps you get started towards compliance

- - 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:

Make informed decisions about how you can configure diagnostic data in your organization

- - image: - - src: https://docs.microsoft.com/media/common/i_filter.svg - - title: Configure Windows diagnostic data - - - href: \windows\privacy\diagnostic-data-viewer-overview - - html:

Review the Windows diagnostic data sent to Microsoft by device in your organization

- - 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:

Learn more about basic Windows diagnostic data events and fields collected

- - 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:

Learn more about Windows diagnostic data events and fields used by Windows Analytics

- - image: - - src: https://docs.microsoft.com/media/common/i_delivery.svg - - title: Enhanced level events and fields - - - href: \windows\privacy\windows-diagnostic-data - - html:

Learn more about all Windows diagnostic data collected

- - 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:

Manage Windows 10 connection endpoints

- -

Manage connections from Windows to Microsoft services

- - - title: Additional resources - - html:

Windows 10 on Trust Center

- -

GDPR on Microsoft 365 Compliance solutions

- -

Support for GDPR Accountability on Service Trust Portal

- \ No newline at end of file +# additionalContent section (optional) +# Card with links style +additionalContent: + # Supports up to 3 sections + sections: + - items: + # Card + - title: View and manage Windows 10 connection endpoints + links: + - text: Manage Windows 10 connection endpoints + url: manage-windows-endpoints.md + - text: Manage connections from Windows to Microsoft services + url: manage-connections-from-windows-operating-system-components-to-microsoft-services + # 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)" \ No newline at end of file From 1007e02a81407f6294d035e99e1c0693a8430de8 Mon Sep 17 00:00:00 2001 From: Dani Halfin Date: Tue, 2 Jun 2020 21:27:49 -0700 Subject: [PATCH 3/7] fixing security index yml while im here --- windows/security/index.yml | 110 ++++++++++++------------------------- 1 file changed, 35 insertions(+), 75 deletions(-) diff --git a/windows/security/index.yml b/windows/security/index.yml index ca0486b130..8dee80970e 100644 --- a/windows/security/index.yml +++ b/windows/security/index.yml @@ -1,80 +1,40 @@ -### 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 + 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:

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 - +# productDirectory section (optional) +productDirectory: + title: sectiontitle # < 60 chars (optional) + summary: sectionsummary # < 160 chars (optional) + 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 \ No newline at end of file From 95a680b27ebcbc767ea76397b0b543088ed89baf Mon Sep 17 00:00:00 2001 From: Dani Halfin Date: Tue, 2 Jun 2020 21:28:53 -0700 Subject: [PATCH 4/7] small fix --- windows/security/index.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/windows/security/index.yml b/windows/security/index.yml index 8dee80970e..bae44d7224 100644 --- a/windows/security/index.yml +++ b/windows/security/index.yml @@ -19,8 +19,6 @@ metadata: # productDirectory section (optional) productDirectory: - title: sectiontitle # < 60 chars (optional) - summary: sectionsummary # < 160 chars (optional) items: # Card - title: Identity and access management From 22cd538c72a6840ca63c8189e1c3099103fa12df Mon Sep 17 00:00:00 2001 From: Dani Halfin Date: Wed, 3 Jun 2020 23:19:26 -0700 Subject: [PATCH 5/7] adding some links to hub --- .openpublishing.redirection.json | 2 +- windows/privacy/index.yml | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json index a4e6e02c6d..c975833477 100644 --- a/.openpublishing.redirection.json +++ b/.openpublishing.redirection.json @@ -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 }, { diff --git a/windows/privacy/index.yml b/windows/privacy/index.yml index c8309a41a9..934a834754 100644 --- a/windows/privacy/index.yml +++ b/windows/privacy/index.yml @@ -161,12 +161,23 @@ additionalContent: 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 + url: manage-connections-from-windows-operating-system-components-to-microsoft-services.md # Card - title: Additional resources links: From 0c09d4a3953611117876e5121fcdee763285a100 Mon Sep 17 00:00:00 2001 From: Dani Halfin Date: Fri, 5 Jun 2020 15:51:45 -0700 Subject: [PATCH 6/7] trying to fix warnings --- windows/privacy/index.yml | 2 +- windows/security/index.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/privacy/index.yml b/windows/privacy/index.yml index 934a834754..ccdb140595 100644 --- a/windows/privacy/index.yml +++ b/windows/privacy/index.yml @@ -8,7 +8,7 @@ metadata: title: Windows Privacy description: Learn about how privacy is managed in Windows. services: windows - product: windows + product: "windows" ms.topic: hub-page # Required ms.collection: M365-security-compliance author: danihalfin diff --git a/windows/security/index.yml b/windows/security/index.yml index bae44d7224..4bf6b3f5b9 100644 --- a/windows/security/index.yml +++ b/windows/security/index.yml @@ -9,7 +9,7 @@ metadata: 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 - product: windows + 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. From d933bc8eaef4dc6abfc739032694900964d97e89 Mon Sep 17 00:00:00 2001 From: Dani Halfin Date: Fri, 5 Jun 2020 16:12:10 -0700 Subject: [PATCH 7/7] trying to fix warnings again --- windows/privacy/index.yml | 2 +- windows/security/index.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/privacy/index.yml b/windows/privacy/index.yml index ccdb140595..43423ceb3e 100644 --- a/windows/privacy/index.yml +++ b/windows/privacy/index.yml @@ -8,7 +8,7 @@ metadata: title: Windows Privacy description: Learn about how privacy is managed in Windows. services: windows - product: "windows" + ms.product: windows ms.topic: hub-page # Required ms.collection: M365-security-compliance author: danihalfin diff --git a/windows/security/index.yml b/windows/security/index.yml index 4bf6b3f5b9..d7b6fbe5a3 100644 --- a/windows/security/index.yml +++ b/windows/security/index.yml @@ -9,7 +9,7 @@ metadata: 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 - product: "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.