summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Campbell <aaron@cvs.openbsd.org>1998-11-28 19:56:38 +0000
committerAaron Campbell <aaron@cvs.openbsd.org>1998-11-28 19:56:38 +0000
commitcd366aedac3a1a3126d77df58d0a0861c63e8147 (patch)
tree4ddb2966604fee83a4b374b411294c1952e0a4ad
parentb77e710b77930242c29b776114492ab08aa2f1c9 (diff)
kill redundant .Nm macro arguments; other misc fixes
-rw-r--r--sbin/ccdconfig/ccdconfig.818
-rw-r--r--sbin/clri/clri.812
-rw-r--r--sbin/disklabel/disklabel.844
-rw-r--r--sbin/dmesg/dmesg.86
-rw-r--r--sbin/dump/dump.86
-rw-r--r--sbin/dumplfs/dumplfs.88
-rw-r--r--sbin/fdisk/fdisk.84
-rw-r--r--sbin/fsck/fsck.86
-rw-r--r--sbin/fsck_ext2fs/fsck_ext2fs.820
-rw-r--r--sbin/fsck_ffs/fsck_ffs.836
-rw-r--r--sbin/fsck_msdos/fsck_msdos.88
-rw-r--r--sbin/fsirand/fsirand.810
-rw-r--r--sbin/ifconfig/ifconfig.822
-rw-r--r--sbin/init/init.850
-rw-r--r--sbin/isakmpd/isakmpd.861
-rw-r--r--sbin/isakmpd/isakmpd.conf.521
-rw-r--r--sbin/kbd/kbd.816
-rw-r--r--sbin/mknod/mknod.88
-rw-r--r--sbin/modload/modload.84
-rw-r--r--sbin/modunload/modunload.84
-rw-r--r--sbin/mount/mount.830
-rw-r--r--sbin/mount_ados/mount_ados.810
-rw-r--r--sbin/mount_cd9660/mount_cd9660.88
-rw-r--r--sbin/mount_ext2fs/mount_ext2fs.88
-rw-r--r--sbin/mount_fdesc/mount_fdesc.88
-rw-r--r--sbin/mount_ffs/mount_ffs.811
-rw-r--r--sbin/mount_kernfs/mount_kernfs.88
-rw-r--r--sbin/mount_lfs/mount_lfs.88
-rw-r--r--sbin/mount_msdos/mount_msdos.810
-rw-r--r--sbin/mount_nfs/mount_nfs.86
-rw-r--r--sbin/mount_null/mount_null.810
-rw-r--r--sbin/mount_portal/mount_portal.88
-rw-r--r--sbin/mount_procfs/mount_procfs.88
-rw-r--r--sbin/mount_umap/mount_umap.816
-rw-r--r--sbin/mount_union/mount_union.88
-rw-r--r--sbin/mount_xfs/mount_xfs.88
-rw-r--r--sbin/mountd/exports.56
-rw-r--r--sbin/mountd/mountd.820
-rw-r--r--sbin/ncheck_ffs/ncheck_ffs.810
-rw-r--r--sbin/newfs/newfs.822
-rw-r--r--sbin/newfs_msdos/newfs_msdos.812
-rw-r--r--sbin/newlfs/newlfs.88
-rw-r--r--sbin/nfsd/nfsd.814
-rw-r--r--sbin/nfsiod/nfsiod.810
-rw-r--r--sbin/nologin/nologin.810
-rw-r--r--sbin/pcmcia_cntrl/pcmcia_cntrl.814
-rw-r--r--sbin/photurisd/photurisd.8144
-rw-r--r--sbin/ping/ping.822
-rw-r--r--sbin/quotacheck/quotacheck.824
-rw-r--r--sbin/reboot/boot_atari.86
-rw-r--r--sbin/reboot/boot_pmax.84
-rw-r--r--sbin/restore/restore.812
-rw-r--r--sbin/route/route.814
-rw-r--r--sbin/routed/routed.810
-rw-r--r--sbin/savecore/savecore.822
-rw-r--r--sbin/scsi/scsi.818
-rw-r--r--sbin/shutdown/shutdown.816
-rw-r--r--sbin/slattach/slattach.88
-rw-r--r--sbin/startkey/startkey.169
-rw-r--r--sbin/swapon/swapon.810
-rw-r--r--sbin/ttyflags/ttyflags.810
-rw-r--r--sbin/tunefs/tunefs.86
-rw-r--r--sbin/umount/umount.812
63 files changed, 539 insertions, 523 deletions
diff --git a/sbin/ccdconfig/ccdconfig.8 b/sbin/ccdconfig/ccdconfig.8
index e74f2a57ac2..a1be2a5932c 100644
--- a/sbin/ccdconfig/ccdconfig.8
+++ b/sbin/ccdconfig/ccdconfig.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ccdconfig.8,v 1.9 1998/09/17 04:14:51 aaron Exp $
+.\" $OpenBSD: ccdconfig.8,v 1.10 1998/11/28 19:56:15 aaron Exp $
.\" $NetBSD: ccdconfig.8,v 1.4 1996/02/28 01:01:17 thorpej Exp $
.\"
.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -42,27 +42,27 @@
.Nm ccdconfig
.Nd configuration utility for the concatenated disk driver
.Sh SYNOPSIS
-.Nm ccdconfig
+.Nm
.Op Fl cv
.Ar ccd
.Ar ileave
.Ar flags
.Ar dev
.Op Ar ...
-.Nm ccdconfig
+.Nm
.Fl C
.Op Fl v
.Op Fl f Ar config_file
-.Nm ccdconfig
+.Nm
.Fl u
.Op Fl v
.Ar ccd
.Op Ar ...
-.Nm ccdconfig
+.Nm
.Fl U
.Op Fl v
.Op Fl f Ar config_file
-.Nm ccdconfig
+.Nm
.Fl g
.Op Fl M Ar core
.Op Fl N Ar system
@@ -71,7 +71,7 @@
.Oc
.Oc
.Sh DESCRIPTION
-.Nm ccdconfig
+.Nm
is used to dynamically configure and unconfigure concatenated disk
devices, or ccds. For more information about the ccd, see
.Xr ccd 4 .
@@ -108,7 +108,7 @@ Unconfigure a ccd.
Unconfigure all ccd devices listed the ccd configuration file.
.It Fl v
Causes
-.Nm ccdconfig
+.Nm
to be verbose.
.El
.Pp
@@ -159,6 +159,6 @@ default ccd configuration file
.Xr rc 8
.Sh HISTORY
The
-.Nm ccdconfig
+.Nm
command first appeared in
.Nx 1.0a .
diff --git a/sbin/clri/clri.8 b/sbin/clri/clri.8
index 44454675245..ac66e310b96 100644
--- a/sbin/clri/clri.8
+++ b/sbin/clri/clri.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: clri.8,v 1.5 1998/09/17 04:14:51 aaron Exp $
+.\" $OpenBSD: clri.8,v 1.6 1998/11/28 19:56:17 aaron Exp $
.\" $NetBSD: clri.8,v 1.2 1995/03/18 14:54:31 cgd Exp $
.\"
.\" Copyright (c) 1980, 1993
@@ -41,23 +41,23 @@
.Nm clri
.Nd clear inode(s)
.Sh SYNOPSIS
-.Nm clri
+.Nm
.Ar special_device inode_number Op Ar ...
.Sh DESCRIPTION
.Bf -symbolic
-.Nm clri
+.Nm
is obsoleted for normal file system repair work by
.Xr fsck 8 .
.Ef
.Pp
-.Nm clri
+.Nm
zeros out the inodes with the specified inode number(s)
on the filesystem residing on the given
.Ar special_device .
The
.Xr fsck 8
utility is usually run after
-.Nm clri
+.Nm
to reclaim the zero'ed inode(s) and the
blocks previously claimed by those inode(s).
Both read and write permission are required on the specified
@@ -77,5 +77,5 @@ will be able to clean up the resulting mess.
.Xr ncheck 8
.Sh BUGS
If the file is open, the work of
-.Nm clri
+.Nm
will be lost when the inode is written back to disk from the inode cache.
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 1d57f183529..2e4b72fb735 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: disklabel.8,v 1.21 1998/11/11 22:19:56 aaron Exp $
+.\" $OpenBSD: disklabel.8,v 1.22 1998/11/28 19:56:17 aaron Exp $
.\" $NetBSD: disklabel.8,v 1.9 1995/03/18 14:54:38 cgd Exp $
.\"
.\" Copyright (c) 1987, 1988, 1991, 1993
@@ -44,38 +44,38 @@
.Nm disklabel
.Nd read and write disk pack label
.Sh SYNOPSIS
-.Nm disklabel
+.Nm
.Op Fl r
.Op Fl n
.Op Fl t
.Ar disk
-.Nm disklabel
+.Nm
.Fl w
.Op Fl r
.Op Fl n
.Ar disk Ar disktype
.Oo Ar packid Oc
-.Nm disklabel
+.Nm
.Fl e
.Op Fl r
.Op Fl n
.Ar disk
-.Nm disklabel
+.Nm
.Fl E
.Op Fl r
.Op Fl n
.Ar disk
-.Nm disklabel
+.Nm
.Fl R
.Op Fl r
.Op Fl n
.Ar disk Ar protofile
-.Nm disklabel
+.Nm
.Op Fl NW
.Op Fl n
.Ar disk
.sp
-.Nm disklabel
+.Nm
.Fl B
.Op Fl n
.Oo
@@ -84,7 +84,7 @@
.Oc
.Ar disk
.Oo Ar disktype Oc
-.Nm disklabel
+.Nm
.Fl w
.Fl B
.Op Fl n
@@ -94,7 +94,7 @@
.Oc
.Ar disk Ar disktype
.Oo Ar packid Oc
-.Nm disklabel
+.Nm
.Fl R
.Fl B
.Op Fl n
@@ -105,14 +105,14 @@
.Ar disk Ar protofile
.Oo Ar disktype Oc
.Sh DESCRIPTION
-.Nm disklabel
+.Nm
can be used to install, examine or modify the label on a disk drive or pack.
When writing the label, it can be used
to change the drive identification,
the disk partitions on the drive,
or to replace a damaged label.
On some systems,
-.Nm disklabel
+.Nm
can be used to install bootstrap code as well.
There are several forms of the command that read (display), install or edit
the label on a disk.
@@ -160,7 +160,7 @@ The second form of the command, with the
.Fl w
flag, is used to write a standard label on the designated drive.
The required arguments to
-.Nm disklabel
+.Nm
are the drive to be labeled (e.g. sd0), and
the drive type as described in the
.Xr disktab 5
@@ -210,7 +210,7 @@ was specified.
With the
.Fl R
flag,
-.Nm disklabel
+.Nm
is capable of restoring a disk label that was formatted
in a prior operation and saved in an ASCII file.
The prototype file used to create the label should be in the same format
@@ -227,14 +227,14 @@ is specified and will be unaffected otherwise.
The
.Fl NW
flags for
-.Nm disklabel
+.Nm
explicitly disallow and
allow, respectively, writing of the pack label area on the selected disk.
.Pp
The
.Fl E
flag to
-.Nm disklabel
+.Nm
will drop you into a simple initial label editor. This mode is
only intended for new disks as it will move partitions around as
necessary to maintain a contiguous pool of free blocks. Some commands
@@ -281,7 +281,7 @@ number of cylinders on the disk, total sectors on the disk, rpm,
interleave, disk type, and a descriptive label string.
.It b
Set OpenBSD disk boundaries. This option tells
-.Nm disklabel
+.Nm
which parts of the disk it is allowed to modify. This option is
probably only useful for ports with fdisk partition tables where the
ending sector in the MBR is incorrect. The user may enter
@@ -336,7 +336,7 @@ Exit the editor without saving any changes to the label.
.El
.Pp
The final three forms of
-.Nm disklabel
+.Nm
are used to install bootstrap code on machines where the bootstrap
is part of the label. The bootstrap code is comprised of one or
two boot programs depending on the machine. The
@@ -465,14 +465,14 @@ area allocated for it by some filesystems. As a result, it may
not be possible to have filesystems on some partitions of a
.Dq bootable
disk. When installing bootstrap code,
-.Nm disklabel
+.Nm
checks for these cases. If the installed boot code would overlap
a partition of type FS_UNUSED it is marked as type FS_BOOT. The
.Xr newfs 8
utility will disallow creation of filesystems on FS_BOOT partitions.
Conversely, if a partition has a type other than FS_UNUSED or
FS_BOOT,
-.Nm disklabel
+.Nm
will not install bootstrap code that overlaps it.
.Sh NOTES
On i386 machines,
@@ -480,7 +480,7 @@ On i386 machines,
is normally used to install boot code. The
.Fl B
option to
-.Nm disklabel
+.Nm
can still be used to install old style boot code,
but this usage is deprecated.
.Sh BUGS
@@ -492,7 +492,7 @@ partition on the tahoe, the
partition on all others. In
.Fl E
mode,
-.Nm disklabel
+.Nm
is far too quick to shuffle partitions around; it should keep a
free block list and only move partitions around with the user's
permission. Also, in
diff --git a/sbin/dmesg/dmesg.8 b/sbin/dmesg/dmesg.8
index f069ac961ea..d6a1f439593 100644
--- a/sbin/dmesg/dmesg.8
+++ b/sbin/dmesg/dmesg.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: dmesg.8,v 1.4 1998/09/17 04:14:51 aaron Exp $
+.\" $OpenBSD: dmesg.8,v 1.5 1998/11/28 19:56:17 aaron Exp $
.\" $NetBSD: dmesg.8,v 1.9 1995/03/18 14:54:47 cgd Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -41,11 +41,11 @@
.Nm dmesg
.Nd "display the system message buffer"
.Sh SYNOPSIS
-.Nm dmesg
+.Nm
.Op Fl M Ar core
.Op Fl N Ar system
.Sh DESCRIPTION
-.Nm dmesg
+.Nm
displays the contents of the system message buffer.
.Pp
The options are as follows:
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index e143e78ccaf..d0b10f38dd6 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: dump.8,v 1.14 1998/09/23 01:20:22 aaron Exp $
+.\" $OpenBSD: dump.8,v 1.15 1998/11/28 19:56:18 aaron Exp $
.\" $NetBSD: dump.8,v 1.17 1997/06/05 11:15:06 lukem Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -52,7 +52,7 @@
.Op Fl s Ar feet
.Op Fl T Ar date
.Ar files-to-dump
-.Nm dump
+.Nm
.Op Fl W Li \&| Fl w
.Pp
.in -\\n(iSu
@@ -111,7 +111,7 @@ option below).
A level number above 0,
incremental backup,
tells
-.Nm dump
+.Nm
to
copy all files new or modified since the
last dump of a lower level.
diff --git a/sbin/dumplfs/dumplfs.8 b/sbin/dumplfs/dumplfs.8
index 86d60f38140..217b180b078 100644
--- a/sbin/dumplfs/dumplfs.8
+++ b/sbin/dumplfs/dumplfs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: dumplfs.8,v 1.5 1998/09/23 01:20:22 aaron Exp $
+.\" $OpenBSD: dumplfs.8,v 1.6 1998/11/28 19:56:18 aaron Exp $
.\" $NetBSD: dumplfs.8,v 1.2 1995/03/18 14:55:19 cgd Exp $
.\"
.\" Copyright (c) 1993
@@ -41,10 +41,10 @@
.Nm dumplfs
.Nd dump file system information
.Sh SYNOPSIS
-.Nm dumplfs
+.Nm
.Op Ar filesys No \&| Ar device
.Sh DESCRIPTION
-.Nm dumplfs
+.Nm
prints out the file system layout information for the
LFS file system or special device specified.
The listing is very long and detailed.
@@ -57,6 +57,6 @@ information such as the file system block size.
.Xr newlfs 8
.Sh HISTORY
The
-.Nm dumplfs
+.Nm
command appeared in
.Bx 4.4 .
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index 681704ccdfa..a0bc90256a8 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fdisk.8,v 1.18 1998/11/11 22:19:56 aaron Exp $
+.\" $OpenBSD: fdisk.8,v 1.19 1998/11/28 19:56:18 aaron Exp $
.\"
.\" Copyright (c) 1997 Tobias Weingartner
.\" All rights reserved.
@@ -183,7 +183,7 @@ Initialize the currently selected, in-memory copy of the
boot block.
.It Em disk
Display the current drive geometry that
-.Nm fdisk
+.Nm
has
probed. You are given a chance to edit it if you wish.
.It Em edit
diff --git a/sbin/fsck/fsck.8 b/sbin/fsck/fsck.8
index 78a4c3d4276..e0c366123ca 100644
--- a/sbin/fsck/fsck.8
+++ b/sbin/fsck/fsck.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fsck.8,v 1.11 1998/11/11 22:19:56 aaron Exp $
+.\" $OpenBSD: fsck.8,v 1.12 1998/11/28 19:56:19 aaron Exp $
.\" $NetBSD: fsck.8,v 1.14 1996/10/03 20:08:29 christos Exp $
.\"
.\" Copyright (c) 1996 Christos Zoulas. All rights reserved.
@@ -35,7 +35,7 @@
.Nm fsck
.Nd filesystem consistency check and interactive repair
.Sh SYNOPSIS
-.Nm fsck
+.Nm
.Op Fl dvplfyn
.Op Fl l Ar maxparallel
.Op Fl t Ar fstype
@@ -43,7 +43,7 @@
.Ar special | node ...
.Sh DESCRIPTION
The
-.Nm fsck
+.Nm
command invokes filesystem-specific programs to check the
special devices listed in the
.Xr fstab 5
diff --git a/sbin/fsck_ext2fs/fsck_ext2fs.8 b/sbin/fsck_ext2fs/fsck_ext2fs.8
index 7f523a1581c..ea92e8c3d6b 100644
--- a/sbin/fsck_ext2fs/fsck_ext2fs.8
+++ b/sbin/fsck_ext2fs/fsck_ext2fs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fsck_ext2fs.8,v 1.6 1998/11/11 22:19:56 aaron Exp $
+.\" $OpenBSD: fsck_ext2fs.8,v 1.7 1998/11/28 19:56:19 aaron Exp $
.\" $NetBSD: fsck_ext2fs.8,v 1.1 1997/06/11 11:21:48 bouyer Exp $
.\"
.\" Copyright (c) 1997 Manuel Bouyer.
@@ -42,7 +42,7 @@
.Nm fsck_ext2fs
.Nd Second Extended File System consistency check and interactive repair
.Sh SYNOPSIS
-.Nm fsck_ext2fs
+.Nm
.Op Fl b Ar block#
.Op Fl c Ar level
.Op Fl d
@@ -54,7 +54,7 @@
.Ar filesystem
.Ar ...
.Sh DESCRIPTION
-.Nm fsck_ext2fs
+.Nm
performs interactive filesystem consistency checks and repair for each of
the filesystems specified on the command line. It is normally invoked from
.Xr fsck 8 .
@@ -77,7 +77,7 @@ Counts in the super-block wrong
.El
.Pp
These are the only inconsistencies that
-.Nm fsck_ext2fs
+.Nm
in
.Dq preen
mode (with the
@@ -87,20 +87,20 @@ with an abnormal return status.
For each corrected inconsistency one or more lines will be printed
identifying the filesystem on which the correction will take place,
and the nature of the correction. After successfully correcting a filesystem,
-.Nm fsck_ext2fs
+.Nm
will print the number of files on that filesystem
and the number of used and free blocks.
.Pp
If sent a
.Dv QUIT
signal,
-.Nm fsck_ext2fs
+.Nm
will finish the filesystem checks, then exit with an abnormal return status.
.Pp
Without the
.Fl p
option,
-.Nm fsck_ext2fs
+.Nm
audits and interactively repairs inconsistent conditions for filesystems.
If the filesystem is inconsistent the operator is prompted for concurrence
before each correction is attempted.
@@ -116,7 +116,7 @@ is to wait for the operator to respond
or
.Dq no .
If the operator does not have write permission on the filesystem,
-.Nm fsck_ext2fs
+.Nm
will default to a
.Fl n
action.
@@ -151,7 +151,7 @@ set of permissions such as 700.
Assume a
.Dq no
response to all questions asked by
-.Nm fsck_ext2fs
+.Nm
except for
.Dq CONTINUE? ,
which is assumed to be affirmative;
@@ -228,7 +228,7 @@ Because of inconsistencies between the block device and the buffer cache,
the raw device should always be used.
.Sh DIAGNOSTICS
The diagnostics produced by
-.Nm fsck_ext2fs
+.Nm
are fully enumerated and explained in Appendix A of
.Rs
.%T "Fsck \- The UNIX File System Check Program"
diff --git a/sbin/fsck_ffs/fsck_ffs.8 b/sbin/fsck_ffs/fsck_ffs.8
index 8f434e1dc08..b6065a49d4f 100644
--- a/sbin/fsck_ffs/fsck_ffs.8
+++ b/sbin/fsck_ffs/fsck_ffs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fsck_ffs.8,v 1.5 1998/11/11 22:19:57 aaron Exp $
+.\" $OpenBSD: fsck_ffs.8,v 1.6 1998/11/28 19:56:19 aaron Exp $
.\" $NetBSD: fsck_ffs.8,v 1.12 1996/09/23 16:18:34 christos Exp $
.\"
.\" Copyright (c) 1980, 1989, 1991, 1993
@@ -38,14 +38,14 @@
.Dt FSCK_FFS 8
.Os BSD 4
.Sh NAME
-.Nm fsck_ffs, fsck
+.Nm fsck_ffs , fsck
.Nd Fast File System consistency check and interactive repair
.Sh SYNOPSIS
-.Nm fsck_ffs
+.Nm
.Fl p
.Op Fl f
.Op Fl m Ar mode
-.Nm fsck_ffs
+.Nm
.Op Fl f
.Op Fl b Ar block#
.Op Fl c Ar level
@@ -56,13 +56,13 @@
.Ar ...
.Sh DESCRIPTION
The first form of
-.Nm fsck_ffs
+.Nm
preens a standard set of filesystems or the specified filesystems.
It is normally used in the script
.Pa /etc/rc
during automatic reboot.
Here
-.Nm fsck_ffs
+.Nm
reads the table
.Pa /etc/fstab
to determine which filesystems to check.
@@ -98,7 +98,7 @@ Counts in the super-block wrong
.El
.Pp
These are the only inconsistencies that
-.Nm fsck_ffs
+.Nm
with the
.Fl p
option will correct; if it encounters other inconsistencies, it exits
@@ -106,7 +106,7 @@ with an abnormal return status and an automatic reboot will then fail.
For each corrected inconsistency one or more lines will be printed
identifying the filesystem on which the correction will take place,
and the nature of the correction. After successfully correcting a filesystem,
-.Nm fsck_ffs
+.Nm
will print the number of files on that filesystem,
the number of used and free blocks,
and the percentage of fragmentation.
@@ -114,7 +114,7 @@ and the percentage of fragmentation.
If sent a
.Dv QUIT
signal,
-.Nm fsck_ffs
+.Nm
will finish the filesystem checks, then exit with an abnormal
return status that causes an automatic reboot to fail.
This is useful when you want to finish the filesystem checks during an
@@ -124,7 +124,7 @@ but do not want the machine to come up multiuser after the checks complete.
Without the
.Fl p
option,
-.Nm fsck_ffs
+.Nm
audits and interactively repairs inconsistent conditions for filesystems.
If the filesystem is inconsistent the operator is prompted for concurrence
before each correction is attempted.
@@ -140,7 +140,7 @@ is to wait for the operator to respond
or
.Dq no .
If the operator does not have write permission on the filesystem,
-.Nm fsck_ffs
+.Nm
will default to a
.Fl n
action.
@@ -154,16 +154,16 @@ and
combined.
.Pp
The following flags are interpreted by
-.Nm fsck_ffs .
+.Nm fsck_ffs :
.Bl -tag -width indent
.It Fl f
Force checking of file systems. Normally, if a file system is cleanly
unmounted, the kernel will set a
.Dq clean flag
in the file system superblock and
-.Nm fsck_ffs
+.Nm
will not check the file system. This option forces
-.Nm fsck_ffs
+.Nm
to check the file system, regardless of the state of the clean flag.
.It Fl b
Use the block specified immediately after the flag as
@@ -188,7 +188,7 @@ to continue after essentially unlimited trouble has been encountered.
Assume a
.Dq no
response to all questions asked by
-.Nm fsck_ffs
+.Nm
except for
.Dq CONTINUE? ,
which is assumed to be affirmative;
@@ -217,7 +217,7 @@ is equal to one, delete any existing segment maps.
.El
.Pp
In interactive mode,
-.Nm fsck_ffs
+.Nm
will list the conversion to be made
and ask whether the conversion should be done.
If a negative answer is given,
@@ -233,7 +233,7 @@ first line of output from
.El
.Pp
If no filesystems are given to
-.Nm fsck_ffs
+.Nm
then a default list of filesystems is read from
the file
.Pa /etc/fstab .
@@ -302,7 +302,7 @@ contains default list of filesystems to check
.El
.Sh DIAGNOSTICS
The diagnostics produced by
-.Nm fsck_ffs
+.Nm
are fully enumerated and explained in Appendix A of
.Rs
.%T "Fsck \- The UNIX File System Check Program"
diff --git a/sbin/fsck_msdos/fsck_msdos.8 b/sbin/fsck_msdos/fsck_msdos.8
index 4b45f79ebab..20b63bb8643 100644
--- a/sbin/fsck_msdos/fsck_msdos.8
+++ b/sbin/fsck_msdos/fsck_msdos.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fsck_msdos.8,v 1.6 1998/09/17 04:14:53 aaron Exp $
+.\" $OpenBSD: fsck_msdos.8,v 1.7 1998/11/28 19:56:19 aaron Exp $
.\" $NetBSD: fsck_msdos.8,v 1.4 1996/10/17 20:41:24 cgd Exp $
.\"
.\" Copyright (C) 1995 Wolfgang Solfrank
@@ -39,12 +39,12 @@
.Nm fsck_msdos
.Nd DOS/Windows (FAT) filesystem consistency checker
.Sh SYNOPSIS
-.Nm fsck_msdos
+.Nm
.Fl p
.Op Fl f
.Ar filesystem
.Ar ...
-.Nm fsck_msdos
+.Nm
.Op Fl fny
.Ar filesystem
.Ar ...
@@ -109,5 +109,5 @@ as the answer to all operator questions.
.Xr fsck_ffs 8 ,
.Xr mount_msdos 8
.Sh BUGS
-.Nm fsck_msdos
+.Nm
is still under construction.
diff --git a/sbin/fsirand/fsirand.8 b/sbin/fsirand/fsirand.8
index 4cbaaf412dd..84ecacb0e7e 100644
--- a/sbin/fsirand/fsirand.8
+++ b/sbin/fsirand/fsirand.8
@@ -23,7 +23,7 @@
.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
.\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: fsirand.8,v 1.13 1998/11/11 22:19:57 aaron Exp $
+.\" $OpenBSD: fsirand.8,v 1.14 1998/11/28 19:56:20 aaron Exp $
.\"
.Dd January 25, 1997
.Dt FSIRAND 8
@@ -32,7 +32,7 @@
.Nm fsirand
.Nd randomize inode generation numbers
.Sh SYNOPSIS
-.Nm fsirand
+.Nm
.Op Fl b
.Op Fl f
.Op Fl p
@@ -40,7 +40,7 @@
.Op Ar "special ..."
.Sh DESCRIPTION
The
-.Nm fsirand
+.Nm
command installs random generation numbers on all the inodes for
each filesystem specified on the command line by
.Ar special .
@@ -59,12 +59,12 @@ run
by hand on a new filesystem. It is only used to
re-randomize or report on an existing filesystem.
.Pp
-.Nm fsirand
+.Nm
should only be used on an unmounted filesystem that
has been checked with
.Xr fsck 8
or a filesystem that is mounted read-only.
-.Nm fsirand
+.Nm
may be used on the root filesystem in single-user mode
but the system should be rebooted via
.Dq reboot -n
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 43c39ea71d2..a38e324c4c6 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ifconfig.8,v 1.17 1998/11/11 22:19:57 aaron Exp $
+.\" $OpenBSD: ifconfig.8,v 1.18 1998/11/28 19:56:20 aaron Exp $
.\" $NetBSD: ifconfig.8,v 1.11 1996/01/04 21:27:29 pk Exp $
.\" $FreeBSD: ifconfig.8,v 1.16 1998/02/01 07:03:29 steve Exp $
.\"
@@ -42,39 +42,39 @@
.Nm ifconfig
.Nd configure network interface parameters
.Sh SYNOPSIS
-.Nm ifconfig
+.Nm
.Ar interface address_family
.Oo
.Ar address
.Op Ar dest_address
.Oc
.Op Ar parameters
-.Nm ifconfig
+.Nm
.Ar interface
.Op Ar address_family
-.Nm ifconfig
+.Nm
.Fl m
.Ar interface
.Op Ar address_family
-.Nm ifconfig
+.Nm
.Op Fl a | am
.Op Ar address_family
-.Nm ifconfig
+.Nm
.Op Fl A | Am
.Op Ar address_family
.Sh DESCRIPTION
-.Nm ifconfig
+.Nm
is used to assign an address
to a network interface and/or configure
network interface parameters.
-.Nm ifconfig
+.Nm
must be used at boot time to define the network address
of each interface present on a machine; it may also be used at
a later time to redefine an interface's address
or other operating parameters.
.Pp
Available operands for
-.Nm ifconfig:
+.Nm ifconfig :
.Bl -tag -width Ds
.It Ar Address
For the
@@ -328,7 +328,7 @@ the hardware will be re-initialized.
.El
.Pp
.Pp
-.Nm ifconfig
+.Nm
displays the current configuration for a network interface
when no optional parameters are supplied.
If a protocol family is specified,
@@ -337,7 +337,7 @@ ifconfig will report only the details specific to that protocol family.
Using
.Fl a
causes
-.Nm ifconfig
+.Nm
to print information on all interfaces.
The protocol family may be specified as well. Additionally, if
.Fl am ,
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index deac786a93c..e71b8e2845f 100644
--- a/sbin/init/init.8
+++ b/sbin/init/init.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: init.8,v 1.12 1998/11/11 22:19:57 aaron Exp $
+.\" $OpenBSD: init.8,v 1.13 1998/11/28 19:56:21 aaron Exp $
.\" $NetBSD: init.8,v 1.6 1995/03/18 14:56:31 cgd Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -44,21 +44,21 @@
.Nm init
.Nd process control initialization
.Sh SYNOPSIS
-.Nm init
+.Nm
.Sh DESCRIPTION
The
-.Nm init
+.Nm
program
is the last stage of the boot process.
It normally runs the automatic reboot sequence as described in
.Xr reboot 8 ,
and if this succeeds, begins multi-user operation.
If the reboot scripts fail,
-.Nm init
+.Nm
commences single-user operation by giving
the super-user a shell on the console.
The
-.Nm init
+.Nm
program may be passed parameters
from the boot program to
prevent the system from going multi-user and to instead execute
@@ -68,29 +68,29 @@ later be made to go to multi-user by exiting the
single-user shell (with ^D).
This
causes
-.Nm init
+.Nm
to run the
.Pa /etc/rc
startup command file in fastboot mode (skipping disk checks).
.Pp
If the
-.Nm console
+.Ar console
entry in the
.Xr ttys 5
file is marked
.Dq insecure ,
then
-.Nm init
+.Nm
will require that the super-user password be
entered before the system will start a single-user shell.
The password check is skipped if the
-.Nm console
+.Ar console
is marked as
.Dq secure .
.Pp
The kernel runs with four different levels of security.
Any super-user process can raise the security level, but only
-.Nm init
+.Nm
can lower it.
Security levels are defined as follows:
.Bl -tag -width flag
@@ -133,11 +133,11 @@ the administrator must build a kernel with
in the config file.
.Pp
In multi-user operation,
-.Nm init
+.Nm
maintains
processes for the terminal ports found in the file
.Xr ttys 5 .
-.Nm init
+.Nm
reads this file, and executes the command found in the second field.
This command is usually
.Xr getty 8 ;
@@ -154,7 +154,7 @@ executes a shell for that user. When this shell
dies, either because the user logged out
or an abnormal termination occurred (a signal),
the
-.Nm init
+.Nm
program wakes up, deletes the user
from the
.Xr utmp 5
@@ -163,7 +163,7 @@ file of current users and records the logout in the
file.
The cycle is
then restarted by
-.Nm init
+.Nm
executing a new
.Xr getty
for the line.
@@ -175,17 +175,17 @@ may be changed in the
file without a reboot by sending the signal
.Dv SIGHUP
to
-.Nm init
+.Nm
with the command
.Dq Li "kill \-s HUP 1" .
On receipt of this signal,
-.Nm init
+.Nm
re-reads the
.Xr ttys
file.
When a line is turned off in
.Xr ttys ,
-.Nm init
+.Nm
will send a
.Dv SIGHUP
signal to the controlling process
@@ -193,18 +193,18 @@ for the session associated with the line.
For any lines that were previously turned off in the
.Xr ttys
file and are now on,
-.Nm init
+.Nm
executes a new
.Xr getty
to enable a new login.
If the getty or window field for a line is changed,
the change takes effect at the end of the current
login session (e.g., the next time
-.Nm init
+.Nm
starts a process on the line).
If a line is commented out or deleted from
.Xr ttys ,
-.Nm init
+.Nm
will not do anything at all to that line.
However, it will complain that the relationship between lines
in the
@@ -214,7 +214,7 @@ file and records in the
file is out of sync,
so this practice is not recommended.
.Pp
-.Nm init
+.Nm
will terminate multi-user operations and resume single-user mode
if sent a terminate
.Pq Dv TERM
@@ -222,11 +222,11 @@ signal, for example,
.Dq Li "kill \-s TERM 1" .
If there are processes outstanding that are deadlocked (because of
hardware or software failure),
-.Nm init
+.Nm
will not wait for them all to die (which might take forever), but
will time out after 30 seconds and print a warning message.
.Pp
-.Nm init
+.Nm
will cease creating new
.Xr getty Ns 's
and allow the system to slowly die away, if it is sent a terminal stop
@@ -241,11 +241,11 @@ and
.Xr halt 8 .
.Pp
The role of
-.Nm init
+.Nm
is so critical that if it dies, the system will reboot itself
automatically.
If, at bootstrap time, the
-.Nm init
+.Nm
process cannot be located, the system will panic with the message
.Dq panic: "init died (signal %d, exit %d) .
.Sh DIAGNOSTICS
diff --git a/sbin/isakmpd/isakmpd.8 b/sbin/isakmpd/isakmpd.8
index 97ccee02beb..f9a13c07f10 100644
--- a/sbin/isakmpd/isakmpd.8
+++ b/sbin/isakmpd/isakmpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.8,v 1.3 1998/11/17 11:10:15 niklas Exp $
+.\" $OpenBSD: isakmpd.8,v 1.4 1998/11/28 19:56:32 aaron Exp $
.\" $EOM: isakmpd.8,v 1.8 1998/10/10 17:28:13 niklas Exp $
.\"
.\" Copyright (c) 1998 Niklas Hallqvist. All rights reserved.
@@ -39,7 +39,7 @@
.Nm isakmpd
.Nd ISAKMP/Oakley aka IKE key management daemon
.Sh SYNOPSIS
-.Nm isakmpd
+.Nm
.Op Fl c Ar config-file
.Op Fl d
.Op Fl D Ar debug-class=level
@@ -50,19 +50,19 @@
.Op Fl r Ar seed
.Sh DESCRIPTION
The
-.Nm ISAKMP
+.Nm
daemon establishes security associations for encrypted
and/or authenticated network traffic.
.Pp
The daemon listens to a named pipe
.Pa isakmpd.fifo
for user requests and on a
-.Nm PF_ENCAP
+.Dv PF_ENCAP
socket for kernel requests.
.Pp
The options are as follows:
.Bl -tag -width Ds
-.It Fl c
+.It Fl c Ar config-file
If given, the
.Fl c
option specifies an alternate configuration file instead of
@@ -71,18 +71,30 @@ option specifies an alternate configuration file instead of
The
.Fl d
option is used to make the daemon run in the foreground, logging to stderr.
-.It Fl D
+.It Xo Fl D
+.Ar debug-class Ns No = Ns Ar level
+.Xc
This argument is possible to specify many times. It takes a parameter of
-the form: class=level where both class and level are numbers. Class denotes
-a debugging class, and level the level you want that debugging class to
-limit debug printouts at. I.e. all debug printouts above the level specified
-will not output anything.
-.It Fl f
+the form
+.Ar class Ns No = Ns Ar level
+where both
+.Ar class
+and
+.Ar level
+are numbers.
+.Ar class
+denotes a debugging class, and
+.Ar level
+the level you want that debugging class to
+limit debug printouts at (i.e., all debug printouts above the level specified
+will not output anything).
+.It Fl f Ar fifo
The
.Fl f
-option specifies the fifo (aka named pipe) where the daemon listens for
-user requests. If the path given is a dash,
-.Nm isakmpd
+option specifies the FIFO (a.k.a. named pipe) where the daemon listens for
+user requests. If the path given is a dash
+.Pq Sq \&- ,
+.Nm
will listen to stdin instead.
.It Fl n
When the
@@ -90,28 +102,29 @@ When the
option is given, the kernel will not take part in the negotiations.
This is a non-destructive mode so to say, in that it won't alter any
SAs in the IPSEC stack.
-.It Fl r
+.It Fl r Ar seed
If given a deterministic random number sequence will be used internally.
This is useful for setting up regression tests.
-.It Fl p
+.It Fl p Ar listen-port
The
.Fl p
option specifies the listen port the daemon will bind to.
-.It Fl P
-On the other hand, the port spcified to capital
+.It Fl P Ar local-port
+On the other hand, the port specified to capital
.Fl P
will be what the daemon binds its local end to when acting as initiator.
.El
.Pp
.Sh SEE ALSO
+.Xr ipsec 4 ,
.Xr isakmpd.conf 5 ,
-.Xr photurisd 8 ,
-.Xr ipsec 4 .
+.Xr photurisd 8
.Sh HISTORY
-The ISAKMP/Oakley keymanagement protocol is described in the internet drafts
-.Nm draft-ietf-ipsec-isakmp ,
-.Nm draft-ietf-ipsec-ipsec-doi &
-.Nm draft-ietf-ipsec-isakmp-oakley .
+The ISAKMP/Oakley key management protocol is described in the Internet drafts
+.%T draft-ietf-ipsec-isakmp ,
+.%T draft-ietf-ipsec-ipsec-doi
+and
+.%T draft-ietf-ipsec-isakmp-oakley .
This implementation was done 1998 by Niklas Hallqvist and Niels Provos,
sponsored by Ericsson Radio Systems.
diff --git a/sbin/isakmpd/isakmpd.conf.5 b/sbin/isakmpd/isakmpd.conf.5
index 227d6228953..0b02d3e5e8b 100644
--- a/sbin/isakmpd/isakmpd.conf.5
+++ b/sbin/isakmpd/isakmpd.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.conf.5,v 1.4 1998/11/20 23:47:42 niklas Exp $
+.\" $OpenBSD: isakmpd.conf.5,v 1.5 1998/11/28 19:56:32 aaron Exp $
.\" $EOM: isakmpd.conf.5,v 1.5 1998/11/20 23:45:05 niklas Exp $
.\"
.\" Copyright (c) 1998 Niklas Hallqvist. All rights reserved.
@@ -33,19 +33,17 @@
.\" Manual page, using -mandoc macros
.\"
.Dd October 10, 1998
-.Dt ISAKMPD.CONF 8
+.Dt ISAKMPD.CONF 5
.Os
.Sh NAME
.Nm isakmpd.conf
-.Nd Configuration file for isakmpd
+.Nd configuration file for isakmpd
.Sh DESCRIPTION
-The
-.Nm isakmpd.conf
-is the configuration file for
+.Nm
+is the configuration file for the
.Nm isakmpd
daemon managing security association and key management for the
-.Nm IPSEC
-layer of the kernel's networking stack.
+IPSEC layer of the kernel's networking stack.
.Pp
The file is of a well known type of format called .INI style, named after
the suffix used by an overrated windowing environment for its configuration
@@ -64,8 +62,9 @@ continue it on the next by ending the first with a backspace character
immediately before the newline character. This method can extend a value for
an arbitrary amount of lines.
.Pp
-Comments can be put anywhere in the file by using a hash mark, "#". Then
-the comment goes on to the end of the line.
+Comments can be put anywhere in the file by using a hash mark
+.Pq Sq \&# .
+Then the comment goes on to the end of the line.
.Pp
.Sh EXAMPLE
An example of a configuration file:
@@ -175,5 +174,5 @@ PUBKEY= /etc/isakmpd_key.pub
.Ed
.Pp
.Sh SEE ALSO
-.Xr isakmpd 8 .
+.Xr isakmpd 8
diff --git a/sbin/kbd/kbd.8 b/sbin/kbd/kbd.8
index 1a94721d6c8..5b76c55d55a 100644
--- a/sbin/kbd/kbd.8
+++ b/sbin/kbd/kbd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: kbd.8,v 1.5 1998/09/17 04:14:54 aaron Exp $
+.\" $OpenBSD: kbd.8,v 1.6 1998/11/28 19:56:21 aaron Exp $
.\"
.\" Copyright (c) 1996 Juergen Hannken-Illjes
.\" All rights reserved.
@@ -37,27 +37,27 @@
.Nm kbd
.Nd "set national keyboard translation"
.Sh SYNOPSIS
-.Nm kbd
+.Nm
.Fl l
-.Nm kbd
+.Nm
.Op Fl q
.Ar name
.Sh DESCRIPTION
-.Nm kbd
+.Nm
is used to change the keyboard encoding.
The execution of
-.Nm kbd
+.Nm
normally occurs in the system multi-user initialization file
.Pa /etc/rc
to set a national keyboard layout.
.Pp
If called as
-.Nm kbd
+.Nm
.Fl l ,
all available keyboard encodings are listed.
.Pp
If called as
-.Nm kbd
+.Nm
.Ar name ,
the keyboard encoding will be set to
.Ar name
@@ -65,7 +65,7 @@ and a short message will be printed to stdout.
If the
.Fl q
flag is present,
-.Nm kbd
+.Nm
will be quiet unless an error occurs.
.Sh SEE ALSO
.Xr keycap 5
diff --git a/sbin/mknod/mknod.8 b/sbin/mknod/mknod.8
index facfbe85f03..306fd0d3e28 100644
--- a/sbin/mknod/mknod.8
+++ b/sbin/mknod/mknod.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mknod.8,v 1.4 1998/11/11 22:19:58 aaron Exp $
+.\" $OpenBSD: mknod.8,v 1.5 1998/11/28 19:56:21 aaron Exp $
.\" $NetBSD: mknod.8,v 1.9 1995/08/10 23:47:32 jtc Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -41,18 +41,18 @@
.Nm mknod
.Nd build special file
.Sh SYNOPSIS
-.Nm mknod
+.Nm
.Ar name
.Op Cm c | Cm b
.Ar major minor
.Sh DESCRIPTION
The
-.Nm mknod
+.Nm
command creates device special files.
Normally the shell script
.Pa /dev/MAKEDEV
is used to create special files for commonly known devices; it executes
-.Nm mknod
+.Nm
with the appropriate arguments and can make all the files required for the
device.
.Pp
diff --git a/sbin/modload/modload.8 b/sbin/modload/modload.8
index 45d101433df..d3887f3d5a6 100644
--- a/sbin/modload/modload.8
+++ b/sbin/modload/modload.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: modload.8,v 1.7 1998/11/11 22:19:58 aaron Exp $
+.\" $OpenBSD: modload.8,v 1.8 1998/11/28 19:56:21 aaron Exp $
.\" $NetBSD: modload.8,v 1.5 1995/03/18 14:56:43 cgd Exp $
.\"
.\" Copyright (c) 1993 Christopher G. Demetriou
@@ -33,7 +33,7 @@
.Nm modload
.Nd load a kernel module
.Sh SYNOPSIS
-.Nm modload
+.Nm
.Op Fl dvuv
.Op Fl A Ar kernel
.Op Fl e Ar entry
diff --git a/sbin/modunload/modunload.8 b/sbin/modunload/modunload.8
index b2e3d703749..5b5dc4d24c9 100644
--- a/sbin/modunload/modunload.8
+++ b/sbin/modunload/modunload.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: modunload.8,v 1.5 1998/09/17 04:14:54 aaron Exp $
+.\" $OpenBSD: modunload.8,v 1.6 1998/11/28 19:56:23 aaron Exp $
.\" $NetBSD: modunload.8,v 1.3 1995/03/18 14:56:49 cgd Exp $
.\"
.\" Copyright (c) 1993 Christopher G. Demetriou
@@ -33,7 +33,7 @@
.Nm modunload
.Nd unload a kernel module
.Sh SYNOPSIS
-.Nm modunload
+.Nm
.Op Fl i Ar id
.Op Fl n Ar name
.Sh DESCRIPTION
diff --git a/sbin/mount/mount.8 b/sbin/mount/mount.8
index f34f460fb7f..acf7404c8cf 100644
--- a/sbin/mount/mount.8
+++ b/sbin/mount/mount.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount.8,v 1.11 1998/11/11 22:19:58 aaron Exp $
+.\" $OpenBSD: mount.8,v 1.12 1998/11/28 19:56:23 aaron Exp $
.\" $NetBSD: mount.8,v 1.11 1995/07/12 06:23:21 cgd Exp $
.\"
.\" Copyright (c) 1980, 1989, 1991, 1993
@@ -41,20 +41,20 @@
.Nm mount
.Nd mount file systems
.Sh SYNOPSIS
-.Nm mount
+.Nm
.Op Fl Aadfruvw
.Op Fl t Ar type
-.Nm mount
+.Nm
.Op Fl dfruvw
.Ar special | node
-.Nm mount
+.Nm
.Op Fl dfruvw
.Op Fl o Ar options
.Op Fl t Ar type
.Ar special node
.Sh DESCRIPTION
The
-.Nm mount
+.Nm
command invokes a filesystem-specific program to prepare
and graft the
.Ar special
@@ -71,14 +71,14 @@ file.
.Pp
The system maintains a list of currently mounted file systems.
If no arguments are given to
-.Nm mount,
+.Nm mount ,
this list is printed.
.Pp
The options are as follows:
.Bl -tag -width indent
.It Fl A
Causes
-.Nm mount
+.Nm
to try to mount all of the file systems listed in the
.Xr fstab 5
table except those for which the
@@ -89,9 +89,9 @@ Similar to the
.Fl A
flag, except that if a file system (other than the root file system)
appears to be already mounted,
-.Nm mount
+.Nm
will not try to mount it again.
-.Nm mount
+.Nm
assumes that a file system is already mounted if a file system with
the same type is mounted on the given mount point.
More stringent checks are not possible because some file system types
@@ -104,7 +104,7 @@ This option is useful in conjunction with the
.Fl v
flag to
determine what the
-.Nm mount
+.Nm
command is trying to do.
.It Fl f
Forces the revocation of write access when trying to downgrade
@@ -176,14 +176,14 @@ distinguished by a leading
(dash).
Options that take a value are specified using the syntax -option=value.
For example, the
-.Nm mount
+.Nm
command:
.Bd -literal -offset indent
mount -t mfs -o nosuid,-N,-s=4000 /dev/dk0b /tmp
.Ed
.Pp
causes
-.Nm mount
+.Nm
to execute the equivalent of:
.Bd -literal -offset indent
/sbin/mount_mfs -o nosuid -N -s 4000 /dev/dk0b /tmp
@@ -215,7 +215,7 @@ to specify the filesystem types for which action should
.Em not
be taken.
For example, the
-.Nm mount
+.Nm
command:
.Bd -literal -offset indent
mount -a -t nonfs,mfs
@@ -226,7 +226,7 @@ mounts all filesystems except those of type
and
.Tn MFS .
.Pp
-.Nm mount
+.Nm
will attempt to execute a program in
.Pa /sbin/mount_ Ns Em XXX
where
@@ -299,6 +299,6 @@ file system table
.Xr umount 8
.Sh HISTORY
A
-.Nm mount
+.Nm
command appeared in
.At v6 .
diff --git a/sbin/mount_ados/mount_ados.8 b/sbin/mount_ados/mount_ados.8
index dfdee3c565e..5ae53ce61de 100644
--- a/sbin/mount_ados/mount_ados.8
+++ b/sbin/mount_ados/mount_ados.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount_ados.8,v 1.4 1998/09/17 04:14:54 aaron Exp $
+.\" $OpenBSD: mount_ados.8,v 1.5 1998/11/28 19:56:24 aaron Exp $
.\" $NetBSD: mount_ados.8,v 1.3 1995/03/18 14:57:09 cgd Exp $
.\"
.\" Copyright (c) 1993,1994 Christopher G. Demetriou
@@ -36,7 +36,7 @@
.Nm mount_ados
.Nd mount an AmigaDOS file system
.Sh SYNOPSIS
-.Nm mount_ados
+.Nm
.Op Fl o Ar options
.Op Fl u Ar uid
.Op Fl g Ar gid
@@ -45,7 +45,7 @@
.Ar node
.Sh DESCRIPTION
The
-.Nm mount_ados
+.Nm
command attaches the AmigaDOS filesystem residing on
the device
.Ar special
@@ -100,9 +100,9 @@ directory on which the file system is being mounted.
.Xr mount 8
.Sh CAVEATS
The
-.Nm ados
+.Li ados
filesystem currently supports the Amiga fast file system.
.Sh HISTORY
The
-.Nm mount_ados
+.Nm
utility first appeared in NetBSD 0.9b.
diff --git a/sbin/mount_cd9660/mount_cd9660.8 b/sbin/mount_cd9660/mount_cd9660.8
index 131f23d312e..c75ba8fe550 100644
--- a/sbin/mount_cd9660/mount_cd9660.8
+++ b/sbin/mount_cd9660/mount_cd9660.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount_cd9660.8,v 1.5 1998/09/17 04:14:55 aaron Exp $
+.\" $OpenBSD: mount_cd9660.8,v 1.6 1998/11/28 19:56:24 aaron Exp $
.\" $NetBSD: mount_cd9660.8,v 1.3 1995/04/23 10:33:13 cgd Exp $
.\"
.\" Copyright (c) 1993, 1994
@@ -44,13 +44,13 @@
.Nm mount_cd9660
.Nd mount an ISO-9660 filesystem
.Sh SYNOPSIS
-.Nm mount_cd9660
+.Nm
.Op Fl egR
.Op Fl o Ar options
.Ar special node
.Sh DESCRIPTION
The
-.Nm mount_cd9660
+.Nm
command attaches the ISO-9660 filesystem residing on the device
.Ar special
to the global filesystem namespace at the location indicated by
@@ -98,6 +98,6 @@ the one with the highest.
There is no ECMA support.
.Sh HISTORY
The
-.Nm mount_cd9660
+.Nm
utility first appeared
.Bx 4.4 .
diff --git a/sbin/mount_ext2fs/mount_ext2fs.8 b/sbin/mount_ext2fs/mount_ext2fs.8
index 1507051b6e5..d47144b992b 100644
--- a/sbin/mount_ext2fs/mount_ext2fs.8
+++ b/sbin/mount_ext2fs/mount_ext2fs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount_ext2fs.8,v 1.1 1996/06/27 07:20:28 downsj Exp $
+.\" $OpenBSD: mount_ext2fs.8,v 1.2 1998/11/28 19:56:24 aaron Exp $
.\"
.\" Copyright (c) 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -39,13 +39,13 @@
.Nm mount_ext2fs
.Nd mount a ext2fs file system
.Sh SYNOPSIS
-.Nm mount_ext2fs
+.Nm
.Op Fl o Ar options
.Ar special
.Ar node
.Sh DESCRIPTION
The
-.Nm mount_ext2fs
+.Nm
command attaches a ext2fs file system
.Ar special
device on to the file system tree at the point
@@ -72,5 +72,5 @@ man page for possible options and their meanings.
.Xr mount 8
.Sh HISTORY
The
-.Nm mount_ext2fs
+.Nm
function first appeared in FreeBSD 2.2.
diff --git a/sbin/mount_fdesc/mount_fdesc.8 b/sbin/mount_fdesc/mount_fdesc.8
index 8b267089b62..6be7d086c2a 100644
--- a/sbin/mount_fdesc/mount_fdesc.8
+++ b/sbin/mount_fdesc/mount_fdesc.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount_fdesc.8,v 1.4 1998/06/15 17:55:42 mickey Exp $
+.\" $OpenBSD: mount_fdesc.8,v 1.5 1998/11/28 19:56:24 aaron Exp $
.\" $NetBSD: mount_fdesc.8,v 1.6 1995/12/17 18:50:19 ghudson Exp $
.\"
.\" Copyright (c) 1992, 1993, 1994
@@ -44,13 +44,13 @@
.Nm mount_fdesc
.Nd mount the file-descriptor file system
.Sh SYNOPSIS
-.Nm mount_fdesc
+.Nm
.Op Fl o Ar options
.Ar fdesc
.Ar mount_point
.Sh DESCRIPTION
The
-.Nm mount_fdesc
+.Nm
command attaches an instance of the per-process file descriptor
namespace to the global filesystem namespace.
The conventional mount point is
@@ -152,6 +152,6 @@ the real controlling terminal device.
This filesystem may not be NFS-exported.
.Sh HISTORY
The
-.Nm mount_fdesc
+.Nm
utility first appeared in
.Bx 4.4 .
diff --git a/sbin/mount_ffs/mount_ffs.8 b/sbin/mount_ffs/mount_ffs.8
index 3fd039c9a26..9717b74f378 100644
--- a/sbin/mount_ffs/mount_ffs.8
+++ b/sbin/mount_ffs/mount_ffs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount_ffs.8,v 1.3 1996/06/23 14:31:20 deraadt Exp $
+.\" $OpenBSD: mount_ffs.8,v 1.4 1998/11/28 19:56:25 aaron Exp $
.\" $NetBSD: mount_ffs.8,v 1.2 1996/02/05 06:33:47 jtc Exp $
.\"
.\" Copyright (c) 1980, 1989, 1991, 1993
@@ -38,16 +38,15 @@
.Dt MOUNT_FFS 8
.Os BSD 4
.Sh NAME
-.Nm mount_ffs ,
-.Nm mount_ufs
+.Nm mount_ffs , mount_ufs
.Nd mount a Berkeley Fast File System
.Sh SYNOPSIS
-.Nm mount_ffs
+.Nm
.Op Fl o Ar options
.Ar special node
.Sh DESCRIPTION
The
-.Nm mount_ffs
+.Nm
command attaches the Berkeley Fast File System on the
.Ar special
device on to the file system tree at point
@@ -86,6 +85,6 @@ man page for possible options and their meanings.
It is possible for a corrupted file system to cause a crash.
.Sh HISTORY
A
-.Nm mount_ffs
+.Nm
command appeared in
.Nx 1.0a .
diff --git a/sbin/mount_kernfs/mount_kernfs.8 b/sbin/mount_kernfs/mount_kernfs.8
index 8a5a883c61a..e80120ca28f 100644
--- a/sbin/mount_kernfs/mount_kernfs.8
+++ b/sbin/mount_kernfs/mount_kernfs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount_kernfs.8,v 1.5 1998/09/17 04:14:55 aaron Exp $
+.\" $OpenBSD: mount_kernfs.8,v 1.6 1998/11/28 19:56:25 aaron Exp $
.\" $NetBSD: mount_kernfs.8,v 1.6 1995/03/18 14:57:24 cgd Exp $
.\"
.\" Copyright (c) 1992, 1993, 1994
@@ -45,13 +45,13 @@
.Nm mount_kernfs
.Nd mount the /kern file system
.Sh SYNOPSIS
-.Nm mount_kernfs
+.Nm
.Op Fl o Ar options
.Ar /kern
.Ar mount_point
.Sh DESCRIPTION
The
-.Nm mount_kern
+.Nm
command attaches an instance of the kernel parameter
namespace to the global filesystem namespace.
The conventional mount point is
@@ -157,6 +157,6 @@ can be generated by running:
This filesystem may not be NFS-exported.
.Sh HISTORY
The
-.Nm mount_kernfs
+.Nm
utility first appeared in
.Bx 4.4 .
diff --git a/sbin/mount_lfs/mount_lfs.8 b/sbin/mount_lfs/mount_lfs.8
index 712ce694cf8..f928531743c 100644
--- a/sbin/mount_lfs/mount_lfs.8
+++ b/sbin/mount_lfs/mount_lfs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount_lfs.8,v 1.4 1998/06/15 17:55:44 mickey Exp $
+.\" $OpenBSD: mount_lfs.8,v 1.5 1998/11/28 19:56:25 aaron Exp $
.\" $NetBSD: mount_lfs.8,v 1.2 1995/03/18 14:57:30 cgd Exp $
.\"
.\" Copyright (c) 1993, 1994
@@ -41,14 +41,14 @@
.Nm mount_lfs
.Nd mount a log-structured file system
.Sh SYNOPSIS
-.Nm mount_lfs
+.Nm
.Op Fl dns
.Op Fl o Ar options
.Ar special
.Ar node
.Sh DESCRIPTION
The
-.Nm mount_lfs
+.Nm
command attaches a log-structured file system
.Ar special
device on to the file system tree at the point
@@ -124,6 +124,6 @@ to read data in small chunks when cleaning the file system.
.Re
.Sh HISTORY
The
-.Nm mount_lfs
+.Nm
function first appeared in
.Bx 4.4 .
diff --git a/sbin/mount_msdos/mount_msdos.8 b/sbin/mount_msdos/mount_msdos.8
index 1c26e847822..337e3386aa9 100644
--- a/sbin/mount_msdos/mount_msdos.8
+++ b/sbin/mount_msdos/mount_msdos.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount_msdos.8,v 1.7 1998/11/21 02:42:45 d Exp $
+.\" $OpenBSD: mount_msdos.8,v 1.8 1998/11/28 19:56:26 aaron Exp $
.\" $NetBSD: mount_msdos.8,v 1.10 1996/01/19 21:14:43 leo Exp $
.\"
.\" Copyright (c) 1993,1994 Christopher G. Demetriou
@@ -36,7 +36,7 @@
.Nm mount_msdos
.Nd mount an MS-DOS file system
.Sh SYNOPSIS
-.Nm mount_msdos
+.Nm
.Op Fl o Ar options
.Op Fl u Ar uid
.Op Fl g Ar gid
@@ -49,7 +49,7 @@
.Ar node
.Sh DESCRIPTION
The
-.Nm mount_msdos
+.Nm
command attaches the MS-DOS filesystem residing on
the device
.Ar special
@@ -109,7 +109,7 @@ If neither
nor
.Fl l
are given,
-.Nm mount_msdos
+.Nm
searches the root directory of the filesystem to
be mounted for any existing Windows 95/98 long filenames.
If no such entries are found,
@@ -152,7 +152,7 @@ Note that Windows 95/98 handles only access dates,
but not access times.
.Sh HISTORY
The
-.Nm mount_msdos
+.Nm
utility first appeared in NetBSD 0.9.
Its predecessor, the
.Nm mount_pcfs
diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8
index 7001cf53943..a472ef6a6c0 100644
--- a/sbin/mount_nfs/mount_nfs.8
+++ b/sbin/mount_nfs/mount_nfs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount_nfs.8,v 1.9 1998/09/17 04:14:55 aaron Exp $
+.\" $OpenBSD: mount_nfs.8,v 1.10 1998/11/28 19:56:26 aaron Exp $
.\" $NetBSD: mount_nfs.8,v 1.3 1996/02/18 11:59:10 fvdl Exp $
.\"
.\" Copyright (c) 1992, 1993, 1994, 1995
@@ -41,7 +41,7 @@
.Nm mount_nfs
.Nd mount nfs file systems
.Sh SYNOPSIS
-.Nm mount_nfs
+.Nm
.Op Fl 23KPTUbcdilqs
.Op Fl D Ar deadthresh
.Op Fl I Ar readdirsize
@@ -58,7 +58,7 @@
.Ar rhost:path node
.Sh DESCRIPTION
The
-.Nm mount_nfs
+.Nm
command
calls the
.Xr mount 2
diff --git a/sbin/mount_null/mount_null.8 b/sbin/mount_null/mount_null.8
index 0210ab4fdaf..e90e9dab8ef 100644
--- a/sbin/mount_null/mount_null.8
+++ b/sbin/mount_null/mount_null.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount_null.8,v 1.5 1998/09/17 04:14:55 aaron Exp $
+.\" $OpenBSD: mount_null.8,v 1.6 1998/11/28 19:56:26 aaron Exp $
.\" $NetBSD: mount_null.8,v 1.4 1996/04/10 20:57:19 thorpej Exp $
.\"
.\" Copyright (c) 1992, 1993, 1994
@@ -44,13 +44,13 @@
.Nm mount_null
.Nd demonstrate the use of a null file system layer
.Sh SYNOPSIS
-.Nm mount_null
+.Nm
.Op Fl o Ar options
.Ar target
.Ar mount_point
.Sh DESCRIPTION
The
-.Nm mount_null
+.Nm
command creates a
null layer, duplicating a sub-tree of the file system
namespace under another part of the global file system namespace.
@@ -87,7 +87,7 @@ for constructing new layers.
.Sh INSTANTIATING NEW NULL LAYERS
New null layers are created with
.Nm mount_null .
-.Nm mount_null
+.Nm
takes two arguments: the pathname
of the lower vfs (target-pn) and the pathname where the null
layer will appear in the namespace (mount-point-pn). After
@@ -216,6 +216,6 @@ UCLA Technical Report CSD-910056,
.Em "Stackable Layers: an Architecture for File System Development" .
.Sh HISTORY
The
-.Nm mount_null
+.Nm
utility first appeared in
.Bx 4.4 .
diff --git a/sbin/mount_portal/mount_portal.8 b/sbin/mount_portal/mount_portal.8
index aa0aa0c53b4..73cc3699d6c 100644
--- a/sbin/mount_portal/mount_portal.8
+++ b/sbin/mount_portal/mount_portal.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount_portal.8,v 1.6 1998/11/11 22:19:58 aaron Exp $
+.\" $OpenBSD: mount_portal.8,v 1.7 1998/11/28 19:56:26 aaron Exp $
.\" $NetBSD: mount_portal.8,v 1.6 1995/08/18 15:01:19 pk Exp $
.\"
.\" Copyright (c) 1993, 1994
@@ -45,13 +45,13 @@
.Nm mount_portal
.Nd mount the portal daemon
.Sh SYNOPSIS
-.Nm mount_portal
+.Nm
.Op Fl o Ar options
.Ar /etc/portal.conf
.Ar mount_point
.Sh DESCRIPTION
The
-.Nm mount_portal
+.Nm
command attaches an instance of the portal daemon
to the global filesystem namespace.
The conventional mount point is
@@ -136,7 +136,7 @@ fs/ file fs/
This filesystem may not be NFS-exported.
.Sh HISTORY
The
-.Nm mount_portal
+.Nm
utility first appeared in
.Bx 4.4 .
diff --git a/sbin/mount_procfs/mount_procfs.8 b/sbin/mount_procfs/mount_procfs.8
index ac1a986b614..e9894923341 100644
--- a/sbin/mount_procfs/mount_procfs.8
+++ b/sbin/mount_procfs/mount_procfs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount_procfs.8,v 1.7 1998/09/23 01:20:24 aaron Exp $
+.\" $OpenBSD: mount_procfs.8,v 1.8 1998/11/28 19:56:27 aaron Exp $
.\" $NetBSD: mount_procfs.8,v 1.6 1995/03/18 14:58:10 cgd Exp $
.\"
.\" Copyright (c) 1992, 1993
@@ -45,13 +45,13 @@
.Nm mount_procfs
.Nd mount the process file system
.Sh SYNOPSIS
-.Nm mount_procfs
+.Nm
.Op Fl o Ar options
.Pa /proc
.Pa mount_point
.Sh DESCRIPTION
The
-.Nm mount_procfs
+.Nm
command attaches an instance of the process
namespace to the global filesystem namespace.
The conventional mount point is
@@ -236,6 +236,6 @@ since most of the functionality of
requires that state be maintained.
.Sh HISTORY
The
-.Nm mount_procfs
+.Nm
utility first appeared in
.Bx 4.4 .
diff --git a/sbin/mount_umap/mount_umap.8 b/sbin/mount_umap/mount_umap.8
index 90e9bb6e7c1..4b3a2ee4c91 100644
--- a/sbin/mount_umap/mount_umap.8
+++ b/sbin/mount_umap/mount_umap.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount_umap.8,v 1.6 1998/09/17 04:14:56 aaron Exp $
+.\" $OpenBSD: mount_umap.8,v 1.7 1998/11/28 19:56:27 aaron Exp $
.\" $NetBSD: mount_umap.8,v 1.4 1996/03/05 02:36:42 thorpej Exp $
.\"
.\" Copyright (c) 1992, 1993, 1994
@@ -45,7 +45,7 @@
.Nm mount_umap
.Nd sample file system layer
.Sh SYNOPSIS
-.Nm mount_umap
+.Nm
.Op Fl o Ar options
-u
.Ar uid-mapfile
@@ -55,7 +55,7 @@
.Ar mount_point
.Sh DESCRIPTION
The
-.Nm mount_umap
+.Nm
command is used to mount a subtree of an existing file system
that uses a different set of UIDs and GIDs than the local system.
Such a file system could be mounted from a remote site via NFS or
@@ -74,13 +74,13 @@ man page for possible options and their meanings.
.El
.Pp
The
-.Nm mount_umap
+.Nm
command uses a set of files provided by the user to make correspondences
between UIDs and GIDs in the subtree's original environment and
some other set of IDs in the local environment. For instance, user
smith might have UID 1000 in the original environment, while having
UID 2000 in the local environment. The
-.Nm mount_umap
+.Nm
command allows the subtree from smith's original environment to be
mapped in such a way that all files with owner UID 1000 look like
they are actually owned by UID 2000.
@@ -116,13 +116,13 @@ at most 16 groups can be mapped by a given subtree.
.Pp
The mapfiles can be located anywhere in the file hierarchy, but they
must be owned by root, and they must be writable only by root.
-.Nm mount_umap
+.Nm
will refuse to map the subtree if the ownership or permissions on
these files are improper. It will also balk if the count of mappings
in the first line of the map files is not correct.
.Pp
The layer created by the
-.Nm mount_umap
+.Nm
command is meant to serve as a simple example of file system layering.
It is not meant for production use. The implementation is not very
sophisticated.
@@ -131,6 +131,6 @@ sophisticated.
.Xr mount_null 8
.Sh HISTORY
The
-.Nm mount_umap
+.Nm
utility first appeared in
.Bx 4.4 .
diff --git a/sbin/mount_union/mount_union.8 b/sbin/mount_union/mount_union.8
index 179c767a75f..f40c71c4f8e 100644
--- a/sbin/mount_union/mount_union.8
+++ b/sbin/mount_union/mount_union.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount_union.8,v 1.4 1998/09/17 04:14:56 aaron Exp $
+.\" $OpenBSD: mount_union.8,v 1.5 1998/11/28 19:56:27 aaron Exp $
.\" $NetBSD: mount_union.8,v 1.4 1995/09/29 06:44:02 jtc Exp $
.\"
.\" Copyright (c) 1994
@@ -44,14 +44,14 @@
.Nm mount_union
.Nd mount union filesystems
.Sh SYNOPSIS
-.Nm mount_union
+.Nm
.Op Fl br
.Op Fl o Ar options
.Ar directory
.Ar uniondir
.Sh DESCRIPTION
The
-.Nm mount_union
+.Nm
command
attaches
.Ar directory
@@ -199,6 +199,6 @@ over a union tree has the side-effect of creating
a tree of shadow directories in the upper layer.
.Sh HISTORY
The
-.Nm mount_union
+.Nm
command first appeared in
.Bx 4.4 .
diff --git a/sbin/mount_xfs/mount_xfs.8 b/sbin/mount_xfs/mount_xfs.8
index 45b969b1ba8..b74c58d2cb1 100644
--- a/sbin/mount_xfs/mount_xfs.8
+++ b/sbin/mount_xfs/mount_xfs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mount_xfs.8,v 1.7 1998/11/25 03:30:55 aaron Exp $
+.\" $OpenBSD: mount_xfs.8,v 1.8 1998/11/28 19:56:36 aaron Exp $
.\" $NetBSD: mount_null.8,v 1.4 1996/04/10 20:57:19 thorpej Exp $
.\"
.\" Copyright (c) 1995, 1996, 1997, 1998 Kungliga Tekniska Högskolan
@@ -44,13 +44,13 @@
.Nm mount_xfs
.Nd mount the xfs filesystem
.Sh SYNOPSIS
-.Nm mount_xfs
+.Nm
.Op Fl o Ar options
.Ar char-device
.Ar mount-point
.Sh DESCRIPTION
The
-.Nm mount_xfs
+.Nm
command mounts one of the xfs character devices. The character device is used
for comunication with a user-land cachemanager and fileprovider.
.Pp
@@ -74,5 +74,5 @@ it could be used for other filesystems as well.
.Xr mount 8
.Sh HISTORY
The
-.Nm mount_xfs
+.Nm
utility first appeared in OpenBSD 2.4.
diff --git a/sbin/mountd/exports.5 b/sbin/mountd/exports.5
index caf7f92bf64..b6c18c3b05f 100644
--- a/sbin/mountd/exports.5
+++ b/sbin/mountd/exports.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: exports.5,v 1.6 1998/11/11 22:19:58 aaron Exp $
+.\" $OpenBSD: exports.5,v 1.7 1998/11/28 19:56:28 aaron Exp $
.\" $NetBSD: exports.5,v 1.9 1996/02/18 11:57:50 fvdl Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
@@ -43,10 +43,10 @@
.Tn NFS
mount requests
.Sh SYNOPSIS
-.Nm exports
+.Nm
.Sh DESCRIPTION
The
-.Nm exports
+.Nm
file specifies remote mount points for the
.Tn NFS
mount protocol per the
diff --git a/sbin/mountd/mountd.8 b/sbin/mountd/mountd.8
index 5ae56a2c233..6c40c3fd9b2 100644
--- a/sbin/mountd/mountd.8
+++ b/sbin/mountd/mountd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mountd.8,v 1.10 1998/09/17 04:14:56 aaron Exp $
+.\" $OpenBSD: mountd.8,v 1.11 1998/11/28 19:56:28 aaron Exp $
.\" $NetBSD: mountd.8,v 1.11 1996/02/18 11:57:51 fvdl Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
@@ -43,15 +43,15 @@
.Tn NFS
mount requests
.Sh SYNOPSIS
-.Nm mountd
+.Nm
.Op Fl dn
.Op Ar exportsfile
.Sh DESCRIPTION
-.Nm mountd
+.Nm
is the server for
.Tn NFS
mount requests from other client machines.
-.Nm mountd
+.Nm
listens for service requests at the port indicated in the
.Tn NFS
server specification; see
@@ -65,7 +65,7 @@ Options and operands available for
.Bl -tag -width Ds
.It Fl d
Enable debugging mode.
-.Nm mountd
+.Nm
will not detach from the controlling terminal and will print
debugging messages to stderr.
.It Fl n
@@ -84,7 +84,7 @@ for the exports file.
.El
.Pp
When
-.Nm mountd
+.Nm
is started,
it loads the export host addresses and options into the kernel
using the
@@ -92,14 +92,14 @@ using the
system call.
After changing the exports file,
a hangup signal should be sent to the
-.Nm mountd
+.Nm
daemon
to get it to reload the export information.
After sending the
.Dv SIGHUP
(kill \-HUP `cat /var/run/mountd.pid`),
check the syslog output to see if
-.Nm mountd
+.Nm
logged any parsing
errors in the exports file.
.Sh FILES
@@ -108,7 +108,7 @@ errors in the exports file.
list of exported filesystems
.It Pa /var/run/mountd.pid
PID of the currently running
-.Nm mountd
+.Nm
.El
.Sh SEE ALSO
.Xr nfsstat 1 ,
@@ -118,6 +118,6 @@ PID of the currently running
.Xr showmount 8
.Sh HISTORY
The
-.Nm mountd
+.Nm
utility first appeared in
.Bx 4.4 .
diff --git a/sbin/ncheck_ffs/ncheck_ffs.8 b/sbin/ncheck_ffs/ncheck_ffs.8
index da4973a66f5..b491117f7cb 100644
--- a/sbin/ncheck_ffs/ncheck_ffs.8
+++ b/sbin/ncheck_ffs/ncheck_ffs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ncheck_ffs.8,v 1.4 1998/11/11 22:19:59 aaron Exp $
+.\" $OpenBSD: ncheck_ffs.8,v 1.5 1998/11/28 19:56:28 aaron Exp $
.\"
.\" Copyright (c) 1995, 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
.\" All rights reserved.
@@ -35,12 +35,12 @@
.Nm ncheck_ffs
.Nd generate names from inode-numbers
.Sh SYNOPSIS
-.Nm ncheck_ffs
+.Nm
.Op Fl i Ar numbers
.Op Fl ams
.Ar filesystem
.Sh DESCRIPTION
-.Nm ncheck_ffs
+.Nm
generates a list of filenames and inode numbers for the given
file system. Names of directories are followed by a
.Dq \&. .
@@ -48,7 +48,7 @@ file system. Names of directories are followed by a
The report is not sorted.
.Pp
The options to
-.Nm ncheck_ffs
+.Nm
are as follows:
.Bl -tag -width indent
.It Fl i Ar numbers
@@ -69,7 +69,7 @@ set. This is meant to find hidden violations of security policies.
.Xr fsck 8
.Sh HISTORY
The
-.Nm ncheck_ffs
+.Nm
command was designed to be similar in functionality to the corresponding
command in
.Tn "SunOS 4.1.3" .
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index 30d5b5bb19d..752db3b79b9 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: newfs.8,v 1.11 1998/11/11 22:19:59 aaron Exp $
+.\" $OpenBSD: newfs.8,v 1.12 1998/11/28 19:56:28 aaron Exp $
.\" $NetBSD: newfs.8,v 1.12 1995/03/18 14:58:41 cgd Exp $
.\"
.\" Copyright (c) 1983, 1987, 1991, 1993, 1994
@@ -38,11 +38,10 @@
.Dt NEWFS 8
.Os BSD 4.2
.Sh NAME
-.Nm newfs ,
-.Nm mount_mfs
+.Nm newfs , mount_mfs
.Nd construct a new file system
.Sh SYNOPSIS
-.Nm newfs
+.Nm
.Op Fl NO
.Op Fl S Ar sector-size
.Op Fl a Ar maxcontig
@@ -65,6 +64,7 @@
.Op Fl x Ar sectors
.Op Fl z Ar tracks
.Ar special
+.Pp
.Nm mount_mfs
.Op Fl N
.Op Fl a Ar maxcontig
@@ -79,23 +79,23 @@
.Op Fl s Ar size
.Ar special node
.Sh DESCRIPTION
-.Nm newfs
+.Nm
replaces the more obtuse
.Xr mkfs 8
program.
Before running
-.Nm newfs
+.Nm
or
.Nm mount_mfs ,
the disk must be labeled using
.Xr disklabel 8 .
-.Nm newfs
+.Nm
builds a file system on the specified
.Ar special
device,
basing its defaults on the information in the disk label.
Typically the defaults are reasonable, however
-.Nm newfs
+.Nm
has numerous options to allow the defaults to be selectively overridden.
.Pp
.Nm mount_mfs
@@ -213,7 +213,7 @@ The size of the file system in sectors.
The following options override the standard sizes for the disk geometry.
Their default values are taken from the disk label.
Changing these defaults is useful only when using
-.Nm newfs
+.Nm
to build a file system whose raw image will eventually be used on a
different type of disk than the one on which it is initially created
(for example on a write-once disk).
@@ -250,7 +250,7 @@ The number of tracks/cylinder available for data allocation by the file
system.
.It Fl t Ar fstype
Set the filesystem type of which filesystem you wish to create.
-.Nm newfs
+.Nm
will be smart enough to run the alternate newfs_XXX program instead.
.It Fl u Ar sectors/track
The number of sectors per track available for data allocation by the file
@@ -271,7 +271,7 @@ system for data allocation.
The options to the
.Nm mount_mfs
command are as described for the
-.Nm newfs
+.Nm
command, except for the
.Fl o
option.
diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8
index d2e95fde014..91560df0357 100644
--- a/sbin/newfs_msdos/newfs_msdos.8
+++ b/sbin/newfs_msdos/newfs_msdos.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: newfs_msdos.8,v 1.6 1998/11/11 22:19:59 aaron Exp $
+.\" $OpenBSD: newfs_msdos.8,v 1.7 1998/11/28 19:56:29 aaron Exp $
.\"
.\" Copyright (c) 1995, 1996 Joerg Wunsch
.\"
@@ -34,12 +34,12 @@
.Nm newfs_msdos
.Nd create an MS-DOS (FAT) file system
.Sh SYNOPSIS
-.Nm newfs_msdos
+.Nm
.Bq Fl s Ar kilobytes
.Bq Fl L Ar vollabel
.Ar device
.Sh DESCRIPTION
-.Nm newfs_msdos
+.Nm
establishes a file system structure on
.Ar device
that is understood by
@@ -99,7 +99,7 @@ one file. There are usually two identical copies of the FAT.
The final structure is the root directory for this medium. It is
merely a space reservation, padded with 0s, and unfortunately fixed
in its size.
-.Nm newfs_msdos
+.Nm
initializes it to empty, and enters a volume label record into the
very first directory slot.
.Sh DIAGNOSTICS
@@ -120,12 +120,12 @@ should be added to the table of known formats, too.
.Pp
No attempt is made to handle media defects. However, this is beyond
the scope of
-.Nm newfs_msdos
+.Nm
and should better be handled by the (nonexistent)
.Xr dosfsck 1
utility.
.Sh HISTORY
-.Nm newfs_msdos
+.Nm
appeared in
.Em FreeBSD 2.2 .
.Sh AUTHOR
diff --git a/sbin/newlfs/newlfs.8 b/sbin/newlfs/newlfs.8
index 8e0ebf6ffa6..9540e1f53f8 100644
--- a/sbin/newlfs/newlfs.8
+++ b/sbin/newlfs/newlfs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: newlfs.8,v 1.4 1998/09/23 01:20:24 aaron Exp $
+.\" $OpenBSD: newlfs.8,v 1.5 1998/11/28 19:56:29 aaron Exp $
.\" $NetBSD: newlfs.8,v 1.2 1995/03/18 14:58:54 cgd Exp $
.\"
.\" Copyright (c) 1993
@@ -41,7 +41,7 @@
.Nm newlfs
.Nd construct a new LFS file system
.Sh SYNOPSIS
-.Nm newlfs
+.Nm
.Fl L
.Op Fl B Ar segsize
.Op Fl b Ar blocksize
@@ -49,12 +49,12 @@
.Op Fl s Ar size
.Ar special
.Sh DESCRIPTION
-.Nm newlfs
+.Nm
builds a log-structured file system on the specified
.Ar special
device, basing its defaults on the information in the disk label.
(Before running
-.Nm newlfs
+.Nm
the disk must be labeled using
.Xr disklabel 8 .)
.Pp
diff --git a/sbin/nfsd/nfsd.8 b/sbin/nfsd/nfsd.8
index b0d8e4e37db..e18354d4709 100644
--- a/sbin/nfsd/nfsd.8
+++ b/sbin/nfsd/nfsd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nfsd.8,v 1.5 1998/09/17 04:14:59 aaron Exp $
+.\" $OpenBSD: nfsd.8,v 1.6 1998/11/28 19:56:30 aaron Exp $
.\" $NetBSD: nfsd.8,v 1.7 1996/02/18 11:58:24 fvdl Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
@@ -43,16 +43,16 @@
.Tn NFS
server
.Sh SYNOPSIS
-.Nm nfsd
+.Nm
.Op Fl rut
.Op Fl n Ar num_servers
.Sh DESCRIPTION
-.Nm nfsd
+.Nm
runs on a server machine to service
.Tn NFS
requests from client machines.
At least one
-.Nm nfsd
+.Nm
must be running for a machine to operate as a server.
.Pp
Unless otherwise specified, four servers for
@@ -96,7 +96,7 @@ A server should run enough daemons to handle
the maximum level of concurrency from its clients,
typically four to six.
.Pp
-.Nm nfsd
+.Nm
listens for service requests at the port indicated in the
.Tn NFS
server specification; see
@@ -105,7 +105,7 @@ RFC1094 and
.%T "NFS: Network File System Version 3 Protocol Specification" .
.Pp
The
-.Nm nfsd
+.Nm
utility exits 0 on success or >0 if an error occurred.
.Sh SEE ALSO
.Xr nfsstat 1 ,
@@ -114,6 +114,6 @@ utility exits 0 on success or >0 if an error occurred.
.Xr portmap 8
.Sh HISTORY
The
-.Nm nfsd
+.Nm
utility first appeared in
.Bx 4.4 .
diff --git a/sbin/nfsiod/nfsiod.8 b/sbin/nfsiod/nfsiod.8
index b79ee056745..cdc4af529da 100644
--- a/sbin/nfsiod/nfsiod.8
+++ b/sbin/nfsiod/nfsiod.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nfsiod.8,v 1.5 1998/09/17 04:14:59 aaron Exp $
+.\" $OpenBSD: nfsiod.8,v 1.6 1998/11/28 19:56:30 aaron Exp $
.\" $NetBSD: nfsiod.8,v 1.6 1995/03/18 14:59:04 cgd Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
@@ -43,10 +43,10 @@
.Tn NFS
asynchronous I/O server
.Sh SYNOPSIS
-.Nm nfsiod
+.Nm
.Op Fl n Ar num_servers
.Sh DESCRIPTION
-.Nm nfsiod
+.Nm
runs on an
.Tn NFS
client machine to service asynchronous I/O requests to its server.
@@ -64,7 +64,7 @@ A client should run enough daemons to handle its maximum
level of concurrency, typically four to six. The system maximum is twenty.
.Pp
The
-.Nm nfsiod
+.Nm
utility exits 0 on success or >0 if an error occurred.
.Sh SEE ALSO
.Xr nfsstat 1 ,
@@ -73,6 +73,6 @@ utility exits 0 on success or >0 if an error occurred.
.Xr portmap 8
.Sh HISTORY
The
-.Nm nfsiod
+.Nm
utility first appeared in
.Bx 4.4 .
diff --git a/sbin/nologin/nologin.8 b/sbin/nologin/nologin.8
index 9649d4b72a6..75ba56a54f8 100644
--- a/sbin/nologin/nologin.8
+++ b/sbin/nologin/nologin.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nologin.8,v 1.5 1998/09/17 04:14:59 aaron Exp $
+.\" $OpenBSD: nologin.8,v 1.6 1998/11/28 19:56:30 aaron Exp $
.\" $NetBSD: nologin.8,v 1.3 1995/03/18 14:59:09 cgd Exp $
.\"
.\" Copyright (c) 1993
@@ -41,9 +41,9 @@
.Nm nologin
.Nd politely refuse a login
.Sh SYNOPSIS
-.Nm nologin
+.Nm
.Sh DESCRIPTION
-.Nm nologin
+.Nm
displays a message that an account is not available and
exits non-zero.
It is intended as a replacement shell field for accounts that
@@ -52,12 +52,12 @@ have been disabled.
If the file
.Pa /etc/nologin.txt
exists,
-.Nm nologin
+.Nm
displays its contents to the user instead of the default message.
.Sh SEE ALSO
.Xr login 1
.Sh HISTORY
The
-.Nm nologin
+.Nm
command appeared in
.Bx 4.4 .
diff --git a/sbin/pcmcia_cntrl/pcmcia_cntrl.8 b/sbin/pcmcia_cntrl/pcmcia_cntrl.8
index 726146484a7..fc6557d50de 100644
--- a/sbin/pcmcia_cntrl/pcmcia_cntrl.8
+++ b/sbin/pcmcia_cntrl/pcmcia_cntrl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pcmcia_cntrl.8,v 1.3 1998/09/17 04:15:00 aaron Exp $
+.\" $OpenBSD: pcmcia_cntrl.8,v 1.4 1998/11/28 19:56:31 aaron Exp $
.\" Copyright (c) 1994 Stefan Grefen
.\" All rights reserved.
.\"
@@ -40,13 +40,13 @@
.Os
.Sh NAME
.Nm pcmcia_cntrl
-.Nd Change the status of a pcmcia slot
+.Nd change the status of a pcmcia slot
.Sh SYNOPSIS
-.Nm pcmcia_cntrl
+.Nm
.Ar slotid
.Op on | off | unmap | probe
.Sh DESCRIPTION
-.Nm pcmcia_cntrl
+.Nm
controls the operation of a PCMCIA card. It operates on the card in slot
.Ar slotid .
\.
@@ -65,9 +65,9 @@ have kernel support for mapping.
Use config_slot for other devices.
.El
.Pp
-If an error occurs,
-.Nm pcmcia_cntrl
-exits with a value >0.
+The
+.Nm
+utility exits 0 on success or >0 if an error occurred.
.Sh SEE ALSO
.Xr pcmcia 4
.Sh BUGS
diff --git a/sbin/photurisd/photurisd.8 b/sbin/photurisd/photurisd.8
index a73f603edfe..2fa8e4c4f10 100644
--- a/sbin/photurisd/photurisd.8
+++ b/sbin/photurisd/photurisd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: photurisd.8,v 1.1 1998/11/14 23:37:27 deraadt Exp $
+.\" $OpenBSD: photurisd.8,v 1.2 1998/11/28 19:56:37 aaron Exp $
.\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
.\" All rights reserved.
.\"
@@ -36,20 +36,20 @@
.Nm photurisd
.Nd IPSec key management daemon
.Sh SYNOPSIS
-.Nm photurisd
+.Nm
.Op Fl cvi
.Op Fl d Ar directory
.Op Fl p Ar port
.Sh DESCRIPTION
The
-.Nm photuris
+.Nm
daemon establishes security associations for encrypted
and/or authenticated network traffic.
.Pp
The daemon listens to a named pipe
.Pa photuris.pipe
for user requests and on a
-.Nm PF_ENCAP
+.Dv PF_ENCAP
socket for kernel requests.
.Pp
The options are as follows:
@@ -72,17 +72,21 @@ option can be used to ignore the
.Pa photuris.startup
file. Otherwise the exchanges in that file will be initiated
on startup.
-.It Fl d
+.It Fl d Ar directory
The
.Fl d
-option specifies the directory in which
-.Nm photurisd
+option specifies the
+.Ar directory
+in which
+.Nm
looks for its startup files. The default is
.Pa /etc/photuris/ .
-.It Fl p
+.It Fl p Ar port
The
.Fl p
-option specifies the local port the daemon shall bind to.
+option specifies the local
+.Ar port
+the daemon shall bind to.
.El
.Pp
The file
@@ -91,62 +95,60 @@ contains the moduli for the DH exchange and the actual exchange
schemes used to establish a shared secret. The following keywords are
understood:
.Bl -tag -width exchange -offset indent
-.It modulus
+.It Ic modulus
This keyword is followed by the numeric generator and modulus. Those two
values describe the group in which exchange values for the
-.Nm Diffie-Hellmann
+.Dq Diffie-Hellmann
key exchange are generated. The modulus needs to be a
-.Nm safe prime .
-.It exchange
-The
-.Nm exchange
-keyword is used to specify the supported exchange schemes. The scheme is
+.Dq safe prime .
+.It Ic exchange
+This keyword is used to specify the supported exchange schemes. The scheme is
followed by either zero or the number of bits of the modulus to be used
with this scheme.
If zero is specified the given scheme acts as modifier to the base
scheme. The base scheme is
-.Nm DH_G_2_MD5
+.Dq DH_G_2_MD5
(generator of two and MD5 identification). Extended schemes are
-.Nm DH_G_2_DES_MD5
+.Dq DH_G_2_DES_MD5
and
-.Nm DH_G_2_3DES_SHA1 .
+.Dq DH_G_2_3DES_SHA1 .
An exchange can only be configured if an apropriate modulus has be given
before.
-.It config
+.It Ic config
This is used to configure the LifeTimes of SPIs and exchanges. The configurable
values are:
-.Nm exchange_max_retries ,
-.Nm exchange_retransmit_timeout ,
-.Nm exchange_timeout ,
-.Nm exchange_lifetime
+.Ic exchange_max_retries ,
+.Ic exchange_retransmit_timeout ,
+.Ic exchange_timeout ,
+.Ic exchange_lifetime
and
-.Nm spi_lifetime .
+.Ic spi_lifetime .
They are followed by an integer.
.El
.Pp
The file
.Pa attributes.conf
-contains the attributes, i.e. different choices of encryption
+contains the attributes, i.e., different choices of encryption
and authenication, offered to the other peer. If a line starts with an ip
address and a space separated netmask the following attributes are only
offered to hosts lying in that net range. Only one attribute per line
is allowed. An attribute can either be an already defined tag or
-an new definition of an attribute. In that case the line is followed by a
+a new definition of an attribute. In that case the line is followed by a
comma separated list:
-.Nm attribute name ,
-.Nm Photuris id ,
-.Nm type of attribute
+.Ar attribute name ,
+.Ar Photuris ID ,
+.Ar type of attribute
and
-.Nm key length .
-The name is only used as reference. A list of possible Photuris ids can
+.Ar key length .
+The name is only used as reference. A list of possible Photuris IDs can
be found in
.Pa /usr/share/ipsec/attributes.conf .
The attribute type is one of the following:
-.Nm enc ,
-.Nm ident ,
-.Nm auth
+.Dq enc ,
+.Dq ident ,
+.Dq auth
or
-.Nm ident|auth .
+.Dq ident|auth .
The key length is so far only used by the encryption attributes and
specifies the number of keying bytes the daemon has to generate.
Predefined attributes are:
@@ -162,21 +164,21 @@ The file
contains the party preconfigured symmetric secrets for the
identity exchange.
.Bl -tag -width identity_pair_local -offset indent
-.It identity local
+.It Ic identity local
Defines the identity the local daemon will assume and the according
password. Both name and secret are braced by quotation marks and follow
the
-.Nm identity local
+.Ic identity local
directive.
-.It identity remote
+.It Ic identity remote
Defines the parties the daemon can communicate with and their secrets.
Both name and secret are braced by quotation marks and follow the
-.Nm identity remote
+.Ic identity remote
directive. The name and secret are the same as the identity local
on the remote site.
-.It identity pair local
+.It Ic identity pair local
If the identity of the remote site is already known,
-.Nm identity pair local
+.Ic identity pair local
enables the daemon to assume an identity and secret based on
the remote identity. The directive is followed by the
remote identity, a new local identity and an according secret.
@@ -192,65 +194,65 @@ contains parameters for exchanges which are created during
startup.
.Pp
The keywords
-.Nm dst ,
-.Nm port ,
-.Nm options ,
-.Nm tsrc ,
-.Nm tdst ,
-.Nm exchange_lifetime ,
-.Nm spi_lifetime
+.Ic dst ,
+.Ic port ,
+.Ic options ,
+.Ic tsrc ,
+.Ic tdst ,
+.Ic exchange_lifetime ,
+.Ic spi_lifetime
and
-.Nm user
+.Ic user
are understood in the
.Pa photuris.startup
file. The values are as follows:
.Bl -tag -width exchange_lifetime -offset indent
-.It dst
+.It Ic dst
The destination IP address with which the exchange is to be established.
-.It port
+.It Ic port
The port number of the destination
-.Nm photuris
+.Nm
daemon.
-.It options
+.It Ic options
The options to be used in the exchange. Possible values are
-.Nm enc
+.Dq enc
and
-.Nm auth .
-.It tsrc
+.Dq auth .
+.It Ic tsrc
If both
-.Nm tsrc
+.Ic tsrc
and
-.Nm tdst
+.Ic tdst
(see below) are specified, a tunnel (IP over IP) is setup. The
-.Nm tsrc
+.Ic tsrc
option is a network address with netmask used for matching the source
IP address of a packet. When both the source and the destination
addresses match their respective options the packet will be routed into the
tunnel.
-.It tdst
+.It Ic tdst
If both
-.Nm tsrc
+.Ic tsrc
(see above) and
-.Nm tdst
+.Ic tdst
are specified, a tunnel (IP over IP) is setup. The
-.Nm tdst
+.Ic tdst
option is a network address with netmask used for matching the destination
IP address of a packet. When both the source and the destination
addresses match their respective options the packet will be routed into the
tunnel.
-.It exchange_lifetime
+.It Ic exchange_lifetime
Determines the lifetime of the exchange. After an exchange expires
no new SPIs are created, which means the transport or tunnel is torn down
as soon as the current SPI times out (see
-.Nm spi_lifetime
+.Ic spi_lifetime
below). The default value is gotten from the
-.Nm exchange_lifetime
+.Ic exchange_lifetime
parameter given in
.Pa photuris.conf .
If it is not given there the default is 1800 seconds.
-.It spi_lifetime
+.It Ic spi_lifetime
Determines the lifetime of each created SPI in the exchange.
-.It user
+.It Ic user
The user name for whom the keying shall be done. Preconfigured
secrets are taken from the users secret file.
.El
@@ -271,10 +273,10 @@ tdst=134.100.106.0/255.255.255.255
.Sh SEE ALSO
.Xr startkey 1 ,
.Xr ipsec 4 ,
-.Xr vpn 8 .
+.Xr vpn 8
.Sh HISTORY
The photuris keymanagement protocol is described in the internet draft
-.Nm draft-simpson-photuris
+.%T draft-simpson-photuris
by the authors Phil Karn and William Allen Simpson.
This implementation was done 1997 by Niels Provos and appeared in
.Ox 2.1 .
diff --git a/sbin/ping/ping.8 b/sbin/ping/ping.8
index a2df22ef72f..82960b3b628 100644
--- a/sbin/ping/ping.8
+++ b/sbin/ping/ping.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ping.8,v 1.10 1998/11/11 22:19:59 aaron Exp $
+.\" $OpenBSD: ping.8,v 1.11 1998/11/28 19:56:31 aaron Exp $
.\" $NetBSD: ping.8,v 1.10 1995/12/31 04:55:35 ghudson Exp $
.\"
.\" Copyright (c) 1985, 1991, 1993
@@ -43,7 +43,7 @@
.Tn ICMP ECHO_REQUEST
packets to network hosts
.Sh SYNOPSIS
-.Nm ping
+.Nm
.Op Fl dfLnqRrv
.Op Fl c Ar count
.Op Fl I Ar ifaddr
@@ -56,7 +56,7 @@ packets to network hosts
.Op Fl w Ar maxwait
.Ar host
.Sh DESCRIPTION
-.Nm ping
+.Nm
uses the
.Tn ICMP
protocol's mandatory
@@ -123,7 +123,7 @@ option.
If
.Ar preload
is specified,
-.Nm ping
+.Nm
sends that many packets as fast as possible before falling into its normal
mode of behavior. Only root may set a preload value.
.It Fl n
@@ -153,7 +153,7 @@ the route buffer on returned packets.
Note that the IP header is only large enough for nine such routes.
If more routes come back than should, such as due to an illegal spoofed
packet,
-.Nm ping
+.Nm
will print the route list and then truncate it at the correct
spot. Many hosts ignore or discard this option.
.It Fl r
@@ -202,7 +202,7 @@ requests.
.El
.Pp
When using
-.Nm ping
+.Nm
for fault isolation, it should first be run on the local host to verify
that the local network interface is up and running.
Then, hosts and gateways further and further away should be
@@ -219,7 +219,7 @@ a brief summary is displayed.
This program is intended for use in network testing, measurement and
management.
Because of the load it can impose on the network, it is unwise to use
-.Nm ping
+.Nm
during normal operations or from automated scripts.
.Sh ICMP PACKET DETAILS
An IP header without options is 20 bytes.
@@ -243,13 +243,13 @@ will always be 8 bytes more than the requested data space
header).
.Pp
If the data space is at least eight bytes large,
-.Nm ping
+.Nm
uses the first eight bytes of this space to include a timestamp which
it uses in the computation of round trip times.
If less than eight bytes of pad are specified, no round trip times are
given.
.Sh DUPLICATE AND DAMAGED PACKETS
-.Nm ping
+.Nm
will report duplicate and damaged packets.
Duplicate packets should never occur, and seem to be caused by
inappropriate link-level retransmissions.
@@ -259,7 +259,7 @@ always be cause for alarm.
.Pp
Damaged packets are obviously serious cause for alarm and often
indicate broken hardware somewhere in the
-.Nm ping
+.Nm
packet's path (in the network or in the hosts).
.Sh TRYING DIFFERENT DATA PATTERNS
The (inter)network layer should never treat packets differently depending
@@ -323,7 +323,7 @@ or
.Xr ftp 1 .
.Pp
In normal operation,
-.Nm ping
+.Nm
prints the TTL value from the packet it receives.
When a remote system receives a ping packet, it can do one of three things
with the
diff --git a/sbin/quotacheck/quotacheck.8 b/sbin/quotacheck/quotacheck.8
index 4dfbbaf4cc4..86825bfa3bd 100644
--- a/sbin/quotacheck/quotacheck.8
+++ b/sbin/quotacheck/quotacheck.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: quotacheck.8,v 1.4 1998/09/17 04:15:00 aaron Exp $
+.\" $OpenBSD: quotacheck.8,v 1.5 1998/11/28 19:56:31 aaron Exp $
.\" $NetBSD: quotacheck.8,v 1.4 1995/03/18 14:59:20 cgd Exp $
.\"
.\" Copyright (c) 1983, 1990, 1991, 1993
@@ -44,13 +44,13 @@
.Nm quotacheck
.Nd filesystem quota consistency checker
.Sh SYNOPSIS
-.Nm quotacheck
+.Nm
.Op Fl d
.Op Fl g
.Op Fl u
.Op Fl v
.Ar filesystem Ar ...
-.Nm quotacheck
+.Nm
.Op Fl d
.Op Fl g
.Op Fl l Ar maxparallel
@@ -58,7 +58,7 @@
.Op Fl v
.Fl a
.Sh DESCRIPTION
-.Nm quotacheck
+.Nm
examines each filesystem,
builds a table of current disk usage,
and compares this table against that recorded
@@ -75,7 +75,7 @@ Available options:
If the
.Fl a
flag is supplied in place of any filesystem names,
-.Nm quotacheck
+.Nm
will check all the filesystems indicated in
.Pa /etc/fstab
to be read-write with disk quotas.
@@ -98,7 +98,7 @@ Only user quotas listed in
.Pa /etc/fstab
are to be checked.
.It Fl v
-.Nm quotacheck
+.Nm
reports discrepancies between the
calculated and recorded disk quotas.
.El
@@ -115,10 +115,10 @@ in an identical fashion to
.Xr fsck 8 .
.Pp
Normally
-.Nm quotacheck
+.Nm
operates silently.
.Pp
-.Nm quotacheck
+.Nm
expects each filesystem to be checked to have
quota files named
.Pa quota.user
@@ -128,10 +128,10 @@ located at the root of the associated file system.
These defaults may be overridden in
.Pa /etc/fstab .
If a file is not present,
-.Nm quotacheck
+.Nm
will create it.
.Pp
-.Nm quotacheck
+.Nm
is normally run at boot time from the
.Pa /etc/rc.local
file
@@ -139,12 +139,12 @@ file
before enabling disk quotas with
.Xr quotaon 8 .
.Pp
-.Nm quotacheck
+.Nm
accesses the raw device in calculating the actual
disk usage for each user.
Thus, the filesystems
checked should be quiescent while
-.Nm quotacheck
+.Nm
is running.
.Sh FILES
.Bl -tag -width quota.group -compact
diff --git a/sbin/reboot/boot_atari.8 b/sbin/reboot/boot_atari.8
index de0fbda58b1..c6a724f0fd4 100644
--- a/sbin/reboot/boot_atari.8
+++ b/sbin/reboot/boot_atari.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: boot_atari.8,v 1.5 1998/11/11 22:19:59 aaron Exp $
+.\" $OpenBSD: boot_atari.8,v 1.6 1998/11/28 19:56:32 aaron Exp $
.\" $NetBSD: boot_atari.8,v 1.1 1996/06/27 11:07:56 leo Exp $
.\"
.\" Copyright (c) 1990, 1991 The Regents of the University of California.
@@ -134,7 +134,9 @@ Enter the kernel debugger.
.Ss Booting using the loadbsd program
When you want (or have to) start OpenBSD from GEM, you have to use the
.Xr loadbsd
-program that is supplied on the kernel-floppy. The loadbsd command line
+program that is supplied on the kernel-floppy. The
+.Xr loadbsd
+command line
specification is:
.Bd -ragged -offset indent
.Nm loadbsd
diff --git a/sbin/reboot/boot_pmax.8 b/sbin/reboot/boot_pmax.8
index b2919f7657f..f0248033860 100644
--- a/sbin/reboot/boot_pmax.8
+++ b/sbin/reboot/boot_pmax.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: boot_pmax.8,v 1.9 1998/11/11 22:19:59 aaron Exp $
+.\" $OpenBSD: boot_pmax.8,v 1.10 1998/11/28 19:56:32 aaron Exp $
.\" $NetBSD: boot_pmax.8,v 1.1 1995/04/25 23:55:11 mellon Exp $
.\"
.\" Copyright (c) 1990, 1991 The Regents of the University of California.
@@ -59,7 +59,7 @@ and unless this fails, the system will resume multi-user operations.
.Pp
.Ss Cold starts
At power up, all DECstation ROMs consult the
-.Nm haltaction
+.Ev haltaction
environment
variable in EEPROM to determine whether or not to attempt an automatic
boot. If this
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index 4f733ed08e6..f50a944ad06 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: restore.8,v 1.11 1998/11/11 22:20:00 aaron Exp $
+.\" $OpenBSD: restore.8,v 1.12 1998/11/28 19:56:33 aaron Exp $
.\" $NetBSD: restore.8,v 1.15 1997/07/01 05:37:53 lukem Exp $
.\"
.\" Copyright (c) 1985, 1991, 1993
@@ -41,32 +41,32 @@
.Nm restore
.Nd "restore files or file systems from backups made with dump"
.Sh SYNOPSIS
-.Nm restore
+.Nm
.Fl i
.Op Fl chmvy
.Op Fl b Ar blocksize
.Op Fl f Ar file
.Op Fl s Ar fileno
-.Nm restore
+.Nm
.Fl R
.Op Fl cvy
.Op Fl b Ar blocksize
.Op Fl f Ar file
.Op Fl s Ar fileno
-.Nm restore
+.Nm
.Fl r
.Op Fl cvy
.Op Fl b Ar blocksize
.Op Fl f Ar file
.Op Fl s Ar fileno
-.Nm restore
+.Nm
.Fl t
.Op Fl chvy
.Op Fl b Ar blocksize
.Op Fl f Ar file
.Op Fl s Ar fileno
.Op Ar file Ar ...
-.Nm restore
+.Nm
.Fl x
.Op Fl chmvy
.Op Fl b Ar blocksize
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index f8cfac4c671..da86199a4d3 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: route.8,v 1.10 1998/11/11 22:20:00 aaron Exp $
+.\" $OpenBSD: route.8,v 1.11 1998/11/28 19:56:33 aaron Exp $
.\" $NetBSD: route.8,v 1.6 1995/03/18 15:00:13 cgd Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
@@ -41,7 +41,7 @@
.Nm route
.Nd manually manipulate the routing tables
.Sh SYNOPSIS
-.Nm route
+.Nm
.Op Fl dnqv
.Ar command
.Oo
@@ -49,7 +49,7 @@
.Ar args
.Oc
.Sh DESCRIPTION
-.Nm route
+.Nm
is a utility used to manually manipulate the network
routing tables. It normally is not needed, as a
system routing table management daemon such as
@@ -57,7 +57,7 @@ system routing table management daemon such as
should tend to this task.
.Pp
The
-.Nm route
+.Nm
utility supports a limited number of general options,
but a rich command language enables the user to specify
any arbitrary request that could be delivered via the
@@ -79,7 +79,7 @@ Suppress all output.
.El
.Pp
The
-.Nm route
+.Nm
utility provides several commands:
.Pp
.Bl -tag -width Fl -compact
@@ -119,7 +119,7 @@ The flush command has the syntax
If the
.Cm flush
command is specified,
-.Nm route
+.Nm
will
.Dq flush
the routing tables of all gateway entries.
@@ -286,7 +286,7 @@ If this lookup fails,
.Xr getnetbyname 3
is then used to interpret the name as that of a network.
.Pp
-.Nm route
+.Nm
uses a routing socket and the new message types
RTM_ADD,
RTM_DELETE,
diff --git a/sbin/routed/routed.8 b/sbin/routed/routed.8
index cf2ec6476e3..dcea3976ae5 100644
--- a/sbin/routed/routed.8
+++ b/sbin/routed/routed.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: routed.8,v 1.18 1998/11/24 01:03:43 deraadt Exp $
+.\" $OpenBSD: routed.8,v 1.19 1998/11/28 19:56:33 aaron Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -49,7 +49,7 @@
.Oc
.Op Fl P Ar parms
.Sh DESCRIPTION
-.Nm routed
+.Nm
is a dameon invoked at boot time to manage the network
routing tables.
It uses Routing Information Protocol, RIPv1 (RFC\ 1058),
@@ -299,7 +299,7 @@ does not care about authentication.
Increases the debugging level to at least 1 and
causes debugging information to be appended to the trace file.
Note that because of security concerns, it is wisest to not run
-.Nm routed
+.Nm
routinely with tracing directed to a file.
.It Fl t
Increases the debugging level, which causes more information to be logged
@@ -532,7 +532,7 @@ discovery advertisements with
or
.Fl s
Causes
-.Nm routed
+.Nm
to act as a client router discovery daemon, not advertising.
.It Cm no_ripv1_in
Causes RIPv1 received responses to be ignored.
@@ -582,7 +582,7 @@ That serves as a "poor man's router discovery" protocol.
.Pp
Note that the netmask associated with point-to-point links (such as SLIP
or PPP, with the IFF_POINTOPOINT flag) is used by
-.Nm routed
+.Nm
to infer the netmask used by the remote system when RIPv1 is used.
.Pp
.Sh FILES
diff --git a/sbin/savecore/savecore.8 b/sbin/savecore/savecore.8
index 61055753bda..e0b6d952216 100644
--- a/sbin/savecore/savecore.8
+++ b/sbin/savecore/savecore.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: savecore.8,v 1.6 1998/11/11 22:20:00 aaron Exp $
+.\" $OpenBSD: savecore.8,v 1.7 1998/11/28 19:56:34 aaron Exp $
.\" $NetBSD: savecore.8,v 1.11 1995/06/27 22:40:46 briggs Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -41,14 +41,14 @@
.Nm savecore
.Nd "save a core dump of the operating system"
.Sh SYNOPSIS
-.Nm savecore
+.Nm
.Fl c
-.Nm savecore
+.Nm
.Op Fl fvz
.Op Fl N Ar system
.Ar directory
.Sh DESCRIPTION
-.Nm savecore
+.Nm
copies the currently running kernel and its associated core dump into
.Fa directory ,
and enters a reboot message and information about the core dump into
@@ -58,7 +58,7 @@ The options are as follows:
.Bl -tag -width directory
.It Fl c
Clears the dump, so that future invocations of
-.Nm savecore
+.Nm
will ignore it.
.It Fl f
Forces a dump to be taken even if the dump doesn't appear correct or there
@@ -75,7 +75,7 @@ Compresses the core dump and kernel (see
.Xr compress 1 ).
.El
.Pp
-.Nm savecore
+.Nm
checks the core dump in various ways to make sure that it is current and
that it corresponds to the currently running system.
If it passes these checks, it saves the core image in
@@ -94,10 +94,10 @@ The
is the number from the first line of the file
.Ar directory Ns Pa /bounds ,
and it is incremented and stored back into the file each time
-.Nm savecore
+.Nm
successfully runs.
.Pp
-.Nm savecore
+.Nm
also checks the available disk space before attempting to make the copies.
If there is insufficient disk space in the filesystem containing
.Ar directory ,
@@ -108,13 +108,13 @@ filesystem after the copies were made would be less than the number
in the first line of this file, the copies are not attempted.
.Pp
If
-.Nm savecore
+.Nm
successfully copies the kernel and the core dump, the core dump is cleared
so that future invocations of
-.Nm savecore
+.Nm
will ignore it.
.Pp
-.Nm savecore
+.Nm
is meant to be called near the end of the initialization file
.Pa /etc/rc
(see
diff --git a/sbin/scsi/scsi.8 b/sbin/scsi/scsi.8
index cae7b1e4950..6fb60fceb12 100644
--- a/sbin/scsi/scsi.8
+++ b/sbin/scsi/scsi.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: scsi.8,v 1.6 1998/09/23 01:20:25 aaron Exp $
+.\" $OpenBSD: scsi.8,v 1.7 1998/11/28 19:56:34 aaron Exp $
.\" $FreeBSD: scsi.8,v 1.5 1995/05/05 20:41:58 dufault Exp $
.\"
.\" Written By Julian ELischer
@@ -47,30 +47,30 @@
.Nm scsi
.Nd program to assist with SCSI devices
.Sh SYNOPSIS
-.Nm scsi
+.Nm
.Fl f Ar device
.Fl d Ar debug_level
-.Nm scsi
+.Nm
.Fl f Ar device
.Op Fl v
.Fl z Ar seconds
-.Nm scsi
+.Nm
.Fl f Ar device
.Fl m Ar page
.Op Fl P Ar pc
.Op Fl e
-.Nm scsi
+.Nm
.Fl f Ar device
.Fl p
.Op Fl b Ar bus
.Op Fl l Ar lun
-.Nm scsi
+.Nm
.Fl f Ar device
.Fl r
.Op Fl b Ar bus
.Op Fl t Ar targ
.Op Fl l Ar lun
-.Nm scsi
+.Nm
.Fl f Ar device
.Op Fl v
.Op Fl s Ar seconds
@@ -95,7 +95,7 @@ If debugging is not compiled in the kernel,
will have no effect.
.Sh DESCRIPTION
The
-.Nm scsi
+.Nm
program is used to send commands to a SCSI device. It is also
a sample usage of the user-level SCSI commands.
.Pp
@@ -276,6 +276,6 @@ to come on line to 8 times during reprobe to different logical units.
to format the disk drive.
.Sh HISTORY
The
-.Nm scsi
+.Nm
command appeared in 386BSD 0.1.2.4/FreeBSD to support the new reprobe
and user SCSI commands.
diff --git a/sbin/shutdown/shutdown.8 b/sbin/shutdown/shutdown.8
index 2abad76fb99..210cbace794 100644
--- a/sbin/shutdown/shutdown.8
+++ b/sbin/shutdown/shutdown.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: shutdown.8,v 1.9 1998/11/11 22:20:01 aaron Exp $
+.\" $OpenBSD: shutdown.8,v 1.10 1998/11/28 19:56:35 aaron Exp $
.\" $NetBSD: shutdown.8,v 1.6 1995/03/18 15:01:07 cgd Exp $
.\"
.\" Copyright (c) 1988, 1991, 1993
@@ -41,13 +41,13 @@
.Nm shutdown
.Nd "close down the system at a given time"
.Sh SYNOPSIS
-.Nm shutdown
+.Nm
.Op Fl
.Op Fl dfhkrnp
.Ar time
.Op Ar warning-message ...
.Sh DESCRIPTION
-.Nm shutdown
+.Nm
provides an automated shutdown procedure for super-users
to nicely notify users when the system is shutting down,
saving them from system administrators, hackers, and gurus, who
@@ -58,7 +58,7 @@ Available friendlinesses:
.It Fl d
The system will perform a crash dump.
.It Fl f
-.Nm shutdown
+.Nm
arranges, in the manner of
.Xr fastboot 8 ,
for the file systems
@@ -69,7 +69,7 @@ checked on reboot.
The system is halted at the specified
.Ar time
when
-.Nm shutdown
+.Nm
execs
.Xr halt 8 .
.It Fl k
@@ -84,7 +84,7 @@ Prevent the normal
.Xr sync 2
before stopping.
.It Fl r
-.Nm shutdown
+.Nm
execs
.Xr reboot 8
at the specified
@@ -99,7 +99,7 @@ causing machines which support automatic power down to do so after halting.
.It Ar time
.Ar time
is the time at which
-.Nm shutdown
+.Nm
will bring the system down and
may be the word
.Ar now
@@ -134,7 +134,7 @@ log in,
.Xr login 1
prints its contents and exits. The file is
removed just before
-.Nm shutdown
+.Nm
exits.
.Pp
At shutdown time a message is written in the system log, containing the
diff --git a/sbin/slattach/slattach.8 b/sbin/slattach/slattach.8
index b9fffa81f7c..90cfc451d8d 100644
--- a/sbin/slattach/slattach.8
+++ b/sbin/slattach/slattach.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: slattach.8,v 1.5 1998/11/11 22:20:01 aaron Exp $
+.\" $OpenBSD: slattach.8,v 1.6 1998/11/28 19:56:35 aaron Exp $
.\" $NetBSD: slattach.8,v 1.12 1995/03/18 15:01:12 cgd Exp $
.\"
.\" Copyright (c) 1986, 1991, 1993
@@ -41,12 +41,12 @@
.Nm slattach
.Nd attach serial lines as network interfaces
.Sh SYNOPSIS
-.Nm slattach
+.Nm
.Op Fl hm
.Op Fl s Ar baudrate
.Ar ttyname
.Sh DESCRIPTION
-.Nm slattach
+.Nm
is used to assign a tty line to a network interface,
and to define the network source and destination addresses.
The following operands are supported by
@@ -93,7 +93,7 @@ Only the super-user may attach a network interface.
To detach the interface, use
.Dq Li ifconfig interface-name down
after killing off the
-.Nm slattach
+.Nm
process.
.Ar interface-name
is the name that is shown by
diff --git a/sbin/startkey/startkey.1 b/sbin/startkey/startkey.1
index d878d7d7175..1b8d7b78319 100644
--- a/sbin/startkey/startkey.1
+++ b/sbin/startkey/startkey.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: startkey.1,v 1.1 1998/11/14 23:37:30 deraadt Exp $
+.\" $OpenBSD: startkey.1,v 1.2 1998/11/28 19:56:37 aaron Exp $
.\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
.\" All rights reserved.
.\"
@@ -36,12 +36,12 @@
.Nm startkey
.Nd start keying with photurisd
.Sh SYNOPSIS
-.Nm startkey
+.Nm
.Op Fl d Ar directory
.Ar options ...
.Sh DESCRIPTION
The
-.Nm startkey
+.Nm
utility attemps to contact the
.Xr photurisd 8
daemon and initalize a key exchange. The flags are:
@@ -50,70 +50,70 @@ daemon and initalize a key exchange. The flags are:
The
.Fl d
option specifies the directory in which
-.Nm photurisd
+.Xr photurisd
looks for its startup files. The default is
.Pa /etc/photuris/ .
.El
.Pp
The options
-.Nm dst ,
-.Nm port ,
-.Nm options ,
-.Nm tsrc ,
-.Nm tdst ,
-.Nm exchange_lifetime ,
-.Nm spi_lifetime
+.Ic dst ,
+.Ic port ,
+.Ic options ,
+.Ic tsrc ,
+.Ic tdst ,
+.Ic exchange_lifetime ,
+.Ic spi_lifetime
and
-.Nm user
+.Ic user
are understood by the daemon.
The meanings are as follows:
.Bl -tag -width options -offset indent
-.It dst
+.It Ic dst
The destination IP address with which the exchange is to be established.
-.It port
+.It Ic port
The port number of the destination
-.Nm photuris
+.Xr photuris
daemon.
-.It options
+.It Ic options
The options to be used in the exchange. Possible values are
-.Nm enc
+.Dq enc
and
-.Nm auth .
-.It tsrc
+.Dq auth .
+.It Ic tsrc
If both
-.Nm tsrc
+.Ic tsrc
and
-.Nm tdst
+.Ic tdst
(see below) are specified, a tunnel (IP over IP) is setup. The
-.Nm tsrc
+.Ic tsrc
option is a network address with netmask used for matching the source
IP address of a packet. When both the source and the destination
addresses match their respective options the packet will be routed into the
tunnel.
-.It tdst
+.It Ic tdst
If both
-.Nm tsrc
+.Ic tsrc
(see above) and
-.Nm tdst
+.Ic tdst
are specified, a tunnel (IP over IP) is setup. The
-.Nm tdst
+.Ic tdst
option is a network address with netmask used for matching the destination
IP address of a packet. When both the source and the destination
addresses match their respective options the packet will be routed into the
tunnel.
-.It exchange_lifetime
+.It Ic exchange_lifetime
Determines the lifetime of the exchange. After an exchange expires
no new SPIs are created, which means the transport or tunnel is torn down
as soon as the current SPI times out (see
-.Nm spi_lifetime
+.Ic spi_lifetime
below). The default value is gotten from the
-.Nm exchange_lifetime
+.Ic exchange_lifetime
parameter given in
.Pa photuris.conf .
If it is not given there the default is 1800 seconds.
-.It spi_lifetime
+.It Ic spi_lifetime
Determines the lifetime of each created SPI in the exchange.
-.It user
+.It Ic user
The user name for whom the keying shall be done. Preconfigured
secrets are taken from the users secret file.
.El
@@ -121,8 +121,9 @@ secrets are taken from the users secret file.
startkey dst=169.200.12.23 options=auth
.Sh FILES
.Bl -tag -width /etc/photuris/photuris.pipe -compact
-.It /etc/photuris/photuris.pipe
-The FIFO in which keying requests are written.
+.It Pa /etc/photuris/photuris.pipe
+FIFO in which keying requests are written
.El
.Sh SEE ALSO
-.Xr photurisd 8 .
+.Xr photurisd 8
+
diff --git a/sbin/swapon/swapon.8 b/sbin/swapon/swapon.8
index c5ee0358b8a..b7335e3421f 100644
--- a/sbin/swapon/swapon.8
+++ b/sbin/swapon/swapon.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: swapon.8,v 1.5 1998/11/11 22:20:01 aaron Exp $
+.\" $OpenBSD: swapon.8,v 1.6 1998/11/28 19:56:35 aaron Exp $
.\" $NetBSD: swapon.8,v 1.8 1995/08/18 14:51:35 pk Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -41,18 +41,18 @@
.Nm swapon
.Nd "specify additional device for paging and swapping"
.Sh SYNOPSIS
-.Nm swapon
+.Nm
.Fl a
-.Nm swapon
+.Nm
.Ar special_file ...
.Sh DESCRIPTION
-.Nm swapon
+.Nm
is used to specify additional devices on which paging and swapping
are to take place.
The system begins by swapping and paging on only a single device
so that only one disk is required at bootstrap time.
Calls to
-.Nm swapon
+.Nm
normally occur in the system multi-user initialization file
.Pa /etc/rc
making all swap devices available, so that the paging and swapping
diff --git a/sbin/ttyflags/ttyflags.8 b/sbin/ttyflags/ttyflags.8
index bd816d4da37..36de8d87f4a 100644
--- a/sbin/ttyflags/ttyflags.8
+++ b/sbin/ttyflags/ttyflags.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ttyflags.8,v 1.5 1998/09/17 04:15:03 aaron Exp $
+.\" $OpenBSD: ttyflags.8,v 1.6 1998/11/28 19:56:36 aaron Exp $
.\" $NetBSD: ttyflags.8,v 1.2 1995/03/18 15:01:22 cgd Exp $
.\"
.\" Copyright (c) 1994 Christopher G. Demetriou
@@ -36,12 +36,12 @@
.Nm ttyflags
.Nd set device-specific flags for terminals
.Sh SYNOPSIS
-.Nm ttyflags
+.Nm
.Op Fl v
.Op Fl p
.Op Fl a | Ar tty ...
.Sh DESCRIPTION
-.Nm ttyflags
+.Nm
sets the device-specific flags for terminals, based on the flags
found on the terminal's line in
.Pa /etc/ttys .
@@ -76,11 +76,11 @@ the ttys, as found in
.Xr ttys 5
.Sh HISTORY
The
-.Nm ttyflags
+.Nm
utility appeared in
.Nx 0.9a .
.Sh BUGS
The conditions on which to report an error are ill-defined.
-.Nm ttyflags
+.Nm
tries to report all significant errors, perhaps going over-board
at times.
diff --git a/sbin/tunefs/tunefs.8 b/sbin/tunefs/tunefs.8
index 6365de8beb0..8b29ba7f36e 100644
--- a/sbin/tunefs/tunefs.8
+++ b/sbin/tunefs/tunefs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tunefs.8,v 1.8 1998/09/23 01:20:26 aaron Exp $
+.\" $OpenBSD: tunefs.8,v 1.9 1998/11/28 19:56:36 aaron Exp $
.\" $NetBSD: tunefs.8,v 1.8 1995/03/18 15:01:29 cgd Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
@@ -41,7 +41,7 @@
.Nm tunefs
.Nd tune up an existing file system
.Sh SYNOPSIS
-.Nm tunefs
+.Nm
.Op Fl A
.Op Fl a Ar maxcontig
.Op Fl d Ar rotdelay
@@ -53,7 +53,7 @@
.Op Fl s Ar enable | disable
.Op Ar special | Ar filesys
.Sh DESCRIPTION
-.Nm tunefs
+.Nm
is designed to change the dynamic parameters of a file system
which affect the layout policies.
The parameters which are to be changed are indicated by the flags
diff --git a/sbin/umount/umount.8 b/sbin/umount/umount.8
index 30aab9368a1..82579a1ddda 100644
--- a/sbin/umount/umount.8
+++ b/sbin/umount/umount.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: umount.8,v 1.4 1998/09/17 04:15:03 aaron Exp $
+.\" $OpenBSD: umount.8,v 1.5 1998/11/28 19:56:36 aaron Exp $
.\" $NetBSD: umount.8,v 1.2 1995/03/18 15:01:35 cgd Exp $
.\"
.\" Copyright (c) 1980, 1989, 1991, 1993
@@ -41,17 +41,17 @@
.Nm umount
.Nd unmount file systems
.Sh SYNOPSIS
-.Nm umount
+.Nm
.Op Fl fv
.Ar special | node
-.Nm umount
+.Nm
.Fl a
.Op Fl fv
.Op Fl h Ar host
.Op Fl t Ar ufs | lfs | external_type
.Sh DESCRIPTION
The
-.Nm umount
+.Nm
command
calls the
.Xr unmount 2
@@ -97,7 +97,7 @@ to specify the filesystem types for which action should
.Em not
be taken.
For example, the
-.Nm umount
+.Nm
command:
.Bd -literal -offset indent
umount -a -t nfs,mfs
@@ -122,6 +122,6 @@ file system table
.Xr mount 8
.Sh HISTORY
A
-.Nm umount
+.Nm
command appeared in
.At v6 .