From 746342c5de549da81ebebb220ffcad5a515c7434 Mon Sep 17 00:00:00 2001
From: Thomas Nikolajsen <thomas@dragonflybsd.org>
Date: Mon, 15 Sep 2008 21:23:44 +0000
Subject: [PATCH]  * Move description of hw.usb.hack_defer_exploration and
 vfs.root.mountfrom from loader.conf.5 to loader.8, as this is where other
 tunables are described.

---
 sys/boot/common/loader.8     | 10 +++++++---
 sys/boot/forth/loader.conf.5 | 13 +------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8
index f4e711b9cd..806bfea37f 100644
--- a/sys/boot/common/loader.8
+++ b/sys/boot/common/loader.8
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/sys/boot/common/loader.8,v 1.57 2003/06/29 20:57:55 brueffer Exp $
-.\" $DragonFly: src/sys/boot/common/loader.8,v 1.23 2008/09/15 20:32:53 thomas Exp $
+.\" $DragonFly: src/sys/boot/common/loader.8,v 1.24 2008/09/15 21:23:44 thomas Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
@@ -452,6 +452,9 @@ are also accepted and indicate kilobytes, megabytes and gigabytes
 respectively.
 An invalid suffix will result in the variable being ignored by the
 kernel.
+.It Va hw.usb.hack_defer_exploration
+The USB keyboard will sometimes not attach properly unless you set this
+variable to 1.
 .It Va kern.emergency_intr_enable
 Setting this to 1 enables emergency interrupt polling.  All interrupt
 handlers are executed periodically.  This mode is very expensive and should
@@ -532,8 +535,9 @@ Must be a power of 2.
 .It Va vfs.root.mountfrom
 File system type and partition, separated by colon,
 for kernel root file system.
-For example
-.Dq hammer:da8s1a .
+Used with boot-only partition, which is typically mounted on root file system as
+.Pa /boot .
+Example: "hammer:da8s1a"
 .El
 .Ss BUILTIN PARSER
 When a builtin command is executed, the rest of the line is taken
diff --git a/sys/boot/forth/loader.conf.5 b/sys/boot/forth/loader.conf.5
index 3b9f173f55..c7337f3e7e 100644
--- a/sys/boot/forth/loader.conf.5
+++ b/sys/boot/forth/loader.conf.5
@@ -23,7 +23,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/sys/boot/forth/loader.conf.5,v 1.18 2002/08/27 01:02:56 trhodes Exp $
-.\" $DragonFly: src/sys/boot/forth/loader.conf.5,v 1.12 2008/09/15 20:41:59 thomas Exp $
+.\" $DragonFly: src/sys/boot/forth/loader.conf.5,v 1.13 2008/09/15 21:23:44 thomas Exp $
 .Dd September 6, 2008
 .Dt LOADER.CONF 5
 .Os
@@ -102,17 +102,6 @@ than
 so its use should be avoided.
 Multiple instances of it will be processed
 independently.
-.It Ar hw.usb.hack_defer_exploration=1
-The USB keyboard will sometimes not attach properly unless you set this
-kernel environment variable to 1.
-.It Ar vfs.root.mountfrom="hammer:da0s1d"
-When booting from a boot-only partition this variable tells the kernel
-where the root filesystem is.
-The boot-only partition is then typically
-mounted under the root filesystem as
-.Pa /boot .
-The assignment is an example
-of how to specify the filesystem and block device.
 .It Ar loader_conf_files
 Defines additional configuration files to be processed right after the
 present file.
-- 
2.41.0