From 7d2b6b06f8324c6947d036614788c687ed0fa183 Mon Sep 17 00:00:00 2001
From: hrs <hrs@FreeBSD.org>
Date: Sat, 19 Jul 2003 14:38:03 +0000
Subject: MFC:  atkbd(4) bug fix.

---
 release/doc/en_US.ISO8859-1/relnotes/article.sgml    | 3 ++-
 release/doc/en_US.ISO8859-1/relnotes/common/new.sgml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/release/doc/en_US.ISO8859-1/relnotes/article.sgml b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
index bb25a24..5078765 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/article.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/article.sgml
@@ -143,7 +143,8 @@
       <para arch="i386">A bug that even when no AT keyboard is connected,
         &man.atkbd.4; registers an AT keyboard during console initialization
         has been fixed.  <command>kbdcontrol -k /dev/kbd1</command>
-        is no longer needed when only a USB keyboard is connected.</para>
+        is no longer needed when only a USB keyboard is connected.
+        &merged;</para>
     </sect3>
 
     <sect3 id="boot">
diff --git a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
index bb25a24..5078765 100644
--- a/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
+++ b/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml
@@ -143,7 +143,8 @@
       <para arch="i386">A bug that even when no AT keyboard is connected,
         &man.atkbd.4; registers an AT keyboard during console initialization
         has been fixed.  <command>kbdcontrol -k /dev/kbd1</command>
-        is no longer needed when only a USB keyboard is connected.</para>
+        is no longer needed when only a USB keyboard is connected.
+        &merged;</para>
     </sect3>
 
     <sect3 id="boot">
-- 
cgit v1.1