Replace /kernel with /boot/kernel/kernel.

PR:		docs/37757
Submitted by:	Hiten Pandya <hiten@uk.FreeBSD.org>

21 files changed, 46 insertions, 45 deletions

diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 3590223..01455d5 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -119,7 +119,7 @@ Sort by memory usage, instead of by process
 .Tn ID .
 .It Fl N
 Extract the name list from the specified system instead of the default
-.Pa /kernel .
+.Pa /boot/kernel/kernel .
 .It Fl O
 Add the information associated with the space or comma separated list
 of keywords specified, after the process
@@ -518,7 +518,7 @@ KLD
 /dev name database
 .It Pa /var/db/kvm_kernel.db
 system namelist database
-.It Pa /kernel
+.It Pa /boot/kernel/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 0365598..6cde6ad 100644
--- a/lib/libc/gen/getbootfile.3
+++ b/lib/libc/gen/getbootfile.3
@@ -63,7 +63,7 @@ placed in the global location
 .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/kernel
 is returned instead of the real boot file.
 .Sh HISTORY
 The
diff --git a/sbin/nextboot/nextboot.8 b/sbin/nextboot/nextboot.8
index b57c4b0..fa9882b 100644
--- a/sbin/nextboot/nextboot.8
+++ b/sbin/nextboot/nextboot.8
@@ -76,14 +76,15 @@ At this time the nameblock will contain only zeroed out names.
 .Pp
 An example of usage might be:
 .Bd -literal
-   nextboot -b  /dev/rwd0 1:sd(0,a)/kernel.experimental wd(0,a)/kernel.old
+   nextboot -b  /dev/rwd0 1:sd(0,a)/boot/kernel/kernel.experimental \\ 
+   wd(0,a)/boot/kernel.old/kernel
 .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/kernel
 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/share/man/man4/vinum.4 b/share/man/man4/vinum.4
index 2edbcb8..b997a94 100644
--- a/share/man/man4/vinum.4
+++ b/share/man/man4/vinum.4
@@ -837,13 +837,13 @@ 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
 .Nm gdb :
 .Bd -literal
-$ file /modules/vinum.ko
-/modules/vinum.ko: ELF 32-bit LSB shared object, Intel 80386,
+$ file /boot/kernel/vinum.ko
+/boot/kernel/vinum.ko: ELF 32-bit LSB shared object, Intel 80386,
   version 1 (FreeBSD), not stripped
 .Ed
 .Pp
 If the output shows that
-.Pa /modules/vinum.ko
+.Pa /boot/kernel/vinum.ko
 is stripped, you will have to find a version which is not.  Usually this will be
 either in
 .Pa /usr/obj/sys/modules/vinum/vinum.ko
diff --git a/sys/boot/forth/loader.4th.8 b/sys/boot/forth/loader.4th.8
index 2d03a61..d3618f8 100644
--- a/sys/boot/forth/loader.4th.8
+++ b/sys/boot/forth/loader.4th.8
@@ -176,7 +176,7 @@ start
 Loads a different kernel with the standard configuration:
 .Pp
 .Bd -literal -offset indent -compact
-set kernel="kernel.old"
+set kernel="/boot/kernel.old/kernel"
 unload
 boot-conf
 .Ed
diff --git a/sys/boot/forth/loader.conf.5 b/sys/boot/forth/loader.conf.5
index c24e984..1e71a23 100644
--- a/sys/boot/forth/loader.conf.5
+++ b/sys/boot/forth/loader.conf.5
@@ -154,7 +154,7 @@ selects the video console, and
 selects a mute console
 (useful for systems with neither a video console nor a serial port).
 .It Va kernel
-.Pq Dq /kernel
+.Pq Dq /boot/kernel/kernel
 .It Va loader_conf_files
 .Pq Do /boot/loader.conf /boot/loader.conf.local Dc
 .It Va splash_bmp_load
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index 4f0de5a..145b4ce 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -74,7 +74,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/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 7dcd03e..f99b430 100644
--- a/usr.bin/ipcs/ipcs.1
+++ b/usr.bin/ipcs/ipcs.1
@@ -100,7 +100,7 @@ or the last operation on a semaphore.
 .It Fl C Ar system
 Extract the name list from the specified system instead of the
 default
-.Dq Pa /kernel .
+.Dq Pa /boot/kernel/kernel .
 Implies
 .Fl y .
 .It Fl M
@@ -154,10 +154,10 @@ This manual page is woefully incomplete, because it does not
 at all attempt to explain the information printed by
 .Nm .
 .Sh FILES
-.Bl -tag -width /etc/passwd -compact
+.Bl -tag -width /boot/kernel/kernel -compact
 .It Pa /dev/kmem
 default kernel memory
-.It Pa /kernel
+.It Pa /boot/kernel/kernel
 default system name list
 .El
 .Sh SEE ALSO
diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1
index 8eeae90..8dd7575 100644
--- a/usr.bin/nfsstat/nfsstat.1
+++ b/usr.bin/nfsstat/nfsstat.1
@@ -63,7 +63,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/kernel .
 .It Fl s
 Only display server side statistics
 .It Fl W
@@ -77,8 +77,8 @@ activity for both the client and server at
 second intervals.
 .El
 .Sh FILES
-.Bl -tag -width /dev/kmem -compact
-.It Pa /kernel
+.Bl -tag -width /boot/kernel/kernel -compact
+.It Pa /boot/kernel/kernel
 default kernel namelist
 .It Pa /dev/kmem
 default memory file
diff --git a/usr.bin/symorder/symorder.1 b/usr.bin/symorder/symorder.1
index ed54ece..0778fd4 100644
--- a/usr.bin/symorder/symorder.1
+++ b/usr.bin/symorder/symorder.1
@@ -76,7 +76,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/kernel .
 .Sh DIAGNOSTICS
 The
 .Nm
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index 9e68126..07512ae 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -503,8 +503,8 @@ and all passthrough devices that provide access to CDROM drives.
 .Xr iostat 8 ,
 .Xr vmstat 8
 .Sh FILES
-.Bl -tag -width /etc/networks -compact
-.It Pa /kernel
+.Bl -tag -width /boot/kernel/kernel -compact
+.It Pa /boot/kernel/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 ff8b80b..10986e0 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -91,7 +91,7 @@ instead of the default
 Extract the name list from the specified
 .Ar system
 instead of the default
-.Pa /kernel .
+.Pa /boot/kernel/kernel .
 .It Fl m
 Report on the usage of kernel dynamic memory listed first by size of
 allocation and then by type of usage.
@@ -297,8 +297,8 @@ will tell vmstat to select the first three direct access or CDROM devices
 and display statistics on those devices, as well as other systems
 statistics every second.
 .Sh FILES
-.Bl -tag -width /dev/kmemxxx -compact
-.It Pa /kernel
+.Bl -tag -width /boot/kernel/kernel -compact
+.It Pa /boot/kernel/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 c5d0c34..cc11c71 100644
--- a/usr.bin/w/uptime.1
+++ b/usr.bin/w/uptime.1
@@ -48,8 +48,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/kernel
+.It Pa /boot/kernel/kernel
 system name list
 .El
 .Sh SEE ALSO
diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1
index 8c87a87..08b2884 100644
--- a/usr.bin/w/w.1
+++ b/usr.bin/w/w.1
@@ -76,7 +76,7 @@ core instead of the default
 .It Fl N
 Extract the name list from the specified system instead of the
 default
-.Dq /kernel .
+.Dq /boot/kernel/kernel .
 .It Fl n
 Don't attempt to resolve network addresses (normally
 .Nm
diff --git a/usr.sbin/getextattr/getextattr.8 b/usr.sbin/getextattr/getextattr.8
index a80780c..72c165f 100644
--- a/usr.sbin/getextattr/getextattr.8
+++ b/usr.sbin/getextattr/getextattr.8
@@ -78,18 +78,18 @@ to succeed, the attribute service must be available on the file system,
 and the attribute must of defined for the file queried.
 .Sh EXAMPLES
 .Bd -literal -offset indent
-# getextattr system md5 /kernel
-/kernel:
+# getextattr system md5 /boot/kernel/kernel
+/boot/kernel/kernel:
   61 61 33 62 39 39 66 65    31 35 35 32 31 62 65 32
   62 36 38 36 62 31 66 39    63 64 33 39 35 36 36 31
-# getextattr -s system md5 /kernel
-/kernel: "aa3b99fe15521be2b686b1f9cd395661"
+# getextattr -s system md5 /boot/kernel/kernel
+/boot/kernel/kernel: "aa3b99fe15521be2b686b1f9cd395661"
 .Ed
 .Pp
 Retrieve the
 .Dq md5
 extended attribute for the file
-.Pa /kernel .
+.Pa /boot/kernel/kernel .
 .Sh SEE ALSO
 .Xr extattr 2 ,
 .Xr extattr 3 ,
diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index cac8f9a..c93dcb4 100644
--- a/usr.sbin/iostat/iostat.8
+++ b/usr.sbin/iostat/iostat.8
@@ -144,7 +144,7 @@ will display fewer devices if there aren't
 devices present.
 .It Fl N
 Extract the name list from the specified system instead of the default
-.Dq Pa /kernel .
+.Dq Pa /boot/kernel/kernel .
 .It Fl o
 Display old-style
 .Nm
@@ -350,8 +350,8 @@ average milliseconds per transaction
 .El
 .El
 .Sh FILES
-.Bl -tag -width /dev/kmem -compact
-.It Pa /kernel
+.Bl -tag -width /boot/kernel/kernel -compact
+.It Pa /boot/kernel/kernel
 Default kernel namelist.
 .It Pa /dev/kmem
 Default memory file.
diff --git a/usr.sbin/kernbb/kernbb.8 b/usr.sbin/kernbb/kernbb.8
index 52187d5..fa3b287 100644
--- a/usr.sbin/kernbb/kernbb.8
+++ b/usr.sbin/kernbb/kernbb.8
@@ -56,8 +56,8 @@ following fields: filename, linenumber, procedure, address, count
 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
+.Bl -tag -width /boot/kernel/kernel -compact
+.It Pa /boot/kernel/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 f21bc0d..8c8eb22 100644
--- a/usr.sbin/pstat/pstat.8
+++ b/usr.sbin/pstat/pstat.8
@@ -364,11 +364,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/kernel .
 .El
 .Sh FILES
-.Bl -tag -width /dev/memxxx -compact
-.It Pa /kernel
+.Bl -tag -width /boot/kernel/kernel -compact
+.It Pa /boot/kernel/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 3102e7f..97a3191 100644
--- a/usr.sbin/rwhod/rwhod.8
+++ b/usr.sbin/rwhod/rwhod.8
@@ -216,7 +216,7 @@ Status messages are generated approximately once every
 performs an
 .Xr nlist 3
 on
-.Pa /kernel
+.Pa /boot/kernel/kernel
 every 30 minutes to guard against
 the possibility that this file is not the system
 image currently operating.
diff --git a/usr.sbin/setextattr/setextattr.8 b/usr.sbin/setextattr/setextattr.8
index 0e406ec..fbe64d6 100644
--- a/usr.sbin/setextattr/setextattr.8
+++ b/usr.sbin/setextattr/setextattr.8
@@ -59,13 +59,13 @@ In order for
 to succeed, the attribute service must be available on the file system,
 and appropriate privilege may be required.
 .Sh EXAMPLES
-.Dl # setextattr system md5 /kernel `md5 -q /kernel`
+.Dl # setextattr system md5 /boot/kernel/kernel `md5 -q /boot/kernel/kernel`
 .Pp
 Set the
 .Dq md5
-extended attribute on the file /kernel to the string
+extended attribute on the file /boot/kernel/kernel to the string
 containing the output of
-.Dq md5 -q /kernel .
+.Dq md5 -q /boot/kernel/kernel .
 .Sh SEE ALSO
 .Xr extattr 2 ,
 .Xr extattr 3 ,
diff --git a/usr.sbin/trpt/trpt.8 b/usr.sbin/trpt/trpt.8
index fa3ab2e..1cbd6ae 100644
--- a/usr.sbin/trpt/trpt.8
+++ b/usr.sbin/trpt/trpt.8
@@ -125,8 +125,8 @@ If debugging is being performed on a system or
 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
+.Bl -tag -width /boot/kernel/kernel -compact
+.It Pa /boot/kernel/kernel
 .It Pa /dev/kmem
 .El
 .Sh SEE ALSO