19 files changed, 48 insertions, 48 deletions
diff --git a/usr.sbin/XNSrouted/defs.h b/usr.sbin/XNSrouted/defs.h
index c380e81..c6f8b5f 100644
--- a/usr.sbin/XNSrouted/defs.h
+++ b/usr.sbin/XNSrouted/defs.h
@@ -73,7 +73,7 @@ int	kmem;
 int	supplier;		/* process should supply updates */
 int	install;		/* if 1 call kernel */
 int	lookforinterfaces;	/* if 1 probe kernel for new up interfaces */
-int	performnlist;		/* if 1 check if /vmunix has changed */
+int	performnlist;		/* if 1 check if /kernel has changed */
 int	externalinterfaces;	/* # of remote and local interfaces */
 int	timeval;		/* local idea of time */
 int	noteremoterequests;	/* squawk on requests from non-local nets */
diff --git a/usr.sbin/bad144/bad144.8 b/usr.sbin/bad144/bad144.8
index 9ea8c88..e3843de 100644
--- a/usr.sbin/bad144/bad144.8
+++ b/usr.sbin/bad144/bad144.8
@@ -172,7 +172,7 @@ errors, or the special
 .Tn SSE
 (skip sector) errors of RM80-type disks.
 This means that none of these errors can occur when reading the file
-.Pa /vmunix
+.Pa /kernel
 to boot.  Sectors 0-15 of the disk drive
 must also not have any of these errors.
 .Pp
diff --git a/usr.sbin/config.new/config.h b/usr.sbin/config.new/config.h
index dde683d..a36abbd 100644
--- a/usr.sbin/config.new/config.h
+++ b/usr.sbin/config.new/config.h
@@ -63,7 +63,7 @@ struct nvlist {
  */
 struct config {
 	struct	config *cf_next;	/* linked list */
-	const char *cf_name;		/* "vmunix" */
+	const char *cf_name;		/* "kernel" */
 	int	cf_lineno;		/* source line */
 	struct	nvlist *cf_root;	/* "root on ra0a" */
 	struct	nvlist *cf_swap;	/* "swap on ra0b and ra1b" */
diff --git a/usr.sbin/config/SMM.doc/3.t b/usr.sbin/config/SMM.doc/3.t
index cbb904f..e0b6234 100644
--- a/usr.sbin/config/SMM.doc/3.t
+++ b/usr.sbin/config/SMM.doc/3.t
@@ -194,17 +194,17 @@ Building the system
 The makefile constructed by
 .I config
 should allow a new system to be rebuilt by simply typing ``make image-name''.
-For example, if you have named your bootable system image ``vmunix'',
-then ``make vmunix''
-will generate a bootable image named ``vmunix''.  Alternate system image names
+For example, if you have named your bootable system image ``kernel'',
+then ``make kernel''
+will generate a bootable image named ``kernel''.  Alternate system image names
 are used when the root file system location and/or swapping configuration
 is done in more than one way.  The makefile which
 .I config
 creates has entry points for each system image defined in
 the configuration file.
-Thus, if you have configured ``vmunix'' to be a system with the root file
-system on an ``hp'' device and ``hkvmunix'' to be a system with the root
-file system on an ``hk'' device, then ``make vmunix hkvmunix'' will generate
+Thus, if you have configured ``kernel'' to be a system with the root file
+system on an ``hp'' device and ``hkkernel'' to be a system with the root
+file system on an ``hk'' device, then ``make kernel hkkernel'' will generate
 binary images for each.
 As the system will generally use the disk from which it is loaded
 as the root filesystem, separate system images are only required
@@ -225,8 +225,8 @@ This is advantageous for programs such as
 which run much faster when the symbols they need are located at
 the front of the symbol table.  
 Remember also that many programs expect
-the currently executing system to be named ``/vmunix''.  If you install
-a new system and name it something other than ``/vmunix'', many programs
+the currently executing system to be named ``/kernel''.  If you install
+a new system and name it something other than ``/kernel'', many programs
 are likely to give strange results.
 .NH 2
 Sharing object modules
diff --git a/usr.sbin/config/SMM.doc/4.t b/usr.sbin/config/SMM.doc/4.t
index d267799..7498185 100644
--- a/usr.sbin/config/SMM.doc/4.t
+++ b/usr.sbin/config/SMM.doc/4.t
@@ -150,7 +150,7 @@ with a ``config'' line:
 The
 .I sysname
 field is the name given to the loaded system image; almost everyone
-names their standard system image ``vmunix''.  The configuration clauses
+names their standard system image ``kernel''.  The configuration clauses
 are one or more specifications indicating where the root file system
 is located and the number and location of paging devices.
 The device used by the system to process argument lists during
@@ -218,7 +218,7 @@ This is done by substituting
 where the device name would normally be found.  For example,
 .IP
 .nf
-\fBconfig\fP vmunix \fBroot\fP \fBon\fP \fBmajor\fP 99 \fBminor\fP 1
+\fBconfig\fP kernel \fBroot\fP \fBon\fP \fBmajor\fP 99 \fBminor\fP 1
 .fi
 .PP
 Normally, the areas configured for swap space are sized by the system
@@ -229,7 +229,7 @@ device name specified for a swap area should have a ``size''
 specification appended.  For example,
 .IP
 .nf
-\fBconfig\fP vmunix \fBroot\fP \fBon\fP hp0 \fBswap\fP \fBon\fP hp0b \fBsize\fP 1200
+\fBconfig\fP kernel \fBroot\fP \fBon\fP hp0 \fBswap\fP \fBon\fP hp0b \fBsize\fP 1200
 .fi
 .LP
 would force swapping to be done in partition ``b'' of ``hp0'' and
diff --git a/usr.sbin/config/SMM.doc/5.t b/usr.sbin/config/SMM.doc/5.t
index 3a0f449..81f2a52 100644
--- a/usr.sbin/config/SMM.doc/5.t
+++ b/usr.sbin/config/SMM.doc/5.t
@@ -109,9 +109,9 @@ Finally, the third will be a generic system,
 to allow us to boot off any of the four disk drives.
 .DS
 .ta 1.5i 2.5i
-config	vmunix	root on hp0
-config	hpvmunix	root on hp0 swap on hp0 and hp2
-config	genvmunix	swap generic
+config	kernel	root on hp0
+config	hpkernel	root on hp0 swap on hp0 and hp2
+config	genkernel	swap generic
 .DE
 .PP
 Finally, the hardware must be specified.  Let us first just try
@@ -206,9 +206,9 @@ the network protocol options do not require corresponding pseudo devices.
 The system images and disks are configured next.
 .DS
 .ta 1.5i 2.5i 4.0i
-config	vmunix	root on hp swap on hp and rk0 and rk1
-config 	upvmunix	root on up
-config 	hkvmunix	root on hk swap on rk0 and rk1
+config	kernel	root on hp swap on hp and rk0 and rk1
+config 	upkernel	root on up
+config 	hkkernel	root on hk swap on rk0 and rk1
 
 controller	mba0	at nexus ?
 controller	uba0	at nexus ?
diff --git a/usr.sbin/config/SMM.doc/b.t b/usr.sbin/config/SMM.doc/b.t
index 7281610..901a009 100644
--- a/usr.sbin/config/SMM.doc/b.t
+++ b/usr.sbin/config/SMM.doc/b.t
@@ -110,7 +110,7 @@ the dump.  The \fIsavecore\fP\|(8)
 program then copies the information from the dump partition to
 a file in a ``crash'' directory and also makes a copy of the
 system which was running at the time of the crash (usually
-``/vmunix'').  The offset to the system dump is defined in the
+``/kernel'').  The offset to the system dump is defined in the
 system variable \fIdumplo\fP (a sector offset from
 the front of the dump partition). The 
 .I savecore
diff --git a/usr.sbin/config/SMM.doc/c.t b/usr.sbin/config/SMM.doc/c.t
index 0f28fda..67b63ec 100644
--- a/usr.sbin/config/SMM.doc/c.t
+++ b/usr.sbin/config/SMM.doc/c.t
@@ -55,9 +55,9 @@ timezone	8 dst
 ident	ANSEL
 maxusers	40
 
-config	vmunix	root on hp0
-config	hpvmunix	root on hp0 swap on hp0 and hp2
-config	genvmunix	swap generic
+config	kernel	root on hp0
+config	hpkernel	root on hp0 swap on hp0 and hp2
+config	genkernel	swap generic
 
 controller	mba0	at nexus ?
 disk	hp0	at mba? disk ?
@@ -86,9 +86,9 @@ maxusers	32
 options	INET
 options	NS
 
-config	vmunix	root on hp swap on hp and rk0 and rk1
-config	upvmunix	root on up
-config	hkvmunix	root on hk swap on rk0 and rk1
+config	kernel	root on hp swap on hp and rk0 and rk1
+config	upkernel	root on up
+config	hkkernel	root on hk swap on rk0 and rk1
 
 controller	mba0	at nexus ?
 controller	uba0	at nexus ?
diff --git a/usr.sbin/config/SMM.doc/spell.ok b/usr.sbin/config/SMM.doc/spell.ok
index 4132452..50c4ef2 100644
--- a/usr.sbin/config/SMM.doc/spell.ok
+++ b/usr.sbin/config/SMM.doc/spell.ok
@@ -157,7 +157,7 @@ files.machine
 filesystem
 foo
 foo.c
-genvmunix
+genkernel
 gettimeofday
 gigabytes
 gprof
@@ -165,14 +165,14 @@ hardwired
 hd
 hk
 hk0
-hkvmunix
+hkkernel
 howmany
 hp0
 hp0b
 hp1
 hp2
 hp3
-hpvmunix
+hpkernel
 ht0
 hz
 ident
@@ -288,7 +288,7 @@ upminfo
 upprobe
 upslave
 upstd
-upvmunix
+upkernel
 upwatch
 upwstart
 value,name2
@@ -298,7 +298,7 @@ vaxif
 vaxmba
 vaxuba
 vmparam.h
-vmunix
+kernel
 wildcard
 wildcarded
 wildcarding
diff --git a/usr.sbin/iostat/iostat.8 b/usr.sbin/iostat/iostat.8
index 48ef627..679dfc6 100644
--- a/usr.sbin/iostat/iostat.8
+++ b/usr.sbin/iostat/iostat.8
@@ -70,7 +70,7 @@ instead of the default
 .Dq Pa /dev/kmem .
 .It Fl N
 Extract the name list from the specified system instead of the default
-.Dq Pa /vmunix .
+.Dq Pa /kernel .
 .It Fl w
 Pause
 .Ar wait
@@ -124,7 +124,7 @@ seeks and rotational latency)
 .El
 .Sh FILES
 .Bl -tag -width /dev/kmem -compact
-.It Pa /vmunix
+.It Pa /kernel
 Default kernel namelist.
 .It Pa /dev/kmem
 Default memory file.
diff --git a/usr.sbin/kgmon/kgmon.8 b/usr.sbin/kgmon/kgmon.8
index 060ed2e..114fea8 100644
--- a/usr.sbin/kgmon/kgmon.8
+++ b/usr.sbin/kgmon/kgmon.8
@@ -82,7 +82,7 @@ Extract values associated with the name list from the specified core
 instead of the default ``/dev/kmem''.
 .It Fl N
 Extract the name list from the specified system instead of the
-default ``/vmunix''.
+default ``/kernel''.
 .El
 .Pp
 If neither 
@@ -98,7 +98,7 @@ the operating system profile buffers will be dumped,
 and profiling will be immediately resumed.
 .Sh FILES
 .Bl -tag -width /dev/kmemx -compact
-.It Pa /vmunix
+.It Pa /kernel
 the default system
 .It Pa /dev/kmem
 the default memory
diff --git a/usr.sbin/kvm_mkdb/kvm_mkdb.8 b/usr.sbin/kvm_mkdb/kvm_mkdb.8
index d9dcbf9..6b14e08 100644
--- a/usr.sbin/kvm_mkdb/kvm_mkdb.8
+++ b/usr.sbin/kvm_mkdb/kvm_mkdb.8
@@ -46,7 +46,7 @@ creates a database in
 .Pa /var/db
 containing information about the specified file.
 If no file is specified,
-.Pa /vmunix
+.Pa /kernel
 is used by default.
 The file is named ``kvm_filename.db'', where ``filename'' is the
 name of the file read.
@@ -57,9 +57,9 @@ used by the
 function, however, in the future the database may contain other static
 information about the current system.
 .Sh FILES
-.Bl -tag -width /var/db/kvm_vmunix.db -compact
-.It Pa /vmunix
-.It Pa /var/db/kvm_vmunix.db
+.Bl -tag -width /var/db/kvm_kernel.db -compact
+.It Pa /kernel
+.It Pa /var/db/kvm_kernel.db
 .El
 .Sh SEE ALSO
 .Xr kvm_nlist 3
diff --git a/usr.sbin/pstat/pstat.8 b/usr.sbin/pstat/pstat.8
index 95f3d86..b2e8dec 100644
--- a/usr.sbin/pstat/pstat.8
+++ b/usr.sbin/pstat/pstat.8
@@ -53,7 +53,7 @@ is given, the information is sought there, otherwise
 in
 .Pa /dev/kmem .
 The required namelist is taken from
-.Pa /vmunix
+.Pa /kernel
 unless 
 .Ar system
 is specified.
@@ -294,7 +294,7 @@ major and minor device of special file.
 .El
 .Sh FILES
 .Bl -tag -width /dev/kmemxxx -compact
-.It Pa /vmunix
+.It Pa /kernel
 namelist
 .It Pa /dev/kmem
 default source of tables
diff --git a/usr.sbin/routed/defs.h b/usr.sbin/routed/defs.h
index 5b5ccac..5672210 100644
--- a/usr.sbin/routed/defs.h
+++ b/usr.sbin/routed/defs.h
@@ -76,7 +76,7 @@ int	kmem;
 int	supplier;		/* process should supply updates */
 int	install;		/* if 1 call kernel */
 int	lookforinterfaces;	/* if 1 probe kernel for new up interfaces */
-int	performnlist;		/* if 1 check if /vmunix has changed */
+int	performnlist;		/* if 1 check if /kernel has changed */
 int	externalinterfaces;	/* # of remote and local interfaces */
 struct	timeval now;		/* current idea of time */
 struct	timeval lastbcast;	/* last time all/changes broadcast */
diff --git a/usr.sbin/rwhod/rwhod.8 b/usr.sbin/rwhod/rwhod.8
index 4b8492e..2922bcc 100644
--- a/usr.sbin/rwhod/rwhod.8
+++ b/usr.sbin/rwhod/rwhod.8
@@ -126,7 +126,7 @@ Status messages are generated approximately once every
 performs an
 .Xr nlist 3
 on
-.Pa /vmunix
+.Pa /kernel
 every 30 minutes to guard against
 the possibility that this file is not the system
 image currently operating.
diff --git a/usr.sbin/sendmail/src/conf.c b/usr.sbin/sendmail/src/conf.c
index e74c8d0..8c7ad33 100644
--- a/usr.sbin/sendmail/src/conf.c
+++ b/usr.sbin/sendmail/src/conf.c
@@ -653,7 +653,7 @@ init_md(argc, argv)
 # if defined(SYSTEM5)
 #  define _PATH_UNIX	"/unix"
 # else
-#  define _PATH_UNIX	"/vmunix"
+#  define _PATH_UNIX	"/kernel"
 # endif
 #endif
 
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 01c5d51..47592d5 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -428,7 +428,7 @@ printsys(msg)
 	int c, pri, flags;
 	char *lp, *p, *q, line[MAXLINE + 1];
 
-	(void)strcpy(line, "vmunix: ");
+	(void)strcpy(line, "kernel: ");
 	lp = line + strlen(line);
 	for (p = msg; *p != '\0'; ) {
 		flags = SYNC_FILE | ADDDATE;	/* fsync file after write */
diff --git a/usr.sbin/trpt/trpt.8 b/usr.sbin/trpt/trpt.8
index 8cc6c2a..eee7dc8 100644
--- a/usr.sbin/trpt/trpt.8
+++ b/usr.sbin/trpt/trpt.8
@@ -124,7 +124,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 /vmunix
+.It Pa /kernel
 .It Pa /dev/kmem
 .El
 .Sh SEE ALSO
diff --git a/usr.sbin/trsp/trsp.8 b/usr.sbin/trsp/trsp.8
index 19c23b4..dd8db27 100644
--- a/usr.sbin/trsp/trsp.8
+++ b/usr.sbin/trsp/trsp.8
@@ -116,7 +116,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 /vmunix
+.It Pa /kernel
 .It Pa /dev/kmem
 .El
 .Sh SEE ALSO