VSTS 12737998

58 files changed, 568 insertions, 12 deletions

diff --git a/README.md b/README.md
index 190349c2..67fc57bd 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,7 @@
+<!---
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=616507
+--->
+
 # Driver samples for Windows 10
 These are the official Microsoft Windows Driver Kit (WDK) team driver code samples for Windows 10. They provide a foundation for Universal Windows driver support of all hardware form factors, from phones to desktop PCs. Use these samples with Visual Studio 2015 and Windows Driver Kit (WDK) 10.
 
diff --git a/audio/sysvad/README.md b/audio/sysvad/README.md
index 9dfc0193..8a5c7709 100644
--- a/audio/sysvad/README.md
+++ b/audio/sysvad/README.md
@@ -1,3 +1,12 @@
+<!---
+    name: SysVAD Virtual Audio Device Driver Sample
+    platform: WDM
+    language: cpp
+    category: Audio
+    description: The Microsoft SysVAD Virtual Audio Device Driver (SYSVAD) shows how to develop a WDM audio driver that exposes support for multiple audio devices.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620183
+--->
+
 SysVAD Virtual Audio Device Driver Sample
 ========================================
 
diff --git a/avstream/avscamera/README.md b/avstream/avscamera/README.md
index e6f79be6..ef956c88 100644
--- a/avstream/avscamera/README.md
+++ b/avstream/avscamera/README.md
@@ -1,3 +1,12 @@
+<!---
+    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/avshws/README.md b/avstream/avshws/README.md
index 240f9b6c..19019304 100644
--- a/avstream/avshws/README.md
+++ b/avstream/avshws/README.md
@@ -1,3 +1,12 @@
+<!---
+    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)
 ==================================================
 
diff --git a/avstream/avssamp/README.md b/avstream/avssamp/README.md
index 6188c5b3..979dda3c 100644
--- a/avstream/avssamp/README.md
+++ b/avstream/avssamp/README.md
@@ -1,3 +1,12 @@
+<!---
+    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)
 =================================================================
 
diff --git a/avstream/samplemft0/README.md b/avstream/samplemft0/README.md
index 7f6e50f6..42f23db4 100644
--- a/avstream/samplemft0/README.md
+++ b/avstream/samplemft0/README.md
@@ -1,3 +1,12 @@
+<!---
+    name: Driver MFT Sample
+    platform: WDM
+    language: cpp
+    category: Camera
+    description: A driver MFT for use with a camera's Windows Store device app.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617126
+--->
+
 Driver MFT Sample
 =================
 
diff --git a/biometrics/README.md b/biometrics/README.md
index 0a366501..102a94b8 100644
--- a/biometrics/README.md
+++ b/biometrics/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Windows Biometric Driver Samples (UMDF Version 1)
+    platform: UMDF1
+    language: cpp
+    category: Security Biometrics
+    description: Contains the Windows Biometric Driver Interface sample and the Windows Biometric Service Adapter samples.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620189
+--->
+
+
 Windows Biometric Driver Samples (UMDF Version 1)
 =================================================
 
diff --git a/bluetooth/bthecho/README.md b/bluetooth/bthecho/README.md
index 6c1a7a2f..be465a7e 100644
--- a/bluetooth/bthecho/README.md
+++ b/bluetooth/bthecho/README.md
@@ -1,3 +1,12 @@
+<!---
+    name: Bluetooth Echo L2CAP Profile Driver
+    platform: WDM
+    language: cpp
+    category: Bluetooth
+    description: Demonstrates development of Bluetooth L2CAP profile drivers using the Bluetooth L2CAP DDIs. 
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617640
+--->
+
 Bluetooth Echo L2CAP Profile Driver
 ===================================
 
diff --git a/bluetooth/serialhcibus/README.md b/bluetooth/serialhcibus/README.md
index 45f56512..9fc965b6 100644
--- a/bluetooth/serialhcibus/README.md
+++ b/bluetooth/serialhcibus/README.md
@@ -1,3 +1,12 @@
+<!---
+    name: Bluetooth Serial HCI Bus Driver
+    platform: WDM
+    language: cpp
+    category: Bluetooth
+    description: Demonstrates how to implement a basic bus driver to support the new Bluetooth Extensibility transport DDIs over the UART transport.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617641
+--->
+
 Bluetooth Serial HCI Bus Driver
 ===============================
 
diff --git a/filesys/cdfs/README.md b/filesys/cdfs/README.md
index 601b22bf..cbe8e4c4 100644
--- a/filesys/cdfs/README.md
+++ b/filesys/cdfs/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: CDFS File System Driver
+    platform: WDM
+    language: cpp
+    category: FileSystem
+    description: The CD-ROM file system driver (cdfs) sample is a file system driver for removable media.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617642
+--->
+
+
 CDFS File System Driver
 =======================
 
diff --git a/filesys/fastfat/README.md b/filesys/fastfat/README.md
index c5ef6b75..801e3f73 100644
--- a/filesys/fastfat/README.md
+++ b/filesys/fastfat/README.md
@@ -1,3 +1,14 @@
+<!---
+    name: fastfat File System Driver
+    platform: WDM
+    language: cpp
+    category: FileSystem
+    description: A file system driver based on the Windows inbox FastFAT file system used as a model for new file systems.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620305
+--->
+
+
+
 fastfat File System Driver
 ==========================
 
diff --git a/filesys/miniFilter/MetadataManager/README.md b/filesys/miniFilter/MetadataManager/README.md
index 6df7bd91..2c56f719 100644
--- a/filesys/miniFilter/MetadataManager/README.md
+++ b/filesys/miniFilter/MetadataManager/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Metadata Manager File System Minifilter Driver
+    platform: WDM
+    language: cpp
+    category: FileSystem
+    description: An example of how to use files for storing metadata that corresponds to minifilters.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617650
+--->
+
+
 Metadata Manager File System Minifilter Driver
 ==============================================
 
diff --git a/filesys/miniFilter/NameChanger/README.md b/filesys/miniFilter/NameChanger/README.md
index 9a2e9929..71b857ef 100644
--- a/filesys/miniFilter/NameChanger/README.md
+++ b/filesys/miniFilter/NameChanger/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: NameChanger File System Minifilter Driver
+    platform: WDM
+    language: cpp
+    category: FileSystem
+    description: Grafts a directory from one part of a volume's namespace to another part using a mapping.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617652
+--->
+
+
 NameChanger File System Minifilter Driver
 =========================================
 
diff --git a/filesys/miniFilter/avscan/README.md b/filesys/miniFilter/avscan/README.md
index 31954fec..d1159670 100644
--- a/filesys/miniFilter/avscan/README.md
+++ b/filesys/miniFilter/avscan/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: AvScan File System Minifilter Driver
+    platform: WDM
+    language: cpp
+    category: FileSystem
+    description: This filter is a transaction-aware file scanner that examines data in files.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617644
+--->
+
+
 AvScan File System Minifilter Driver
 ====================================
 
diff --git a/filesys/miniFilter/cancelSafe/README.md b/filesys/miniFilter/cancelSafe/README.md
index c8cacf28..3e4c7b06 100644
--- a/filesys/miniFilter/cancelSafe/README.md
+++ b/filesys/miniFilter/cancelSafe/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: CancelSafe File System Minifilter Driver
+    platform: WDM
+    language: cpp
+    category: FileSystem
+    description: A minifilter demonstrating the use of cancel-safe queues.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617645
+--->
+
+
 CancelSafe File System Minifilter Driver
 ========================================
 
diff --git a/filesys/miniFilter/cdo/README.md b/filesys/miniFilter/cdo/README.md
index 4f37890f..4a0fb6d9 100644
--- a/filesys/miniFilter/cdo/README.md
+++ b/filesys/miniFilter/cdo/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: CDO File System Minifilter Driver
+    platform: WDM
+    language: cpp
+    category: FileSystem
+    description: An example of using a control device object (CDO) with a minifilter.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=
+--->
+
+
 CDO File System Minifilter Driver
 =================================
 
diff --git a/filesys/miniFilter/change/README.md b/filesys/miniFilter/change/README.md
index 6d541083..3e4af1db 100644
--- a/filesys/miniFilter/change/README.md
+++ b/filesys/miniFilter/change/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Change File System Minifilter Driver
+    platform: WDM
+    language: cpp
+    category: FileSystem
+    description: A transaction-aware filter that monitors file changes in real time.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617647
+--->
+
+
 Change File System Minifilter Driver
 ====================================
 
diff --git a/filesys/miniFilter/ctx/README.md b/filesys/miniFilter/ctx/README.md
index 7609985a..326c9221 100644
--- a/filesys/miniFilter/ctx/README.md
+++ b/filesys/miniFilter/ctx/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Ctx File System Minifilter Driver
+    platform: WDM
+    language: cpp
+    category: FileSystem
+    description: Demonstrates how to attach contexts to instances, files, streams, and stream handles in your minifilter. 
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617648
+--->
+
+
 Ctx File System Minifilter Driver
 =================================
 
diff --git a/filesys/miniFilter/delete/README.md b/filesys/miniFilter/delete/README.md
index ad60db1a..b56eded0 100644
--- a/filesys/miniFilter/delete/README.md
+++ b/filesys/miniFilter/delete/README.md
@@ -1,3 +1,12 @@
+<!---
+    name: Delete File System Minifilter Driver
+    platform: WDM
+    language: cpp
+    category: FileSystem
+    description: Demonstrates how to detect deletions of files or streams.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617649
+--->
+
 Delete File System Minifilter Driver
 ====================================
 
diff --git a/filesys/miniFilter/minispy/README.md b/filesys/miniFilter/minispy/README.md
index ca3749d3..075675b7 100644
--- a/filesys/miniFilter/minispy/README.md
+++ b/filesys/miniFilter/minispy/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Minispy File System Minifilter Driver
+    platform: WDM
+    language: cpp
+    category: FileSystem
+    description: A tool to monitor and log any I/O and transaction activity that occurs in the system.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617651
+--->
+
+
 Minispy File System Minifilter Driver
 =====================================
 
diff --git a/filesys/miniFilter/nullFilter/README.md b/filesys/miniFilter/nullFilter/README.md
index 06d825eb..e0c2ff2e 100644
--- a/filesys/miniFilter/nullFilter/README.md
+++ b/filesys/miniFilter/nullFilter/README.md
@@ -1,3 +1,12 @@
+<!---
+    name: NullFilter File System Minifilter Driver
+    platform: WDM
+    language: cpp
+    category: FileSystem
+    description: A minifilter that demonstrates registration with the filter manager.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617653
+--->
+
 NullFilter File System Minifilter Driver
 ========================================
 
diff --git a/filesys/miniFilter/passThrough/README.md b/filesys/miniFilter/passThrough/README.md
index 91230df5..7400c146 100644
--- a/filesys/miniFilter/passThrough/README.md
+++ b/filesys/miniFilter/passThrough/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: PassThrough File System Minifilter Driver
+    platform: WDM
+    language: cpp
+    category: FileSystem
+    description: Demonstrates how to specify callback functions for different types of I/O requests.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617654
+--->
+
+
 PassThrough File System Minifilter Driver
 =========================================
 
diff --git a/filesys/miniFilter/scanner/README.md b/filesys/miniFilter/scanner/README.md
index 46009e9a..eb9d2bcd 100644
--- a/filesys/miniFilter/scanner/README.md
+++ b/filesys/miniFilter/scanner/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Scanner File System Minifilter Driver
+    platform: WDM
+    language: cpp
+    category: FileSystem
+    description: A file data scanner example. Typically, anti-virus filters are of this type.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617655
+--->
+
+
 Scanner File System Minifilter Driver
 =====================================
 
diff --git a/filesys/miniFilter/simrep/README.md b/filesys/miniFilter/simrep/README.md
index fcf31965..df02b1f5 100644
--- a/filesys/miniFilter/simrep/README.md
+++ b/filesys/miniFilter/simrep/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: SimRep File System Minifilter Driver
+    platform: WDM
+    language: cpp
+    category: FileSystem
+    description: Demonstrates how a file system filter can simulate file-system like reparse-point behavior to redirect a file open to an alternate path.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617656
+--->
+
+
 SimRep File System Minifilter Driver
 ====================================
 
diff --git a/filesys/miniFilter/swapBuffers/README.md b/filesys/miniFilter/swapBuffers/README.md
index e57b38a5..f2c48181 100644
--- a/filesys/miniFilter/swapBuffers/README.md
+++ b/filesys/miniFilter/swapBuffers/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: SwapBuffer File System Minifilter Driver
+    platform: WDM
+    language: cpp
+    category: FileSystem
+    description: Demonstrates how to switch buffers between reads and writes of data. This technique is particularly useful for encryption filters.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617657
+--->
+
+
 SwapBuffer File System Minifilter Driver
 ========================================
 
diff --git a/general/DCHU/README.md b/general/DCHU/README.md
index df571af6..7311db0c 100644
--- a/general/DCHU/README.md
+++ b/general/DCHU/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: DHCU - Driver package installation toolkit for universal drivers 
+    platform: UMDF2
+    language: cpp
+    category: General DHCU
+    description: Illustrates DCHU principles of universal driver design.
+    samplefwlink: https://aka.ms/sceeqq
+--->
+
+
 # Driver package installation toolkit for universal drivers 
 
 This sample illustrates the DCHU principles of universal driver design.  The sample uses the [OSR FX2 learning kit](http://store.osr.com/product/osr-usb-fx2-learning-kit-v2/).  For a detailed code walkthrough, see [Universal Driver Scenarios](https://docs.microsoft.com/windows-hardware/drivers/develop/universal-driver-scenarios).
diff --git a/general/PLX9x5x/README.md b/general/PLX9x5x/README.md
index a706b7d0..e665839b 100644
--- a/general/PLX9x5x/README.md
+++ b/general/PLX9x5x/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: PLX9x5x PCI Driver
+    platform: KMDF
+    language: cpp
+    category: General PCI WDF
+    description: Demonstrates how to write a driver for a generic PCI device using Windows Driver Frameworks (WDF).
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617719
+--->
+
+
 PLX9x5x PCI Driver
 ==================
 
diff --git a/general/SystemDma/wdm/README.md b/general/SystemDma/wdm/README.md
index a077fe8d..ad7d9dbc 100644
--- a/general/SystemDma/wdm/README.md
+++ b/general/SystemDma/wdm/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: System DMA sample
+    platform: WDM
+    language: cpp
+    category: General
+    description: Demonstrates how a driver could use a system DMA controller to write data to a hardware location using V3 System DMA.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617722
+--->
+
+
 System DMA
 ==========
 
diff --git a/general/cancel/README.md b/general/cancel/README.md
index 2a1be648..491ef673 100644
--- a/general/cancel/README.md
+++ b/general/cancel/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Cancel-Safe IRP Queue Sample
+    platform: WDM
+    language: cpp
+    category: General
+    description: Demonstrates the use of the cancel-safe queue routines.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617705
+--->
+
+
 Cancel-Safe IRP Queue Sample
 ============================
 
diff --git a/general/echo/kmdf/README.md b/general/echo/kmdf/README.md
index 3b89850c..2ed4518a 100644
--- a/general/echo/kmdf/README.md
+++ b/general/echo/kmdf/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: KMDF Echo Sample
+    platform: KMDF
+    language: cpp
+    category: General WDF
+    description: Demonstrates how to use a sequential queue to serialize read and write requests presented to the driver.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617706
+--->
+
+
 KMDF Echo Sample
 ================
 
diff --git a/general/echo/umdf/README.md b/general/echo/umdf/README.md
index e2123cd3..af4818d4 100644
--- a/general/echo/umdf/README.md
+++ b/general/echo/umdf/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Echo Sample (UMDF Version 1)
+    platform: UMDF1
+    language: cpp
+    category: General WDF
+    description: Demonstrates how to use UMDF version 1 to write a driver and demonstrates best practices.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617707
+--->
+
+
 Echo Sample (UMDF Version 1)
 ============================
 
diff --git a/general/echo/umdf2/README.md b/general/echo/umdf2/README.md
index ba3ffa36..a9ec9e76 100644
--- a/general/echo/umdf2/README.md
+++ b/general/echo/umdf2/README.md
@@ -1,3 +1,12 @@
+<!---
+    name: Echo Sample (UMDF Version 2)
+    platform: UMDF2
+    language: cpp
+    category: General WDF
+    description: Demonstrates how to use UMDF 2 to write a driver and to employ best practices.  
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617708
+--->
+
 Echo Sample (UMDF Version 2)
 ============================
 
diff --git a/general/echo/umdfSocketEcho/README.md b/general/echo/umdfSocketEcho/README.md
index 06819a47..26cd5a7e 100644
--- a/general/echo/umdfSocketEcho/README.md
+++ b/general/echo/umdfSocketEcho/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: UMDF SocketEcho Sample (UMDF Version 1)
+    platform: UMDF1
+    language: cpp
+    category: General WDF
+    description: Demonstrates how to use UMDF version 1 to write a driver and demonstrates best practices. 
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617709
+--->
+
+
 UMDF SocketEcho Sample (UMDF Version 1)
 =======================================
 
diff --git a/general/event/README.md b/general/event/README.md
index c091af5a..68da1666 100644
--- a/general/event/README.md
+++ b/general/event/README.md
@@ -1,3 +1,13 @@
+<!--- 
+    name: Hardware Event Sample
+    platform: WDM
+    language: cpp
+    category: General
+    description: Demonstrates different ways a kernel-mode driver can notify an application about a hardware event.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617711
+--->
+
+
 Hardware Event Sample
 =====================
 
diff --git a/general/filehistory/README.md b/general/filehistory/README.md
index 3e29b08e..7ed723d8 100644
--- a/general/filehistory/README.md
+++ b/general/filehistory/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: File History Sample
+    platform: WDM
+    language: cpp
+    category: General
+    description: A console application that starts the file history service, if it is stopped, and schedules regular backups.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617712
+--->
+
+
 File History Sample
 ==================
 
diff --git a/general/installwdf/README.md b/general/installwdf/README.md
index 429957d5..df9e8445 100644
--- a/general/installwdf/README.md
+++ b/general/installwdf/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: WDF Installation Package
+    platform: Tool
+    language: cpp
+    category: General WDF
+    description: Demonstrates how to install WDF packages on a system.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617713
+--->
+
+
 WDF Installation Package
 ========================
 
diff --git a/general/ioctl/kmdf/README.md b/general/ioctl/kmdf/README.md
index c9a10365..9c3d80d4 100644
--- a/general/ioctl/kmdf/README.md
+++ b/general/ioctl/kmdf/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Non-PnP Driver Sample
+    platform: KMDF
+    language: cpp
+    category: General WDF
+    description: Demonstrates how to write a non-PnP driver using the Kernel Mode Driver Framework. 
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620307
+--->
+
+
 Non-PnP Driver Sample
 ====================
 
diff --git a/general/ioctl/wdm/README.md b/general/ioctl/wdm/README.md
index fcbf71f2..e9e2e57d 100644
--- a/general/ioctl/wdm/README.md
+++ b/general/ioctl/wdm/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: IOCTL
+    platform: WDM
+    language: cpp
+    category: General
+    description: Demonstrates usage of four different types of IOCTLs
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617715
+--->
+
+
 IOCTL
 =====
 
diff --git a/general/obcallback/README.md b/general/obcallback/README.md
index ca4069a2..37326565 100644
--- a/general/obcallback/README.md
+++ b/general/obcallback/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: ObCallback Callback Registration Driver
+    platform: WDM
+    language: cpp
+    category: General
+    description: Demonstrates the use of registered callbacks for process protection.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617716
+--->
+
+
 ObCallback Callback Registration Driver
 =======================================
 
diff --git a/general/pcidrv/README.md b/general/pcidrv/README.md
index 04bf35b5..2fa15558 100644
--- a/general/pcidrv/README.md
+++ b/general/pcidrv/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: PCIDRV - WDF Driver for PCI Device
+    platform: KMDF
+    language: cpp
+    category: General PCI WDF
+    description: Demonstrates how to write a KMDF driver for a PCI device.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617717
+--->
+
+
 PCIDRV - WDF Driver for PCI Device
 ==================================
 
diff --git a/general/perfcounters/kcs/README.md b/general/perfcounters/kcs/README.md
index 1cbd3ac0..2e7553e5 100644
--- a/general/perfcounters/kcs/README.md
+++ b/general/perfcounters/kcs/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Kernel Counter Sample (Kcs)
+    platform: WDM
+    language: cpp
+    category: General
+    description: Demonstrates the use of the kernel-mode performance library.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617718
+--->
+
+
 Kernel Counter Sample (Kcs)
 ===========================
 
diff --git a/general/registry/regfltr/README.md b/general/registry/regfltr/README.md
index 9e5a0740..40fe7011 100644
--- a/general/registry/regfltr/README.md
+++ b/general/registry/regfltr/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: RegFltr Sample Driver
+    platform: WDM
+    language: cpp
+    category: General
+    description: Demonstrates how to write a registry filter driver. 
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617720
+--->
+
+
 RegFltr Sample Driver
 =====================
 
diff --git a/general/toaster/toastDrv/README.md b/general/toaster/toastDrv/README.md
index 326d40a9..4a29ff7d 100644
--- a/general/toaster/toastDrv/README.md
+++ b/general/toaster/toastDrv/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Toaster Sample Driver
+    platform: KMDF UDMF1
+    language: cpp
+    category: General WDF
+    description: An iterative series of samples that demonstrate KDMF and UDMF1 driver development.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620309
+--->
+
+
 Toaster Sample Driver
 =====================
 The Toaster collection is an iterative series of samples that demonstrate fundamental aspects of Windows driver development for both Kernel-Mode Driver Framework (KMDF) and User-Mode Driver Framework (UMDF) version 1.
diff --git a/general/toaster/toastpkg/README.md b/general/toaster/toastpkg/README.md
index 326d40a9..a4763177 100644
--- a/general/toaster/toastpkg/README.md
+++ b/general/toaster/toastpkg/README.md
@@ -1,5 +1,15 @@
-Toaster Sample Driver
-=====================
+<!---
+    name: Toaster Package Sample Driver
+    platform: WDM
+    language: cpp
+    category: General
+    description: Simulates hardware-first and software-first installation of the toaster sample driver.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617723
+--->
+
+
+Toaster Package Sample Driver
+=============================
 The Toaster collection is an iterative series of samples that demonstrate fundamental aspects of Windows driver development for both Kernel-Mode Driver Framework (KMDF) and User-Mode Driver Framework (UMDF) version 1.
 
 All the samples work with a hypothetical toaster bus, over which toaster devices can be connected to a PC.
diff --git a/general/toaster/umdf2/README.md b/general/toaster/umdf2/README.md
index 9dcdd158..75cf882b 100644
--- a/general/toaster/umdf2/README.md
+++ b/general/toaster/umdf2/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Toaster Sample (UMDF version 2)
+    platform: UMDF2
+    language: cpp
+    category: General WDF
+    description: An iterative series of samples that demonstrate driver development using UMDF version 2.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620310
+--->
+
+
 Toaster Sample (UMDF Version 2)
 ===============================
 The Toaster (UMDF version 2) sample is an iterative series of samples that demonstrate fundamental aspects of Windows driver development.
diff --git a/general/tracing/SystemTraceControl/README.md b/general/tracing/SystemTraceControl/README.md
index eb044ddb..b45ae788 100644
--- a/general/tracing/SystemTraceControl/README.md
+++ b/general/tracing/SystemTraceControl/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: System Trace Control
+    platform: Application
+    language: cpp
+    category: General Tracing
+    description: Demonstrates how to use event tracing control APIs to collect events from the system trace provider.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617725
+--->
+
+
 SystemTraceProvider
 ===================
 
diff --git a/general/tracing/evntdrv/README.md b/general/tracing/evntdrv/README.md
index 4e64ecae..41359ad1 100644
--- a/general/tracing/evntdrv/README.md
+++ b/general/tracing/evntdrv/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Eventdrv
+    platform: Application
+    language: cpp
+    category: General Tracing
+    description: Demonstrates the use of the Event Tracing for Windows (ETW) API in a driver. 
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617724
+--->
+
+
 Eventdrv
 ========
 
diff --git a/general/tracing/tracedriver/README.md b/general/tracing/tracedriver/README.md
index 064fb133..358053a1 100644
--- a/general/tracing/tracedriver/README.md
+++ b/general/tracing/tracedriver/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Tracedrv
+    platform: Application
+    language: cpp
+    category: General Tracing
+    description: A sample driver instrumented for software tracing.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617726
+--->
+
+
 Tracedrv
 ========
 
diff --git a/general/umdfSkeleton/README.md b/general/umdfSkeleton/README.md
index 923f44df..85d384f5 100644
--- a/general/umdfSkeleton/README.md
+++ b/general/umdfSkeleton/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: UMDF Driver Skeleton Sample (UMDF version 1)
+    platform: UDMF1
+    language: cpp
+    category: General WDF
+    description: Demonstrates how to use UDMF to write a minimal driver.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617727
+--->
+
+
 UMDF Driver Skeleton Sample (UMDF Version 1)
 ============================================
 
diff --git a/gpio/samples/README.md b/gpio/samples/README.md
index dcf5ca64..ba05c2f6 100644
--- a/gpio/samples/README.md
+++ b/gpio/samples/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: GPIO Sample Drivers
+    platform: KMDF UMDF1
+    language: cpp
+    category: GPIO
+    description: Illustrates how to write a GPIO controller driver that works in conjunction with the GPIO framework extension (GpioClx).
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617729
+--->
+
+
 GPIO Sample Drivers
 ===================
 
diff --git a/hid/firefly/README.md b/hid/firefly/README.md
index 306d816f..cd526150 100644
--- a/hid/firefly/README.md
+++ b/hid/firefly/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: KMDF filter driver for a HID device
+    platform: KMDF
+    language: cpp
+    category: HID
+    description: Illustrates using remote I/O target interfaces to open a HID collection in kernel-mode and send IOCTL requests to set and get feature reports.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620192
+--->
+
+
 KMDF filter driver for a HID device
 ===================================
 Firefly is a KMDF-based filter driver for a HID device. Along with illustrating how to write a filter driver, this sample shows how to use remote I/O target interfaces to open a HID collection in kernel-mode and send IOCTL requests to set and get feature reports, as well as how an application can use WMI interfaces to send commands to a filter driver.
diff --git a/hid/hclient/README.md b/hid/hclient/README.md
index b98902fe..192f4f90 100644
--- a/hid/hclient/README.md
+++ b/hid/hclient/README.md
@@ -1,3 +1,13 @@
+<!---
+    name:  HClient sample application
+    platform: WDM
+    language: cpp
+    category: HID
+    description: Demonstrates how to write a user-mode client application that communicates with HID devices.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617730
+--->
+
+
 HClient sample application
 ==========================
 
diff --git a/hid/hidusbfx2/README.md b/hid/hidusbfx2/README.md
index bd0b88a9..20eb2001 100644
--- a/hid/hidusbfx2/README.md
+++ b/hid/hidusbfx2/README.md
@@ -1,3 +1,14 @@
+<!---
+    name: HIDUSBFX2 sample driver
+    platform: KMDF
+    language: cpp
+    category: HID
+    description: Demonstrates mapping of a non-HID USB device to a HID device.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620190
+--->
+
+
+
 HIDUSBFX2 sample driver
 =======================
 The HIDUSBFX2 sample driver (hidusbfx2.sys) demonstrates how to map a non-HID USB device to a HID device.
diff --git a/hid/vhidmini2/README.md b/hid/vhidmini2/README.md
index 7679a849..bd6ea894 100644
--- a/hid/vhidmini2/README.md
+++ b/hid/vhidmini2/README.md
@@ -1,4 +1,13 @@
-HID Minidriver Sample (UMDF V2)
+<!---
+    name: HID Minidriver Sample (UMDF version 2)
+    platform: UMDF2
+    language: cpp
+    category: HID
+    description: Demonstrates how to write a HID minidriver using User-Mode Driver Framework (UMDF).
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617731
+--->
+
+HID Minidriver Sample (UMDF version 2)
 ======================================
 The *HID minidriver* sample demonstrates how to write a HID minidriver using User-Mode Driver Framework (UMDF).
 
diff --git a/input/hiddigi/SynapticsTouch/README.md b/input/hiddigi/SynapticsTouch/README.md
index df0347d2..6fb9b5ee 100644
--- a/input/hiddigi/SynapticsTouch/README.md
+++ b/input/hiddigi/SynapticsTouch/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Synaptics Touch Sample
+    platform: KMDF
+    language: cpp
+    category: HID Touch
+    description: Demonstrates how to write a HID miniport driver for the Synaptics 3202 touch controller.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620196
+--->
+
+
 Synaptics Touch Sample
 ======================
 
@@ -17,15 +27,6 @@ Related technologies
 [Windows Pointer Device](http://msdn.microsoft.com/en-us/library/windows/hardware/jj151570)
 
 
-##System requirements
--------------------
-**Client:** Windows 10 Technical Preview
-
-**Server:** Windows 10 Technical Preview
-
-**Phone:**  Windows 10 Technical Preview
-
-
 File Manifest
 -------------
 
diff --git a/input/kbfiltr/README.md b/input/kbfiltr/README.md
index 9942ec40..f570c5cb 100644
--- a/input/kbfiltr/README.md
+++ b/input/kbfiltr/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Keyboard Input WDF Filter Driver (Kbfiltr)
+    platform: KMDF
+    language: cpp
+    category: HID WDF
+    description: A WDF example of a keyboard input filter driver.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620194
+--->
+
+
 Keyboard Input WDF Filter Driver (Kbfiltr)
 ==========================================
 
diff --git a/input/layout/README.md b/input/layout/README.md
index 341c8ade..d998e379 100644
--- a/input/layout/README.md
+++ b/input/layout/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Keyboard Layout Samples
+    platform: Application
+    language: cpp
+    category: HID
+    description: Demonstrates how to generate layouts for various keyboards and locales.
+    samplefwlink: https://aka.ms/rapjms
+--->
+
+
 Keyboard Layout Samples
 =======================
 
diff --git a/input/moufiltr/README.md b/input/moufiltr/README.md
index e0cc32c5..6cf5c585 100644
--- a/input/moufiltr/README.md
+++ b/input/moufiltr/README.md
@@ -1,3 +1,13 @@
+<!---
+    name: Mouse Input WDF Filter Driver (Moufiltr)
+    platform: KMDF
+    language: cpp
+    category: HID WDF
+    description: A WDF example of a mouse input filter driver.
+    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620195
+--->
+
+
 Mouse Input WDF Filter Driver (Moufiltr)
 ========================================
 The Moufiltr sample is an example of a mouse input filter driver.