From 0f4baad37574adae3e24961e0fed870f1c323d87 Mon Sep 17 00:00:00 2001 From: Ed Gallagher Date: Sun, 19 Aug 2018 20:17:08 -0500 Subject: [PATCH 1/2] Update 2016 server reference Changed reference to Windows Server 2016 Technical Preview to Windows Server 2016 as indicated by user crompto --- windows/deployment/update/waas-optimize-windows-10-updates.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/deployment/update/waas-optimize-windows-10-updates.md b/windows/deployment/update/waas-optimize-windows-10-updates.md index d36e9fcaab..831d0da5ff 100644 --- a/windows/deployment/update/waas-optimize-windows-10-updates.md +++ b/windows/deployment/update/waas-optimize-windows-10-updates.md @@ -27,7 +27,7 @@ Two methods of peer-to-peer content distribution are available in Windows 10. Windows Update, Windows Update for Business, and Windows Server Update Services (WSUS) can use Delivery Optimization. Delivery Optimization can significantly reduce the amount of network traffic to external Windows Update sources as well as the time it takes for clients to retrieve the updates. -- [BranchCache](waas-branchcache.md) is a bandwidth optimization technology that is included in some editions of the Windows Server 2016 Technical Preview and Windows 10 operating systems, as well as in some editions of Windows Server 2012 R2, Windows 8.1, Windows Server 2012, Windows 8, Windows Server 2008 R2, and Windows 7. +- [BranchCache](waas-branchcache.md) is a bandwidth optimization technology that is included in some editions of Windows Server 2016 and Windows 10 operating systems, as well as in some editions of Windows Server 2012 R2, Windows 8.1, Windows Server 2012, Windows 8, Windows Server 2008 R2, and Windows 7. >[!NOTE] >Full BranchCache functionality is supported in Windows 10 Enterprise and Education; Windows 10 Pro supports some BranchCache functionality, including BITS transfers used for servicing operations. From a2c026c2675e4a6bf1f72ed87384c8ccbc6e7c71 Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Mon, 20 Aug 2018 17:08:06 +0000 Subject: [PATCH 2/2] Merged PR 10770: File structure rename --- .openpublishing.redirection.json | 10 +++++----- windows/privacy/TOC.md | 2 +- ...-level-windows-diagnostic-events-and-fields-1703.md | 2 ++ ...-level-windows-diagnostic-events-and-fields-1709.md | 1 + ...level-windows-diagnostic-events-and-fields-1803.md} | 0 5 files changed, 9 insertions(+), 6 deletions(-) rename windows/privacy/{basic-level-windows-diagnostic-events-and-fields.md => basic-level-windows-diagnostic-events-and-fields-1803.md} (100%) diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json index 50e104e045..5b0aef0b16 100644 --- a/.openpublishing.redirection.json +++ b/.openpublishing.redirection.json @@ -5261,11 +5261,6 @@ "redirect_document_id": true }, { -"source_path": "windows/configuration/basic-level-windows-diagnostic-events-and-fields-1803.md", -"redirect_url": "/windows/configuration/basic-level-windows-diagnostic-events-and-fields", -"redirect_document_id": true -}, -{ "source_path": "windows/configuration/windows-diagnostic-data-1709.md", "redirect_url": "/windows/configuration/windows-diagnostic-data", "redirect_document_id": true @@ -13731,6 +13726,11 @@ "redirect_document_id": true }, { +"source_path": "windows/privacy/basic-level-windows-diagnostic-events-and-fields.md", +"redirect_url": "/windows/privacy/basic-level-windows-diagnostic-events-and-fields-1803", +"redirect_document_id": true +}, +{ "source_path": "windows/configuration/basic-level-windows-diagnostic-events-and-fields-1703.md", "redirect_url": "/windows/privacy/basic-level-windows-diagnostic-events-and-fields-1703", "redirect_document_id": true diff --git a/windows/privacy/TOC.md b/windows/privacy/TOC.md index 05709993b8..085675fdde 100644 --- a/windows/privacy/TOC.md +++ b/windows/privacy/TOC.md @@ -5,7 +5,7 @@ ## [Configure Windows diagnostic data in your organization](configure-windows-diagnostic-data-in-your-organization.md) ## [Diagnostic Data Viewer Overview](diagnostic-data-viewer-overview.md) ## Basic level Windows diagnostic data events and fields -### [Windows 10, version 1803 basic level Windows diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields.md) +### [Windows 10, version 1803 basic level Windows diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields-1803.md) ### [Windows 10, version 1709 basic level Windows diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields-1709.md) ### [Windows 10, version 1703 basic level Windows diagnostic events and fields](basic-level-windows-diagnostic-events-and-fields-1703.md) ## Enhanced level Windows diagnostic data events and fields diff --git a/windows/privacy/basic-level-windows-diagnostic-events-and-fields-1703.md b/windows/privacy/basic-level-windows-diagnostic-events-and-fields-1703.md index 249270aaf6..d75aa0580e 100644 --- a/windows/privacy/basic-level-windows-diagnostic-events-and-fields-1703.md +++ b/windows/privacy/basic-level-windows-diagnostic-events-and-fields-1703.md @@ -23,6 +23,8 @@ The Basic level gathers a limited set of information that is critical for unders Use this article to learn about diagnostic events, grouped by event area, and the fields within each event. A brief description is provided for each field. Every event generated includes common data, which collects device data. You can learn more about Windows functional and diagnostic data through these articles: +- [Windows 10, version 1803 basic diagnostic events and fields](https://docs.microsoft.com/windows/configuration/basic-level-windows-diagnostic-events-and-fields-1803) +- [Windows 10, version 1709 basic diagnostic events and fields](https://docs.microsoft.com/windows/configuration/basic-level-windows-diagnostic-events-and-fields-1709) - [Manage connections from Windows operating system components to Microsoft services](manage-connections-from-windows-operating-system-components-to-microsoft-services.md) - [Configure Windows diagnostic data in your organization](configure-windows-diagnostic-data-in-your-organization.md) diff --git a/windows/privacy/basic-level-windows-diagnostic-events-and-fields-1709.md b/windows/privacy/basic-level-windows-diagnostic-events-and-fields-1709.md index d4669aa951..d9719bbdd6 100644 --- a/windows/privacy/basic-level-windows-diagnostic-events-and-fields-1709.md +++ b/windows/privacy/basic-level-windows-diagnostic-events-and-fields-1709.md @@ -30,6 +30,7 @@ Use this article to learn about diagnostic events, grouped by event area, and th You can learn more about Windows functional and diagnostic data through these articles: +- [Windows 10, version 1803 basic diagnostic events and fields](https://docs.microsoft.com/windows/configuration/basic-level-windows-diagnostic-events-and-fields-1803) - [Windows 10, version 1703 basic diagnostic events and fields](https://docs.microsoft.com/windows/configuration/basic-level-windows-diagnostic-events-and-fields-1703) - [Manage connections from Windows operating system components to Microsoft services](https://docs.microsoft.com/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services) - [Configure Windows diagnostic data in your organization](https://docs.microsoft.com/windows/configuration/configure-windows-diagnostic-data-in-your-organization) diff --git a/windows/privacy/basic-level-windows-diagnostic-events-and-fields.md b/windows/privacy/basic-level-windows-diagnostic-events-and-fields-1803.md similarity index 100% rename from windows/privacy/basic-level-windows-diagnostic-events-and-fields.md rename to windows/privacy/basic-level-windows-diagnostic-events-and-fields-1803.md