From 2616dd0b8035b18ba4915b231b489cc53a5a9be9 Mon Sep 17 00:00:00 2001
From: Andriy Voskoboinyk <avos@FreeBSD.org>
Date: Mon, 17 Oct 2016 21:35:13 +0000
Subject: Fix dates + add an UPDATING entry.

---
 ObsoleteFiles.inc         | 2 +-
 UPDATING                  | 7 +++++++
 share/man/man4/rtwn.4     | 2 +-
 share/man/man4/rtwn_pci.4 | 2 +-
 share/man/man4/rtwn_usb.4 | 2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 75b2828ae9e6..ecb9731b8304 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,7 +38,7 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
-# 20161016: urtwn(4) was merged into rtwn(4)
+# 20161017: urtwn(4) was merged into rtwn(4)
 OLD_FILES+=usr/share/man/man4/urtwn.4.gz
 OLD_FILES+=usr/share/man/man4/urtwnfw.4.gz
 # 20161015: Remove GNU rcs
diff --git a/UPDATING b/UPDATING
index 3e4aa3d61976..a744cb841b68 100644
--- a/UPDATING
+++ b/UPDATING
@@ -31,6 +31,13 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW:
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20161017:
+	The urtwn(4) driver was merged into rtwn(4) and now consists of
+	rtwn(4) main module + rtwn_usb(4) and rtwn_pci(4) bus-specific
+	parts.
+	Also, firmware for RTL8188CE was renamed due to possible name
+	conflict (rtwnrtl8192cU(B) -> rtwnrtl8192cE(B))
+
 20161015:
 	GNU rcs has been removed from base.  It is available as packages:
 	- rcs: Latest GPLv3 GNU rcs version.
diff --git a/share/man/man4/rtwn.4 b/share/man/man4/rtwn.4
index 3cdb46264795..e43053fcef9e 100644
--- a/share/man/man4/rtwn.4
+++ b/share/man/man4/rtwn.4
@@ -18,7 +18,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 19, 2016
+.Dd October 17, 2016
 .Dt RTWN 4
 .Os
 .Sh NAME
diff --git a/share/man/man4/rtwn_pci.4 b/share/man/man4/rtwn_pci.4
index b0fd71d9fb07..71fa1669233e 100644
--- a/share/man/man4/rtwn_pci.4
+++ b/share/man/man4/rtwn_pci.4
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"/
-.Dd September 19, 2016
+.Dd October 17, 2016
 .Dt RTWN_PCI 4
 .Os
 .Sh NAME
diff --git a/share/man/man4/rtwn_usb.4 b/share/man/man4/rtwn_usb.4
index ec744ebeccb7..8d157edc4300 100644
--- a/share/man/man4/rtwn_usb.4
+++ b/share/man/man4/rtwn_usb.4
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"/
-.Dd September 19, 2016
+.Dd October 17, 2016
 .Dt RTWN_USB 4
 .Os
 .Sh NAME
-- 
cgit v1.2.3