6 files changed, 25 insertions, 106 deletions
diff --git a/avstream/avscamera/README.md b/avstream/avscamera/README.md
index 51f3353d..da8e8d65 100644
--- a/avstream/avscamera/README.md
+++ b/avstream/avscamera/README.md
@@ -9,16 +9,6 @@ products:
 - windows-wdk
 ---
 
-
-<!---
-    name: AvsCamera - AVStream Camera Sample Driver
-    platform: WDM
-    language: cpp
-    category: Camera AVStream
-    description: Provides a pin-centric AVStream capture driver for a simulated front and back camera that performs simulated captures at 320x240 or 640x480 in RGB24, RGB32, YUY2 and NV12 formats at various frame rates.
-    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620184
---->
-
 # AvsCamera - AVStream Camera Sample Driver
 
 The AvsCamera sample provides a pin-centric AVStream capture driver for a simulated front and back camera. The driver performs simulated captures at 320x240 or 640x480 in RGB24, RGB32, YUY2 and NV12 formats at various frame rates. The purpose of the sample is to demonstrate how to write a fully functional AVStream camera driver.
diff --git a/avstream/avscamera/mft0/README.md b/avstream/avscamera/mft0/README.md
deleted file mode 100644
index eaee3bdf..00000000
--- a/avstream/avscamera/mft0/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-page_type: sample
-description: "Provides a pin-centric AVStream capture driver for a simulated front and back camera that performs simulated captures."
-languages:
-- cpp
-products:
-- windows
-- windows-wdk
----
-
-
-<!---
-    name: AvsCamera - AVStream Camera Sample Driver
-    platform: WDM
-    language: cpp
-    category: Camera AVStream
-    description: Provides a pin-centric AVStream capture driver for a simulated front and back camera that performs simulated captures at 320x240 or 640x480 in RGB24, RGB32, YUY2 and NV12 formats at various frame rates.
-    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620184
---->
-
-# AvsCamera: AVStream Camera Sample Driver
-
-The AvsCamera sample provides a pin-centric AVStream capture driver for a simulated front and back camera. The driver performs simulated captures at 320x240 or 640x480 in RGB24, RGB32, YUY2 and NV12 formats at various frame rates. The purpose of the sample is to demonstrate how to write a fully functional AVStream camera driver.
-
-This sample features strong parameter validation and overflow detection.  It provides validation and simulation logic for all advanced camera controls in the CCaptureFilter class.  A real camera driver would replace the filter automation table and CSensor and CSynthesizer class hierarchies to produce a new camera driver.
-
-The sample comes with its own MFT0 called AvsCameraMft0.dll.  This MFT0 is used to parse metadata supplied in the AvsCamera driver samples.  The metadata communications from the driver is primarily a private channel to its MFT0.  The MFT0 is responsible for reformatting that information for the capture pipeline.
-
-## Universal Windows Driver Compliant
-
-This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.  The sample works on 32-bit and 64-bit x86, amd64 and arm platforms.  Once installed, the simulated camera should show in the Windows Inbox camera app.
-
-## Building the sample
-
-The AvsCamera sample can be built by opening the AvsCamera.sln solution file. A successful build produces AvsCamera.sys, AvsCameraMft0.dll, AvsCamera.inf and AvsCamera.cat.
diff --git a/avstream/avshws/README.md b/avstream/avshws/README.md
index a67f71ca..49bb9e04 100644
--- a/avstream/avshws/README.md
+++ b/avstream/avshws/README.md
@@ -8,18 +8,9 @@ products:
 - windows-wdk
 ---
 
-<!---
-    name: AVStream simulated hardware sample driver (Avshws)
-    platform: WDM
-    language: cpp
-    category: Camera
-    description: A simulated hardware sample driver providing a pin-centric capture driver to simulate AV capture hardware.
-    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620185
---->
-
 # AVStream simulated hardware sample driver (Avshws)
 
-The AVStream simulated hardware sample driver (Avshws) provides a pin-centric [AVStream](http://msdn.microsoft.com/library/windows/hardware/ff554240) capture driver for a simulated piece of hardware. This streaming media driver performs video captures at 320 x 240 pixels in either RGB24 or YUV422 format using direct memory access (DMA) into capture buffers. The purpose of the sample is to demonstrate how to write a pin-centric AVStream minidriver. The sample also shows how to implement DMA by using the related functionality provided by the AVStream class driver.
+The AVStream simulated hardware sample driver (Avshws) provides a pin-centric [AVStream](https://docs.microsoft.com/windows-hardware/drivers/stream/avstream-overview) capture driver for a simulated piece of hardware. This streaming media driver performs video captures at 320 x 240 pixels in either RGB24 or YUV422 format using direct memory access (DMA) into capture buffers. The purpose of the sample is to demonstrate how to write a pin-centric AVStream minidriver. The sample also shows how to implement DMA by using the related functionality provided by the AVStream class driver.
 
 This sample features enhanced parameter validation and overflow detection.
 
@@ -27,9 +18,9 @@ This sample features enhanced parameter validation and overflow detection.
 
 After you've installed the sample on your host computer, run Visual Studio, and from the **File** menu, select **Open**, then **Project/Solution...**, navigate to the directory where you've copied the Avshws sample, then to the C++ folder, and select **avshws.vcxproj** (the VC++ Project).
 
-In the **Solution Explorer** pane in Visual Studio, at the top is **Solution 'avshws'**. Right-click this and select **Configuration Manager**. Follow the instructions in [Building a Driver with the WDK](http://msdn.microsoft.com/library/windows/hardware/ff554644) to set the platform, operating system, and debug configuration you want to use, and to build the sample. This sample project will automatically sign the driver package.
+In the **Solution Explorer** pane in Visual Studio, at the top is **Solution 'avshws'**. Right-click this and select **Configuration Manager**. Follow the instructions in [Building a Driver with Visual Studio and the WDK](https://docs.microsoft.com/windows-hardware/drivers/develop/building-a-driver) to set the platform, operating system, and debug configuration you want to use, and to build the sample. This sample project will automatically sign the driver package.
 
-Provision your target computer using instructions in, for example, [Preparing a Computer for Provisioning](http://msdn.microsoft.com/library/windows/hardware/dn265573). Ensure that in the **Network and Sharing Center** control panel your target computer has **Network Discovery** and **File and Printer Sharing** enabled.
+Provision your target computer using instructions in, for example, [Provision a computer for driver deployment and testing](https://docs.microsoft.com/windows-hardware/drivers/gettingstarted/provision-a-target-computer-wdk-8-1). Ensure that in the **Network and Sharing Center** control panel your target computer has **Network Discovery** and **File and Printer Sharing** enabled.
 
 ## Deploy the driver to the target computer
 
diff --git a/avstream/avssamp/README.md b/avstream/avssamp/README.md
index ec11091b..42f0d393 100644
--- a/avstream/avssamp/README.md
+++ b/avstream/avssamp/README.md
@@ -8,15 +8,6 @@ products:
 - windows-wdk
 ---
 
-<!---
-    name: AVStream filter-centric simulated capture sample driver (Avssamp)
-    platform: WDM
-    language: cpp
-    category: Camera
-    description: An AVStream filter-centric simulated capture sample driver with functional audio.
-    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620186
---->
-
 # AVStream filter-centric simulated capture sample driver (Avssamp)
 
 The AVStream filter-centric simulated capture sample driver (Avssamp) provides a filter-centric [AVStream](https://docs.microsoft.com/windows-hardware/drivers/stream/avstream-overview) capture driver with functional audio. This streaming media driver performs video captures at 320 x 240 pixel resolution in RGB24 or YUV422 format while playing a user-provided Pulse Code Modulation (PCM) wave audio file in a loop. The sample demonstrates how to write a filter-centric AVStream minidriver.
diff --git a/avstream/sampledevicemft/README.md b/avstream/sampledevicemft/README.md
index 17f163db..05367d11 100644
--- a/avstream/sampledevicemft/README.md
+++ b/avstream/sampledevicemft/README.md
@@ -8,40 +8,29 @@ products:
 - windows-wdk
 ---
 
-
-<!---
-    name: Driver Device Transform Sample
-    platform: WDM
-    language: cpp
-    category: Camera
-    description: A driver device transform which loads in a process streaming an Avstream based camera device using Media Foundation.
-    samplefwlink: https://go.microsoft.com/fwlink/?linkid=866747
---->
-
 # Driver Device Transform Sample
 
-Illustrative example for a *Driver Device Transform* which loads in a process streaming an Avstream based camera device using Media Foundation. 
+Illustrative example for a *Driver Device Transform* which loads in a process streaming an Avstream based camera device using Media Foundation.
 
-A *Driver Device Transform* is a new kind of a transform that's used with a specific camera when capturing video. The *Driver Device Transform* is also known as DeviceMFT because it is the first Device Transform applied to the video source. This *Driver Device Transform* is an alternative to the Driver MFT i.e. MFT0  in that, it caters to the source rather than the streams . An N stream source supporting DeviceMFT will have a single instance of the *Device Driver Transform* loaded, while MFT0 will have *N* instances for each pipeline process. The DeviceMFT can advertise multiple streams at the output, which can differ from the number of streams advertised by the source. This is analogous to having a user mode driver in the MF pipeline which intercepts and processes commands before they enter/ leave the Kernel mode driver loaded for the streaming source.
+A *Driver Device Transform* is a new kind of a transform that's used with a specific camera when capturing video. The *Driver Device Transform* is also known as DeviceMFT because it is the first Device Transform applied to the video source. This *Driver Device Transform* is an alternative to the Driver MFT, for example, MFT0  in that it caters to the source rather than the streams. An N stream source supporting DeviceMFT will have a single instance of the *Device Driver Transform* loaded, while MFT0 will have *N* instances for each pipeline process. The DeviceMFT can advertise multiple streams at the output, which can differ from the number of streams advertised by the source. This is analogous to having a user mode driver in the MF pipeline which intercepts and processes commands before they enter/ leave the Kernel mode driver loaded for the streaming source.
 
-In this sample, the Device Transform , when enabled, will replicate a photo sequence in the user mode from a one pin device . It acts as a passthrough for sources exposing more than one pins. 
+In this sample, the Device Transform, when enabled, will replicate a photo sequence in the user mode from a one pin device. It acts as a passthrough for sources exposing more than one pins.
 
 This sample is designed to be used with a specific camera. To run the sample, you need the your camera's device ID and device metadata package.
 
-Related topics
---------------
+## Related topics
 
-**Concepts**
+### Concepts
 
-[UWP device apps for cameras](http://go.microsoft.com/fwlink/p/?LinkId=306683)
+[UWP device apps for cameras](https://docs.microsoft.com/windows-hardware/drivers/devapps/uwp-device-apps-for-webcams)
 
-[Media Foundation Transforms](http://msdn.microsoft.com/en-us/library/windows/hardware/ms703138)
+[Media Foundation Transforms](https://docs.microsoft.com/windows/win32/medfound/media-foundation-transforms)
 
-[Roadmap for Developing Streaming Media Drivers](http://msdn.microsoft.com/en-us/library/windows/hardware/ff568130)
+[Streaming media device driver design guide](https://docs.microsoft.com/windows-hardware/drivers/stream)
 
-[Universal camera driver design guide for Windows 10](https://msdn.microsoft.com/en-us/Library/Windows/Hardware/dn937080)
+[Universal camera driver design guide for Windows 10](https://docs.microsoft.com/windows-hardware/drivers/stream/windows-10-technical-preview-camera-drivers-design-guide)
 
-**Samples**
+### Samples
 
 [Device app for camera sample](http://go.microsoft.com/fwlink/p/?linkid=249442)
 
diff --git a/avstream/samplemft0/README.md b/avstream/samplemft0/README.md
index 3d4f8444..0ea52c91 100644
--- a/avstream/samplemft0/README.md
+++ b/avstream/samplemft0/README.md
@@ -8,38 +8,31 @@ products:
 - windows-wdk
 ---
 
-
-<!---
-    name: Driver MFT Sample
-    platform: WDM
-    language: cpp
-    category: Camera
-    description: A driver MFT for use with a camera's UWP device app.
-    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617126
---->
-
 # Driver MFT Sample
 
 Provides a *driver MFT* for use with a camera's UWP device app.A *driver MFT* is a Media Foundation Transform that's used with a specific camera when capturing video. The driver MFT is also known as MFT0 because it is the first MFT applied to the video stream captured from the camera. This MFT can provide a video effect or other processing when capturing photos or video from the camera. It can be distributed along with the driver package for a camera.
 
-In this sample, the driver MFT, when enabled, replaces a portion of the captured video with a green box. To test this sample, download the [UWP device app for camera sample](http://go.microsoft.com/fwlink/p/?linkid=249442) and the [Camera Capture UI sample](http://go.microsoft.com/fwlink/p/?linkid=249441). The [UWP device app for camera sample](http://go.microsoft.com/fwlink/p/?linkid=249442) provides a *UWP device app* that controls the effect implemented by the driver MFT. The [Camera Capture UI sample](http://go.microsoft.com/fwlink/p/?linkid=249441) provides a way to invoke the *UWP device app*.
+In this sample, the driver MFT, when enabled, replaces a portion of the captured video with a green box. To test this sample, download the [UWP device app for camera sample](http://go.microsoft.com/fwlink/p/?linkid=249442) and the [Camera Capture UI sample](http://go.microsoft.com/fwlink/p/?linkid=249441).
+
+The **UWP device app for camera sample** provides a *UWP device app* that controls the effect implemented by the driver MFT.
+
+The **Camera Capture UI sample** provides a way to invoke the **UWP device app**.
 
 This sample is designed to be used with a specific camera. To run the sample, you need the your camera's device ID and device metadata package.
 
-Related topics
---------------
+## Related topics
 
-**Concepts**
+### Concepts
 
-[UWP device apps for cameras](http://go.microsoft.com/fwlink/p/?LinkId=306683)
+[UWP device apps for cameras](https://docs.microsoft.com/windows-hardware/drivers/devapps/uwp-device-apps-for-webcams)
 
-[Media Foundation Transforms](http://msdn.microsoft.com/en-us/library/windows/hardware/ms703138)
+[Media Foundation Transforms](https://docs.microsoft.com/windows/win32/medfound/media-foundation-transforms)
 
-[Roadmap for Developing Streaming Media Drivers](http://msdn.microsoft.com/en-us/library/windows/hardware/ff568130)
+[Streaming media device driver design guide](https://docs.microsoft.com/windows-hardware/drivers/stream)
 
-[Universal camera driver design guide for Windows 10](https://msdn.microsoft.com/en-us/Library/Windows/Hardware/dn937080)
+[Universal camera driver design guide for Windows 10](https://docs.microsoft.com/windows-hardware/drivers/stream/windows-10-technical-preview-camera-drivers-design-guide)
 
-**Samples**
+### Samples
 
 [Device app for camera sample](http://go.microsoft.com/fwlink/p/?linkid=249442)