Update README.md for samples portal (#358)

* Update README.md for samples portal

* Update README.md for samples portal

* Removed installwdf

* Update fork (#2)

* Fix typo

ture -> true

* Remove InstallWdf sample

* Fix typo (#340)

ture -> true

* Readme typo fix (#349)

* Update langid

40 files changed, 217 insertions, 286 deletions

diff --git a/network/config/bindview/README.md b/network/config/bindview/README.md
index b239b700..1f168493 100644
--- a/network/config/bindview/README.md
+++ b/network/config/bindview/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: Bindview Network Configuration Utility
+description: An application that demonstrates how to use INetCfg APIs to enumerate, install, uninstall, bind and unbind network components.
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: Bindview Network Configuration Utility
     platform: Application
@@ -7,11 +17,8 @@
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617732
 --->
 
-
-Bindview Network Configuration Utility
-======================================
+# Bindview Network Configuration Utility
 
 The Bindview sample demonstrates how to use INetCfg APIs to enumerate, install, uninstall, bind and unbind network components.
 
 For more information on the INetCfg interface, see [Network Configuration Interfaces](http://msdn.microsoft.com/en-us/library/windows/hardware/ff559080).
-
diff --git a/network/config/bindview/network-config-bindview.yml b/network/config/bindview/network-config-bindview.yml
deleted file mode 100644
index a43c64bf..00000000
--- a/network/config/bindview/network-config-bindview.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: Bindview Network Configuration Utility
-  description: An application that demonstrates how to use INetCfg APIs to enumerate, install, uninstall, bind and unbind network components.
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /network/config/bindview/bindview.sln
diff --git a/network/modem/fakemodem/README.md b/network/modem/fakemodem/README.md
index 3734a95a..b202d8a3 100644
--- a/network/modem/fakemodem/README.md
+++ b/network/modem/fakemodem/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: Fakemodem Driver
+description: Demonstrates a simple controller-less modem driver.
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: Fakemodem Driver
     platform: KMDF
@@ -7,11 +17,10 @@
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617733
 --->
 
-Fakemodem Driver
-================
+# Fakemodem Driver
 
 The Fakemodem sample demonstrates a simple controller-less modem driver. This driver supports sending and receiving AT commands using the `ReadFile`/`WriteFile` calls or via a TAPI interface using an application such as *HyperTerminal.*
 
 ## Universal Windows Driver Compliant
-This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
+This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
diff --git a/network/modem/fakemodem/network-modem-fakemodem.yml b/network/modem/fakemodem/network-modem-fakemodem.yml
deleted file mode 100644
index ac15da5c..00000000
--- a/network/modem/fakemodem/network-modem-fakemodem.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: Fakemodem Driver
-  description: Demonstrates a simple controller-less modem driver.
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /network/modem/fakemodem/fakemodem.sln
diff --git a/network/ndis/extension/README.md b/network/ndis/extension/README.md
index df154559..ee57d16b 100644
--- a/network/ndis/extension/README.md
+++ b/network/ndis/extension/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: Hyper-V Extensible Switch extension filter driver
+description: A base library used to implement a Hyper-V Extensible Switch extension filter driver.
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: Hyper-V Extensible Switch extension filter driver
     platform: WDM
@@ -7,9 +17,7 @@
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617913
 --->
 
-
-Hyper-V Extensible Switch extension filter driver
-=================================================
+# Hyper-V Extensible Switch extension filter driver
 
 This sample contains a base library used to implement a Hyper-V Extensible Switch extension filter driver. This sample also contains two different extension filter drivers that were developed by using the library.
 
@@ -21,11 +29,8 @@ MsPassthroughExt is a basic filtering extension filter driver that is implemente
 
 MsForwardExt is a basic forwarding extension filter driver that is implemented by using *SxBase.lib*. MsForwardExt uses basic MAC forwarding and custom switch policy to allow sends from given MAC addresses. This forwarding sample implements Hybrid Forwarding, which means that the destination table is not populated by this sample if the packet is flagged as a Hyper-V Network Virtualization (HNV) packet. HNV flagged packets' destination tables are computed by the vSwitch HNV policies instead. If this extension filter driver is unconfigured, it will block sends from all VMs, but will maintain connectivity to the host. Each switch policy, which is defined in *MsForwardExtPolicy.mof*, is a MAC address. Applying a switch policy to MsForwardExt allows packets to be sent from the MAC address that is defined in the policy.
 
-
-Installation
-------------
+## Installation
 
 Use the *install.cmd* script provided with each extension filter driver. The *install.cmd* uses **netcfg** to install the extension and **mofcomp** to register any required mof files. The PowerShell cmdlet *Enable-VmSwitchExtension* can then be used to enable the extension filter driver on a Hyper-V Extensible Switch.
 
 For more information on Hyper-V Extensible Switch extensions, see [Hyper-V Extensible Switch](http://msdn.microsoft.com/en-us/library/windows/hardware/hh598161).
-
diff --git a/network/ndis/extension/network-ndis-extension.yml b/network/ndis/extension/network-ndis-extension.yml
deleted file mode 100644
index 0494f22b..00000000
--- a/network/ndis/extension/network-ndis-extension.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: Hyper-V Extensible Switch extension filter driver
-  description: A base library used to implement a Hyper-V Extensible Switch extension filter driver.
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /network/ndis/extension/extensions.sln
diff --git a/network/ndis/filter/README.md b/network/ndis/filter/README.md
index 274287bc..a5e41f19 100644
--- a/network/ndis/filter/README.md
+++ b/network/ndis/filter/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: NDIS 6.0 Filter Driver
+description: A pass-through NDIS 6 filter driver demonstrating the basic principles of an NDIS 6.0 Filter driver.
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: NDIS 6.0 Filter Driver
     platform: WDM
@@ -7,15 +17,12 @@
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617915
 --->
 
-
-NDIS 6.0 Filter Driver
-======================
+# NDIS 6.0 Filter Driver
 
 The Ndislwf sample is a do-nothing pass-through NDIS 6 filter driver that demonstrates the basic principles underlying an NDIS 6.0 Filter driver. The sample replaces the NDIS 5 Sample Intermediate Driver (Passthru driver).
 
 Although this sample filter driver is installed as a modifying filter driver, it doesn't modify any packets; it only repackages and sends down all OID requests. You can modify this filter driver to change packets before passing them along. Or you can use the filter to originate new packets to send or receive. For example, the filter could encrypt/compress outgoing and decrypt/decompress incoming data.
 
-
 For more information, see [NDIS Filter Drivers](http://msdn.microsoft.com/en-us/library/windows/hardware/ff565492) in the network devices design guide.
 
 
diff --git a/network/ndis/filter/network-ndis-filter.yml b/network/ndis/filter/network-ndis-filter.yml
deleted file mode 100644
index cef3ec90..00000000
--- a/network/ndis/filter/network-ndis-filter.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: NDIS 6.0 Filter Driver
-  description: A pass-through NDIS 6 filter driver demonstrating the basic principles of an NDIS 6.0 Filter driver.
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /network/ndis/filter/filter.sln
diff --git a/network/ndis/mux/README.md b/network/ndis/mux/README.md
index cf9a112c..f9086d39 100644
--- a/network/ndis/mux/README.md
+++ b/network/ndis/mux/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: NDIS MUX Intermediate Driver and Notify Object
+description: An NDIS 6.0 driver that demonstrates the operation of an N:1 MUX driver.
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: NDIS MUX Intermediate Driver and Notify Object
     platform: WDM
@@ -7,9 +17,7 @@
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617916
 --->
 
-
-NDIS MUX Intermediate Driver and Notify Object
-==============================================
+# NDIS MUX Intermediate Driver and Notify Object
 
 The MUX Intermediate Miniport (IM) driver is an NDIS 6.0 driver that demonstrates the operation of an "N:1" MUX driver.The sample demonstrates creating multiple virtual network devices on top of a single lower adapter. Protocols bind to these virtual adapters as if they are real adapters. Examples of Intermediate Miniport drivers that can use this framework are Virtual LAN (VLAN) drivers. Included in the project is a sample Notify Object that demonstrates how to write a notify object for installing and configuring an NDIS MUX intermediate miniport (IM) driver that implements an N:1 relationship between upper and lower bindings, for example, it creates multiple virtual network devices on top of a single lower adapter. Protocols bind to these virtual adapters as if they are real adapters. Examples of Intermediate Miniport drivers that can use this type of notify object are Virtual LAN (VLAN) drivers.
 
diff --git a/network/ndis/mux/network-ndis-mux.yml b/network/ndis/mux/network-ndis-mux.yml
deleted file mode 100644
index d3dfdc31..00000000
--- a/network/ndis/mux/network-ndis-mux.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: NDIS MUX Intermediate Driver and Notify Object
-  description: An NDIS 6.0 driver that demonstrates the operation of an N:1 MUX driver.
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /network/ndis/mux/mux.sln
diff --git a/network/ndis/ndisprot/6x/README.md b/network/ndis/ndisprot/6x/README.md
index 211a8721..31afd6b9 100644
--- a/network/ndis/ndisprot/6x/README.md
+++ b/network/ndis/ndisprot/6x/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: NDIS Connection-less Protocol WDM Driver Sample
+description: Demonstrates a connection-less NDIS 6.0 protocol WDM driver.
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: NDIS Connection-less Protocol WDM Driver Sample
     platform: WDM
@@ -7,13 +17,11 @@
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617917
 --->
 
-
-NDIS Connection-less Protocol WDM Driver Sample
-===============================================
+# NDIS Connection-less Protocol WDM Driver Sample
 
 This sample demonstrates a connection-less NDIS 6.0 protocol WDM driver. The driver supports sending and receiving raw Ethernet frames using `ReadFile`/`WriteFile` calls from user-mode. It only receives frames with a specific EtherType field. As an NDIS protocol, it illustrates how to establish and tear down bindings to Ethernet adapters, i.e. those that export medium type **NdisMedium802\_3**. It shows how to set a packet filter, send and receive data, and handle plug-and-play events.
 
-### INSTALLATION
+## Installation
 
 The driver is installed using the INF file ndisprot.inf, which is provided in the driver directory. In Network Connections UI, select an adapter and open **Properties.**
 
@@ -21,7 +29,7 @@ Click **Install**, then **Protocol**, then **Add**, and then **Have disk**. Then
 
 Select **Sample NDIS Protocol Driver** and click **OK**. After installing the protocol, copy over the test application prottest.exe to a convenient location. Please note that the driver service has been set to manual start in the INF file. As a result, it doesn't get loaded automatically when you install.
 
-### Usage
+## Usage
 
 To start the driver, type **Net start ndisprot**.
 
@@ -54,7 +62,7 @@ Use the **-e** option to enumerate all devices to which NDISPROT is bound:
 
 For more information, see [NDIS Protocol Drivers](http://msdn.microsoft.com/en-us/library/windows/hardware/ff566821) in the network devices design guide.
 
-### File Manifest
+## File Manifest
 
 File | Description 
 -----|------------
@@ -69,5 +77,3 @@ ntdisp.c | NT Entry points and dispatch routines for NDISPROT
 protuser.h | IOCTL and associated structure definitions 
 recv.c | NDIS protocol entry points for receiving data, and IRP_MJ_READ processing 
 send.c | NDIS protocol routines for sending data, and IRP_MJ_WRITE processing 
-
-
diff --git a/network/ndis/ndisprot/6x/network-ndis-ndisprot-6x.yml b/network/ndis/ndisprot/6x/network-ndis-ndisprot-6x.yml
deleted file mode 100644
index 657790e4..00000000
--- a/network/ndis/ndisprot/6x/network-ndis-ndisprot-6x.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: NDIS Connection-less Protocol WDM Driver Sample
-  description: Demonstrates a connection-less NDIS 6.0 protocol WDM driver.
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /network/ndis/ndisprot/6x/ndisprot60.sln
diff --git a/network/ndis/ndisprot_kmdf/README.md b/network/ndis/ndisprot_kmdf/README.md
index 0f2ceb23..bbe1b812 100644
--- a/network/ndis/ndisprot_kmdf/README.md
+++ b/network/ndis/ndisprot_kmdf/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: Connection-less NDIS 6.0 Protocol KMDF Sample Driver
+description: Demonstrates a connection-less NDIS 6.0 protocol KMDF driver.
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: Connection-less NDIS 6.0 Protocol KMDF Sample Driver
     platform: KMDF
@@ -7,9 +17,7 @@
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620197
 --->
 
-
-Connection-less NDIS 6.0 Protocol KMDF Sample Driver
-====================================================
+# Connection-less NDIS 6.0 Protocol KMDF Sample Driver
 
 This sample demonstrates a connection-less NDIS 6.0 protocol KMDF driver.
 
diff --git a/network/ndis/ndisprot_kmdf/network-ndis-ndisprot-kmdf.yml b/network/ndis/ndisprot_kmdf/network-ndis-ndisprot-kmdf.yml
deleted file mode 100644
index 129a1693..00000000
--- a/network/ndis/ndisprot_kmdf/network-ndis-ndisprot-kmdf.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: Connection-less NDIS 6.0 Protocol KMDF Sample Driver
-  description: Demonstrates a connection-less NDIS 6.0 protocol KMDF driver.
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /network/ndis/ndisprot_kmdf/ndisprot_kmdf.sln
diff --git a/network/ndis/netvmini/6x/README.md b/network/ndis/netvmini/6x/README.md
index 023e1674..8235ee35 100644
--- a/network/ndis/netvmini/6x/README.md
+++ b/network/ndis/netvmini/6x/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: NDIS Virtual Miniport Driver
+description: Demonstrates the functionality of an NDIS miniport driver without requiring a physical network adapter.
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: NDIS Virtual Miniport Driver
     platform: WDM
@@ -7,9 +17,7 @@
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617918
 --->
 
-
-NDIS Virtual Miniport Driver
-============================
+# NDIS Virtual Miniport Driver
 
 The NDIS Virtual Miniport Driver sample illustrates the functionality of an NDIS miniport driver without requiring a physical network adapter.
 
@@ -22,4 +30,3 @@ To test the miniport driver, install more than one miniport driver instance. You
 **Note** This sample provides an example of minimal driver intended for education purposes. The driver and its sample test programs are not intended for use in a production environment.
 
 For more information on creating NDIS Miniport Drivers, see [NDIS Miniport Drivers](http://msdn.microsoft.com/en-us/library/windows/hardware/ff565949).
-
diff --git a/network/ndis/netvmini/6x/network-ndis-netvmini-6x.yml b/network/ndis/netvmini/6x/network-ndis-netvmini-6x.yml
deleted file mode 100644
index 6cd74b8a..00000000
--- a/network/ndis/netvmini/6x/network-ndis-netvmini-6x.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: NDIS Virtual Miniport Driver
-  description: Demonstrates the functionality of an NDIS miniport driver without requiring a physical network adapter.
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /network/ndis/netvmini/6x/netvmini.sln
diff --git a/network/radio/HidSwitchDriverSample/README.md b/network/radio/HidSwitchDriverSample/README.md
index 9726babf..05e394f4 100644
--- a/network/radio/HidSwitchDriverSample/README.md
+++ b/network/radio/HidSwitchDriverSample/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: Radio Switch Test Driver for OSR USB-FX2 Development Board
+description: Demonstrates how to structure a HID driver for radio switches for the OSR USB-FX2 Development Board.
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: Radio Switch Test Driver for OSR USB-FX2 Development Board
     platform: KMDF
@@ -7,30 +17,27 @@
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617919
 --->
 
-
-Radio Switch Test Driver for OSR USB-FX2 Development Board
-==========================================================
+# Radio Switch Test Driver for OSR USB-FX2 Development Board
 
 This sample demonstrates how to structure a HID driver for radio switches for the OSR USB-FX2 Development Board.
 
 The hardware switch or button to control wireless transmission and the global software switch (Airplane mode switch) in the Radio Management User Interface must be synchronized. To ensure the hardware and software switches that control radio transmission are synchronized, the hardware switch or button must have a HID-compliant driver.
 
-Switch Pack Mapping
--------------------
+## Switch Pack Mapping
 
 ### Switch Mapping
+
  1 | 2 | 3 | 4 | 5 | 7 | 8
 ---|---|---|---|---|---|---
  Mode Select Bit 3 |  Mode Select Bit 2 |  Mode Select Bit 1 | - | - | - | Radio Switch
 
-Testing
--------
+## Testing
 
 ### Testing Modes
 
 The driver supports five modes representing the valid combinations of HID descriptors that we have defined for the USB forum. Modes are selected using switches 1, 2, and 3 on the switch pack.
 
-### Switch Mapping
+### Switch Mapping Modes
 
  1 | 2 | 3 | Mode
 ---|---|---|-----
@@ -43,7 +50,6 @@ The driver supports five modes representing the valid combinations of HID descri
  1 | 1 | 0 | Mode 1
  1 | 1 | 1 | Mode 1
 
-
 ### Mode 1 Radio Push Button
 
 In this mode the radio switch (switch 8 on the switch pack) represents a momentary push button. A HID report is generated when the switch transitions to the On state (switch down).
@@ -63,4 +69,3 @@ In this mode the radio switch (switch 8 on the switch pack) represents an A-B sl
 ### Mode 5 LED only
 
 In this mode the radio switch (switch 8 on the switch pack) is ignored. The LED array will reflect the state of the Radio LED: either all on or all off (note that the top 2 LEDs never illuminate as these are not wired in).
-
diff --git a/network/radio/HidSwitchDriverSample/network-radio-hidswitchdriversample.yml b/network/radio/HidSwitchDriverSample/network-radio-hidswitchdriversample.yml
deleted file mode 100644
index d106b9d1..00000000
--- a/network/radio/HidSwitchDriverSample/network-radio-hidswitchdriversample.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: Radio Switch Test Driver for OSR USB-FX2 Development Board
-  description: Demonstrates how to structure a HID driver for radio switches for the OSR USB-FX2 Development Board.
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /network/radio/HidSwitchDriverSample/HidSwitchDriverSample.sln
diff --git a/network/radio/RadioManagerSample/README.md b/network/radio/RadioManagerSample/README.md
index 3cac53e9..5822727f 100644
--- a/network/radio/RadioManagerSample/README.md
+++ b/network/radio/RadioManagerSample/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: Windows Radio Management Sample
+description: Demonstrates how to structure a Radio Manager for use with the Windows Radio Management APIs.
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: Windows Radio Management Sample
     platform: WDM
@@ -7,9 +17,7 @@
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617920
 --->
 
-
-Windows Radio Management Sample
-===============================
+# Windows Radio Management Sample
 
 The Radio Manager sample demonstrates how to structure a Radio Manager for use with the Windows Radio Management APIs.
 
diff --git a/network/radio/RadioManagerSample/network-radio-radiomanagersample.yml b/network/radio/RadioManagerSample/network-radio-radiomanagersample.yml
deleted file mode 100644
index 82a05e36..00000000
--- a/network/radio/RadioManagerSample/network-radio-radiomanagersample.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: Windows Radio Management Sample
-  description: Demonstrates how to structure a Radio Manager for use with the Windows Radio Management APIs.
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /network/radio/RadioManagerSample/RadioManagerSample.sln
diff --git a/network/trans/WFPSampler/README.md b/network/trans/WFPSampler/README.md
index 84621bcd..977d42db 100644
--- a/network/trans/WFPSampler/README.md
+++ b/network/trans/WFPSampler/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: Windows Filtering Platform Sample
+description: A sample firewall that has a command-line interface which allows adding filters at various WFP layers.
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: Windows Filtering Platform Sample
     platform: KMDF
@@ -7,9 +17,7 @@
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620198
 --->
 
-
-Windows Filtering Platform Sample
-=================================
+# Windows Filtering Platform Sample
 
 The WFPSampler sample driver is a sample firewall. It has a command-line interface which allows adding filters at various WFP layers with a wide variety of conditions. Additionally it exposes callout functions for injection, basic action, proxying, and stream inspection.
 
diff --git a/network/trans/WFPSampler/network-trans-wfpsampler.yml b/network/trans/WFPSampler/network-trans-wfpsampler.yml
deleted file mode 100644
index ad4e75d0..00000000
--- a/network/trans/WFPSampler/network-trans-wfpsampler.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: Windows Filtering Platform Sample
-  description: A sample firewall that has a command-line interface which allows adding filters at various WFP layers.
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /network/trans/WFPSampler/WFPSampler.sln
diff --git a/network/trans/ddproxy/README.md b/network/trans/ddproxy/README.md
index 45a122d9..7331a807 100644
--- a/network/trans/ddproxy/README.md
+++ b/network/trans/ddproxy/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: Windows Filtering Platform Packet Modification Sample
+description: Demonstrates the packet modification capabilities of the Windows Filtering Platform (WFP).
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: Windows Filtering Platform Packet Modification Sample
     platform: KMDF
@@ -7,13 +17,12 @@
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617930
 --->
 
-
-Windows Filtering Platform Packet Modification Sample
-=====================================================
+# Windows Filtering Platform Packet Modification Sample
 
 The sample driver demonstrates the packet modification capabilities of the Windows Filtering Platform (WFP).
 
 ## Universal Windows Driver Compliant
+
 This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 Run the sample
diff --git a/network/trans/ddproxy/network-trans-ddproxy.yml b/network/trans/ddproxy/network-trans-ddproxy.yml
deleted file mode 100644
index 2ceb94a7..00000000
--- a/network/trans/ddproxy/network-trans-ddproxy.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: Windows Filtering Platform Packet Modification Sample
-  description: Demonstrates the packet modification capabilities of the Windows Filtering Platform (WFP).
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /network/trans/ddproxy/ddproxy.sln
diff --git a/network/trans/inspect/README.md b/network/trans/inspect/README.md
index 2c197c4f..2bd8d98e 100644
--- a/network/trans/inspect/README.md
+++ b/network/trans/inspect/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: Windows Filtering Platform Traffic Inspection Sample
+description: Demonstrates the traffic inspection capabilities of the Windows Filtering Platform (WFP).
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: Windows Filtering Platform Traffic Inspection Sample
     platform: KMDF
@@ -7,9 +17,8 @@
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617931
 --->
 
+# Windows Filtering Platform Traffic Inspection Sample
 
-Windows Filtering Platform Traffic Inspection Sample
-====================================================
 
 This sample driver demonstrates the traffic inspection capabilities of the Windows Filtering Platform (WFP).
 
@@ -22,6 +31,7 @@ Inspect.sys implements the `ClassifyFn` callout functions for the ALE Connect, R
 Connect/Packet inspection is done out-of-band by a system worker thread by using the reference-drop-clone-reinject mechanism as well as the ALE pend/complete mechanism. Therefore, the sample can serve as a basis for scenarios in which a filtering decision cannot be made within the `classifyFn()` callout and instead must be made, for example, by a user-mode application.
 
 ## Universal Windows Driver Compliant
+
 This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 Automatic deployment
diff --git a/network/trans/inspect/network-trans-inspect.yml b/network/trans/inspect/network-trans-inspect.yml
deleted file mode 100644
index 464fabdc..00000000
--- a/network/trans/inspect/network-trans-inspect.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: Windows Filtering Platform Traffic Inspection Sample
-  description: Demonstrates the traffic inspection capabilities of the Windows Filtering Platform (WFP).
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /network/trans/inspect/inspect.sln
diff --git a/network/trans/msnmntr/README.md b/network/trans/msnmntr/README.md
index 14127cbc..bdb146de 100644
--- a/network/trans/msnmntr/README.md
+++ b/network/trans/msnmntr/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: Windows Filtering Platform MSN Messenger Monitor Sample
+description: Demonstrates the stream inspection capabilities of the Windows Filtering Platform (WFP).
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: Windows Filtering Platform MSN Messenger Monitor Sample
     platform: KMDF
@@ -7,9 +17,7 @@
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617932
 --->
 
-
-Windows Filtering Platform MSN Messenger Monitor Sample
-=======================================================
+# Windows Filtering Platform MSN Messenger Monitor Sample
 
 This sample application and driver demonstrate the stream inspection capabilities of the Windows Filtering Platform (WFP).
 
diff --git a/network/trans/msnmntr/network-trans-msnmntr.yml b/network/trans/msnmntr/network-trans-msnmntr.yml
deleted file mode 100644
index 6c6cdde9..00000000
--- a/network/trans/msnmntr/network-trans-msnmntr.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: Windows Filtering Platform MSN Messenger Monitor Sample
-  description: Demonstrates the stream inspection capabilities of the Windows Filtering Platform (WFP).
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /network/trans/msnmntr/msnmntr.sln
diff --git a/network/trans/stmedit/README.md b/network/trans/stmedit/README.md
index 67905639..936b122c 100644
--- a/network/trans/stmedit/README.md
+++ b/network/trans/stmedit/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: Windows Filtering Platform Stream Edit Sample
+description: Demonstrates replacing a string pattern for a Transmission Control Protocol (TCP) connection using the Windows Filtering Platform (WFP).
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: Windows Filtering Platform Stream Edit Sample
     platform: KMDF
@@ -7,13 +17,12 @@
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617933
 --->
 
-
-Windows Filtering Platform Stream Edit Sample
-=============================================
+# Windows Filtering Platform Stream Edit Sample
 
 This sample driver demonstrates replacing a string pattern for a Transmission Control Protocol (TCP) connection using the Windows Filtering Platform (WFP).
 
 ## Universal Windows Driver Compliant
+
 This sample builds a Universal Windows Driver. It uses only APIs and DDIs that are included in OneCoreUAP.
 
 The sample consists of a kernel-mode Windows Filtering Platform (WFP) callout driver (Stmedit.sys) that can operate in one of the following modes:
diff --git a/network/trans/stmedit/network-trans-stmedit.yml b/network/trans/stmedit/network-trans-stmedit.yml
deleted file mode 100644
index c3101e05..00000000
--- a/network/trans/stmedit/network-trans-stmedit.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: Windows Filtering Platform Stream Edit Sample
-  description: Demonstrates replacing a string pattern for a Transmission Control Protocol (TCP) connection using the Windows Filtering Platform (WFP).
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /network/trans/stmedit/stmedit.sln
diff --git a/network/wlan/WDI/COMMON/ChannelInfo.c b/network/wlan/WDI/COMMON/ChannelInfo.c
index 71ff6490..40ec119b 100644
--- a/network/wlan/WDI/COMMON/ChannelInfo.c
+++ b/network/wlan/WDI/COMMON/ChannelInfo.c
@@ -306,7 +306,7 @@ CHNL_ChangeBwChnlFromPeerWorkitemCallBack(
 		if(pExtAdapter->bAPChannelInprogressForNewconnected)
 		{
 			RT_DISP(FCHNL, FCHNL_ERROR, ("%s: AP change channel in progress , return \n", __FUNCTION__));
-			return;

+			return;
 
 		}
 	}
diff --git a/network/wlan/WDI/COMMON/MgntActQueryParam.h b/network/wlan/WDI/COMMON/MgntActQueryParam.h
index f5d11f9e..603a00ad 100644
--- a/network/wlan/WDI/COMMON/MgntActQueryParam.h
+++ b/network/wlan/WDI/COMMON/MgntActQueryParam.h
@@ -248,7 +248,7 @@ MgntActQuery_P2PChannelList(
 	IN u4Byte ChannelListBufLen,
 	OUT pu1Byte pChennelListLen,
 	OUT pu1Byte pChannelList
-	);

+	);
 
 VOID
 MgntActQuery_P2PListenChannel(
diff --git a/network/wlan/WDI/PLATFORM/NDIS6/N63C_Oids.c b/network/wlan/WDI/PLATFORM/NDIS6/N63C_Oids.c
index 5812f010..263648b9 100644
--- a/network/wlan/WDI/PLATFORM/NDIS6/N63C_Oids.c
+++ b/network/wlan/WDI/PLATFORM/NDIS6/N63C_Oids.c
@@ -387,7 +387,7 @@ n63c_SendP2pRspActionFrameStateCb(
 		if(N63C_P2P_ACTION_FRAME_GO_NEGOTIATION_CONFIRM == ctx->rspType)
 		{
 			n63c_IndicateRxP2pRspActionFrame(pAdapter, ctx);
-		}

+		}
 
 	}
 	else if(OFF_CHNL_TX_STATE_RETRY == state)
@@ -427,7 +427,7 @@ n63c_SendP2pReqActionFrameStateCb(
 			)
 		{
 			n63c_IndicateRxP2pRspActionFrame(pAdapter, ctx);
-		}

+		}
 
 
 		if(N63C_P2P_ACTION_FRAME_GO_NEGOTIATION_RESPONSE == ctx->rspType)
diff --git a/network/wlan/WDI/PLATFORM/NDIS6/N63C_Oids.h b/network/wlan/WDI/PLATFORM/NDIS6/N63C_Oids.h
index 39e4b17f..116c8bc8 100644
--- a/network/wlan/WDI/PLATFORM/NDIS6/N63C_Oids.h
+++ b/network/wlan/WDI/PLATFORM/NDIS6/N63C_Oids.h
@@ -23,7 +23,7 @@ typedef enum _P2P_ROLE P2P_ROLE, * PP2P_ROLE;
 
 // For resetting the Wifi-Direct port
 typedef enum _RESET_LEVEL
-{

+{
 	RESET_LEVEL_P2P_ONLY = 0,
 	RESET_LEVEL_FULL
 }RESET_LEVEL, * PRESET_LEVEL;
diff --git a/network/wlan/WDI/README.md b/network/wlan/WDI/README.md
index 414cf30c..21aa108a 100644
--- a/network/wlan/WDI/README.md
+++ b/network/wlan/WDI/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: WDI samples
+description: Demonstrates use of the WLAN WDI.
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: WDI samples
     platform: KMDF
@@ -8,3 +18,5 @@
 --->
 
 # WDI samples
+
+This sample demonstrates use of the WLAN WDI.
diff --git a/network/wlan/WDI/network-wlan-wdi.yml b/network/wlan/WDI/network-wlan-wdi.yml
deleted file mode 100644
index 216f3449..00000000
--- a/network/wlan/WDI/network-wlan-wdi.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: WDI samples
-  description: WDI samples
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /network/wlan/WDI/windows.msbuild.rtwssample.sln
diff --git a/network/wlan/ihvsampleui/README.md b/network/wlan/ihvsampleui/README.md
index 957396ed..564b1199 100644
--- a/network/wlan/ihvsampleui/README.md
+++ b/network/wlan/ihvsampleui/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: IHV Sample UI
+description: Demonstrates the WLAN IHV UI.
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: IHV Sample UI
     platform: Application
@@ -8,3 +18,5 @@
 --->
 
 # IHV Sample UI
+
+This sample demonstrates the WLAN IHV UI.
diff --git a/network/wlan/ihvsampleui/network-wlan-ihvsampleui.yml b/network/wlan/ihvsampleui/network-wlan-ihvsampleui.yml
deleted file mode 100644
index eb043ec0..00000000
--- a/network/wlan/ihvsampleui/network-wlan-ihvsampleui.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: IHV Sample UI
-  description: IHV Sample UI
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
diff --git a/network/wsk/echosrv/README.md b/network/wsk/echosrv/README.md
index 96cc02d5..ee48299d 100644
--- a/network/wsk/echosrv/README.md
+++ b/network/wsk/echosrv/README.md
@@ -1,3 +1,13 @@
+---
+topic: sample
+name: WSK TCP Echo Server
+description: A minimal sample driver to demonstrate the usage of the Winsock Kernel (WSK) programming interface.
+languages:
+  - cpp
+products:
+  - windows
+---
+
 <!---
     name: WSK TCP Echo Server
     platform: WDM
@@ -7,9 +17,7 @@
     samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=617935
 --->
 
-
-WSK TCP Echo Server
-===================
+# WSK TCP Echo Server
 
 This sample driver is a minimal driver meant to demonstrate the usage of the Winsock Kernel (WSK) programming interface.
 
diff --git a/network/wsk/echosrv/network-wsk-echosrv.yml b/network/wsk/echosrv/network-wsk-echosrv.yml
deleted file mode 100644
index e0aa241f..00000000
--- a/network/wsk/echosrv/network-wsk-echosrv.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-### YamlMime:Sample
-sample:
-- name: WSK TCP Echo Server
-  description: A minimal sample driver to demonstrate the usage of the Winsock Kernel (WSK) programming interface.
-  generateZip: true
-  preserveParentHierarchy: true
-  author: windows-driver-samples
-  languages:
-  - cpp
-  technologies:
-  - windows
-  vssolution: /network/wsk/echosrv/echosrv.sln