From 8e1c6f815cab59f3f869ca918f763f975a5a983a Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <matthias@dragonflybsd.org>
Date: Tue, 2 Sep 2008 11:50:47 +0000
Subject: [PATCH] Rename /kernel and /module to /boot/kernel and /boot/module
 where appropriate.

---
 bin/ps/ps.1                    |  8 ++++----
 lib/libc/gen/getbootfile.3     |  6 +++---
 lib/libc/gen/getbootfile.c     |  4 ++--
 sbin/i386/nextboot/nextboot.8  |  8 ++++----
 sbin/ip6fw/ip6fw.8             |  6 +++---
 sbin/ipfw/ipfw.8               |  6 +++---
 sbin/kldconfig/kldconfig.8     |  6 +++---
 sbin/kldload/kldload.8         |  8 ++++----
 sbin/reboot/boot_pc32.8        | 10 +++++-----
 share/man/man4/aac.4           |  8 ++++----
 share/man/man4/kld.4           |  8 ++++----
 share/man/man4/netgraph.4      |  8 ++++----
 share/man/man4/splash.4        | 10 +++++-----
 share/man/man4/vinum.4         | 14 +++++++-------
 share/man/man7/hier.7          | 18 +++++++++---------
 share/man/man9/sysctl.9        |  6 +++---
 share/mk/bsd.own.mk            |  4 ++--
 sys/boot/common/loader.8       |  6 +++---
 sys/boot/forth/loader.4th.8    |  6 +++---
 sys/boot/forth/loader.conf.5   |  6 +++---
 usr.bin/fstat/fstat.1          |  6 +++---
 usr.bin/ipcs/ipcs.1            |  8 ++++----
 usr.bin/ktrdump/ktrdump.c      |  4 ++--
 usr.bin/netstat/netgraph.c     |  4 ++--
 usr.bin/nfsstat/nfsstat.1      |  8 ++++----
 usr.bin/pctrack/pctrack.c      |  4 ++--
 usr.bin/symorder/symorder.1    |  6 +++---
 usr.bin/systat/systat.1        |  6 +++---
 usr.bin/vmstat/vmstat.8        |  8 ++++----
 usr.bin/w/uptime.1             |  8 ++++----
 usr.bin/w/w.1                  |  6 +++---
 usr.sbin/asf/asf.8             |  6 +++---
 usr.sbin/asf/asf.c             |  4 ++--
 usr.sbin/dconschat/dconschat.8 |  6 +++---
 usr.sbin/kernbb/kernbb.8       |  6 +++---
 usr.sbin/kgmon/kgmon.8         |  8 ++++----
 usr.sbin/pstat/pstat.8         |  8 ++++----
 usr.sbin/rwhod/rwhod.8         |  6 +++---
 usr.sbin/trpt/trpt.8           |  6 +++---
 39 files changed, 137 insertions(+), 137 deletions(-)

diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 2e59a94709..40c17b4987 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -31,9 +31,9 @@
 .\"
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD: src/bin/ps/ps.1,v 1.24.2.7 2002/06/20 22:43:33 charnier Exp $
-.\" $DragonFly: src/bin/ps/ps.1,v 1.19 2008/01/04 12:31:45 matthias Exp $
+.\" $DragonFly: src/bin/ps/ps.1,v 1.20 2008/09/02 11:50:45 matthias Exp $
 .\"
-.Dd April 6, 2006
+.Dd September 2, 2008
 .Dt PS 1
 .Os
 .Sh NAME
@@ -127,7 +127,7 @@ instead of the default
 Sort by memory usage, instead of by process ID.
 .It Fl N
 Extract the name list from the specified system instead of the default
-.Pa /kernel .
+.Pa /boot/kernel .
 .It Fl O
 Add the information associated with the space or comma separated list
 of keywords specified, after the process ID,
@@ -507,7 +507,7 @@ default kernel memory
 /dev name database
 .It Pa /var/db/kvm_kernel.db
 system namelist database
-.It Pa /kernel
+.It Pa /boot/kernel
 default system namelist
 .It Pa /proc
 the mount point of
diff --git a/lib/libc/gen/getbootfile.3 b/lib/libc/gen/getbootfile.3
index 15c4649784..fd185c0c22 100644
--- a/lib/libc/gen/getbootfile.3
+++ b/lib/libc/gen/getbootfile.3
@@ -31,9 +31,9 @@
 .\"
 .\"     From: @(#)gethostname.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD: src/lib/libc/gen/getbootfile.3,v 1.6.2.3 2001/12/14 18:33:51 ru Exp $
-.\" $DragonFly: src/lib/libc/gen/getbootfile.3,v 1.5 2007/07/14 21:48:15 swildner Exp $
+.\" $DragonFly: src/lib/libc/gen/getbootfile.3,v 1.6 2008/09/02 11:50:46 matthias Exp $
 .\"
-.Dd September 23, 1994
+.Dd September 2, 2008
 .Dt GETBOOTFILE 3
 .Os
 .Sh NAME
@@ -69,5 +69,5 @@ function call appeared in
 .Sh BUGS
 If the boot blocks have not been modified to pass this information into
 the kernel at boot time, the static string
-.Dq Pa /kernel
+.Dq Pa /boot/kernel
 is returned instead of the real boot file.
diff --git a/lib/libc/gen/getbootfile.c b/lib/libc/gen/getbootfile.c
index 190fcf400d..f12290a1c9 100644
--- a/lib/libc/gen/getbootfile.c
+++ b/lib/libc/gen/getbootfile.c
@@ -32,7 +32,7 @@
  *
  * @(#)gethostname.c	8.1 (Berkeley) 6/4/93
  * $FreeBSD: src/lib/libc/gen/getbootfile.c,v 1.5 1999/08/27 23:58:37 peter Exp $
- * $DragonFly: src/lib/libc/gen/getbootfile.c,v 1.3 2005/11/19 22:32:53 swildner Exp $
+ * $DragonFly: src/lib/libc/gen/getbootfile.c,v 1.4 2008/09/02 11:50:46 matthias Exp $
  */
 
 #include <sys/param.h>
@@ -49,6 +49,6 @@ getbootfile(void)
 	mib[0] = CTL_KERN;
 	mib[1] = KERN_BOOTFILE;
 	if (sysctl(mib, 2, name, &size, NULL, 0) == -1)
-		return ("/kernel");
+		return ("/boot/kernel");
 	return (name);
 }
diff --git a/sbin/i386/nextboot/nextboot.8 b/sbin/i386/nextboot/nextboot.8
index 8af4b4cd8c..74c5f5efc6 100644
--- a/sbin/i386/nextboot/nextboot.8
+++ b/sbin/i386/nextboot/nextboot.8
@@ -1,6 +1,6 @@
 .\" $FreeBSD: src/sbin/i386/nextboot/nextboot.8,v 1.11.2.5 2003/01/05 19:19:39 semenu Exp $
-.\" $DragonFly: src/sbin/i386/nextboot/nextboot.8,v 1.3 2004/03/11 12:28:54 hmp Exp $
-.Dd July 9, 1996
+.\" $DragonFly: src/sbin/i386/nextboot/nextboot.8,v 1.4 2008/09/02 11:50:45 matthias Exp $
+.Dd September 2, 2008
 .Dt NEXTBOOT 8
 .Os
 .Sh NAME
@@ -77,14 +77,14 @@ At this time the nameblock will contain only zeroed out names.
 .Pp
 An example of usage might be:
 .Bd -literal
-   nextboot -b  /dev/rad0 1:da(0,a)/kernel.experimental ad(0,a)/kernel.old
+   nextboot -b  /dev/rad0 1:da(0,a)/boot/kernel.experimental ad(0,a)/boot/kernel.old
 .Ed
 .Pp
 Which would instruct the boot blocks at the next boot,
 to try boot the experimental kernel off the SCSI disk.
 If for any reason this failed, the next boot attempt would
 boot the kernel
-.Pa /kernel.old
+.Pa /boot/kernel.old
 off the IDE drive.  (Assuming the write-back option were enabled) If this
 in turn failed.
 The compiled in default would be used.
diff --git a/sbin/ip6fw/ip6fw.8 b/sbin/ip6fw/ip6fw.8
index 33ebe88644..b5c4c269df 100644
--- a/sbin/ip6fw/ip6fw.8
+++ b/sbin/ip6fw/ip6fw.8
@@ -1,6 +1,6 @@
 .\"
 .\" $FreeBSD: src/sbin/ip6fw/ip6fw.8,v 1.3.2.12 2003/02/23 20:17:15 trhodes Exp $
-.\" $DragonFly: src/sbin/ip6fw/ip6fw.8,v 1.6 2008/05/02 02:05:05 swildner Exp $
+.\" $DragonFly: src/sbin/ip6fw/ip6fw.8,v 1.7 2008/09/02 11:50:45 matthias Exp $
 .\"
 .\"	$KAME$
 .\"
@@ -31,7 +31,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd March 13, 2000
+.Dd September 2, 2008
 .Dt IP6FW 8
 .Os
 .Sh NAME
@@ -499,7 +499,7 @@ is probably not as straightforward as you would think
 .Em ( "not supported" ) .
 I recommend this command line:
 .Bd -literal -offset center
-kldload /modules/ip6fw_mod.o && \e
+kldload /boot/modules/ip6fw_mod.o && \e
 ip6fw add 32000 allow all from any to any
 .Ed
 .Pp
diff --git a/sbin/ipfw/ipfw.8 b/sbin/ipfw/ipfw.8
index 34634139e3..a91084cbd2 100644
--- a/sbin/ipfw/ipfw.8
+++ b/sbin/ipfw/ipfw.8
@@ -1,8 +1,8 @@
 .\"
 .\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.63.2.33 2003/02/04 01:36:02 brueffer Exp $
-.\" $DragonFly: src/sbin/ipfw/ipfw.8,v 1.17 2008/08/29 07:44:09 swildner Exp $
+.\" $DragonFly: src/sbin/ipfw/ipfw.8,v 1.18 2008/09/02 11:50:45 matthias Exp $
 .\"
-.Dd August 13, 2002
+.Dd September 2, 2008
 .Dt IPFW 8
 .Os
 .Sh NAME
@@ -1482,7 +1482,7 @@ version of
 is probably not as straightforward as you would think.
 I recommend the following command line:
 .Bd -literal -offset indent
-kldload /modules/ipfw.ko && \e
+kldload /boot/modules/ipfw.ko && \e
 ipfw add 32000 allow ip from any to any
 .Ed
 .Pp
diff --git a/sbin/kldconfig/kldconfig.8 b/sbin/kldconfig/kldconfig.8
index 25b644ea7e..622f015f51 100644
--- a/sbin/kldconfig/kldconfig.8
+++ b/sbin/kldconfig/kldconfig.8
@@ -24,9 +24,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/sbin/kldconfig/kldconfig.8,v 1.2.2.2 2003/02/23 20:17:15 trhodes Exp $
-.\" $DragonFly: src/sbin/kldconfig/kldconfig.8,v 1.3 2004/12/20 14:21:19 swildner Exp $
+.\" $DragonFly: src/sbin/kldconfig/kldconfig.8,v 1.4 2008/09/02 11:50:45 matthias Exp $
 .\"
-.Dd June 15, 2001
+.Dd September 2, 2008
 .Dt KLDCONFIG 8
 .Os
 .Sh NAME
@@ -91,7 +91,7 @@ flag is specified more than once, the old path is displayed as well.
 .El
 .Sh FILES
 .Bl -tag -width indent
-.It Pa / , /boot , /modules
+.It Pa / , /boot , /boot/modules
 The default module search path used by the kernel.
 .El
 .Sh DIAGNOSTICS
diff --git a/sbin/kldload/kldload.8 b/sbin/kldload/kldload.8
index 56c0be5b43..84890dacc4 100644
--- a/sbin/kldload/kldload.8
+++ b/sbin/kldload/kldload.8
@@ -24,9 +24,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/sbin/kldload/kldload.8,v 1.7.2.10 2002/12/07 08:44:02 jmallett Exp $
-.\" $DragonFly: src/sbin/kldload/kldload.8,v 1.3 2004/12/20 14:21:19 swildner Exp $
+.\" $DragonFly: src/sbin/kldload/kldload.8,v 1.4 2008/09/02 11:50:45 matthias Exp $
 .\"
-.Dd April 25, 1997
+.Dd September 2, 2008
 .Dt KLDLOAD 8
 .Os
 .Sh NAME
@@ -51,8 +51,8 @@ The following option is available:
 Be more verbose.
 .El
 .Sh FILES
-.Bl -tag -width /modules -compact
-.It Pa /modules
+.Bl -tag -width /boot/modules -compact
+.It Pa /boot/modules
 directory containing loadable modules.
 Modules must have an extension of
 .Pa .ko .
diff --git a/sbin/reboot/boot_pc32.8 b/sbin/reboot/boot_pc32.8
index 5de2f982b9..904dfafb6e 100644
--- a/sbin/reboot/boot_pc32.8
+++ b/sbin/reboot/boot_pc32.8
@@ -39,9 +39,9 @@
 .\"     @(#)boot_i386.8	8.2 (Berkeley) 4/19/94
 .\"
 .\" $FreeBSD: src/sbin/reboot/boot_i386.8,v 1.23.2.11 2002/04/24 17:47:58 rnordier Exp $
-.\" $DragonFly: src/sbin/reboot/boot_pc32.8,v 1.9 2007/04/26 17:35:03 swildner Exp $
+.\" $DragonFly: src/sbin/reboot/boot_pc32.8,v 1.10 2008/09/02 11:50:45 matthias Exp $
 .\"
-.Dd April 19, 1994
+.Dd September 2, 2008
 .Dt BOOT 8 i386
 .Os
 .Sh NAME
@@ -161,7 +161,7 @@ slice.
 .It Ar filename
 The pathname of the file to boot (relative to the root directory
 on the specified partition).  Defaults to
-.Pa /kernel .
+.Pa /boot/kernel .
 Symbolic links are not supported (hard links are).
 .It Fl acCdDghnPrsv
 Boot flags:
@@ -245,9 +245,9 @@ first stage bootstrap file
 second stage bootstrap file
 .It Pa /boot/loader
 third stage bootstrap
-.It Pa /kernel
+.It Pa /boot/kernel
 default kernel
-.It Pa /kernel.old
+.It Pa /boot/kernel.old
 typical non-default kernel (optional)
 .El
 .Sh DIAGNOSTICS
diff --git a/share/man/man4/aac.4 b/share/man/man4/aac.4
index 3de6858531..a9ee42ec9d 100644
--- a/share/man/man4/aac.4
+++ b/share/man/man4/aac.4
@@ -23,8 +23,8 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/aac.4,v 1.3.2.8 2001/09/27 22:01:38 scottl Exp $
-.\" $DragonFly: src/share/man/man4/aac.4,v 1.7 2007/11/10 19:58:23 swildner Exp $
-.Dd May 11, 2006
+.\" $DragonFly: src/share/man/man4/aac.4,v 1.8 2008/09/02 11:50:46 matthias Exp $
+.Dd September 2, 2008
 .Dt AAC 4
 .Os
 .Sh NAME
@@ -112,12 +112,12 @@ performance peaks at a value of 96K,
 and drops off dramatically at 128K,
 due to other limitations of the card.
 .Sh FILES
-.Bl -tag -width /modules/aac.ko -compact
+.Bl -tag -width /boot/modules/aac.ko -compact
 .It Pa /dev/aac?
 aac management interface
 .It Pa /dev/aacd?
 disk/container interface
-.It Pa /modules/aac.ko
+.It Pa /boot/modules/aac.ko
 aac loadable module
 .El
 .Sh DIAGNOSTICS
diff --git a/share/man/man4/kld.4 b/share/man/man4/kld.4
index 0aea3c6870..ed76f2a7a4 100644
--- a/share/man/man4/kld.4
+++ b/share/man/man4/kld.4
@@ -24,9 +24,9 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/kld.4,v 1.5.2.6 2001/08/17 13:08:38 ru Exp $
-.\" $DragonFly: src/share/man/man4/kld.4,v 1.7 2007/03/22 22:58:22 swildner Exp $
+.\" $DragonFly: src/share/man/man4/kld.4,v 1.8 2008/09/02 11:50:46 matthias Exp $
 .\"
-.Dd May 21, 2006
+.Dd September 2, 2008
 .Dt KLD 4
 .Os
 .Sh NAME
@@ -60,7 +60,7 @@ client and server, all the screen-savers, and the
 emulator.
 .Nm
 modules are placed by default in the
-.Pa /modules
+.Pa /boot/modules
 directory.
 .Pp
 The
@@ -109,7 +109,7 @@ driver has been successfully loaded.
 .El
 .Sh FILES
 .Bl -tag -width ".In sys/module.h" -compact
-.It Pa /modules
+.It Pa /boot/modules
 directory containing module binaries shipped with the system
 .It In sys/module.h
 file containing definitions required to compile a
diff --git a/share/man/man4/netgraph.4 b/share/man/man4/netgraph.4
index 59ffd8c27d..816421a8c9 100644
--- a/share/man/man4/netgraph.4
+++ b/share/man/man4/netgraph.4
@@ -34,10 +34,10 @@
 .\"          Archie Cobbs <archie@FreeBSD.org>
 .\"
 .\" $FreeBSD: src/share/man/man4/netgraph.4,v 1.39.2.1 2001/12/21 09:00:50 ru Exp $
-.\" $DragonFly: src/share/man/man4/netgraph.4,v 1.13 2008/05/02 02:05:05 swildner Exp $
+.\" $DragonFly: src/share/man/man4/netgraph.4,v 1.14 2008/09/02 11:50:46 matthias Exp $
 .\" $Whistle: netgraph.4,v 1.7 1999/01/28 23:54:52 julian Exp $
 .\"
-.Dd January 19, 1999
+.Dd September 2, 2008
 .Dt NETGRAPH 4
 .Os
 .Sh NAME
@@ -986,9 +986,9 @@ Definitions needed to use
 .Nm
 {type}
 nodes, including the type cookie definition.
-.It Pa /modules/netgraph.ko
+.It Pa /boot/modules/netgraph.ko
 Netgraph subsystem loadable KLD module.
-.It Pa /modules/ng_{type}.ko
+.It Pa /boot/modules/ng_{type}.ko
 Loadable KLD module for node type {type}.
 .El
 .Sh USER MODE SUPPORT
diff --git a/share/man/man4/splash.4 b/share/man/man4/splash.4
index fd3813b1e8..4148435dd7 100644
--- a/share/man/man4/splash.4
+++ b/share/man/man4/splash.4
@@ -25,9 +25,9 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man4/splash.4,v 1.9.2.7 2001/08/17 13:08:39 ru Exp $
-.\" $DragonFly: src/share/man/man4/splash.4,v 1.5 2007/08/09 02:27:51 swildner Exp $
+.\" $DragonFly: src/share/man/man4/splash.4,v 1.6 2008/09/02 11:50:46 matthias Exp $
 .\"
-.Dd August 8, 2007
+.Dd September 2, 2008
 .Dt SPLASH 4
 .Os
 .Sh NAME
@@ -172,11 +172,11 @@ section above.
 boot loader configuration defaults
 .It Pa /etc/rc.conf
 system configuration information
-.It Pa /modules/splash_*.ko
+.It Pa /boot/modules/splash_*.ko
 splash image decoder modules
-.It Pa /modules/*_saver.ko
+.It Pa /boot/modules/*_saver.ko
 screen saver modules
-.It Pa /modules/vesa.ko
+.It Pa /boot/modules/vesa.ko
 the VESA support module
 .El
 .Sh EXAMPLES
diff --git a/share/man/man4/vinum.4 b/share/man/man4/vinum.4
index 0093e5437f..17d1f7150b 100644
--- a/share/man/man4/vinum.4
+++ b/share/man/man4/vinum.4
@@ -35,9 +35,9 @@
 .\" advised of the possibility of such damage.
 .\"
 .\" $FreeBSD: src/share/man/man4/vinum.4,v 1.22.2.9 2002/04/22 08:19:35 kuriyama Exp $
-.\" $DragonFly: src/share/man/man4/vinum.4,v 1.14 2008/02/11 15:59:37 matthias Exp $
+.\" $DragonFly: src/share/man/man4/vinum.4,v 1.15 2008/09/02 11:50:46 matthias Exp $
 .\"
-.Dd February 11, 2008
+.Dd September 2, 2008
 .Dt VINUM 4
 .Os
 .Sh NAME
@@ -876,19 +876,19 @@ builds a module with debugging symbols by default.
 If the version of
 .Nm
 in
-.Pa /modules
+.Pa /boot/modules
 does not contain symbols, you will not get an error message, but the stack trace
 will not show the symbols.
 Check the module before starting
 .Xr kgdb 1 :
 .Bd -literal
-$ file /modules/vinum.ko
-/modules/vinum.ko: ELF 32-bit LSB shared object, Intel 80386,
-  version 1 (FreeBSD), not stripped
+$ file /boot/modules/vinum.ko
+/boot/modules/vinum.ko: ELF 32-bit LSB shared object, Intel 80386,
+  version 1 (SYSV), dynamically linked, not stripped
 .Ed
 .Pp
 If the output shows that
-.Pa /modules/vinum.ko
+.Pa /boot/modules/vinum.ko
 is stripped, you will have to find a version which is not.
 Usually this will be
 either in
diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7
index 8e489a150a..e37e9ea9c6 100644
--- a/share/man/man7/hier.7
+++ b/share/man/man7/hier.7
@@ -31,9 +31,9 @@
 .\"
 .\"	@(#)hier.7	8.1 (Berkeley) 6/5/93
 .\" $FreeBSD: src/share/man/man7/hier.7,v 1.29.2.17 2003/01/13 21:43:50 ceri Exp $
-.\" $DragonFly: src/share/man/man7/hier.7,v 1.23 2008/02/03 18:02:42 swildner Exp $
+.\" $DragonFly: src/share/man/man7/hier.7,v 1.24 2008/09/02 11:50:46 matthias Exp $
 .\"
-.Dd February 2, 2008
+.Dd September 2, 2008
 .Dt HIER 7
 .Os
 .Sh NAME
@@ -53,6 +53,13 @@ programs and configuration files used during operating system bootstrap
 .It Pa defaults/
 default bootstrapping configuration files; see
 .Xr loader.conf 5
+.It Pa kernel
+pure kernel executable (the operating system loaded into memory
+at boot time).
+.It Pa modules/
+loadable kernel modules;
+see
+.Xr kldstat 8
 .El
 .It Pa /dev/
 block and character device files
@@ -133,16 +140,9 @@ see
 .El
 .It Pa /home/
 HOME directories of non-root users
-.It Pa /kernel
-pure kernel executable (the operating system loaded into memory
-at boot time).
 .It Pa /mnt/
 empty directory commonly used by
 system administrators as a temporary mount point
-.It Pa /modules/
-loadable kernel modules;
-see
-.Xr kldstat 8
 .It Pa /proc/
 process file system;
 see
diff --git a/share/man/man9/sysctl.9 b/share/man/man9/sysctl.9
index 403dd6157c..35dc44b879 100644
--- a/share/man/man9/sysctl.9
+++ b/share/man/man9/sysctl.9
@@ -24,9 +24,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/share/man/man9/sysctl.9,v 1.3 2006/04/28 23:21:36 keramida Exp $
-.\" $DragonFly: src/share/man/man9/sysctl.9,v 1.5 2007/12/15 09:07:13 swildner Exp $
+.\" $DragonFly: src/share/man/man9/sysctl.9,v 1.6 2008/09/02 11:50:46 matthias Exp $
 .\"
-.Dd June 22, 2006
+.Dd September 2, 2008
 .Dt SYSCTL 9
 .Os
 .Sh NAME
@@ -312,7 +312,7 @@ SYSCTL_INT(_debug, OID_AUTO, vfscache, CTLFLAG_RW, &doingcache, 0,
  * size are set.  Unlike newer sysctls, this older sysctl uses a
  * static oid number.
  */
-char kernelname[MAXPATHLEN] = "/kernel";	/* XXX bloat */
+char kernelname[MAXPATHLEN] = "/boot/kernel";	/* XXX bloat */
 SYSCTL_STRING(_kern, KERN_BOOTFILE, bootfile, CTLFLAG_RW,
     kernelname, sizeof(kernelname), "Name of kernel file booted");
 
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 7342728e5d..e09ffe6eef 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,5 +1,5 @@
 # $FreeBSD: src/share/mk/bsd.own.mk,v 1.27.2.4 2002/07/22 14:21:51 ru Exp $
-# $DragonFly: src/share/mk/bsd.own.mk,v 1.16 2008/09/01 19:39:42 dillon Exp $
+# $DragonFly: src/share/mk/bsd.own.mk,v 1.17 2008/09/02 11:50:45 matthias Exp $
 #
 # The include file <bsd.own.mk> set common variables for owner,
 # group, mode, and directories. Defaults are in brackets.
@@ -85,7 +85,7 @@
 #
 #
 # KMODDIR	Base path for loadable kernel modules
-#		(see kld(4)). [/modules]
+#		(see kld(4)). [/boot/modules]
 #
 # KMODOWN	KLD owner. [${BINOWN}]
 #
diff --git a/sys/boot/common/loader.8 b/sys/boot/common/loader.8
index fc88c05103..96879d57c3 100644
--- a/sys/boot/common/loader.8
+++ b/sys/boot/common/loader.8
@@ -23,11 +23,11 @@
 .\" 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.20 2008/09/01 19:39:45 dillon Exp $
+.\" $DragonFly: src/sys/boot/common/loader.8,v 1.21 2008/09/02 11:50:46 matthias Exp $
 .\"
 .\" Note: The date here should be updated whenever a non-trivial
 .\" change is made to the manual page.
-.Dd May 11, 2006
+.Dd September 2, 2008
 .Dt LOADER 8
 .Os
 .Sh NAME
@@ -797,7 +797,7 @@ This would be needed in a system with two IDE disks,
 with the second IDE disk hardwired to wd2 instead of wd1.
 .Bd -literal -offset indent
 set root_disk_unit=2
-boot /kernel
+boot /boot/kernel
 .Ed
 .Pp
 See also:
diff --git a/sys/boot/forth/loader.4th.8 b/sys/boot/forth/loader.4th.8
index e9cf2b556d..e643de81b1 100644
--- a/sys/boot/forth/loader.4th.8
+++ b/sys/boot/forth/loader.4th.8
@@ -23,9 +23,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/sys/boot/forth/loader.4th.8,v 1.14 2002/08/13 15:09:33 ru Exp $
-.\" $DragonFly: src/sys/boot/forth/loader.4th.8,v 1.4 2004/12/20 13:13:19 joerg Exp $
+.\" $DragonFly: src/sys/boot/forth/loader.4th.8,v 1.5 2008/09/02 11:50:46 matthias Exp $
 .\"
-.Dd April 25, 1999
+.Dd September 2, 2008
 .Dt LOADER.4TH 8
 .Os
 .Sh NAME
@@ -184,7 +184,7 @@ start
 Load a different kernel with the standard configuration:
 .Pp
 .Bd -literal -offset indent -compact
-set kernel="/kernel.old"
+set kernel="/boot/kernel.old"
 unload
 boot-conf
 .Ed
diff --git a/sys/boot/forth/loader.conf.5 b/sys/boot/forth/loader.conf.5
index 0ba71d1a3d..f4a145288c 100644
--- a/sys/boot/forth/loader.conf.5
+++ b/sys/boot/forth/loader.conf.5
@@ -23,8 +23,8 @@
 .\" 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.8 2006/08/07 19:45:56 swildner Exp $
-.Dd May 29, 2005
+.\" $DragonFly: src/sys/boot/forth/loader.conf.5,v 1.9 2008/09/02 11:50:46 matthias Exp $
+.Dd September 2, 2008
 .Dt LOADER.CONF 5
 .Os
 .Sh NAME
@@ -167,7 +167,7 @@ boot menu appears. To make his life a bit more colorful, consider setting
 to
 .Dq YES .
 .It Va kernel
-.Pq Dq /kernel
+.Pq Dq /boot/kernel
 .It Va loader_color
 .Pq Dq NO
 If set to
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index dcda0bcbb7..b76eeb157f 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -31,9 +31,9 @@
 .\"
 .\"     @(#)fstat.1	8.3 (Berkeley) 2/25/94
 .\" $FreeBSD: src/usr.bin/fstat/fstat.1,v 1.9.2.7 2002/06/21 15:26:59 charnier Exp $
-.\" $DragonFly: src/usr.bin/fstat/fstat.1,v 1.6 2007/11/04 16:33:19 swildner Exp $
+.\" $DragonFly: src/usr.bin/fstat/fstat.1,v 1.7 2008/09/02 11:50:45 matthias Exp $
 .\"
-.Dd February 25, 1994
+.Dd September 2, 2008
 .Dt FSTAT 1
 .Os
 .Sh NAME
@@ -75,7 +75,7 @@ instead of the default
 .Pa /dev/kmem .
 .It Fl N
 Extract the name list from the specified system instead of the default
-.Pa /kernel .
+.Pa /boot/kernel .
 .It Fl m
 Include memory-mapped files in the listing; normally these are excluded
 due to the extra processing required.
diff --git a/usr.bin/ipcs/ipcs.1 b/usr.bin/ipcs/ipcs.1
index 6659736a72..196f5d1aaa 100644
--- a/usr.bin/ipcs/ipcs.1
+++ b/usr.bin/ipcs/ipcs.1
@@ -28,9 +28,9 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.bin/ipcs/ipcs.1,v 1.9.2.4 2003/04/08 11:07:51 tjr Exp $
-.\" $DragonFly: src/usr.bin/ipcs/ipcs.1,v 1.6 2006/07/22 18:49:25 swildner Exp $
+.\" $DragonFly: src/usr.bin/ipcs/ipcs.1,v 1.7 2008/09/02 11:50:45 matthias Exp $
 .\"
-.Dd October 31, 2004
+.Dd September 2, 2008
 .Dt "IPCS" 1
 .Os
 .Sh NAME
@@ -119,7 +119,7 @@ Display system information about shared memory.
 .It Fl N Ar system
 Extract the name list from the specified system instead of the
 default
-.Dq Pa /kernel .
+.Dq Pa /boot/kernel .
 .It Fl Q
 Display system information about messages queues.
 .It Fl S
@@ -149,7 +149,7 @@ is not guaranteed to be consistent.
 .Bl -tag -width /etc/passwd -compact
 .It Pa /dev/kmem
 default kernel memory
-.It Pa /kernel
+.It Pa /boot/kernel
 default system name list
 .El
 .Sh SEE ALSO
diff --git a/usr.bin/ktrdump/ktrdump.c b/usr.bin/ktrdump/ktrdump.c
index d81d7f901d..8199c9ec07 100644
--- a/usr.bin/ktrdump/ktrdump.c
+++ b/usr.bin/ktrdump/ktrdump.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.bin/ktrdump/ktrdump.c,v 1.10 2005/05/21 09:55:06 ru Exp $
- * $DragonFly: src/usr.bin/ktrdump/ktrdump.c,v 1.11 2008/02/17 10:23:57 corecode Exp $
+ * $DragonFly: src/usr.bin/ktrdump/ktrdump.c,v 1.12 2008/09/02 11:50:45 matthias Exp $
  */
 
 #include <sys/cdefs.h>
@@ -451,7 +451,7 @@ read_symbols(const char *execfile)
 
 	if (execfile == NULL) {
 		if (sysctlbyname("kern.bootfile", buf, &buflen, NULL, 0) < 0)
-			execfile = "/kernel";
+			execfile = "/boot/kernel";
 		else
 			execfile = buf;
 	}
diff --git a/usr.bin/netstat/netgraph.c b/usr.bin/netstat/netgraph.c
index 613fb1337d..f8d8a3ac22 100644
--- a/usr.bin/netstat/netgraph.c
+++ b/usr.bin/netstat/netgraph.c
@@ -32,7 +32,7 @@
  * OF SUCH DAMAGE.
  *
  * $FreeBSD: src/usr.bin/netstat/netgraph.c,v 1.3.2.2 2001/08/10 09:07:09 ru Exp $
- * $DragonFly: src/usr.bin/netstat/netgraph.c,v 1.5 2007/04/22 01:25:04 dillon Exp $
+ * $DragonFly: src/usr.bin/netstat/netgraph.c,v 1.6 2008/09/02 11:50:46 matthias Exp $
  *
  * $Id: atalk.c,v 1.11 1998/07/06 21:01:22 bde Exp $
  */
@@ -76,7 +76,7 @@ netgraphprotopr(u_long off, char *name, int af __unused)
 	if (off == 0) {
 		const char *const modname = "ng_socket.ko";
 /* XXX We should get "mpath" from "sysctl kern.module_path" */
-		const char *mpath[] = { "/", "/boot/", "/modules/", NULL };
+		const char *mpath[] = { "/", "/boot/", "/boot/modules/", NULL };
 		struct nlist sym[] = { { "_ngsocklist" }, { NULL } };
 		const char **pre;
 		struct kld_file_stat ks;
diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1
index b44b5be878..6a2ea60eb7 100644
--- a/usr.bin/nfsstat/nfsstat.1
+++ b/usr.bin/nfsstat/nfsstat.1
@@ -31,9 +31,9 @@
 .\"
 .\"     From: @(#)nfsstat.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD: src/usr.bin/nfsstat/nfsstat.1,v 1.10.2.1 2001/08/16 13:16:59 ru Exp $
-.\" $DragonFly: src/usr.bin/nfsstat/nfsstat.1,v 1.2 2003/06/17 04:29:30 dillon Exp $
+.\" $DragonFly: src/usr.bin/nfsstat/nfsstat.1,v 1.3 2008/09/02 11:50:46 matthias Exp $
 .\"
-.Dd June 6, 1993
+.Dd September 2, 2008
 .Dt NFSSTAT 1
 .Os
 .Sh NAME
@@ -64,7 +64,7 @@ instead of the default
 .Pa /dev/kmem .
 .It Fl N
 Extract the name list from the specified system instead of the default
-.Pa /kernel .
+.Pa /boot/kernel .
 .It Fl s
 Only display server side statistics
 .It Fl W
@@ -79,7 +79,7 @@ second intervals.
 .El
 .Sh FILES
 .Bl -tag -width /dev/kmem -compact
-.It Pa /kernel
+.It Pa /boot/kernel
 default kernel namelist
 .It Pa /dev/kmem
 default memory file
diff --git a/usr.bin/pctrack/pctrack.c b/usr.bin/pctrack/pctrack.c
index 4c4a5042b4..a21afef916 100644
--- a/usr.bin/pctrack/pctrack.c
+++ b/usr.bin/pctrack/pctrack.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $DragonFly: src/usr.bin/pctrack/pctrack.c,v 1.1 2006/06/08 18:48:30 dillon Exp $
+ * $DragonFly: src/usr.bin/pctrack/pctrack.c,v 1.2 2008/09/02 11:50:46 matthias Exp $
  */
 
 #include <sys/cdefs.h>
@@ -260,7 +260,7 @@ read_symbols(const char *execfile)
 
 	if (execfile == NULL) {
 		if (sysctlbyname("kern.bootfile", buf, &buflen, NULL, 0) < 0)
-			execfile = "/kernel";
+			execfile = "/boot/kernel";
 		else
 			execfile = buf;
 	}
diff --git a/usr.bin/symorder/symorder.1 b/usr.bin/symorder/symorder.1
index d3b4519922..c8b26c1108 100644
--- a/usr.bin/symorder/symorder.1
+++ b/usr.bin/symorder/symorder.1
@@ -31,9 +31,9 @@
 .\"
 .\"     @(#)symorder.1	6.5 (Berkeley) 4/22/91
 .\" $FreeBSD: src/usr.bin/symorder/symorder.1,v 1.9.2.3 2001/08/16 13:17:05 ru Exp $
-.\" $DragonFly: src/usr.bin/symorder/symorder.1,v 1.2 2003/06/17 04:29:32 dillon Exp $
+.\" $DragonFly: src/usr.bin/symorder/symorder.1,v 1.3 2008/09/02 11:50:46 matthias Exp $
 .\"
-.Dd April 22, 1991
+.Dd September 2, 2008
 .Dt SYMORDER 1
 .Os
 .Sh NAME
@@ -77,7 +77,7 @@ Exit with status zero, even if some symbols are missing.
 .Pp
 This program was specifically designed to cut down on the
 overhead of getting symbols from
-.Pa /kernel .
+.Pa /boot/kernel .
 .Sh DIAGNOSTICS
 The
 .Nm
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index 23b195508b..8f018b8ea3 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -31,9 +31,9 @@
 .\"
 .\"	@(#)systat.1	8.2 (Berkeley) 12/30/93
 .\" $FreeBSD: src/usr.bin/systat/systat.1,v 1.23.2.9 2002/12/29 16:35:40 schweikh Exp $
-.\" $DragonFly: src/usr.bin/systat/systat.1,v 1.7 2007/10/04 11:12:34 swildner Exp $
+.\" $DragonFly: src/usr.bin/systat/systat.1,v 1.8 2008/09/02 11:50:46 matthias Exp $
 .\"
-.Dd May 31, 2007
+.Dd September 2, 2008
 .Dt SYSTAT 1
 .Os
 .Sh NAME
@@ -517,7 +517,7 @@ and all passthrough devices that provide access to CDROM drives.
 .El
 .Sh FILES
 .Bl -tag -width /etc/networks -compact
-.It Pa /kernel
+.It Pa /boot/kernel
 For the namelist.
 .It Pa /dev/kmem
 For information in main memory.
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index d54cc0ad9b..897dc9cb8b 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -31,9 +31,9 @@
 .\"
 .\"	@(#)vmstat.8	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD: src/usr.bin/vmstat/vmstat.8,v 1.16.2.5 2001/08/16 13:17:13 ru Exp $
-.\" $DragonFly: src/usr.bin/vmstat/vmstat.8,v 1.5 2008/05/02 02:05:07 swildner Exp $
+.\" $DragonFly: src/usr.bin/vmstat/vmstat.8,v 1.6 2008/09/02 11:50:46 matthias Exp $
 .\"
-.Dd June 4, 2007
+.Dd September 2, 2008
 .Dt VMSTAT 8
 .Os
 .Sh NAME
@@ -92,7 +92,7 @@ instead of the default
 Extract the name list from the specified
 .Ar system
 instead of the default
-.Pa /kernel .
+.Pa /boot/kernel .
 .It Fl m
 Report on the usage of kernel dynamic memory listed first by size of
 allocation and then by type of usage.
@@ -288,7 +288,7 @@ cpu idle
 .El
 .Sh FILES
 .Bl -tag -width /dev/kmemxxx -compact
-.It Pa /kernel
+.It Pa /boot/kernel
 default kernel namelist
 .It Pa /dev/kmem
 default memory file
diff --git a/usr.bin/w/uptime.1 b/usr.bin/w/uptime.1
index 735f5e3892..6b40ddaef1 100644
--- a/usr.bin/w/uptime.1
+++ b/usr.bin/w/uptime.1
@@ -31,9 +31,9 @@
 .\"
 .\"     @(#)uptime.1	8.2 (Berkeley) 4/18/94
 .\" $FreeBSD: src/usr.bin/w/uptime.1,v 1.5.2.2 2001/08/16 13:17:13 ru Exp $
-.\" $DragonFly: src/usr.bin/w/uptime.1,v 1.2 2003/06/17 04:29:33 dillon Exp $
+.\" $DragonFly: src/usr.bin/w/uptime.1,v 1.3 2008/09/02 11:50:46 matthias Exp $
 .\"
-.Dd April 18, 1994
+.Dd September 2, 2008
 .Dt UPTIME 1
 .Os
 .Sh NAME
@@ -49,8 +49,8 @@ the length of time the system has been up,
 the number of users, and the load average of the system over the last
 1, 5, and 15 minutes.
 .Sh FILES
-.Bl -tag -width /kernel
-.It Pa /kernel
+.Bl -tag -width /boot/kernel
+.It Pa /boot/kernel
 system name list
 .El
 .Sh SEE ALSO
diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1
index d43ef7a027..e285ede9d6 100644
--- a/usr.bin/w/w.1
+++ b/usr.bin/w/w.1
@@ -31,9 +31,9 @@
 .\"
 .\"     @(#)w.1	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD: src/usr.bin/w/w.1,v 1.12.2.5 2001/12/14 15:53:32 ru Exp $
-.\" $DragonFly: src/usr.bin/w/w.1,v 1.4 2007/09/02 19:30:47 swildner Exp $
+.\" $DragonFly: src/usr.bin/w/w.1,v 1.5 2008/09/02 11:50:46 matthias Exp $
 .\"
-.Dd June 6, 1993
+.Dd September 2, 2008
 .Dt W 1
 .Os
 .Sh NAME
@@ -77,7 +77,7 @@ core instead of the default
 .It Fl N
 Extract the name list from the specified system instead of the
 default
-.Pa /kernel .
+.Pa /boot/kernel .
 .It Fl n
 Don't attempt to resolve network addresses (normally
 .Nm
diff --git a/usr.sbin/asf/asf.8 b/usr.sbin/asf/asf.8
index ad9996f1cb..afbb0100fb 100644
--- a/usr.sbin/asf/asf.8
+++ b/usr.sbin/asf/asf.8
@@ -22,9 +22,9 @@
 .\" such damage.
 .\"
 .\" $FreeBSD$
-.\" $DragonFly: src/usr.sbin/asf/asf.8,v 1.5 2008/05/19 11:34:23 swildner Exp $
+.\" $DragonFly: src/usr.sbin/asf/asf.8,v 1.6 2008/09/02 11:50:46 matthias Exp $
 .\"
-.Dd May 19, 2008
+.Dd September 2, 2008
 .Os
 .Dt ASF 8
 .Sh NAME
@@ -53,7 +53,7 @@ If
 is specified,
 .Nm
 uses it for the modules directory instead of the default
-.Pa /modules .
+.Pa /boot/modules .
 This is useful when building in a non-standard location (i.e., not
 .Pa /usr/src
 and
diff --git a/usr.sbin/asf/asf.c b/usr.sbin/asf/asf.c
index 64b371300e..c82c903fa8 100644
--- a/usr.sbin/asf/asf.c
+++ b/usr.sbin/asf/asf.c
@@ -25,7 +25,7 @@
  */
 /* $Id: asf.c,v 1.6 2003/11/04 06:38:37 green Exp $ */
 /* $FreeBSD: src/usr.sbin/asf/asf.c,v 1.6 2003/11/04 06:38:37 green Exp $ */
-/* $DragonFly: src/usr.sbin/asf/asf.c,v 1.6 2008/07/14 00:09:42 dillon Exp $ */
+/* $DragonFly: src/usr.sbin/asf/asf.c,v 1.7 2008/09/02 11:50:46 matthias Exp $ */
 
 #define MAXLINE 1024
 #include <ctype.h>
@@ -234,7 +234,7 @@ main(int argc, char *argv[])
 	return 1;
     }
     if (modules_path == NULL)
-	modules_path = "/modules";
+	modules_path = "/boot/modules";
     if (outfile == NULL)
 	outfile = ".asf";
     if ((out = fopen(outfile, filemode)) == NULL) {
diff --git a/usr.sbin/dconschat/dconschat.8 b/usr.sbin/dconschat/dconschat.8
index e62acb4e7a..7abbd3fa12 100644
--- a/usr.sbin/dconschat/dconschat.8
+++ b/usr.sbin/dconschat/dconschat.8
@@ -23,10 +23,10 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/dconschat/dconschat.8,v 1.5 2004/06/13 18:03:42 ru Exp $
-.\" $DragonFly: src/usr.sbin/dconschat/dconschat.8,v 1.3 2006/02/17 19:40:14 swildner Exp $
+.\" $DragonFly: src/usr.sbin/dconschat/dconschat.8,v 1.4 2008/09/02 11:50:46 matthias Exp $
 .\"
 .\"
-.Dd February 11, 2003
+.Dd September 2, 2008
 .Dt DCONSCHAT 8
 .Os
 .Sh NAME
@@ -162,7 +162,7 @@ The default value is \-1 (disabled).
 Specify core file.
 .It Fl N Ar system
 Specify system file such as
-.Pa /kernel .
+.Pa /boot/kernel .
 .It Fl t Ar target_eui64
 Specify the 64-bit extended unique identifier of the target,
 and use FireWire to access remote
diff --git a/usr.sbin/kernbb/kernbb.8 b/usr.sbin/kernbb/kernbb.8
index 08ea61e498..e6f6d74a50 100644
--- a/usr.sbin/kernbb/kernbb.8
+++ b/usr.sbin/kernbb/kernbb.8
@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\" $FreeBSD: src/usr.sbin/kernbb/kernbb.8,v 1.9.2.5 2001/08/16 15:56:01 ru Exp $
-.\" $DragonFly: src/usr.sbin/kernbb/kernbb.8,v 1.2 2003/06/17 04:29:55 dillon Exp $
+.\" $DragonFly: src/usr.sbin/kernbb/kernbb.8,v 1.3 2008/09/02 11:50:46 matthias Exp $
 .\"
-.Dd May 22, 1995
+.Dd September 2, 2008
 .Dt KERNBB 8
 .Os
 .Sh NAME
@@ -58,7 +58,7 @@ of executions, length of the basic-block in bytes and the product of
 the previous two fields.
 .Sh FILES
 .Bl -tag -width /dev/kmemx -compact
-.It Pa /kernel
+.It Pa /boot/kernel
 the default system
 .It Pa /dev/kmem
 the default memory
diff --git a/usr.sbin/kgmon/kgmon.8 b/usr.sbin/kgmon/kgmon.8
index 88f2a7d06b..caf1000c31 100644
--- a/usr.sbin/kgmon/kgmon.8
+++ b/usr.sbin/kgmon/kgmon.8
@@ -31,9 +31,9 @@
 .\"
 .\"     @(#)kgmon.8	8.1 (Berkeley) 6/6/93
 .\" $FreeBSD: src/usr.sbin/kgmon/kgmon.8,v 1.7.2.4 2003/03/11 21:13:50 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/kgmon/kgmon.8,v 1.3 2006/02/17 19:40:16 swildner Exp $
+.\" $DragonFly: src/usr.sbin/kgmon/kgmon.8,v 1.4 2008/09/02 11:50:46 matthias Exp $
 .\"
-.Dd June 6, 1993
+.Dd September 2, 2008
 .Dt KGMON 8
 .Os
 .Sh NAME
@@ -89,7 +89,7 @@ instead of the default
 .It Fl N
 Extract the name list from the specified system instead of the
 default
-.Pa /kernel .
+.Pa /boot/kernel .
 .El
 .Pp
 If neither
@@ -110,7 +110,7 @@ The profile buffers should be reset when the resolution
 of the profile data is changed.
 .Sh FILES
 .Bl -tag -width /dev/kmemx -compact
-.It Pa /kernel
+.It Pa /boot/kernel
 the default system
 .It Pa /dev/kmem
 the default memory
diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8
index 1311458085..01ef5636ef 100644
--- a/usr.sbin/pstat/pstat.8
+++ b/usr.sbin/pstat/pstat.8
@@ -31,9 +31,9 @@
 .\"
 .\"     @(#)pstat.8	8.5 (Berkeley) 5/13/94
 .\" $FreeBSD: src/usr.sbin/pstat/pstat.8,v 1.19.2.10 2002/07/12 09:12:49 des Exp $
-.\" $DragonFly: src/usr.sbin/pstat/pstat.8,v 1.4 2008/05/09 20:31:04 swildner Exp $
+.\" $DragonFly: src/usr.sbin/pstat/pstat.8,v 1.5 2008/09/02 11:50:46 matthias Exp $
 .\"
-.Dd May 13, 1994
+.Dd September 2, 2008
 .Dt PSTAT 8
 .Os
 .Sh NAME
@@ -238,11 +238,11 @@ instead of the default
 .Pa /dev/kmem .
 .It Fl N
 Extract the name list from the specified system instead of the default
-.Pa /kernel .
+.Pa /boot/kernel .
 .El
 .Sh FILES
 .Bl -tag -width /dev/memxxx -compact
-.It Pa /kernel
+.It Pa /boot/kernel
 namelist
 .It Pa /dev/mem
 default source of tables
diff --git a/usr.sbin/rwhod/rwhod.8 b/usr.sbin/rwhod/rwhod.8
index 0605a2e32b..c7a1131134 100644
--- a/usr.sbin/rwhod/rwhod.8
+++ b/usr.sbin/rwhod/rwhod.8
@@ -31,9 +31,9 @@
 .\"
 .\"     @(#)rwhod.8	8.2 (Berkeley) 12/11/93
 .\" $FreeBSD: src/usr.sbin/rwhod/rwhod.8,v 1.13.2.4 2003/03/11 22:31:33 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/rwhod/rwhod.8,v 1.6 2006/02/17 19:40:26 swildner Exp $
+.\" $DragonFly: src/usr.sbin/rwhod/rwhod.8,v 1.7 2008/09/02 11:50:47 matthias Exp $
 .\"
-.Dd December 11, 1993
+.Dd September 2, 2008
 .Dt RWHOD 8
 .Os
 .Sh NAME
@@ -232,7 +232,7 @@ Status messages are generated by default approximately once every
 performs an
 .Xr nlist 3
 on
-.Pa /kernel
+.Pa /boot/kernel
 every 30 minutes to guard against
 the possibility that this file is not the system
 image currently operating.
diff --git a/usr.sbin/trpt/trpt.8 b/usr.sbin/trpt/trpt.8
index e83b92179e..9e6684ac47 100644
--- a/usr.sbin/trpt/trpt.8
+++ b/usr.sbin/trpt/trpt.8
@@ -31,9 +31,9 @@
 .\"
 .\"     @(#)trpt.8	8.2 (Berkeley) 12/11/93
 .\" $FreeBSD: src/usr.sbin/trpt/trpt.8,v 1.8.2.5 2003/03/11 22:31:34 trhodes Exp $
-.\" $DragonFly: src/usr.sbin/trpt/trpt.8,v 1.3 2006/02/17 19:40:28 swildner Exp $
+.\" $DragonFly: src/usr.sbin/trpt/trpt.8,v 1.4 2008/09/02 11:50:47 matthias Exp $
 .\"
-.Dd December 11, 1993
+.Dd September 2, 2008
 .Dt TRPT 8
 .Os
 .Sh NAME
@@ -128,7 +128,7 @@ core file other than the default, the last two
 arguments may be used to supplant the defaults.
 .Sh FILES
 .Bl -tag -width /dev/kmem -compact
-.It Pa /kernel
+.It Pa /boot/kernel
 .It Pa /dev/kmem
 .El
 .Sh DIAGNOSTICS
-- 
2.41.0