Merged PR 13406: 12/14 AM Publish

windows/client-management/troubleshoot-stop-errors.md

@@ -101,7 +101,7 @@ The memory dump file is saved at the following locations.
 
 You can use the Microsoft DumpChk (Crash Dump File Checker) tool to verify that the memory dump files are not corrupted or invalid. For more information, see the following video: 
 
->[!video https://www.youtube.com/embed?v=xN7tOfgNKag]
+>[!video https://www.youtube.com/watch?v=xN7tOfgNKag&feature=youtu.be]
 
 
 More information on how to use Dumpchk.exe to check your dump files:

windows/deployment/update/waas-delivery-optimization-reference.txt

@@ -1,23 +0,0 @@
----
-title: Delivery Optimization reference
-description: Delivery Optimization is a new peer-to-peer distribution method in Windows 10
-keywords: oms, operations management suite, wdav, updates, downloads, log analytics
-ms.prod: w10
-ms.mktglfcycl: deploy
-ms.sitesec: library
-author: JaimeO
-ms.localizationpriority: medium
-ms.author: jaimeo
-ms.date: 10/23/2018
----
-
-# Delivery Optimization reference
-
-**Applies to**
-
-- Windows 10
-
-> **Looking for consumer information?** See [Windows Update: FAQ](https://support.microsoft.com/help/12373/windows-update-faq)
-
-There are a great many details you can set in Delivery Optimization to customize it to do just what you need it to. This topic summarizes them for your reference.
-

windows/deployment/update/waas-delivery-optimization-setup.md

@@ -1,42 +0,0 @@
----
-title: Set up Delivery Optimization
-description: Delivery Optimization is a new peer-to-peer distribution method in Windows 10
-keywords: oms, operations management suite, wdav, updates, downloads, log analytics
-ms.prod: w10
-ms.mktglfcycl: deploy
-ms.sitesec: library
-author: JaimeO
-ms.localizationpriority: medium
-ms.author: jaimeo
-ms.date: 10/23/2018
----
-
-# Set up Delivery Optimization for Windows 10 updates
-
-**Applies to**
-
-- Windows 10
-
-> **Looking for consumer information?** See [Windows Update: FAQ](https://support.microsoft.com/help/12373/windows-update-faq)
-
-## Plan to use Delivery Optimization
-
-general guidelines + “recommended policies” chart
-
-
-## Implement Delivery Optimization
-[procedural-type material; go here, click this]
-
-### Peer[?] topology (steps for setting up Group download mode)
-
-
-### Hub and spoke topology (steps for setting up peer selection)
-
-
-## Monitor Delivery Optimization
-how to tell if it’s working? What values are reasonable; which are not? If not, which way to adjust and how?
-
-### Monitor w/ PS
-
-### Monitor w/ Update Compliance
-

windows/deployment/update/waas-delivery-optimization.md

@@ -1,5 +1,5 @@
 ---
-title: Delivery Optimization for Windows 10 updates (Windows 10)
+title: Configure Delivery Optimization for Windows 10 updates (Windows 10)
 description: Delivery Optimization is a new peer-to-peer distribution method in Windows 10
 keywords: oms, operations management suite, wdav, updates, downloads, log analytics
 ms.prod: w10
@@ -8,10 +8,10 @@ ms.sitesec: library
 author: JaimeO
 ms.localizationpriority: medium
 ms.author: jaimeo
-ms.date: 10/23/2018
+ms.date: 04/30/2018
 ---
 
-# Delivery Optimization for Windows 10 updates
+# Configure Delivery Optimization for Windows 10 updates
 
 
 **Applies to**
@@ -20,14 +20,15 @@ ms.date: 10/23/2018
 
 > **Looking for consumer information?** See [Windows Update: FAQ](https://support.microsoft.com/help/12373/windows-update-faq) 
 
-Delivery Optimization reduces the bandwidth needed to download Windows updates and applications by sharing the work of downloading these packages among multiple devices in your deployment. It does this by using a self-organizing distributed cache that allows clients to download those packages from alternate sources (such as other peers on the network) in addition to the traditional Internet-based Windows Update servers.
+Windows updates, upgrades, and applications can contain packages with very large files. Downloading and distributing updates can consume quite a bit of network resources on the devices receiving them. You can use Delivery Optimization to reduce bandwidth consumption by sharing the work of downloading these packages among multiple devices in your deployment. Delivery Optimization can accomplish this because it is a self-organizing distributed cache that allows clients to download those packages from alternate sources (such as other peers on the network) in addition to the traditional Internet-based Windows Update servers. You can use Delivery Optimization in conjunction with stand-alone Windows Update, Windows Server Update Services (WSUS), Windows Update for Business, or System Center Configuration Manager when installation of Express Updates is enabled.  
 
-You can use Delivery Optimization in conjunction with standalone Windows Update, Windows Server Update Services (WSUS), Windows Update for Business, or System Center Configuration Manager (when installation of Express Updates is enabled).  
+Delivery Optimization is a cloud-managed solution. Access to the Delivery Optimization cloud services is a requirement. This means that in order to use the peer-to-peer functionality of Delivery Optimization, devices must have access to the internet.
 
-To take advantage of Delivery Optimization, you'll need the following:
 
-- The devices being updated must have access to the internet.
+>[!NOTE]
-- The devices must be running at least these minimum versions:
+>WSUS can also use [BranchCache](waas-branchcache.md) for content sharing and caching. If Delivery Optimization is enabled on devices that use BranchCache, Delivery Optimization will be used instead. 
+
+The following table lists the minimum Windows 10 version that supports Delivery Optimization:
 
 | Device type | Minimum Windows version |
 |------------------|---------------|
@@ -36,11 +37,10 @@ To take advantage of Delivery Optimization, you'll need the following:
 | IoT devices | 1803 |
 | HoloLens devices | 1803 |
 
- In Windows 10 Enterprise and Education editions, Delivery Optimization allows peer-to-peer sharing on the organization's own network only, but you can configure it differently in Group Policy and mobile device management (MDM) solutions such as Microsoft Intune. These options are detailed in [Download mode](#download-mode).
 
->[!NOTE]
+By default in Windows 10 Enterprise and Education editions, Delivery Optimization allows peer-to-peer sharing on the organization's own network only, but you can configure it differently in Group Policy and mobile device management (MDM) solutions such as Microsoft Intune.
->WSUS can also use [BranchCache](waas-branchcache.md) for content sharing and caching. If Delivery Optimization is enabled on devices that use BranchCache, Delivery Optimization will be used instead. 
 
+For more details, see [Download mode](#download-mode).
 
 ## Delivery Optimization options