Merge remote-tracking branch 'upstream/master'

2 files changed, 18 insertions, 40 deletions

diff --git a/nfp/net/README.md b/nfp/net/README.md
index 5f9c670b..0df76029 100644
--- a/nfp/net/README.md
+++ b/nfp/net/README.md
@@ -1,21 +1,26 @@
-<!---
-    name: Near-Field Proximity Sample Driver (UMDF Version 1)
-    platform: UMDF1
-    language: cpp
-    category: Proximity
-    description: Demonstrates how to use UMDF version 1 to write a near-field proximity driver.
-    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620200
---->
+---
+page_type: sample
+description: "Demonstrates how to use UMDF version 1 to write a near-field proximity driver."
+languages:
+- cpp
+products:
+- windows
+- windows-wdk
+---
 
+# Near-Field Proximity Sample Driver (UMDF Version 1)
 
-Near-Field Proximity Sample Driver (UMDF Version 1)
-===================================================
+> [!WARNING]
+> UMDF 2 is the latest version of UMDF and supersedes UMDF 1.  All new UMDF drivers should be written using UMDF 2.  No new features are being added to UMDF 1 and there is limited support for UMDF 1 on newer versions of Windows 10.  Universal Windows drivers must use UMDF 2.
+>
+> For more info, see [Getting Started with UMDF](https://docs.microsoft.com/windows-hardware/drivers/wdf/getting-started-with-umdf-version-2).
 
 This sample demonstrates how to use User-Mode Driver Framework (UMDF) version 1 to write a near-field proximity driver.
 
 Typically, a near-field proximity driver would use near-field technologies such as Near Field Communication (NFC), TransferJet, or Bump. However, this sample uses a TCP/IPv6 network connection and a static configuration between two machines to simulate near-field interaction.
 
-Related technologies
---------------------
-[User-Mode Driver Framework](http://msdn.microsoft.com/en-us/library/windows/hardware/ff560456)
+## See also
 
+[Getting Started with UMDF](https://docs.microsoft.com/windows-hardware/drivers/wdf/getting-started-with-umdf-version-2)
+
+[UMDF 1.x Design Guide](https://docs.microsoft.com/windows-hardware/drivers/wdf/user-mode-driver-framework-design-guide)
diff --git a/nfp/net/inc/README.md b/nfp/net/inc/README.md
deleted file mode 100644
index 57c8e274..00000000
--- a/nfp/net/inc/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-page_type: sample
-description: "Demonstrates how to use UMDF version 1 to write a near-field proximity driver."
-languages:
-- cpp
-products:
-- windows
----
-
-<!---
-    name: Near-Field Proximity Sample Driver (UMDF Version 1)
-    platform: UMDF1
-    language: cpp
-    category: Proximity
-    description: Demonstrates how to use UMDF version 1 to write a near-field proximity driver.
-    samplefwlink: http://go.microsoft.com/fwlink/p/?LinkId=620200
---->
-
-# Near-Field Proximity Sample Driver (UMDF Version 1)
-
-This sample demonstrates how to use User-Mode Driver Framework (UMDF) version 1 to write a near-field proximity driver.
-
-Typically, a near-field proximity driver would use near-field technologies such as Near Field Communication (NFC), TransferJet, or Bump. However, this sample uses a TCP/IPv6 network connection and a static configuration between two machines to simulate near-field interaction.
-
-## Related technologies
-
-[User-Mode Driver Framework](http://msdn.microsoft.com/en-us/library/windows/hardware/ff560456)