Merge branch 'master' into jkaiser-surface-2020

windows/deployment/index.yml

@@ -13,7 +13,7 @@ metadata:
   ms.collection: windows-10
   author: greg-lindsay #Required; your GitHub user alias, with correct capitalization.
   ms.author: greglin #Required; microsoft alias of author; optional team alias.
-  ms.date: 06/08/2020 #Required; mm/dd/yyyy format.
+  ms.date: 06/09/2020 #Required; mm/dd/yyyy format.
   localization_priority: medium
     
 # linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
@@ -29,38 +29,12 @@ landingContent:
           - text: Windows 10 deployment scenarios
             url: windows-10-deployment-scenarios.md
 
-      - linkListType: quickstart
+      - linkListType: get-started
         links:
           - text: Demonstrate Autopilot deployment
             url: windows-autopilot/demonstrate-deployment-on-vm.md
           - text: Deploy Windows 10 in a test lab
             url: windows-10-poc.md
-      - linkListType: architecture
-        links:
-          - text: Windows 10 deployment considerations
-            url: planning/windows-10-deployment-considerations.md
-          - text: Windows 10 infrastructure requirements
-            url: planning/windows-10-infrastructure-requirements.md
-          - text: Windows 10 features lifecycle
-            url: planning/features-lifecycle.md
-          - text: Plan for volume activation
-            url: volume-activation/plan-for-volume-activation-client.md
-      - linkListType: how-to-guide
-        links:
-          - text: Prepare for Zero Touch Installation with Configuration Manager
-            url: deploy-windows-cm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md
-          - text: Prepare to deploy Windows 10 with MDT
-            url: deploy-windows-mdt/prepare-for-windows-deployment-with-mdt.md
-      - linkListType: deploy
-        links:
-          - text: Windows Autopilot scenarios and capabilities
-            url: windows-autopilot/windows-autopilot-scenarios.md
-          - text: Deploy Windows 10 to a new device with Configuration Manager
-            url: deploy-windows-cm/deploy-windows-10-using-pxe-and-configuration-manager.md
-          - text: Deploy a Windows 10 image using MDT
-            url: deploy-windows-mdt/deploy-a-windows-10-image-using-mdt.md
-          - text: Resolve Windows 10 upgrade errors
-            url: upgrade/resolve-windows-10-upgrade-errors.md
 
   # Card (optional)
   - title: Update Windows 10
@@ -75,6 +49,11 @@ landingContent:
         links:
           - text: Servicing the Windows 10 operating system
             url: update/waas-servicing-strategy-windows-10-updates.md
+
+
+  # Card (optional)
+  - title: Deployment planning
+    linkLists:
       - linkListType: architecture
         links:
           - text: Create a deployment plan
@@ -87,61 +66,52 @@ landingContent:
             url: update/plan-determine-app-readiness.md
           - text: Define your servicing strategy
             url: update/waas-servicing-strategy-windows-10-updates.md
+ 
+   # Card
+  - title: Prepare to deploy Windows 10
+    linkLists:
       - linkListType: how-to-guide
         links:
+          - text: Prepare for Zero Touch Installation with Configuration Manager
+            url: deploy-windows-cm/prepare-for-zero-touch-installation-of-windows-10-with-configuration-manager.md
+          - text: Prepare to deploy Windows 10 with MDT
+            url: deploy-windows-mdt/prepare-for-windows-deployment-with-mdt.md
           - text: Evaluate and update infrastructure
             url: update/update-policies.md
           - text: Build a successful servicing strategy
             url: update/waas-deployment-rings-windows-10-updates.md
+
+  # Card
+  - title: Deploy and update Windows 10
+    linkLists:
       - linkListType: deploy
         links:
+          - text: Windows Autopilot scenarios and capabilities
+            url: windows-autopilot/windows-autopilot-scenarios.md
+          - text: Deploy Windows 10 to a new device with Configuration Manager
+            url: deploy-windows-cm/deploy-windows-10-using-pxe-and-configuration-manager.md
+          - text: Deploy a Windows 10 image using MDT
+            url: deploy-windows-mdt/deploy-a-windows-10-image-using-mdt.md
           - text: Assign devices to servicing channels
             url: update/waas-servicing-channels-windows-10-updates.md
           - text: Deploy Windows 10 updates
             url: update/waas-servicing-channels-windows-10-updates.md
-          - text: Troubleshoot Windows Update
+          - text: Resolve Windows 10 upgrade errors
-            url: update/windows-update-troubleshooting.md
+            url: upgrade/resolve-windows-10-upgrade-errors.md          
 
   # Card (optional)
-  - title: Resources
+  - title: Windows 10 resources
     linkLists:
-      - linkListType: reference
-        links:
-          - text: How does Windows Update work?
-            url: update/how-windows-update-works.md
-          - text: Unified Update Platform (UUP) architecture
-            url: update/windows-update-overview.md#unified-update-platform-uup-architecture
-          - text: Servicing stack updates
-            url: update/servicing-stack-updates.md
-          - text: Manage additional Windows Update setings
-            url: update/waas-wu-settings.md
-          - text: Delivery Optimization reference
-            url: update/waas-delivery-optimization-reference.md
-          - text: Convert an MBR partition to GPT
-            url: mbr-to-gpt.md
-          - text: VAMT technical reference
-            url: volume-activation/volume-activation-management-tool.md
-          - text: User State Migration Tool (USMT) overview
-            url: usmt/usmt-overview.md  
       - linkListType: reference
         links:
           - text: Windows 10 release information
             url: https://docs.microsoft.com/windows/release-information/
           - text: What's new in Windows 10
             url: https://docs.microsoft.com/windows/whats-new/
-          - text: Microsoft 365 for enterprise documention
-            url: https://docs.microsoft.com/microsoft-365/enterprise/
-          - text: Microsoft Surface documentation
-            url: https://docs.microsoft.com/surface/
-          - text: Evaluate Windows 10 Enterprise
-            url: https://www.microsoft.com/evalcenter/evaluate-windows-10-enterprise
-          - text: Microsoft FastTrack cloud solutions
-            url: https://www.microsoft.com/fasttrack/
-          - text: Microsoft Intune documentation
-            url: https://docs.microsoft.com/mem/intune/
-          - text: Microsoft Endpoint Configuration Manager documentation
-            url: https://docs.microsoft.com/mem/configmgr/   
           - text: Windows 10 Enterprise Security
             url: https://docs.microsoft.com/windows/security/
           - text: Desktop Deployment Center
             url: https://docs.microsoft.com/microsoft-365/enterprise/desktop-deployment-center-home
+          - text: Microsoft 365 solution and architecture center
+            url: https://docs.microsoft.com/microsoft-365/solutions/?view=o365-worldwide
+

windows/privacy/index.yml

@@ -45,7 +45,7 @@ productDirectory:
       # 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
+      url: required-windows-diagnostic-data-events-and-fields-2004.md
     # Card
     - title: Enhanced level events and fields
       imageSrc: https://docs.microsoft.com/media/common/i_delivery.svg

windows/privacy/manage-windows-2004-endpoints.md

@@ -12,7 +12,7 @@ ms.author: obezeajo
 manager: robsize
 ms.collection: M365-security-compliance
 ms.topic: article
-ms.date: 5/11/2020
+ms.date: 6/9/2020
 ---
 # Manage connection endpoints for Windows 10 Enterprise, version 2004
 
@@ -80,7 +80,7 @@ The following methodology was used to derive these network endpoints:
 ||The following endpoints are used to communicate with Microsoft Store. If you turn off traffic for these endpoints, apps cannot be installed or updated from the Microsoft Store. |HTTP|*.dl.delivery.mp.microsoft.com|
 ||The following endpoint is used to get Microsoft Store analytics.|TLSv1.2|manage.devcenter.microsoft.com|
 |Network Connection Status Indicator (NCSI)|||[Learn how to turn off traffic to all of the following endpoint(s).](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-ncsi)|
-||Network Connection Status Indicator (NCSI) detects Internet connectivity and corporate network connectivity status. NCSI sends a DNS request and HTTP query to this endpoint to determine if the device can communicate with the Internet. If you turn off traffic for this endpoint, NCSI won't be able to determine if the device is connected to the Internet and the network status tray icon will show a warning.|HTTPS|www.msftconnecttest.com*|
+||Network Connection Status Indicator (NCSI) detects Internet connectivity and corporate network connectivity status. NCSI sends a DNS request and HTTP query to this endpoint to determine if the device can communicate with the Internet. If you turn off traffic for this endpoint, NCSI won't be able to determine if the device is connected to the Internet and the network status tray icon will show a warning.|HTTP|www.msftconnecttest.com*|
 |Office|The following endpoints are used to connect to the Office 365 portal's shared infrastructure, including Office in a browser. For more info, see Office 365 URLs and IP address ranges. You can turn this off by removing all Microsoft Office apps and the Mail and Calendar apps. If you turn off traffic for these endpoints, users won't be able to save documents to the cloud or see their recently used documents.||[Learn how to turn off traffic to all of the following endpoint(s).](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#26-microsoft-store)|
 |||HTTPS|*ow1.res.office365.com|
 |||HTTPS|office.com|

windows/privacy/windows-endpoints-2004-non-enterprise-editions.md

@@ -84,7 +84,7 @@ The following methodology was used to derive the network endpoints:
 |watson.telemetry.microsoft.com|HTTPS|Diagnostic Data
 |wdcp.microsoft.com|TLSv1.2|Used for Windows Defender when Cloud-based Protection is enabled
 |www.bing.com|TLSv1.2|Used for updates for Cortana, apps, and Live Tiles
-|www.msftconnecttest.com|HTTPS|Network Connection (NCSI)
+|www.msftconnecttest.com|HTTP|Network Connection (NCSI)
 |www.office.com|HTTPS|Microsoft Office
 
 
@@ -144,7 +144,7 @@ The following methodology was used to derive the network endpoints:
 |watson.telemetry.microsoft.com|HTTPS|Diagnostic Data
 |wdcp.microsoft.com|TLSv1.2|Used for Windows Defender when Cloud-based Protection is enabled
 |www.bing.com|TLSv1.2|Used for updates for Cortana, apps, and Live Tiles
-|www.msftconnecttest.com|HTTPS|Network Connection (NCSI)
+|www.msftconnecttest.com|HTTP|Network Connection (NCSI)
 |www.msn.com|HTTPS|Network Connection (NCSI)
 |www.office.com|HTTPS|Microsoft Office
 
@@ -198,6 +198,6 @@ The following methodology was used to derive the network endpoints:
 |wdcp.microsoft.com|TLSv1.2|Used for Windows Defender when Cloud-based Protection is enabled
 |www.bing.com|TLSv1.2|Used for updates for Cortana, apps, and Live Tiles
 |www.microsoft.com|HTTP|Connected User Experiences and Telemetry, Microsoft Data Management service
-|www.msftconnecttest.com|HTTPS|Network Connection (NCSI)
+|www.msftconnecttest.com|HTTP|Network Connection (NCSI)
 |www.office.com|HTTPS|Microsoft Office
 

windows/security/threat-protection/microsoft-defender-atp/configure-endpoints-vdi.md

@@ -30,7 +30,14 @@ ms.date: 04/16/2020
 
 ## Onboard non-persistent virtual desktop infrastructure (VDI) machines
 
-Microsoft Defender ATP supports non-persistent VDI session onboarding. There might be associated challenges when onboarding VDIs. The following are typical challenges for this scenario:
+Microsoft Defender ATP supports non-persistent VDI session onboarding. 
+
+>[!Note]
+>To onboard non-persistent VDI sessions, VDI machines must be on Windows 10.
+>
+>While other Windows versions might work, only Windows 10 is supported.
+
+There might be associated challenges when onboarding VDIs. The following are typical challenges for this scenario:
 
 - Instant early onboarding of a short-lived sessions, which must be onboarded to Microsoft Defender ATP prior to the actual provisioning.
 - The machine name is typically reused for new sessions.