summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/chmod/chmod.13
-rw-r--r--bin/ed/ed.18
-rw-r--r--bin/ln/symlink.74
-rw-r--r--bin/stty/stty.113
-rw-r--r--lib/libc/crypt/arc4random.37
-rw-r--r--lib/libc/db/man/btree.331
-rw-r--r--lib/libc/db/man/hash.318
-rw-r--r--lib/libc/gen/sysctl.311
-rw-r--r--lib/libc/net/getservent.33
-rw-r--r--lib/libc/regex/regex.36
-rw-r--r--lib/libc/stdlib/random.313
-rw-r--r--lib/libc/stdlib/tsearch.34
-rw-r--r--lib/libc/sys/fcntl.23
-rw-r--r--lib/libc/sys/getpgrp.24
-rw-r--r--lib/libc/sys/intro.27
-rw-r--r--lib/libc/sys/link.23
-rw-r--r--lib/libc/sys/mmap.24
-rw-r--r--lib/libc/sys/nfssvc.28
-rw-r--r--sbin/disklabel/disklabel.867
-rw-r--r--sbin/dump/dump.83
-rw-r--r--sbin/fdisk/fdisk.88
-rw-r--r--sbin/fsdb/fsdb.86
-rw-r--r--sbin/fsirand/fsirand.85
-rw-r--r--sbin/ifconfig/ifconfig.84
-rw-r--r--sbin/init/init.83
-rw-r--r--sbin/ipsecadm/ipsecadm.88
-rw-r--r--sbin/mount_lfs/mount_lfs.84
-rw-r--r--sbin/mount_null/mount_null.84
-rw-r--r--sbin/newfs_msdos/newfs_msdos.89
-rw-r--r--sbin/reboot/boot_pmax.826
-rw-r--r--sbin/restore/restore.84
-rw-r--r--sbin/routed/rtquery/rtquery.857
-rw-r--r--sbin/scsi/scsi.826
33 files changed, 180 insertions, 204 deletions
diff --git a/bin/chmod/chmod.1 b/bin/chmod/chmod.1
index d1920158eb2..99226fd3b61 100644
--- a/bin/chmod/chmod.1
+++ b/bin/chmod/chmod.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: chmod.1,v 1.12 1999/05/30 17:44:55 aaron Exp $
+.\" $OpenBSD: chmod.1,v 1.13 1999/07/04 18:59:38 aaron Exp $
.\" $NetBSD: chmod.1,v 1.8 1995/03/21 09:02:07 cgd Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993, 1994
@@ -178,7 +178,6 @@ It is the user bit,
.Sq u ,
that refers to the owner of the file.
.Pp
-.ne 1i
The
.Ar perm
symbols represent the portions of the mode bits as follows:
diff --git a/bin/ed/ed.1 b/bin/ed/ed.1
index c7f33c4c912..338393533f9 100644
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ed.1,v 1.19 1999/06/04 02:45:13 aaron Exp $
+.\" $OpenBSD: ed.1,v 1.20 1999/07/04 18:59:37 aaron Exp $
.\"
.Dd May 2, 1993
.Dt ED 1
@@ -322,13 +322,11 @@ specifies the lower case characters.
The following literal expressions can also be used in
.Em char-class
to specify sets of characters:
-.sp
+.Pp
.Em \ \ [:alnum:]\ \ [:cntrl:]\ \ [:lower:]\ \ [:space:]
-.PD 0
.Em \ \ [:alpha:]\ \ [:digit:]\ \ [:print:]\ \ [:upper:]
-.PD 0
.Em \ \ [:blank:]\ \ [:graph:]\ \ [:punct:]\ \ [:xdigit:]
-.sp
+.Pp
If
.Em -
appears as the first or last character of
diff --git a/bin/ln/symlink.7 b/bin/ln/symlink.7
index d5565f3aa42..727b8eaa0f1 100644
--- a/bin/ln/symlink.7
+++ b/bin/ln/symlink.7
@@ -1,4 +1,4 @@
-.\" $OpenBSD: symlink.7,v 1.7 1999/07/04 11:53:50 aaron Exp $
+.\" $OpenBSD: symlink.7,v 1.8 1999/07/04 18:59:37 aaron Exp $
.\" $NetBSD: symlink.7,v 1.4 1996/04/25 15:44:56 mycroft Exp $
.\"
.\" Copyright (c) 1992, 1993, 1994
@@ -82,7 +82,7 @@ exceeded.)
.Pp
There are three separate areas that need to be discussed.
They are as follows:
-.sp
+.Pp
.Bl -enum -compact -offset indent
.It
Symbolic links used as file name arguments for system calls.
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index 84c9acb34a3..3b022ec680b 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: stty.1,v 1.12 1998/12/15 01:20:27 aaron Exp $
+.\" $OpenBSD: stty.1,v 1.13 1999/07/04 18:59:38 aaron Exp $
.\" $NetBSD: stty.1,v 1.10 1995/09/07 06:57:14 jtc Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
@@ -129,7 +129,6 @@ If
the output baud rate is set to
zero, modem control is
no longer asserted.
-.ne 1i
.It Cm speed Ar number
This sets both
.Cm ispeed
@@ -208,7 +207,6 @@ receives
or if
.Cm ixany
is set, any character restarts output.
-.ne 1i
.It Cm ixoff Pq Fl ixoff
Request that the system send (not
send)
@@ -313,7 +311,6 @@ Echo (do not echo)
after
.Dv KILL
character.
-.ne 1i
.It Cm echoke Pq Fl echoke
The
.Dv KILL
@@ -473,7 +470,6 @@ columns.
.It Cm cols Ar number
is an alias for
.Cm columns .
-.ne 1i
.It Cm rows Ar number
The terminal size is recorded as having
.Ar number
@@ -506,14 +502,12 @@ This means that unsetting
may not put back all the setting that were previously in effect.
To set the terminal into a raw state and then accurately restore it, the following
shell code is recommended:
-.nf
-
+.Bd -literal -offset indent
save_state=$(stty -g)
stty raw
\&...
stty "$save_state"
-
-.fi
+.Ed
.It Cm size
The size of the terminal is printed as two numbers on a single line,
first rows, then columns.
@@ -558,7 +552,6 @@ Same as
.It Cm decctlq Pq Fl decctlq
The converse of
.Cm ixany .
-.ne 1i
.It Cm crterase Pq Fl crterase
Same as
.Cm echoe .
diff --git a/lib/libc/crypt/arc4random.3 b/lib/libc/crypt/arc4random.3
index bcf98bd9648..988de1d0f67 100644
--- a/lib/libc/crypt/arc4random.3
+++ b/lib/libc/crypt/arc4random.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: arc4random.3,v 1.9 1999/06/30 01:40:18 deraadt Exp $
+.\" $OpenBSD: arc4random.3,v 1.10 1999/07/04 18:59:42 aaron Exp $
.\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
.\" All rights reserved.
.\"
@@ -50,10 +50,7 @@ The
.Fn arc4random
function uses the key stream generator employed by the
arc4 cipher, which uses 8*8 8 bit S-Boxes. The S-Boxes
-can be in about
-.if t 2\u\s71700\s10\d
-.if n (2**1700)
-states.
+can be in about (2**1700) states.
.Pp
The
.Fn arc4random_stir
diff --git a/lib/libc/db/man/btree.3 b/lib/libc/db/man/btree.3
index 4fdc9cd6786..71b398a1ba1 100644
--- a/lib/libc/db/man/btree.3
+++ b/lib/libc/db/man/btree.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: btree.3,v 1.9 1999/06/05 04:47:41 aaron Exp $
+.\" $OpenBSD: btree.3,v 1.10 1999/07/04 18:59:42 aaron Exp $
.\" $NetBSD: btree.3,v 1.6 1996/05/03 21:26:48 cgd Exp $
.\"
.\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
@@ -135,7 +135,7 @@ cache can reduce the number of I/O operations significantly.
Obviously, using a cache increases (but only increases) the likelihood of
corruption or lost data if the system crashes while a tree is being modified.
If
-.Em cachesize
+.Fa cachesize
is 0 (no size is specified) a default cache is used.
.It maxkeypage
The maximum number of keys which will be stored on any single page.
@@ -146,13 +146,13 @@ This value is used to determine which keys will be stored on overflow
pages, i.e. if a key or data item is longer than the pagesize divided
by the minkeypage value, it will be stored on overflow pages instead
of in the page itself. If
-.Em minkeypage
+.Fa minkeypage
is 0 (no minimum number of keys is specified) a value of 2 is used.
.It psize
Page size is the size (in bytes) of the pages used for nodes in the tree.
The minimum page size is 512 bytes and the maximum page size is 64K.
If
-.Em psize
+.Fa psize
is 0 (no page size is specified) a page size is chosen based on the
underlying file system I/O block size.
.It compare
@@ -162,8 +162,10 @@ first key argument is considered to be respectively less than, equal to,
or greater than the second key argument.
The same comparison function must be used on a given tree every time it
is opened.
-.Em compare
-is NULL (no comparison function is specified), the keys are compared
+.Fa compare
+is
+.Dv NULL
+(no comparison function is specified), the keys are compared
lexically, with shorter keys considered less than longer keys.
.It prefix
Prefix is the prefix comparison function.
@@ -173,20 +175,23 @@ key argument.
If the keys are equal, the key length should be returned.
Note, the usefulness of this routine is very data dependent, but, in some
data sets can produce significantly reduced tree sizes and search times. If
-.Em prefix
-is NULL (no prefix function is specified),
-.B and
+.Fa prefix
+is
+.Dv NULL
+(no prefix function is specified),
+.Em and
no comparison function is specified, a default lexical comparison routine
is used. If
-.I prefix
-is NULL and a comparison routine is specified, no prefix comparison is
-done.
+.Fa prefix
+is
+.Dv NULL
+and a comparison routine is specified, no prefix comparison is done.
.It lorder
The byte order for integers in the stored database metadata.
The number should represent the order as an integer; for example,
big endian order would be the number 4,321.
If
-.Em lorder
+.Fa lorder
is 0 (no order is specified) the current host order is used.
.El
.Pp
diff --git a/lib/libc/db/man/hash.3 b/lib/libc/db/man/hash.3
index 43a66b96e62..413a734b9e0 100644
--- a/lib/libc/db/man/hash.3
+++ b/lib/libc/db/man/hash.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: hash.3,v 1.6 1999/05/23 14:10:58 aaron Exp $
+.\" $OpenBSD: hash.3,v 1.7 1999/07/04 18:59:42 aaron Exp $
.\" $NetBSD: hash.3,v 1.6 1996/05/03 21:26:50 cgd Exp $
.\"
.\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
@@ -59,7 +59,7 @@ The hash data structure is an extensible, dynamic hashing scheme.
The access method specific data structure provided to
.Fn dbopen
is defined in the
-.Em <db.h>
+.Aq Pa db.h
include file as follows:
.Pp
.Bl -item -compact
@@ -86,18 +86,18 @@ int lorder;
The elements of this structure are as follows:
.Bl -tag -width XXXXXX -offset indent
.It bsize
-.Em bsize
+.Fa bsize
defines the hash table bucket size, and is, by default, 256 bytes.
It may be preferable to increase the page size for disk-resident tables
and tables with large data items.
.It ffactor
-.Em Ffactor
+.Fa ffactor
indicates a desired density within the hash table.
It is an approximation of the number of keys allowed to accumulate in any
one bucket, determining when the hash table grows or shrinks.
The default value is 8.
.It nelem
-.Em Nelem
+.Fa nelem
is an estimate of the final size of the hash table.
If not set or set too low, hash tables will expand gracefully as keys
are entered, although a slight performance degradation may be noticed.
@@ -105,11 +105,11 @@ The default value is 1.
.It cachesize
A suggested maximum size, in bytes, of the memory cache.
This value is
-.B only
+.Em only
advisory, and the access method will allocate more memory rather
than fail.
.It hash
-.Em Hash
+.Fa hash
is a user defined hash function.
Since no hash function performs equally well on all possible data, the
user may find that the built-in hash function does poorly on a particular
@@ -121,7 +121,7 @@ value.
The byte order for integers in the stored database metadata.
The number should represent the order as an integer; for example,
big endian order would be the number 4,321. If
-.Em lorder
+.Fa lorder
is 0 (no order is specified) the current host order is used.
If the file already exists, the specified value is ignored and the
value specified when the tree was created is used.
@@ -134,7 +134,7 @@ values specified for the parameters bsize, ffactor, lorder and nelem are
ignored and the values specified when the tree was created are used.
.Pp
If a hash function is specified,
-.Em hash_open
+.Fa hash_open
will attempt to determine if the hash function specified is the same as
the one with which the database was created, and will fail if it is not.
.Pp
diff --git a/lib/libc/gen/sysctl.3 b/lib/libc/gen/sysctl.3
index a4fb69338b6..2de353c1a90 100644
--- a/lib/libc/gen/sysctl.3
+++ b/lib/libc/gen/sysctl.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sysctl.3,v 1.25 1999/07/04 12:25:14 aaron Exp $
+.\" $OpenBSD: sysctl.3,v 1.26 1999/07/04 18:59:42 aaron Exp $
.\"
.\" Copyright (c) 1993
.\" The Regents of the University of California. All rights reserved.
@@ -142,20 +142,20 @@ in the system:
.Bd -literal -offset indent -compact
int mib[2], maxproc;
size_t len;
-.sp
+
mib[0] = CTL_KERN;
mib[1] = KERN_MAXPROC;
len = sizeof(maxproc);
sysctl(mib, 2, &maxproc, &len, NULL, 0);
.Ed
-.sp
+.Pp
To retrieve the standard search path for the system utilities:
.Pp
.Bd -literal -offset indent -compact
int mib[2];
size_t len;
char *p;
-.sp
+
mib[0] = CTL_USER;
mib[1] = USER_CS_PATH;
sysctl(mib, 2, NULL, &len, NULL, 0);
@@ -261,6 +261,7 @@ information.
.It Dv KERN_NAME_MAX No " integer no"
.It Dv KERN_NGROUPS No " integer no"
.It Dv KERN_NO_TRUNC No " integer no"
+.It Dv KERN_NOSUIDCOREDUMP No " integer yes"
.It Dv KERN_OSRELEASE No " string no"
.It Dv KERN_OSREV No " integer no"
.It Dv KERN_OSTYPE No " string no"
@@ -350,6 +351,8 @@ The maximum number of supplemental groups.
Return 1 if file names longer than
.Dv KERN_NAME_MAX
are truncated.
+.It Dv KERN_NOSUIDCOREDUMP
+Programs with their set-user-ID bit set will not dump core when this is set.
.It Dv KERN_OSRELEASE
The system release string.
.It Dv KERN_OSREV
diff --git a/lib/libc/net/getservent.3 b/lib/libc/net/getservent.3
index 6badd85337b..477d34249d3 100644
--- a/lib/libc/net/getservent.3
+++ b/lib/libc/net/getservent.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: getservent.3,v 1.6 1999/05/25 01:50:58 aaron Exp $
+.\" $OpenBSD: getservent.3,v 1.7 1999/07/04 18:59:43 aaron Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -124,7 +124,6 @@ is encountered.
If a protocol name is also supplied (non-
.Dv NULL ) ,
searches must also match the protocol.
-.ne 1i
.Sh FILES
.Bl -tag -width /etc/services -compact
.It Pa /etc/services
diff --git a/lib/libc/regex/regex.3 b/lib/libc/regex/regex.3
index 39dc19de6bc..fe81eff0779 100644
--- a/lib/libc/regex/regex.3
+++ b/lib/libc/regex/regex.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: regex.3,v 1.9 1999/06/05 04:47:41 aaron Exp $
+.\" $OpenBSD: regex.3,v 1.10 1999/07/04 18:59:43 aaron Exp $
.\"
.\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
.\"
@@ -306,7 +306,7 @@ and
both of type
.Fa regoff_t
(a signed arithmetic type at least as large as an
-.I off_t
+.Li off_t
and a
.Li ssize_t ),
containing respectively the offset of the first character of a substring
@@ -321,7 +321,7 @@ both indicating the character following the empty substring.
The 0th member of the
.Fa pmatch
array is filled in to indicate what substring of
-.I string
+.Fa string
was matched by the entire RE.
Remaining members report what substring was matched by parenthesized
subexpressions within the RE;
diff --git a/lib/libc/stdlib/random.3 b/lib/libc/stdlib/random.3
index e1ab9e44da9..7b8a566115a 100644
--- a/lib/libc/stdlib/random.3
+++ b/lib/libc/stdlib/random.3
@@ -29,7 +29,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $OpenBSD: random.3,v 1.8 1999/06/29 18:36:23 aaron Exp $
+.\" $OpenBSD: random.3,v 1.9 1999/07/04 18:59:43 aaron Exp $
.\"
.Dd April 19, 1991
.Dt RANDOM 3
@@ -56,9 +56,7 @@ The
function
uses a non-linear additive feedback random number generator employing a
default table of size 31 long integers to return successive pseudo-random
-numbers in the range from 0 to
-.if t 2\u\s731\s10\d\(mi1.
-.if n (2**31)\(mi1.
+numbers in the range from 0 to (2**31)\-1.
The maximum value returned by
.Fn random
is
@@ -66,8 +64,7 @@ is
(as defined by the header file
.Aq Pa limits.h ) .
The period of this random number generator is very large, approximately
-.if t 16\(mu(2\u\s731\s10\d\(mi1).
-.if n 16*((2**31)\(mi1).
+16*((2**31)\-1.
.Pp
The
.Fn random Ns / Fn srandom
@@ -148,9 +145,7 @@ is that the size of the state array does not have to be remembered after
it is initialized.
.Pp
With 256 bytes of state information, the period of the random number
-generator is greater than
-.if t 2\u\s769\s10\d,
-.if n 2**69
+generator is greater than 2**69
which should be sufficient for most purposes.
.Sh AUTHOR
Earl T. Cohen
diff --git a/lib/libc/stdlib/tsearch.3 b/lib/libc/stdlib/tsearch.3
index 8456457e272..79e220e2cb5 100644
--- a/lib/libc/stdlib/tsearch.3
+++ b/lib/libc/stdlib/tsearch.3
@@ -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: tsearch.3,v 1.5 1999/06/29 18:36:24 aaron Exp $
+.\" $OpenBSD: tsearch.3,v 1.6 1999/07/04 18:59:43 aaron Exp $
.\"
.Dd June 15, 1997
.Dt TSEARCH 3
@@ -84,7 +84,7 @@ will be adjusted.
.Pp
.Fn twalk
walks the binary search tree rooted in
-.fa root
+.Fa root
and calls the function
.Fa action
on each node.
diff --git a/lib/libc/sys/fcntl.2 b/lib/libc/sys/fcntl.2
index 46baf45cb0b..16bb09733c3 100644
--- a/lib/libc/sys/fcntl.2
+++ b/lib/libc/sys/fcntl.2
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fcntl.2,v 1.15 1999/06/29 14:23:28 aaron Exp $
+.\" $OpenBSD: fcntl.2,v 1.16 1999/07/04 18:59:43 aaron Exp $
.\" $NetBSD: fcntl.2,v 1.6 1995/02/27 12:32:29 cgd Exp $
.\"
.\" Copyright (c) 1983, 1993
@@ -178,7 +178,6 @@ upon availability of data to be read.
.Pp
Several commands are available for doing advisory file locking;
they all operate on the following structure:
-.ne 7v
.Bd -literal
struct flock {
off_t l_start; /* starting offset */
diff --git a/lib/libc/sys/getpgrp.2 b/lib/libc/sys/getpgrp.2
index 9d082519024..7ad5ef3799b 100644
--- a/lib/libc/sys/getpgrp.2
+++ b/lib/libc/sys/getpgrp.2
@@ -1,4 +1,4 @@
-.\" $OpenBSD: getpgrp.2,v 1.5 1999/05/23 14:10:52 aaron Exp $
+.\" $OpenBSD: getpgrp.2,v 1.6 1999/07/04 18:59:43 aaron Exp $
.\" $NetBSD: getpgrp.2,v 1.8 1995/02/27 12:33:09 cgd Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
@@ -100,7 +100,7 @@ This incompatibility is required by
From the
.St -p1003.1-88
Rationale:
-.sp
+.Pp
.Bx 4.3
provides a
.Fn getpgrp
diff --git a/lib/libc/sys/intro.2 b/lib/libc/sys/intro.2
index 44d68cb32a0..8602a7e39c1 100644
--- a/lib/libc/sys/intro.2
+++ b/lib/libc/sys/intro.2
@@ -1,4 +1,4 @@
-.\" $OpenBSD: intro.2,v 1.14 1999/07/02 19:50:51 deraadt Exp $
+.\" $OpenBSD: intro.2,v 1.15 1999/07/04 18:59:43 aaron Exp $
.\" $NetBSD: intro.2,v 1.6 1995/02/27 12:33:41 cgd Exp $
.\"
.\" Copyright (c) 1980, 1983, 1986, 1991, 1993
@@ -196,10 +196,7 @@ while the pure procedure file was being executed an
.Xr open 2
call requested write access.
.It Er 27 EFBIG Em "File too large" .
-The size of a file exceeded the maximum (about
-.if t 2\u\s-231\s+2\d
-.if n 2.1E9
-bytes).
+The size of a file exceeded the maximum (about 2.1E9 bytes).
.It Er 28 ENOSPC Em "Device out of space" .
A
.Xr write 2
diff --git a/lib/libc/sys/link.2 b/lib/libc/sys/link.2
index 0c72c6427ff..23eefdccccf 100644
--- a/lib/libc/sys/link.2
+++ b/lib/libc/sys/link.2
@@ -1,4 +1,4 @@
-.\" $OpenBSD: link.2,v 1.10 1999/06/29 14:10:04 aaron Exp $
+.\" $OpenBSD: link.2,v 1.11 1999/07/04 18:59:43 aaron Exp $
.\" $NetBSD: link.2,v 1.7 1995/02/27 12:34:01 cgd Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -141,7 +141,6 @@ are on different file systems.
The directory in which the entry for the new link is being placed
cannot be extended because there is no space left on the file
system containing the directory.
-.ne 3v
.It Bq Er EDQUOT
The directory in which the entry for the new link
is being placed cannot be extended because the
diff --git a/lib/libc/sys/mmap.2 b/lib/libc/sys/mmap.2
index 8031c0018c0..c23d2a2a0dd 100644
--- a/lib/libc/sys/mmap.2
+++ b/lib/libc/sys/mmap.2
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mmap.2,v 1.18 1999/07/02 16:57:49 aaron Exp $
+.\" $OpenBSD: mmap.2,v 1.19 1999/07/04 18:59:44 aaron Exp $
.\" $NetBSD: mmap.2,v 1.5 1995/06/24 10:48:59 cgd Exp $
.\"
.\" Copyright (c) 1991, 1993
@@ -202,7 +202,7 @@ is not a valid open file descriptor.
.It Bq Er EINVAL
.Dv MAP_FIXED
was specified and the
-.I addr
+.Fa addr
parameter was not page aligned.
.Fa fd
did not reference a regular or character special file.
diff --git a/lib/libc/sys/nfssvc.2 b/lib/libc/sys/nfssvc.2
index f4d96deef8f..58658023b3a 100644
--- a/lib/libc/sys/nfssvc.2
+++ b/lib/libc/sys/nfssvc.2
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nfssvc.2,v 1.8 1999/06/29 14:10:11 aaron Exp $
+.\" $OpenBSD: nfssvc.2,v 1.9 1999/07/04 18:59:44 aaron Exp $
.\" $NetBSD: nfssvc.2,v 1.6 1995/02/27 12:35:08 cgd Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
@@ -95,7 +95,7 @@ struct nfsd_cargs {
NFSKERBKEY_T ncd_key; /* Session key */
};
.Ed
-.sp
+.Pp
structure.
The initial call has only the
.Dv NFSSVC_MNTD
@@ -152,7 +152,7 @@ struct nfsd_srvargs {
NFSKERBKEY_T nsd_key; /* Session key */
};
.Ed
-.sp
+.Pp
to enter the kernel as an
.Xr nfsd 8
daemon.
@@ -206,7 +206,7 @@ struct nfsd_args {
int namelen; /* Length of name */
};
.Ed
-.sp
+.Pp
to pass a server side
.Tn NFS
socket into the kernel for servicing by the
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 88de346bd54..c4cb020c543 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: disklabel.8,v 1.30 1999/05/23 14:11:14 aaron Exp $
+.\" $OpenBSD: disklabel.8,v 1.31 1999/07/04 18:59:38 aaron Exp $
.\" $NetBSD: disklabel.8,v 1.9 1995/03/18 14:54:38 cgd Exp $
.\"
.\" Copyright (c) 1987, 1988, 1991, 1993
@@ -81,7 +81,7 @@
.Op Fl n
.Op Fl v
.Ar disk
-.sp
+.Pp
.Nm disklabel
.Fl B
.Op Fl n
@@ -241,7 +241,9 @@ With the
flag,
.Nm
is capable of restoring a disk label that was formatted
-in a prior operation and saved in an ASCII file.
+in a prior operation and saved in an
+.Tn ASCII
+file.
The prototype file used to create the label should be in the same format
as that produced when reading or editing a label.
Comments are delimited by
@@ -268,22 +270,27 @@ 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
or prompts take an optional unit. Available units are
-.Dq b
+.Sq b
for bytes,
-.Dq c
+.Sq c
for cylinders,
-.Dq k
+.Sq k
for kilobytes,
-.Dq m
+.Sq m
for megabytes,
and
-.Dq g
+.Sq g
for gigabytes. Quantities will be rounded to the nearest
cylinder when units are specified for sizes (or offsets). Commands
-may be aborted by entering ^D (Control-D). Entering ^D at the main
-.Dq \&>
+may be aborted by entering
+.Ql ^D
+(Control-D).
+Entering
+.Ql ^D
+at the main
+.Ql >
prompt will exit the editor. At prompts that request a size,
-.Dq \&*
+.Ql *
may be entered to indicate the rest of the available space.
The editor commands are as follows:
.Bl -tag -width "p [unit] "
@@ -314,7 +321,7 @@ Set OpenBSD disk boundaries. This option tells
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
-.Dq \&*
+.Ql *
at the
.Dq Size
prompt to indicate the entire size of the disk (minus
@@ -332,16 +339,16 @@ one.
Change the size of an existing partition. If no partition is
specified, the user will be prompted for one. The new size may be
in terms of the aforementioned units and may also be prefixed with
-.Dq +
+.Ql +
or
-.Dq -
+.Ql -
to change the size by a relative amount.
.It d Op part
Delete an existing partition (or
-.Dq *
+.Ql *
to delete all partitions). If no partition is specified, the
user will be prompted for one. You may not delete the
-.Dq c
+.Ql c
partition.
.It g Op d|b|u
Set disk geometry based on what the
@@ -370,7 +377,9 @@ was invoked with the
.Fl f
flag.
.It s Op path
-Save the label to a file in ASCII format (suitable for loading via
+Save the label to a file in
+.Tn ASCII
+format (suitable for loading via
the
.Fl R
option). If no path is specified, the user will be prompted for
@@ -519,12 +528,12 @@ to be decreased or the offset of a partition to be changed while
it is open. Some device drivers create a label containing only a
single large partition if a disk is unlabeled; thus, the label must
be written to the
-.Dq a
+.Sq a
partition of the disk while it is open.
This sometimes requires the desired label to be set in two steps,
the first one creating at least one other partition, and the second
setting the label on the new partition while shrinking the
-.Dq a
+.Sq a
partition.
.Pp
On some machines the bootstrap code may not fit entirely in the
@@ -534,11 +543,19 @@ not be possible to have filesystems on some partitions of a
disk. When installing bootstrap code,
.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
+a partition of type
+.Dv FS_UNUSED
+it is marked as type
+.Dv 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,
+utility will disallow creation of filesystems on
+.Dv FS_BOOT
+partitions.
+Conversely, if a partition has a type other than
+.Dv FS_UNUSED
+or
+.Dv FS_BOOT ,
.Nm
will not install bootstrap code that overlaps it.
.Sh NOTES
@@ -553,9 +570,9 @@ but this usage is deprecated.
.Sh BUGS
When a disk name is given without a full pathname, the constructed
device name uses the
-.Dq a
+.Sq a
partition on the tahoe, the
-.Dq c
+.Sq c
partition on all others. In
.Fl E
mode,
diff --git a/sbin/dump/dump.8 b/sbin/dump/dump.8
index b81eeebe769..d6173981d8f 100644
--- a/sbin/dump/dump.8
+++ b/sbin/dump/dump.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: dump.8,v 1.19 1999/06/04 02:45:15 aaron Exp $
+.\" $OpenBSD: dump.8,v 1.20 1999/07/04 18:59:38 aaron Exp $
.\" $NetBSD: dump.8,v 1.17 1997/06/05 11:15:06 lukem Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -55,7 +55,6 @@
.Nm dump
.Op Fl W Li \&| Fl w
.Pp
-.in -\\n(iSu
(The
.Bx 4.3
option syntax is implemented for backward compatibility but
diff --git a/sbin/fdisk/fdisk.8 b/sbin/fdisk/fdisk.8
index 958a744928e..81460f557c1 100644
--- a/sbin/fdisk/fdisk.8
+++ b/sbin/fdisk/fdisk.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fdisk.8,v 1.25 1999/07/03 02:11:07 aaron Exp $
+.\" $OpenBSD: fdisk.8,v 1.26 1999/07/04 18:59:39 aaron Exp $
.\"
.\" Copyright (c) 1997 Tobias Weingartner
.\" All rights reserved.
@@ -111,7 +111,7 @@ Number of partition table entry. A
denotes the bootable partition.
.It Em "id"
System identifier.
-.oS
+.Os
reserves the
magic number 166 decimal (A6 in hex).
If no 166 partition is found, it will use an older FreeBSD partition
@@ -141,7 +141,7 @@ will completely overwrite the primary MBR, and start with a fresh one using
a default template, or one given by the
.Fl f
flag. It will set up partition number 3 to be an
-.oS
+.Os
partition, that will start at cylinder 0, head 1, sector 1, and extend
to the end of the disk.
This mode is designed to initialize an MBR the very first time,
@@ -241,7 +241,7 @@ that use geometry translation under a potentially different BIOS.
.Pp
If you hand craft your disk layout,
please make sure that the
-.oS
+.Os
partition starts on a cylinder boundary.
(This restriction may be changed in the future.)
.Pp
diff --git a/sbin/fsdb/fsdb.8 b/sbin/fsdb/fsdb.8
index c861ec5d8d5..4eab50b5057 100644
--- a/sbin/fsdb/fsdb.8
+++ b/sbin/fsdb/fsdb.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fsdb.8,v 1.11 1999/06/04 02:45:16 aaron Exp $
+.\" $OpenBSD: fsdb.8,v 1.12 1999/07/04 18:59:39 aaron Exp $
.\" $NetBSD: fsdb.8,v 1.5 1997/01/11 05:51:40 lukem Exp $
.\"
.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@ may be a multi-component name or may begin with slash to indicate that
the root inode should be used to start the lookup. If some component
along the pathname is not found, the last valid directory encountered is
left as the active inode.
-.br
+.Pp
This command is valid only if the starting inode is a directory.
.Pp
.It Cm active
@@ -234,7 +234,7 @@ to implement most of the file system manipulation code. The remainder of
first appeared in
.Nx 1.1 .
.Sh WARNING
-Use this tool with extreme caution--you can damage an FFS file system
+Use this tool with extreme caution \(en you can damage an FFS file system
beyond what
.Xr fsck 8
can repair.
diff --git a/sbin/fsirand/fsirand.8 b/sbin/fsirand/fsirand.8
index 67cbf773d21..af2fdb710ec 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.16 1999/05/28 22:59:58 aaron Exp $
+.\" $OpenBSD: fsirand.8,v 1.17 1999/07/04 18:59:39 aaron Exp $
.\"
.Dd January 25, 1997
.Dt FSIRAND 8
@@ -99,12 +99,9 @@ of memory for large disks with few cylinder groups.
The
.Nm
command appeared in SunOS 3.x.
-.br
This version of
.Nm
first appeared in
.Ox 2.1 .
.Sh AUTHOR
-.nf
Todd C. Miller <Todd.Miller@courtesan.com>
-.fi
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 0b6ede74b09..002b020cc90 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ifconfig.8,v 1.26 1999/07/03 02:11:07 aaron Exp $
+.\" $OpenBSD: ifconfig.8,v 1.27 1999/07/04 18:59:39 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 $
.\"
@@ -167,7 +167,6 @@ Enable driver dependent debugging code; usually, this turns on
extra console error logging.
.It Fl debug
Disable driver dependent debugging code.
-.ne 1i
.It Cm delete
Remove the network address specified.
This would be used if you incorrectly specified an alias, or it
@@ -318,7 +317,6 @@ they are in general used to select special modes of operation. An example
of this is to enable SLIP compression, or to select the connector type
for some Ethernet cards. Refer to the man page for the specific driver
for more information.
-.ne 1i
.It Fl link[0-2]
Disable special processing at the link level with the specified interface.
.It Cm up
diff --git a/sbin/init/init.8 b/sbin/init/init.8
index 21ea2b88991..7728bd06ba1 100644
--- a/sbin/init/init.8
+++ b/sbin/init/init.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: init.8,v 1.18 1999/06/04 02:45:17 aaron Exp $
+.\" $OpenBSD: init.8,v 1.19 1999/07/04 18:59:40 aaron Exp $
.\" $NetBSD: init.8,v 1.6 1995/03/18 14:56:31 cgd Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -165,7 +165,6 @@ then restarted by
executing a new
.Xr getty
for the line.
-.pl +1
.Pp
Line status (on, off, secure, getty, or window information)
may be changed in the
diff --git a/sbin/ipsecadm/ipsecadm.8 b/sbin/ipsecadm/ipsecadm.8
index ed0461ef4bc..6641bd48577 100644
--- a/sbin/ipsecadm/ipsecadm.8
+++ b/sbin/ipsecadm/ipsecadm.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipsecadm.8,v 1.7 1999/06/04 02:45:24 aaron Exp $
+.\" $OpenBSD: ipsecadm.8,v 1.8 1999/07/04 18:59:41 aaron Exp $
.\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
.\" All rights reserved.
.\"
@@ -141,7 +141,7 @@ Association. Allowed modifiers are:
.Fl transport ,
.Fl sport ,
.Fl dport ,
-.FL local ,
+.Fl local ,
.Fl delete .
The
.Xr netstat 1
@@ -264,7 +264,7 @@ should be chosen in random (ideally, using some true-random source like
coin flipping). It is very important that the key is not guessable. One
practical way of generating keys is by using the
.Xr random 4
-device (e.g. dd if=/dev/urandom bs=1024 count=1 | sha1)
+device (e.g., dd if=/dev/urandom bs=1024 count=1 | sha1)
.It authkey
The secret key material used for authentication
if additional authentication in new esp mode is required. For
@@ -278,7 +278,7 @@ should be chosen in random (ideally, using some true-random source like
coin flipping). It is very important that the key is not guessable. One
practical way of generating keys is by using the
.Xr random 4
-device (e.g. dd if=/dev/urandom bs=1024 count=1 | sha1)
+device (e.g., dd if=/dev/urandom bs=1024 count=1 | sha1)
.It iv
This option has been deprecated. The argument is ignored. When applicable,
it has the same behaviour as the
diff --git a/sbin/mount_lfs/mount_lfs.8 b/sbin/mount_lfs/mount_lfs.8
index 2eaf37ac184..45993efc1c8 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.8 1999/07/02 20:11:47 aaron Exp $
+.\" $OpenBSD: mount_lfs.8,v 1.9 1999/07/04 18:59:40 aaron Exp $
.\" $NetBSD: mount_lfs.8,v 1.2 1995/03/18 14:57:30 cgd Exp $
.\"
.\" Copyright (c) 1993, 1994
@@ -89,7 +89,7 @@ to read data in small chunks when cleaning the file system.
.Xr fstab 5 ,
.Xr lfs_cleanerd 8 ,
.Xr mount 8
-.sp
+.Pp
.Rs
.%A Ousterhout and Douglis
.%D 1989
diff --git a/sbin/mount_null/mount_null.8 b/sbin/mount_null/mount_null.8
index 63f31d15f7c..af3a5a4ac6f 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.9 1999/06/04 02:45:18 aaron Exp $
+.\" $OpenBSD: mount_null.8,v 1.10 1999/07/04 18:59:40 aaron Exp $
.\" $NetBSD: mount_null.8,v 1.4 1996/04/10 20:57:19 thorpej Exp $
.\"
.\" Copyright (c) 1992, 1993, 1994
@@ -211,7 +211,7 @@ is that vnodes arguments must be manually mapped.
.\"
.Sh SEE ALSO
.Xr mount 8
-.sp
+.Pp
UCLA Technical Report CSD-910056,
.Em "Stackable Layers: an Architecture for File System Development" .
.Sh HISTORY
diff --git a/sbin/newfs_msdos/newfs_msdos.8 b/sbin/newfs_msdos/newfs_msdos.8
index e8645b680a8..53e8919184b 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.10 1999/06/04 02:45:19 aaron Exp $
+.\" $OpenBSD: newfs_msdos.8,v 1.11 1999/07/04 18:59:41 aaron Exp $
.\"
.\" Copyright (c) 1995, 1996 Joerg Wunsch
.\"
@@ -128,9 +128,6 @@ utility.
.Sh HISTORY
.Nm
appeared in
-.Em FreeBSD 2.2 .
+.Fx 2.2 .
.Sh AUTHOR
-The program has been contributed by
-.if n Joerg Wunsch,
-.if t J\(:org Wunsch,
-Dresden.
+The program has been contributed by Joerg Wunsch, Dresden.
diff --git a/sbin/reboot/boot_pmax.8 b/sbin/reboot/boot_pmax.8
index c201646bed1..4737d9cbd4f 100644
--- a/sbin/reboot/boot_pmax.8
+++ b/sbin/reboot/boot_pmax.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: boot_pmax.8,v 1.12 1999/06/04 02:45:23 aaron Exp $
+.\" $OpenBSD: boot_pmax.8,v 1.13 1999/07/04 18:59:41 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.
@@ -99,11 +99,8 @@ must be specified. Generally, the kernel is named
An example
.Nm bootpath
setting would be:
-.nf
-.sp 1
-.ce 1
-setenv bootpath rz(0,1,0)bsd
-.fi
+.Pp
+.Dl setenv bootpath rz(0,1,0)bsd
.Pp
For automatic boots, the ROM automatically passes a
.Fl a
@@ -139,9 +136,8 @@ with the
.Fl f
flag, followed by the path of the kernel to boot, as described above.
For example:
-.sp 1
-.ce 1
-boot -f rz(0,4,0)bsd.new
+.Pp
+.Dl boot -f rz(0,4,0)bsd.new
.Pp
On TurboChannel machines (all DECstation 5000 models), the bootpath
is specified in the
@@ -153,11 +149,8 @@ when setting the
.Nm boot
environment variable, the filename and arguments
must be enclosed in quotes. For example:
-.nf
-.sp 1
-.ce 1
-setenv boot "3/rz4/bsd -a"
-.fi
+.Pp
+.Dl setenv boot "3/rz4/bsd -a"
.Pp
The device from which to boot is specified as the TurboChannel slot
number, a TurboChannel-option-specific device name, and a path to the
@@ -193,9 +186,8 @@ If no
environment variable is set, or if an alternate kernel is to be
booted, the path of that kernel may be specified after the boot command as
described above, and any arguments may be passed similarly. For example:
-.sp 1
-.ce 1
-boot 3/rz4/bsd.new -a
+.Pp
+.Dl boot 3/rz4/bsd.new -a
.Sh SEE ALSO
.Xr crash 8 ,
.Xr fsck 8 ,
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index 59db570da51..308b0c4fbae 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: restore.8,v 1.15 1999/06/04 02:45:23 aaron Exp $
+.\" $OpenBSD: restore.8,v 1.16 1999/07/04 18:59:41 aaron Exp $
.\" $NetBSD: restore.8,v 1.15 1997/07/01 05:37:53 lukem Exp $
.\"
.\" Copyright (c) 1985, 1991, 1993
@@ -74,7 +74,6 @@
.Op Fl s Ar fileno
.Op Ar file Ar ...
.Pp
-.in -\\n(iSu
(The
.Bx 4.3
option syntax is implemented for backward compatibility but
@@ -241,7 +240,6 @@ Note that the
flag replaces the function of the old
.Xr dumpdir 8
program.
-.ne 1i
.It Fl x
The named files are read from the given media.
If a named file matches a directory whose contents
diff --git a/sbin/routed/rtquery/rtquery.8 b/sbin/routed/rtquery/rtquery.8
index b5b688d4d18..b30b9db4bc0 100644
--- a/sbin/routed/rtquery/rtquery.8
+++ b/sbin/routed/rtquery/rtquery.8
@@ -11,44 +11,46 @@
.Op Fl r Ar addr
.Ar host ...
.Sh DESCRIPTION
-.Nm Rtquery
+.Nm
is used to query a network routing daemon,
.Xr routed 8
or
.Xr gated 8 ,
for its routing table by sending a
-.Em request
+.Cm request
or
-.Em poll
+.Cm poll
command. The routing information in any routing
-.Em response
+.Dq response
packets returned is displayed numerically and symbolically.
.Pp
-.Em Rtquery
+.Nm
by default uses the
-.Em request
+.Cm request
command.
When the
.Fl p
option is specified,
-.Nm rtquery
+.Nm
uses the
-.Em poll
+.Cm poll
command, an
undocumented extension to the RIP protocol supported by
.Xr gated 8 .
When querying gated, the
-.Em poll
+.Cm poll
command is preferred over the
-.Em Request
+.Cm request
command because the response is not subject to Split Horizon and/or
Poisoned Reverse, and because some versions of gated do not answer
the Request command. Routed does not answer the Poll command, but
-recognizes Requests coming from rtquery and so answers completely.
+recognizes Requests coming from
+.Nm
+and so answers completely.
.Pp
-.Em Rtquery
+.Nm
is also used to turn tracing on or off in
-.Em routed .
+.Xr routed 8 .
.Pp
Options supported by
.Nm rtquery :
@@ -61,43 +63,42 @@ The
option displays only the numeric network and host numbers.
.It Fl p
Uses the
-.Em Poll
+.Cm poll
command to request full routing information from
.Xr gated 8 .
This is an undocumented extension RIP protocol supported only by
.Xr gated 8 .
.It Fl 1
-query using RIP version 1 instead of RIP version 2.
+Query using RIP version 1 instead of RIP version 2.
.It Fl w Ar timeout
-changes the delay for an answer from each host.
+Changes the delay for an answer from each host.
By default, each host is given 15 seconds to respond.
.It Fl r Ar addr
-ask about the route to destination
-.Em addr .
+Ask about the route to destination
+.Ar addr .
.It Fl t Ar op
-change tracing, where
-.Em op
+Change tracing, where
+.Ar op
is one of the following.
Requests from processes not running with UID 0 or on distant networks
are generally ignored by the daemon except for a message in the system log.
.El
.Bl -tag -width Ds -offset indent-two
.It Em on=tracefile
-turn tracing on into the specified file. That file must usually
+Turn tracing on into the specified file. That file must usually
have been specified when the daemon was started or be the same
as a fixed name, often
.Pa /etc/routed.trace .
.It Em more
-increases the debugging level.
+Increases the debugging level.
.It Em off
-turns off tracing.
+Turns off tracing.
.It Em dump
-dumps the daemon's routing table to the current tracefile.
+Dumps the daemon's routing table to the current tracefile.
.El
.Sh SEE ALSO
.Xr gated 8 ,
.Xr routed 8
-.br
-RFC\ 1058 - Routing Information Protocol, RIPv1
-.br
-RFC\ 1723 - Routing Information Protocol, RIPv2
+.Pp
+.Dl RFC\ 1058 - Routing Information Protocol, RIPv1
+.Dl RFC\ 1723 - Routing Information Protocol, RIPv2
diff --git a/sbin/scsi/scsi.8 b/sbin/scsi/scsi.8
index d19bc88ea8b..4ca016404f8 100644
--- a/sbin/scsi/scsi.8
+++ b/sbin/scsi/scsi.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: scsi.8,v 1.11 1999/07/03 02:11:08 aaron Exp $
+.\" $OpenBSD: scsi.8,v 1.12 1999/07/04 18:59:42 aaron Exp $
.\" $FreeBSD: scsi.8,v 1.5 1995/05/05 20:41:58 dufault Exp $
.\"
.\" Written By Julian ELischer
@@ -79,26 +79,20 @@
.Fl o Ar count out_fmt
.Op Ar arg ...
.Fl i Ar count in_fmt
-.Pp
-.in -\\n(iSu
+.Sh DESCRIPTION
+The
+.Nm
+program is used to send commands to a SCSI device. It is also
+a sample usage of the user-level SCSI commands.
.Ar out_fmt
can be
-.Sq -
+.Ql -
to read output data from stdin;
.Ar in_fmt
can be
-.Sq -
+.Ql -
to write input data to stdout.
.Pp
-If debugging is not compiled in the kernel,
-.Fl d
-will have no effect.
-.Sh DESCRIPTION
-The
-.Nm
-program is used to send commands to a SCSI device. It is also
-a sample usage of the user-level SCSI commands.
-.Pp
The following options are available:
.Bl -tag -width Ds
.It Fl d Ar debug_level
@@ -205,7 +199,7 @@ bytes of data. The data out is built up using the facilities described in
using the provided arguments to fill in any integer variables.
.Ar out_fmt
can be specified as a hyphen
-.Pq Sq -
+.Pq Ql -
to indicate that the
.Ar count
bytes of data should be read from the standard input.
@@ -221,7 +215,7 @@ using the facilities described in
and displayed on the standard output.
.Ar in_fmt
can be specified as a hyphen
-.Pq Sq -
+.Pq Ql -
to indicate that the
.Ar count
bytes of data input should be written to the standard output.