summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/apply/apply.119
-rw-r--r--usr.bin/apropos/apropos.115
-rw-r--r--usr.bin/ar/ar.118
-rw-r--r--usr.bin/ar/ar.512
-rw-r--r--usr.bin/asa/asa.122
-rw-r--r--usr.bin/at/at.181
-rw-r--r--usr.bin/aucat/aucat.18
-rw-r--r--usr.bin/audioctl/audioctl.118
-rw-r--r--usr.bin/banner/banner.17
-rw-r--r--usr.bin/basename/basename.110
-rw-r--r--usr.bin/basename/dirname.110
-rw-r--r--usr.bin/biff/biff.117
-rw-r--r--usr.bin/cal/cal.14
-rw-r--r--usr.bin/calendar/calendar.1113
-rw-r--r--usr.bin/cap_mkdb/cap_mkdb.110
-rw-r--r--usr.bin/cdio/cdio.173
-rw-r--r--usr.bin/checknr/checknr.112
-rw-r--r--usr.bin/chflags/chflags.16
-rw-r--r--usr.bin/chpass/chpass.136
-rw-r--r--usr.bin/cksum/cksum.16
-rw-r--r--usr.bin/cmp/cmp.18
-rw-r--r--usr.bin/col/col.18
-rw-r--r--usr.bin/colcrt/colcrt.18
-rw-r--r--usr.bin/colrm/colrm.14
-rw-r--r--usr.bin/column/column.111
-rw-r--r--usr.bin/comm/comm.19
-rw-r--r--usr.bin/compile_et/compile_et.16
-rw-r--r--usr.bin/compress/compress.128
-rw-r--r--usr.bin/ctags/ctags.128
-rw-r--r--usr.bin/cut/cut.111
-rw-r--r--usr.bin/du/du.18
-rw-r--r--usr.bin/elf2aout/elf2aout.110
-rw-r--r--usr.bin/elf2ecoff/elf2ecoff.114
-rw-r--r--usr.bin/elf2olf/elf2olf.112
-rw-r--r--usr.bin/encrypt/encrypt.18
-rw-r--r--usr.bin/env/env.117
-rw-r--r--usr.bin/error/error.144
-rw-r--r--usr.bin/expand/expand.118
38 files changed, 380 insertions, 369 deletions
diff --git a/usr.bin/apply/apply.1 b/usr.bin/apply/apply.1
index fe7fe37d4d1..0004b38ee1b 100644
--- a/usr.bin/apply/apply.1
+++ b/usr.bin/apply/apply.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: apply.1,v 1.6 1998/05/13 10:33:24 deraadt Exp $
+.\" $OpenBSD: apply.1,v 1.7 1998/09/23 04:32:33 aaron Exp $
.\" $NetBSD: apply.1,v 1.4 1996/03/18 23:16:57 jtc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
@@ -44,9 +44,10 @@
.Nm apply
.Op Fl a Ns Ar c
.Op Fl Ns Ar #
-.Ar command argument ...
+.Ar command argument
+.Op Ar ...
.Sh DESCRIPTION
-.Nm Apply
+.Nm apply
runs the named
.Ar command
on each
@@ -59,7 +60,7 @@ Character sequences of the form
in
.Ar command ,
where
-.Dq Li d
+.Sq Li d
is a digit from 1 to 9, are replaced by the
.Li d Ns \'th
following unused
@@ -82,12 +83,14 @@ is run, without arguments, once for each
.Pp
If any sequences of
.Dq Li \&%d
-occur in command, the
+occur in
+.Ar command ,
+the
.Fl #
option is ignored.
.It Fl a Ns Ar c
The use of the character
-.Dq Li %
+.Sq Li %
as a magic character may be changed with the
.Fl a
option.
@@ -115,10 +118,10 @@ runs
links all files in the current directory to the directory
.Pa /usr/joe .
.El
-.Sh Files
+.Sh FILES
.Bl -tag -width /bin/sh -compact
.It Pa /bin/sh
-Default shell
+default shell
.El
.Sh AUTHOR
Rob Pike
diff --git a/usr.bin/apropos/apropos.1 b/usr.bin/apropos/apropos.1
index a564f844a5c..ec4cd576379 100644
--- a/usr.bin/apropos/apropos.1
+++ b/usr.bin/apropos/apropos.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: apropos.1,v 1.3 1998/03/24 05:40:17 deraadt Exp $
+.\" $OpenBSD: apropos.1,v 1.4 1998/09/23 04:32:34 aaron Exp $
.\" $NetBSD: apropos.1,v 1.4 1995/09/04 20:46:17 tls Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -44,9 +44,10 @@
.Nm apropos
.Op Fl M Ar path
.Op Fl m Ar path
-.Ar keyword ...
+.Ar keyword
+.Op Ar ...
.Sh DESCRIPTION
-.Nm Apropos
+.Nm apropos
shows which manual pages contain instances of any of the given
.Ar keyword(s)
in their title line.
@@ -76,18 +77,18 @@ searches for a database named
The supplied
.Ar path
must be a colon
-.Dq \&:
+.Pq Sq \&:
separated list of directories.
This search path may also be set using the environment variable
.Ev MANPATH .
-.It Fl m path
+.It Fl m Ar path
Augment the list of standard directories
.Nm apropos
searches for its database.
The supplied
.Ar path
must be a colon
-.Dq \&:
+.Pq Sq \&:
separated list of directories.
These directories will be searched before the standard directories,
or the directories supplied with the
@@ -104,7 +105,7 @@ may be overridden by specifying a path in the
.Ev MANPATH
environment variable.
The format of the path is a colon
-.Dq \&:
+.Pq Sq \&:
separated list of directories.
.El
.Sh FILES
diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index 6c2b91916ad..0ec76b3ee4b 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ar.1,v 1.3 1997/08/19 07:23:13 denny Exp $
+.\" $OpenBSD: ar.1,v 1.4 1998/09/23 04:32:34 aaron Exp $
.\" $NetBSD: ar.1,v 1.7 1995/08/18 15:05:11 pk Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -91,7 +91,7 @@ Once an archive has been created, new files can be added and existing
files can be extracted, deleted, or replaced.
.Pp
Files are named in the archive by a single component, i.e., if a file
-referenced by a path containing a slash (``/'') is archived it will be
+referenced by a path containing a slash (`/') is archived it will be
named by the last component of that path.
When matching paths listed on the command line against file names stored
in the archive, only the last component of the path will be compared.
@@ -195,7 +195,7 @@ historic archiver and loader implementations were unable to handle names
that used the entire space.
This means that file names that are not unique in their first fifteen
characters can subsequently be confused.
-A warning message is printed to the standard error output if any file
+A warning message is printed to the standard error if any file
names are truncated.
(See
.Xr ar 5
@@ -228,7 +228,7 @@ options,
.Nm ar
gives a file-by-file description of the archive modification.
This description consists of three, white-space separated fields: the
-option letter, a dash (``-'') and the file name.
+option letter, a dash (`-') and the file name.
When used with the
.Fl r
option,
@@ -242,8 +242,8 @@ When used with the
option,
the name of each printed file is written to the standard output before
the contents of the file, preceded by a single newline character, and
-followed by two newline characters, enclosed in less-than (``<'') and
-greater-than (``>'') characters.
+followed by two newline characters, enclosed in less-than (`<') and
+greater-than (`>') characters.
.Pp
When used with the
.Fl t
@@ -254,7 +254,7 @@ the archive.
This listing consists of eight, white-space separated fields:
the file permissions (see
.Xr strmode 3 ),
-the decimal user and group ID's, separated by a single slash (``/''),
+the decimal user and group ID's, separated by a single slash (`/'),
the file size (in bytes), the file modification time (in the
.Xr date 1
format ``%b %e %H:%M %Y''), and the name of the file.
@@ -277,14 +277,14 @@ extracted file or the super-user.
.Pp
The
.Nm ar
-utility exits 0 on success, and >0 if an error occurs.
+utility exits 0 on success or >0 if an error occurred.
.Sh ENVIRONMENT
.Bl -tag -width indent -compact
.It Ev TMPDIR
The pathname of the directory to use when creating temporary files.
.El
.Sh FILES
-.Bl -tag -width indent -compact
+.Bl -tag -width ar.XXXXXX -compact
.It Pa /tmp
default temporary file directory
.It Pa ar.XXXXXX
diff --git a/usr.bin/ar/ar.5 b/usr.bin/ar/ar.5
index 15fde759c7b..100c674c67f 100644
--- a/usr.bin/ar/ar.5
+++ b/usr.bin/ar/ar.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ar.5,v 1.3 1998/06/15 17:56:06 mickey Exp $
+.\" $OpenBSD: ar.5,v 1.4 1998/09/23 04:32:34 aaron Exp $
.\" $NetBSD: ar.5,v 1.2 1995/03/25 06:39:38 glass Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
@@ -63,7 +63,7 @@ The header is made up of six variable length
fields, followed by a
two character trailer.
The fields are the object name (16 characters), the file last modification
-time (12 characters), the user and group id's (each 6 characters), the file
+time (12 characters), the user and group IDs (each 6 characters), the file
mode (8 characters) and the file size (10 characters).
All numeric fields are in decimal, except for the file mode which is in
octal.
@@ -74,7 +74,7 @@ field, i.e.,
.Dv CUT
seconds since
the epoch.
-The user and group id's are the file
+The user and group IDs are the file
.Fa st_uid
and
.Fa st_gid
@@ -103,7 +103,7 @@ If any fields are their particular maximum number of characters in
length, there will be no separation between the fields.
.Pp
Objects in the archive are always an even number of bytes long; files
-which are an odd number of bytes long are padded with a newline (``\en'')
+which are an odd number of bytes long are padded with a newline (`\en')
character, although the size in the header does not reflect this.
.Sh SEE ALSO
.Xr ar 1 ,
@@ -117,7 +117,7 @@ type int).
These archives were almost certainly created on a 16-bit machine, and
contain headers made up of five fields.
The fields are the object name (8 characters), the file last modification
-time (type long), the user id (type char), the file mode (type char) and
+time (type long), the user ID (type char), the file mode (type char) and
the file size (type unsigned int).
Files were padded to an even number of bytes.
.Pp
@@ -126,7 +126,7 @@ type int).
These archives may have been created on either 16 or 32-bit machines, and
contain headers made up of six fields.
The fields are the object name (14 characters), the file last modification
-time (type long), the user and group id's (each type char), the file mode
+time (type long), the user and group IDs (each type char), the file mode
(type int) and the file size (type long).
Files were padded to an even number of bytes.
For more information on converting from this format see
diff --git a/usr.bin/asa/asa.1 b/usr.bin/asa/asa.1
index 04fc01f76ba..8c1f48adc54 100644
--- a/usr.bin/asa/asa.1
+++ b/usr.bin/asa/asa.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: asa.1,v 1.4 1998/09/07 16:44:33 aaron Exp $
+.\" $OpenBSD: asa.1,v 1.5 1998/09/23 04:32:34 aaron Exp $
.\" $NetBSD: asa.1,v 1.4 1995/03/26 02:25:05 glass Exp $
.\"
.\" Copyright (c) 1993 Winning Strategies, Inc.
@@ -37,7 +37,9 @@
.Nm fpr
.Nd interpret carriage-control characters.
.Sh SYNOPSIS
-.Nm asa|fpr
+.Nm asa
+.Op Ar
+.Nm fpr
.Op Ar
.Sh DESCRIPTION
The
@@ -48,21 +50,27 @@ carriage-control characters to line-printer control sequences,
and writes them to the standard output.
.Pp
The first character of each line is interpreted as a carriage-control
-character. The following characters are interpreted as follows:
+character. Additionally, the following characters are interpreted as shown:
.Bl -tag -width indent
.It <space>
Output the rest of the line without change.
.It 0
-Output a <newline> character before printing the rest of the line.
+Output a newline
+.Pq Sq \en
+character before printing the rest of the line.
.It 1
Output a <formfeed> character before printing the rest of the line.
.It +
-The trailing <newline> of the previous line is replaced by a <carriage-return>
+The trailing newline
+.Pq Sq \en
+of the previous line is replaced by a carriage-return
+.Pq Sq \er
before printing the rest of the line.
.El
.Pp
Lines beginning with characters other than the above are treated as if they
-begin with <space>.
+begin with a space
+.Pq Sq \ .
.Sh EXAMPLES
To view a file containing the output of a
.Tn FORTRAN program:
@@ -75,7 +83,7 @@ program and redirect it to a line-printer.
.Sh DIAGNOSTICS
The
.Nm
-utility exit 0 on success, and >0 if an error occurs.
+utility exits 0 on success or >0 if an error occurred.
.Sh SEE ALSO
.Xr f77 1
.Sh STANDARDS
diff --git a/usr.bin/at/at.1 b/usr.bin/at/at.1
index 8471a045ea9..e8492c72a8e 100644
--- a/usr.bin/at/at.1
+++ b/usr.bin/at/at.1
@@ -1,10 +1,10 @@
-.\" $OpenBSD: at.1,v 1.6 1998/06/05 00:47:46 deraadt Exp $
+.\" $OpenBSD: at.1,v 1.7 1998/09/23 04:32:34 aaron Exp $
.\" $FreeBSD: at.man,v 1.6 1997/02/22 19:54:05 peter Exp $
.Dd April 12, 1995
-.Dt "AT" 1
+.Dt AT 1
.Os
.Sh NAME
-.Nm at, batch, atq, atrm
+.Nm at, atq, atrm, batch
.Nd queue, examine or delete jobs for later execution
.Sh SYNOPSIS
.Nm at
@@ -13,21 +13,17 @@
.Op Fl f Ar file
.Op Fl mldbv
.Ar time
-.Pp
.Nm at
.Op Fl V
.Fl c Ar job Op Ar job ...
-.Pp
.Nm atq
.Op Fl V
.Op Fl q Ar queue
.Op Fl v
-.Pp
.Nm atrm
.Op Fl V
.Ar job
.Op Ar job ...
-.Pp
.Nm batch
.Op Fl V
.Op Fl q Ar queue
@@ -35,7 +31,7 @@
.Op Fl mv
.Op Ar time
.Sh DESCRIPTION
-.Nm At
+.Nm at
and
.Nm batch
read commands from standard input or a specified file which
@@ -46,7 +42,7 @@ are to be executed at a later time, using
Executes commands at a specified time.
.It Nm atq
Lists the user's pending jobs, unless the user is the superuser.
-In that case, everybody's jobs are listed.
+In that case, all users' jobs are listed.
.It Nm atrm
Deletes jobs.
.It Nm batch
@@ -55,7 +51,7 @@ the load average drops below 1.5, or the value specified in the invocation of
.Nm atrun .
.El
.Pp
-.Nm At
+.Nm at
allows some moderately complex
.Ar time
specifications. It accepts times of the form
@@ -81,8 +77,7 @@ by giving a date in the form
with an optional
.Ar year ,
or giving a date of the form
-.Ar MMDDYY
-or
+.Ar MMDDYY ,
.Ar MM/DD/YY
or
.Ar DD.MM.YY .
@@ -105,10 +100,10 @@ and to run the job tomorrow by suffixing the time with
.Nm tomorrow.
.Pp
For example, to run a job at 4pm three days from now, you would do
-.Nm at 4pm + 3 days ,
-to run a job at 10:00am on July 31, you would do
-.Nm at 10am Jul 31
-and to run a job at 1am tomorrow, you would do
+.Nm at 4pm + 3 days .
+To run a job at 10:00am on July 31, you would do
+.Nm at 10am Jul 31 .
+To run a job at 1am tomorrow, you would do
.Nm at 1am tomorrow.
.Pp
For both
@@ -120,11 +115,11 @@ with the
.Fl f
option and executed.
The working directory, the environment (except for the variables
-.Nm TERM ,
-.Nm TERMCAP ,
-.Nm DISPLAY
+.Ev TERM ,
+.Ev TERMCAP ,
+.Ev DISPLAY ,
and
-.Nm _ )
+.Ev _ )
and the
.Ar umask
are retained from the time of invocation.
@@ -134,7 +129,7 @@ or
.Nm batch
command invoked from a
.Xr su 1
-shell will retain the current userid.
+shell will retain the current user ID.
The user will be mailed standard error and standard output from his
commands, if any. Mail will be sent using the command
.Xr sendmail 8 .
@@ -159,7 +154,7 @@ If
.Pa /var/at/at.allow
does not exist,
.Pa /var/at/at.deny
-is checked, every username not mentioned in it is then allowed
+is checked. Every username not mentioned in it is then allowed
to use
.Nm at .
.Pp
@@ -200,7 +195,7 @@ If
.Nm atq
is given a specific queue, it will only show jobs pending in that queue.
.It Fl m
-Send mail to the user when the job has completed even if there was no
+Send mail to the user when the job has completed, even if there was no
output.
.It Fl f Ar file
Reads the job from
@@ -208,55 +203,54 @@ Reads the job from
rather than standard input.
.It Fl l
Is an alias for
-.Nm atq.
+.Nm atq .
.It Fl d
Is an alias for
-.Nm atrm.
+.Nm atrm .
.It Fl b
Is an alias for
-.Nm batch.
+.Nm batch .
.It Fl v
For
.Nm atq ,
shows completed but not yet deleted jobs in the queue. Otherwise
shows the time the job will be executed.
.It Fl c
-Cats the jobs listed on the command line to standard output.
+Prints the jobs listed on the command line to standard output.
.Sh FILES
.Bl -tag -width /var/at/.lockfile -compact
.It Pa /var/at/jobs
-Directory containing job files
+directory containing job files
.It Pa /var/at/spool
-Directory containing output spool files
+directory containing output spool files
.It Pa /var/run/utmp
-Login records
+login records
.It Pa /var/at/at.allow
-Allow permission control
+allow permission control
.It Pa /var/at/at.deny
-Deny permission control
+deny permission control
.It Pa /var/at/.lockfile
-Job-creation lock file.
+job-creation lock file
.Sh SEE ALSO
-.Xr cron 8 ,
.Xr nice 1 ,
-.Xr umask 2 ,
.Xr sh 1 ,
-.Xr sendmail 8 ,
-.Xr atrun 8 .
+.Xr umask 2 ,
+.Xr atrun 8 ,
+.Xr cron 8 ,
+.Xr sendmail 8
.El
.Sh BUGS
-.Pp
If the file
.Pa /var/run/utmp
is not available or corrupted, or if the user is not logged on at the
time
.Nm at
-is invoked, the mail is sent to the userid found
+is invoked, the mail is sent to the user ID found
in the environment variable
-.Nm LOGNAME .
-If that is undefined or empty, the current userid is assumed.
+.Ev LOGNAME .
+If that is undefined or empty, the current user ID is assumed.
.Pp
-.Nm At
+.Nm at
and
.Nm batch
as presently implemented are not suitable when users are competing for
@@ -265,5 +259,6 @@ If this is the case for your site, you might want to consider another
batch system, such as
.Nm nqs .
.Sh AUTHORS
-At was mostly written by Thomas Koenig <ig25@rz.uni-karlsruhe.de>.
+.Nm at
+was mostly written by Thomas Koenig <ig25@rz.uni-karlsruhe.de>.
The time parsing routines are by David Parsons <orc@pell.chi.il.us>.
diff --git a/usr.bin/aucat/aucat.1 b/usr.bin/aucat/aucat.1
index 7c5deed5e5e..252ff4729c6 100644
--- a/usr.bin/aucat/aucat.1
+++ b/usr.bin/aucat/aucat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: aucat.1,v 1.3 1998/03/10 04:51:02 millert Exp $
+.\" $OpenBSD: aucat.1,v 1.4 1998/09/23 04:32:34 aaron Exp $
.\"
.\" Copyright (c) 1997 Kenneth Stailey. All rights reserved.
.\"
@@ -50,16 +50,16 @@ utility reads files sequentially, writing them to /dev/audio.
The
.Ar file
operands are processed in command line order. If a Sun .au header is
-detected it is skipped over and not copied to /dev/audio otherwise the
+detected it is skipped over and not copied to /dev/audio. Otherwise, the
entire file is copied to /dev/audio.
.Pp
The
.Nm aucat
-utility exits 0 on success, and >0 if an error occurs.
+utility exits 0 on success or >0 if an error occurred.
.Sh SEE ALSO
.Xr audio 4
.Sh HISTORY
-A
+An
.Nm
utility appeared in
.Ox 2.0 .
diff --git a/usr.bin/audioctl/audioctl.1 b/usr.bin/audioctl/audioctl.1
index 8b2e180bf59..6a7c5b69388 100644
--- a/usr.bin/audioctl/audioctl.1
+++ b/usr.bin/audioctl/audioctl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: audioctl.1,v 1.4 1998/04/30 13:46:16 provos Exp $
+.\" $OpenBSD: audioctl.1,v 1.5 1998/09/23 04:32:34 aaron Exp $
.\" $NetBSD: audioctl.1,v 1.7 1998/04/27 16:55:23 augustss Exp $
.\" Copyright (c) 1997 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -48,18 +48,20 @@
.Nm
.Op Fl f Ar file
.Op Fl n
-.Ar name ...
+.Ar name
+.Op Ar ...
.br
.Nm
.Op Fl f Ar file
.Op Fl n
.Fl w
-.Ar name=value ...
+.Ar name=value
+.Op Ar ...
.Sh DESCRIPTION
The
.Nm
command displays or sets various audio system driver variables.
-If a list of variables is present on the command line, then
+If a list of variables is present on the command line,
.Nm
prints the current value of those variables for the specified device.
If the
@@ -67,13 +69,13 @@ If the
flag is specified, all variables for the device are printed.
If the
.Fl w
-flag is specified
+flag is specified,
.Nm
attempts to set the specified variables to the given values.
.Pp
The
.Fl f
-flag can be used to give an alternative audio control device, the default is
+flag can be used to give an alternative audio control device. The default is
.Pa /dev/audioctl .
.Pp
The
@@ -97,8 +99,8 @@ audio control device
.El
.Sh ENVIRONMENT
.Bl -tag -width AUDIOCTLDEVICE
-.It Pa AUDIOCTLDEVICE
-the audio control device to use.
+.It Ev AUDIOCTLDEVICE
+The audio control device to use.
.Sh SEE ALSO
.Xr mixerctl 1 ,
.Xr audio 4 ,
diff --git a/usr.bin/banner/banner.1 b/usr.bin/banner/banner.1
index 74015a621f6..825cdd6f5ed 100644
--- a/usr.bin/banner/banner.1
+++ b/usr.bin/banner/banner.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: banner.1,v 1.2 1996/06/26 05:31:33 deraadt Exp $
+.\" $OpenBSD: banner.1,v 1.3 1998/09/23 04:32:35 aaron Exp $
.\" $NetBSD: banner.1,v 1.1.1.1 1995/04/09 05:53:04 cgd Exp $
.\"
.\" @(#)Copyright (c) 1995, Simon J. Gerraty.
@@ -24,9 +24,10 @@
.Nd print strings in large letters
.Sh SYNOPSIS
.Nm banner
-.Ar string ...
+.Ar string
+.Op Ar ...
.Sh DESCRIPTION
-.Nm Banner
+.Nm banner
prints up to 10 chars of each
.Ar string
in large letters on the standard output.
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index 1ff9fcc06dd..9cbb8e44f1a 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: basename.1,v 1.4 1998/07/04 08:52:32 deraadt Exp $
+.\" $OpenBSD: basename.1,v 1.5 1998/09/23 04:32:35 aaron Exp $
.\" $NetBSD: basename.1,v 1.9 1995/03/25 18:17:45 glass Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
@@ -48,9 +48,9 @@
.Ar string
.Op Ar suffix
.Sh DESCRIPTION
-.Nm Basename
+.Nm basename
deletes any prefix ending with the last slash
-.Ql \&/
+.Pq Sq \&/
character present in
.Ar string ,
and a
@@ -71,10 +71,10 @@ to
The
.Nm basename
utility
-exit 0 on success, and >0 if an error occurs.
+exits 0 on success or >0 if an error occurred.
.Sh SEE ALSO
-.Xr dirname 1 ,
.Xr csh 1 ,
+.Xr dirname 1 ,
.Xr sh 1
.Sh STANDARDS
The
diff --git a/usr.bin/basename/dirname.1 b/usr.bin/basename/dirname.1
index b824a255639..5832a39bd7d 100644
--- a/usr.bin/basename/dirname.1
+++ b/usr.bin/basename/dirname.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: dirname.1,v 1.1 1998/07/04 08:53:03 deraadt Exp $
+.\" $OpenBSD: dirname.1,v 1.2 1998/09/23 04:32:35 aaron Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -46,10 +46,10 @@
.Nm dirname
.Ar string
.Sh DESCRIPTION
-.Nm Dirname
+.Nm dirname
deletes the filename portion, beginning
with the last slash
-.Ql \&/
+.Pq Sq \&/
character to the end of
.Ar string ,
and writes the result to the standard output.
@@ -57,7 +57,7 @@ and writes the result to the standard output.
The following line sets the shell variable
.Ev FOO
to
-.Pa /usr/bin .
+.Pa /usr/bin :
.Pp
.Dl FOO=`dirname /usr/bin/trail`
.Pp
@@ -65,7 +65,7 @@ to
The
.Nm dirname
utility
-exit 0 on success, and >0 if an error occurs.
+exits 0 on success or >0 if an error occurred.
.Sh SEE ALSO
.Xr basename 1 ,
.Xr csh 1 ,
diff --git a/usr.bin/biff/biff.1 b/usr.bin/biff/biff.1
index 99aef7f1ff4..7b6f631ac69 100644
--- a/usr.bin/biff/biff.1
+++ b/usr.bin/biff/biff.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: biff.1,v 1.3 1996/08/07 06:16:34 deraadt Exp $
+.\" $OpenBSD: biff.1,v 1.4 1998/09/23 04:32:35 aaron Exp $
.\" $NetBSD: biff.1,v 1.3 1995/03/26 02:34:21 glass Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -44,16 +44,16 @@
.Nm biff
.Op Cm ny
.Sh DESCRIPTION
-.Nm Biff
+.Nm biff
informs the system whether you want to be notified when mail arrives
during the current terminal session.
.Pp
Options supported by
.Nm biff :
.Bl -tag -width 4n
-.It Cm n
+.It Fl n
Disables notification.
-.It Cm y
+.It Fl y
Enables notification.
.El
.Pp
@@ -67,14 +67,14 @@ or
.Pa \&.profile
to be executed at each login.
.Pp
-.Nm Biff
+.Nm biff
operates asynchronously.
For synchronous notification use the
-.Ar MAIL
+.Ev MAIL
variable of
.Xr sh 1
or the
-.Ar mail
+.Ev mail
variable of
.Xr csh 1 .
.Sh SEE ALSO
@@ -87,4 +87,5 @@ The
.Nm
command appeared in
.Bx 4.0 .
-Biff was Heidi Stettner's dog. He died in August 1993, at 15.
+.Nm biff
+was Heidi Stettner's dog. He died in August 1993, at 15.
diff --git a/usr.bin/cal/cal.1 b/usr.bin/cal/cal.1
index 964c2da963c..99e900ef48f 100644
--- a/usr.bin/cal/cal.1
+++ b/usr.bin/cal/cal.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cal.1,v 1.5 1997/12/12 19:24:02 deraadt Exp $
+.\" $OpenBSD: cal.1,v 1.6 1998/09/23 04:32:35 aaron Exp $
.\" $NetBSD: cal.1,v 1.6 1995/09/02 05:34:20 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -51,7 +51,7 @@
.Ar year
.Oc
.Sh DESCRIPTION
-.Nm Cal
+.Nm cal
displays a simple calendar.
If arguments are not specified,
the current month is displayed.
diff --git a/usr.bin/calendar/calendar.1 b/usr.bin/calendar/calendar.1
index 33cbb334bf8..424a04967a3 100644
--- a/usr.bin/calendar/calendar.1
+++ b/usr.bin/calendar/calendar.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: calendar.1,v 1.4 1997/08/26 23:37:20 millert Exp $
+.\" $OpenBSD: calendar.1,v 1.5 1998/09/23 04:32:36 aaron Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -50,7 +50,7 @@
The
.Nm calendar
utility checks the current directory or the directory specified by the
-.Dq Ev CALENDAR_DIR
+.Ev CALENDAR_DIR
environment variable for a file named
.Pa calendar
and displays lines that begin with either today's date
@@ -64,25 +64,25 @@ Process the ``calendar'' files of all users and mail the results
to them.
This requires super-user privileges.
.It Fl A Ar num
-print lines from today and next
+Print lines from today and next
.Ar num
-days (forward, future)
+days (forward, future).
.It Fl B Ar num
-print lines from today and previous
+Print lines from today and previous
.Ar num
-days (backward, past)
+days (backward, past).
.It Fl f Pa calendarfile
-use
+Use
.Pa calendarfile
-as default calendar file.
+as the default calendar file.
.It Fl t Ar [[[yy]yy][mm]]dd
-act like the specified value is ``today'' instead of using the current date.
+Act like the specified value is ``today'' instead of using the current date.
.El
.Pp
To handle calendars in your national code table you can specify
.Dq LANG=<locale_name>
in the calendar file as early as possible. To handle national Easter
-names in the calendars
+names in the calendars,
.Dq Easter=<national_name>
(for Catholic Easter) or
.Dq Paskha=<national_name>
@@ -93,26 +93,28 @@ They may be entered in almost any format, either numeric or as character
strings.
If proper locale is set, national months and weekdays
names can be used.
-A single asterisk (``*'') matches every month.
+A single asterisk (`*') matches every month.
A day without a month matches that day of every week.
A month without a day matches the first of that month.
Two numbers default to the month followed by the day.
Lines with leading tabs default to the last entered date, allowing
multiple line specifications for a single date.
-``Easter'', may be followed by an positive or negative integer, is
+``Easter'' (may be followed by a positive or negative integer) is
Easter for this year.
-``Paskha'', may be followed by an positive or negative integer, is
+``Paskha'' (may be followed by a positive or negative integer) is
Orthodox Easter for this year.
Weekdays may be followed by ``-4'' ... ``+5'' (aliases
last, first, second, third, fourth) for moving events like
-``the last Monday in April''
+``the last Monday in April''.
.Pp
-By convention, dates followed by an asterisk are not fixed, i.e., change
+By convention, dates followed by an asterisk
+.Pq Sq *
+are not fixed, i.e., change
from year to year.
.Pp
-Day description start after the first <tab> character in the line;
-if the line not contains <tab> character, it isn't printed out.
-If the first character in the line is a <tab> character, it is treated as
+Day descriptions start after the first <tab> character in the line;
+if the line does not contain a <tab> character, it isn't printed out.
+If the first character in the line is a <tab> character, it is treated as
continue of previous description.
.Pp
The ``calendar'' file is preprocessed by
@@ -128,8 +130,8 @@ Empty lines and lines protected by the C commenting syntax
.Pq Li /* ... */
are ignored.
.Pp
-Some possible calendar entries (<tab> characters highlighted by
-\fB\et\fR sequence)
+Some possible calendar entries (<tab> characters are highlighted by a
+\fB\et\fR sequence):
.Bd -unfilled -offset indent
LANG=C
Easter=Ostern
@@ -152,71 +154,50 @@ Ostern-2\fB\et\fRGood Friday (2 days before Easter)
Paskha\fB\et\fROrthodox Easter
.Ed
.Sh FILES
-.Pp
-.Bl -tag -width calendar.christian -compact
+.Bl -tag -width ~/.calendar/calendar -compact
.It Pa calendar
file in current directory
-
.It Pa ~/.calendar
-.Pa calendar
-HOME directory.
+file in home directory (which
.Nm calendar
-does a chdir into this directory if it exists.
-
+.Xr chdir 1 's
+into if it exists)
.It Pa ~/.calendar/calendar
-calendar file to use if no calendar file exists in the current directory.
-
+file to use if no calendar file exists in the current directory
.It Pa ~/.calendar/nomail
-do not send mail if this file exists.
-.El
-
-The following default calendar files are provided:
-.Pp
-.Bl -tag -width calendar.christian -compact
+.Nm calendar
+will not send mail if this file exists
.It Pa calendar.birthday
-Births and deaths of famous (and not-so-famous) people.
-
+births and deaths of famous (and not-so-famous) people
.It Pa calendar.christian
-Christian holidays.
-This calendar should be updated yearly by the local system administrator
-so that roving holidays are set correctly for the current year.
-
+christian holidays (should be updated yearly by the local system administrator
+so that roving holidays are set correctly for the current year)
.It Pa calendar.computer
-Days of special significance to computer people.
-
+days of special significance to computer people
.It Pa calendar.history
-Everything else, mostly U. S. historical events.
-
+everything else, mostly U.S. historical events
.It Pa calendar.holiday
-Other holidays, including the not-well-known, obscure, and
+other holidays (including the not-well-known, obscure, and
.Em really
-obscure.
-
+obscure)
.It Pa calendar.judaic
-Jewish holidays.
-This calendar should be updated yearly by the local system administrator
-so that roving holidays are set correctly for the current year.
-
+Jewish holidays (should be updated yearly by the local system administrator
+so that roving holidays are set correctly for the current year)
.It Pa calendar.music
-Musical events, births, and deaths.
-Strongly oriented toward rock 'n' roll.
-
+musical events, births, and deaths (strongly oriented toward rock n' roll)
.It Pa calendar.usholiday
-U.S. holidays.
-This calendar should be updated yearly by the local system administrator
-so that roving holidays are set correctly for the current year.
-
+U.S. holidays (should be updated yearly by the local system administrator
+so that roving holidays are set correctly for the current year)
.It Pa calendar.german
-German calendar.
-
+German calendar
.It Pa calendar.russian
-Russian calendar.
+Russian calendar
.El
.Sh SEE ALSO
.Xr at 1 ,
.Xr cpp 1 ,
-.Xr cron 8 ,
-.Xr mail 1
+.Xr mail 1 ,
+.Xr cron 8
.Sh COMPATIBILITY
The
.Nm calendar
@@ -230,5 +211,5 @@ A
command appeared in
.At v7 .
.Sh BUGS
-.Nm Calendar
-doesn't handle Jewish holidays and moon phases.
+.Nm calendar
+doesn't handle Jewish holidays or moon phases.
diff --git a/usr.bin/cap_mkdb/cap_mkdb.1 b/usr.bin/cap_mkdb/cap_mkdb.1
index 878b8be1331..99300c4c930 100644
--- a/usr.bin/cap_mkdb/cap_mkdb.1
+++ b/usr.bin/cap_mkdb/cap_mkdb.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cap_mkdb.1,v 1.5 1998/09/06 22:23:16 aaron Exp $
+.\" $OpenBSD: cap_mkdb.1,v 1.6 1998/09/23 04:32:36 aaron Exp $
.\" $NetBSD: cap_mkdb.1,v 1.4 1995/03/26 03:59:36 glass Exp $
.\"
.\" Copyright (c) 1992, 1993
@@ -49,7 +49,7 @@
.Op Ar file2 ...
.Pp
.Sh DESCRIPTION
-.Nm Cap_mkdb
+.Nm cap_mkdb
builds a hashed database out of the
.Xr getcap 3
logical database constructed by the concatenation of the specified
@@ -78,7 +78,9 @@ Print out the number of capability records in the database.
Each record is stored in the database using two different types of keys.
.Pp
The first type is a key which consists of the first capability of
-the record (not including the trailing colon (``:'')) with a data
+the record (not including the trailing colon
+.Pq Sq \&: )
+with a data
field consisting of a special byte followed by the rest of the record.
The special byte is either a 0 or 1, where a 0 means that the record
is okay, and a 1 means that there was a ``tc'' capability in the record
@@ -97,7 +99,7 @@ name.
.Sh RETURN VALUE
The
.Nm cap_mkdb
-utility exits 0 on success and >0 if an error occurs.
+utility exits 0 on success or >0 if an error occurred.
.Sh SEE ALSO
.Xr dbopen 3 ,
.Xr getcap 3 ,
diff --git a/usr.bin/cdio/cdio.1 b/usr.bin/cdio/cdio.1
index f8589f21f6f..faaa7cc0dc8 100644
--- a/usr.bin/cdio/cdio.1
+++ b/usr.bin/cdio/cdio.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cdio.1,v 1.12 1998/09/01 16:38:23 deraadt Exp $
+.\" $OpenBSD: cdio.1,v 1.13 1998/09/23 04:32:36 aaron Exp $
.Dd July 3, 1995
.Dt CDIO 1
.Os OpenBSD 2.0
@@ -9,67 +9,76 @@
.Nm cdio
.Op Fl s
.Op Fl v
-.Op Fl f Ar discname
-.Op Ar command args...
+.Op Fl f Ar device
+.Op Ar command args ...
.Sh DESCRIPTION
+The
.Nm cdio
-is a program to control audio features of a CD drive. The device is a name such
-as cd0, acd0, or mcd0
+program controls audio features of a CD drive. The
+.Ar device
+is a name such
+as ``cd0'', ``acd0'', or ``mcd0''.
.Pp
-If the device is not specified, the environment variable
+If a
+.Ar device
+is not specified, the environment variable
.Ev DISC
-will be used to find the cd device.
+will be used to find the CD device.
.Pp
-If no command is given, then
+If no command is given,
.Nm cdio
enters an interactive mode, reading commands from the standard input.
.Pp
The following options are available:
.Bl -tag -width flag
.It Fl s
-Silent mode - do not print table headers and human readable comments.
+Silent mode. Do not print table headers or human-readable comments.
.It Fl v
-Verbose mode - print as much information as possible.
-.It Fl f Ar discname
-Specifies a device name, such as /dev/rcd0d or mcd0.
-Both absolute path and relative to /dev filename are possible.
+Verbose mode. Print as much information as possible.
+.It Fl f Ar device
+Specifies a device name such as
+.Pa /dev/rcd0d
+or
+.Pa mcd0 .
+Both absolute and relative paths to
+.Pa /dev
+filenames are possible.
The raw partition name is added if needed.
.El
.Pp
The available commands are listed below. Only as many
characters as are required to uniquely identify a command
-need be specified. Word
-.Nm play
-can be omitted.
+need be specified. The word
+.Cm play
+may be omitted.
.Bl -tag -width Cm
.It Cm play Ar first_track Op Ar last_track
Play from track
.Nm first_track
to track
.Nm last_track.
-The first track has number 1.
-can be ommited in all cases.
+The first track has number 1 and may be omitted in all cases.
.It Cm play Ar start_m:start_s.start_f Op Ar end_m:end_s.end_f
Play from the absolute address
(MSF) defined by
-.Nm start_m
+.Ar start_m
in minutes,
-.Nm start_s,
+.Ar start_s,
in seconds and
-.Nm start_f
+.Ar start_f
(frame number) to the absolute address defined by
-.Nm end_m
+.Ar end_m
in minutes,
-.Nm end_s,
+.Ar end_s,
in seconds and
-.Nm end_f
+.Ar end_f
(frame number). Minutes are in the range 0-99. Seconds are in the range 0-59.
Frame numbers are in the range 0-74.
.It Cm play Op Ar #start_block Op length
Play starting from the logical block
-.Nm start_block
+.Ar start_block
using
-.Nm length
+.Ar length
logical blocks.
.It Cm pause
Stop playing. Do not stop the disc.
@@ -90,10 +99,10 @@ Eject the disc.
.It Cm close
Inject the disc.
.It Cm volume Ar left_channel Ar right_channel
-Set the volume of left channel to
-.Nm left_channel
-and the volume of right channel to
-.Nm right_channel.
+Set the volume of the left channel to
+.Ar left_channel
+and the volume of the right channel to
+.Ar right_channel .
Allowed values are in the range 0-255.
.It Cm volume Ar mute
Turn the sound off.
@@ -108,7 +117,7 @@ Play the right subtrack on both left and right channels.
.It Cm info
Print the table of contents.
.It Cm status
-Print the information about the disc:
+Print information about the disc:
the current playing status and position,
the current media catalog status,
the current values of the volume for left and right channels.
@@ -147,4 +156,4 @@ The
.Nm cdio
command is based on
.Nm cdcontrol ,
-which first appeared in FreeBSD 2.1
+which first appeared in FreeBSD 2.1.
diff --git a/usr.bin/checknr/checknr.1 b/usr.bin/checknr/checknr.1
index 3587bf40053..62c8a35309d 100644
--- a/usr.bin/checknr/checknr.1
+++ b/usr.bin/checknr/checknr.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: checknr.1,v 1.3 1997/07/17 07:39:53 deraadt Exp $
+.\" $OpenBSD: checknr.1,v 1.4 1998/09/23 04:32:36 aaron Exp $
.\" $NetBSD: checknr.1,v 1.5 1995/03/26 04:10:14 glass Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -48,7 +48,7 @@
.Op Fl f
.Ar file
.Sh DESCRIPTION
-.Nm Checknr
+.Nm checknr
checks a list of
.Xr nroff 1
or
@@ -99,7 +99,7 @@ Macros that come in open ... close forms, for example,
the .TS and .TE macros which must always come in pairs.
.El
.Pp
-.Nm Checknr
+.Nm checknr
is intended for use on documents that are prepared with
.Nm checknr
in mind, much the same as
@@ -131,7 +131,7 @@ forms anyway,
you should think of this as a contribution to your document
preparation style.
.Pp
-.Nm Checknr
+.Nm checknr
knows about the
.Xr ms 7
and
@@ -140,8 +140,8 @@ macro packages.
.Sh SEE ALSO
.Xr nroff 1 ,
.Xr troff 1 ,
-.Xr ms 7 ,
-.Xr me 7
+.Xr me 7 ,
+.Xr ms 7
.Sh DIAGNOSTICS
.Bd -ragged -compact
Complaints about unmatched delimiters.
diff --git a/usr.bin/chflags/chflags.1 b/usr.bin/chflags/chflags.1
index dbd73a44835..d5e3911362c 100644
--- a/usr.bin/chflags/chflags.1
+++ b/usr.bin/chflags/chflags.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: chflags.1,v 1.3 1997/02/14 21:08:38 deraadt Exp $
+.\" $OpenBSD: chflags.1,v 1.4 1998/09/23 04:32:36 aaron Exp $
.\" $NetBSD: chflags.1,v 1.4 1995/08/31 22:50:22 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993, 1994
@@ -50,7 +50,7 @@
.Op Fl H | Fl L | Fl P
.Oc
.Ar flags
-.Ar file ...
+.Ar file Op Ar ...
.Sh DESCRIPTION
The
.Nm chflags
@@ -121,7 +121,7 @@ You can use "ls -lo" to see the flags of existing files.
.Pp
The
.Nm chflags
-utility exits 0 on success, and >0 if an error occurs.
+utility exits 0 on success or >0 if an error occurred.
.Sh SEE ALSO
.Xr ls 1 ,
.Xr chflags 2 ,
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 8cd26e32570..7d75ea90988 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: chpass.1,v 1.8 1998/06/14 18:12:23 deraadt Exp $
+.\" $OpenBSD: chpass.1,v 1.9 1998/09/23 04:32:36 aaron Exp $
.\" $NetBSD: chpass.1,v 1.7 1996/05/15 21:50:40 jtc Exp $
.\"
.\" Copyright (c) 1988, 1990, 1993
@@ -44,12 +44,12 @@
.Nm chpass
.Op Fl a Ar list
.Op Fl s Ar newshell
-.Op user
+.Op Ar user
.Sh DESCRIPTION
-.Nm Chpass
+.Nm chpass
allows editing of the user database information associated
with
-.Ar user
+.Ar user ,
or, by default, the current user.
The information is formatted and supplied to an editor for changes.
.Pp
@@ -62,12 +62,12 @@ The super-user is allowed to directly supply a user database
entry, in the format specified by
.Xr passwd 5 ,
as an argument.
-This argument must be a colon (``:'') separated list of all the
+This argument must be a colon
+.Pq Sq \&:
+separated list of all the
user database fields, although they may be empty.
.It Fl s Ar newshell
-The
-.Fl s
-option attempts to change the user's shell to
+Attempts to change the user's shell to
.Ar newshell .
.El
.Pp
@@ -119,7 +119,7 @@ Both of these fields should be unique across the system (and often
across a group of systems) as they control file access.
.Pp
While it is possible to have multiple entries with identical login names
-and/or identical user id's, it is usually a mistake to do so. Routines
+and/or identical user IDs, it is usually a mistake to do so. Routines
that manipulate these files will often return only one of the multiple
entries, and that one by random selection.
.Pp
@@ -127,7 +127,7 @@ The
.Ar group
field is the group that the user will be placed in at login.
Since BSD supports multiple groups (see
-.Xr groups 1 )
+.Xr groups 1 ),
this field currently has little special meaning.
This field may be filled in with either a number or a group name (see
.Xr group 5 ) .
@@ -169,8 +169,8 @@ The
field is the command interpreter the user prefers.
If the
.Ar shell
-field is empty, the Bourne shell,
-.Pa /bin/sh ,
+field is empty, the Bourne shell
+.Pq Pa /bin/sh
is assumed.
When altering a login shell, and not the super-user, the user
may not change from a non-standard shell or to a non-standard
@@ -203,17 +203,17 @@ update the user database itself.
Only the user, or the super-user, may edit the information associated
with the user.
.Sh FILES
-.Bl -tag -width /etc/master.passwd -compact
+.Bl -tag -width /var/tmp/pw.XXXXXXXX -compact
.It Pa /etc/master.passwd
-The user database
+user database
.It Pa /etc/passwd
-A Version 7 format password file
+a Version 7 format password file
.It Pa /etc/ptmp
-Lock file for the passwd database
+lock file for the passwd database
.It Pa /var/tmp/pw.XXXXXXXX
-Temporary copy of the user passwd information
+temporary copy of the user passwd information
.It Pa /etc/shells
-The list of approved shells
+list of approved shells
.El
.Sh SEE ALSO
.Xr login 1 ,
diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1
index d697ca58b5b..a998f17199d 100644
--- a/usr.bin/cksum/cksum.1
+++ b/usr.bin/cksum/cksum.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cksum.1,v 1.6 1998/02/16 10:56:20 deraadt Exp $
+.\" $OpenBSD: cksum.1,v 1.7 1998/09/23 04:32:37 aaron Exp $
.\" $NetBSD: cksum.1,v 1.8 1995/09/02 05:45:15 jtc Exp $
.\"
.\" Copyright (c) 1991, 1993
@@ -156,7 +156,7 @@ The
.Nm cksum
and
.Nm sum
-utilities exit 0 on success, and >0 if an error occurs.
+utilities exit 0 on success or >0 if an error occurred.
.Sh WARNING
Do not use
.Nm sum
@@ -164,7 +164,7 @@ or
.Nm cksum
to detect hostile binary modifications. An attacker
can trivially produce backdoored daemons which have the same CRC as the
-standard versions. Use a cryptographic checksum, such as MD5 instead.
+standard versions. Use a cryptographic checksum (such as MD5) instead.
.Sh SEE ALSO
.Xr md5 1 ,
.Xr rmd160 1 ,
diff --git a/usr.bin/cmp/cmp.1 b/usr.bin/cmp/cmp.1
index 85df2f9ed00..06fd8f12a36 100644
--- a/usr.bin/cmp/cmp.1
+++ b/usr.bin/cmp/cmp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cmp.1,v 1.3 1998/05/26 07:22:21 deraadt Exp $
+.\" $OpenBSD: cmp.1,v 1.4 1998/09/23 04:32:37 aaron Exp $
.\" $NetBSD: cmp.1,v 1.4 1995/09/08 03:22:55 tls Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
@@ -49,7 +49,9 @@
.Ar file1 file2
.Op Ar skip1 Op Ar skip2
.Sh DESCRIPTION
-The cmp utility compares two files of any type and writes the results
+The
+.Nm cmp
+utility compares two files of any type and writes the results
to the standard output.
By default,
.Nm
@@ -77,7 +79,7 @@ are the byte offsets from the beginning of
and
.Ar file2 ,
respectively, where the comparison will begin.
-The offset is decimal by default, but may be expressed as an hexadecimal
+The offset is decimal by default, but may be expressed as a hexadecimal
or octal value by preceding it with a leading ``0x'' or ``0''.
.Pp
The
diff --git a/usr.bin/col/col.1 b/usr.bin/col/col.1
index f891c96ebb1..c232b694b42 100644
--- a/usr.bin/col/col.1
+++ b/usr.bin/col/col.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: col.1,v 1.2 1996/06/26 05:32:09 deraadt Exp $
+.\" $OpenBSD: col.1,v 1.3 1998/09/23 04:32:37 aaron Exp $
.\" $NetBSD: col.1,v 1.4 1995/03/26 05:25:52 glass Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -48,7 +48,7 @@
.Op Fl bfx
.Op Fl l Ar num
.Sh DESCRIPTION
-.Nm Col
+.Nm col
filters out reverse (and half reverse) line feeds so that the output is
in the correct order with only forward and half forward line
feeds, and replaces white-space characters with tabs where possible.
@@ -57,7 +57,7 @@ This can be useful in processing the output of
and
.Xr tbl 1 .
.Pp
-.Nm Col
+.Nm col
reads from the standard input and writes to the standard output.
.Pp
The options are as follows:
@@ -111,7 +111,7 @@ reverse line feed (11)
All unrecognized control characters and escape sequences are
discarded.
.Pp
-.Nm Col
+.Nm col
keeps track of the character set as characters are read and makes
sure the character set is correct when they are output.
.Pp
diff --git a/usr.bin/colcrt/colcrt.1 b/usr.bin/colcrt/colcrt.1
index 36c86606f96..4a4063162aa 100644
--- a/usr.bin/colcrt/colcrt.1
+++ b/usr.bin/colcrt/colcrt.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: colcrt.1,v 1.2 1996/06/26 05:32:11 deraadt Exp $
+.\" $OpenBSD: colcrt.1,v 1.3 1998/09/23 04:32:37 aaron Exp $
.\" $NetBSD: colcrt.1,v 1.3 1995/03/26 05:30:59 glass Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -46,7 +46,7 @@
.Op Fl \&2
.Op Ar
.Sh DESCRIPTION
-.Nm Colcrt
+.Nm colcrt
provides virtual half-line and reverse line feed sequences
for terminals without such capability, and on which overstriking
is destructive.
@@ -79,10 +79,10 @@ would be
tbl exum2.n \&| nroff \-ms \&| colcrt \- \&| more
.Ed
.Sh SEE ALSO
-.Xr nroff 1 ,
-.Xr troff 1 ,
.Xr col 1 ,
.Xr more 1 ,
+.Xr nroff 1 ,
+.Xr troff 1 ,
.Xr ul 1
.Sh BUGS
Should fold underlines onto blanks even with the
diff --git a/usr.bin/colrm/colrm.1 b/usr.bin/colrm/colrm.1
index 7735cb76799..c3c3a28a303 100644
--- a/usr.bin/colrm/colrm.1
+++ b/usr.bin/colrm/colrm.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: colrm.1,v 1.2 1996/06/26 05:32:13 deraadt Exp $
+.\" $OpenBSD: colrm.1,v 1.3 1998/09/23 04:32:37 aaron Exp $
.\" $NetBSD: colrm.1,v 1.3 1995/03/26 09:04:01 glass Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -44,7 +44,7 @@
.Nm colrm
.Op Ar start Op Ar stop
.Sh DESCRIPTION
-.Nm Colrm
+.Nm colrm
removes selected columns from the lines of a file.
A column is defined as a single character in a line.
Input is read from the standard input.
diff --git a/usr.bin/column/column.1 b/usr.bin/column/column.1
index c86af094ab4..ac5310c7b23 100644
--- a/usr.bin/column/column.1
+++ b/usr.bin/column/column.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: column.1,v 1.2 1996/06/26 05:32:15 deraadt Exp $
+.\" $OpenBSD: column.1,v 1.3 1998/09/23 04:32:37 aaron Exp $
.\" $NetBSD: column.1,v 1.3 1995/03/26 09:08:28 glass Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -58,11 +58,11 @@ Empty lines are ignored.
.Pp
The options are as follows:
.Bl -tag -width Ds
-.It Fl c
+.It Fl c Ar columns
Output is formatted for a display
.Ar columns
wide.
-.It Fl s
+.It Fl s Ar sep
Specify a set of characters to be used to delimit columns for the
.Fl t
option.
@@ -77,8 +77,9 @@ Useful for pretty-printing displays.
Fill columns before filling rows.
.El
.Pp
-.Nm Column
-exits 0 on success, >0 if an error occurred.
+The
+.Nm column
+utility exits 0 on success or >0 if an error occurred.
.Sh ENVIRONMENT
.Bl -tag -width COLUMNS
.It Ev COLUMNS
diff --git a/usr.bin/comm/comm.1 b/usr.bin/comm/comm.1
index 8d55d78b0b1..78a461e56b0 100644
--- a/usr.bin/comm/comm.1
+++ b/usr.bin/comm/comm.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: comm.1,v 1.2 1996/06/26 05:32:17 deraadt Exp $
+.\" $OpenBSD: comm.1,v 1.3 1998/09/23 04:32:38 aaron Exp $
.\" $NetBSD: comm.1,v 1.4 1995/03/26 09:25:50 glass Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -80,7 +80,7 @@ For example, if column number two is being suppressed, lines printed
in column number one will not have any tabs preceding them, and lines
printed in column number three will have one.
.Pp
-.Nm Comm
+.Nm comm
assumes that the files are lexically sorted; all characters
participate in line comparisons.
.\" .Sh ENVIRONMENT
@@ -92,8 +92,9 @@ participate in line comparisons.
.\" .It Ev LC_MESSAGES
.\" .El
.Sh DIAGNOSTICS
-.Nm Comm
-exits 0 on success, >0 if an error occurred.
+The
+.Nm comm
+utility exits 0 on success or >0 if an error occurred.
.Sh SEE ALSO
.Xr cmp 1 ,
.Xr diff 1 ,
diff --git a/usr.bin/compile_et/compile_et.1 b/usr.bin/compile_et/compile_et.1
index b03b1d86e92..a08df6996bc 100644
--- a/usr.bin/compile_et/compile_et.1
+++ b/usr.bin/compile_et/compile_et.1
@@ -1,8 +1,8 @@
.\" Copyright (c) 1988 Massachusetts Institute of Technology,
.\" Student Information Processing Board. All rights reserved.
.\"
-.\" $OpenBSD: compile_et.1,v 1.3 1997/07/01 07:22:04 grr Exp $
-.\" $Header: /cvs/OpenBSD/src/usr.bin/compile_et/compile_et.1,v 1.3 1997/07/01 07:22:04 grr Exp $
+.\" $OpenBSD: compile_et.1,v 1.4 1998/09/23 04:32:38 aaron Exp $
+.\" $Header: /cvs/OpenBSD/src/usr.bin/compile_et/compile_et.1,v 1.4 1998/09/23 04:32:38 aaron Exp $
.\"
.Dd November 22, 1988
.Os
@@ -14,7 +14,7 @@
.Nm compile_et
.Ar file
.Sh DESCRIPTION
-.Nm Compile_et
+.Nm compile_et
converts a table listing error-code names and associated messages into
a C source file suitable for use with the
.Xr com_err 3
diff --git a/usr.bin/compress/compress.1 b/usr.bin/compress/compress.1
index 8d039b39c80..1ea33dc407a 100644
--- a/usr.bin/compress/compress.1
+++ b/usr.bin/compress/compress.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: compress.1,v 1.5 1997/08/19 06:33:37 denny Exp $
+.\" $OpenBSD: compress.1,v 1.6 1998/09/23 04:32:38 aaron Exp $
.\" $NetBSD: compress.1,v 1.5 1995/03/26 09:44:34 glass Exp $
.\"
.\" Copyright (c) 1986, 1990, 1993
@@ -60,7 +60,7 @@
.\".Nm zcat
.\".Op Ar
.Sh DESCRIPTION
-.Nm Compress
+.Nm compress
reduces the size of the named files using adaptive Lempel-Ziv coding.
Each
.Ar file
@@ -73,7 +73,7 @@ If compression would not reduce the size of a
.Ar file ,
the file is ignored.
.Pp
-.Nm Uncompress
+.Nm uncompress
restores the compressed files to their original form, renaming the
files by deleting the
.Dq .Z
@@ -97,7 +97,7 @@ not removed, and the attributes of the input file are not retained.
.Pp
The options are as follows:
.Bl -tag -width Ds
-.It Fl b
+.It Fl b Ar bits
Specify the
.Ar bits
code limit (see below).
@@ -112,20 +112,20 @@ Force compression of
even if it is not actually reduced in size.
Additionally, files are overwritten without prompting for confirmation.
.It Fl g
-Use deflate scheme wich reported to provide better compression rates.
+Use deflate scheme which reportedly provides better compression rates.
.It Fl O
Use old compression method (default is based on the program name).
-.It Fl o
+.It Fl o Ar filename
Set the output file name.
.It Fl t
-Test the entefrity of each file leaving any files intact.
+Test the integrity of each file leaving any files intact.
.It Fl q
-Be quite, suppress any messages.
+Be quiet, suppress any messages.
.It Fl v
Print the percentage reduction of each file.
.El
.Pp
-.Nm Compress
+.Nm compress
uses a modified Lempel-Ziv algorithm.
Common substrings in the file are first replaced by 9-bit codes 257 and up.
When code 512 is reached, the algorithm switches to 10-bit codes and
@@ -133,7 +133,7 @@ continues to use more bits until the
limit specified by the
.Fl b
flag is reached (the default is 16).
-.Ar Bits
+.Ar bits
must be between 9 and 16.
.Pp
After the
@@ -173,9 +173,11 @@ time to compute.
.Pp
The
.Nm compress
-utility exits 0 on success, 1 if an error occurs, and 2 if one or
+utility exits 0 on success, 1 if an error occurred, or 2 if one or
more files were not compressed because they would have grown in
-size (and -f was not specifed).
+size (and
+.Fl f
+was not specifed).
.Sh SEE ALSO
.Rs
.%A Welch, Terry A.
@@ -196,5 +198,5 @@ The
.Nm
command appeared in
.Bx 4.3 .
-The deflate compression support added in
+The deflate compression support was added in
.Ox 2.1 .
diff --git a/usr.bin/ctags/ctags.1 b/usr.bin/ctags/ctags.1
index 41f30dc5400..eafed6d2985 100644
--- a/usr.bin/ctags/ctags.1
+++ b/usr.bin/ctags/ctags.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ctags.1,v 1.2 1996/06/26 05:32:27 deraadt Exp $
+.\" $OpenBSD: ctags.1,v 1.3 1998/09/23 04:32:38 aaron Exp $
.\" $NetBSD: ctags.1,v 1.4 1995/03/26 20:14:04 glass Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
@@ -46,7 +46,7 @@
.Op Fl f Ar tagsfile
.Ar name ...
.Sh DESCRIPTION
-.Nm Ctags
+.Nm ctags
makes a tags file for
.Xr ex 1
from the specified C,
@@ -65,21 +65,21 @@ can quickly locate these object definitions.
Depending upon the options provided to
.Nm ctags ,
objects will consist of subroutines, typedefs, defines, structs,
-enums and unions.
+enums, and unions.
.Bl -tag -width Ds
.It Fl B
-use backward searching patterns
+Use backward searching patterns
.Pq Li ?...? .
.It Fl F
-use forward searching patterns
+Use forward searching patterns
.Pq Li /.../
(the default).
.It Fl a
-append to
+Append to
.Ar tags
file.
.It Fl d
-create tags for
+Create tags for
.Li #defines
that don't take arguments;
.Li #defines
@@ -90,9 +90,9 @@ Places the tag descriptions in a file called
The default behaviour is to place them in a file called
.Ar tags .
.It Fl t
-create tags for typedefs, structs, unions, and enums.
+Create tags for typedefs, structs, unions, and enums.
.It Fl u
-update the specified files in the
+Update the specified files in the
.Ar tags
file, that is, all
references to them are deleted, and the new values are appended to the
@@ -114,7 +114,7 @@ ctags \-v files \&| sort \-f > index
vgrind \-x index
.Ed
.It Fl w
-suppress warning diagnostics.
+Suppress warning diagnostics.
.It Fl x
.Nm ctags
produces a list of object
@@ -171,7 +171,7 @@ the second section of the lex file.
default output tags file
.El
.Sh DIAGNOSTICS
-.Nm Ctags
+.Nm ctags
exits with a value of 1 if an error occurred, 0 otherwise.
Duplicate objects are not considered errors.
.Sh SEE ALSO
@@ -185,10 +185,10 @@ and
.Nm procedures
for
.Tn FORTRAN
-and Pascal is done is a very simpleminded way. No attempt
+and Pascal is done is a very simple-minded way. No attempt
is made to deal with block structure; if you have two Pascal procedures
in different blocks with the same name you lose.
-.Nm Ctags
+.Nm ctags
doesn't
understand about Pascal types.
.Pp
@@ -196,7 +196,7 @@ The method of deciding whether to look for C, Pascal or
.Tn FORTRAN
functions is a hack.
.Pp
-.Nm Ctags
+.Nm ctags
relies on the input being well formed, and any syntactical
errors will completely confuse it. It also finds some legal syntax
confusing; for example, since it doesn't understand
diff --git a/usr.bin/cut/cut.1 b/usr.bin/cut/cut.1
index effb38702ee..5fb43ca8978 100644
--- a/usr.bin/cut/cut.1
+++ b/usr.bin/cut/cut.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cut.1,v 1.2 1996/06/26 05:32:33 deraadt Exp $
+.\" $OpenBSD: cut.1,v 1.3 1998/09/23 04:32:38 aaron Exp $
.\" $NetBSD: cut.1,v 1.6 1995/10/02 20:19:26 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -70,11 +70,11 @@ The items specified by
can be in terms of column position or in terms of fields delimited
by a special character. Column numbering starts from 1.
.Pp
-.Ar List
+.Ar list
is a comma or whitespace separated set of increasing numbers and/or
number ranges.
Number ranges consist of a number, a dash
-.Pq Li \- ,
+.Pq Sq \- ,
and a second number
and select the fields or columns from the first number to the second,
inclusive.
@@ -112,8 +112,9 @@ Suppresses lines with no field delimiter characters.
Unless specified, lines with no delimiters are passed through unmodified.
.El
.Pp
-.Nm Cut
-exits 0 on success, 1 if an error occurred.
+The
+.Nm cut
+utility exits 0 on success or 1 if an error occurred.
.Sh SEE ALSO
.Xr paste 1
.Sh STANDARDS
diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1
index 9276748c075..5c86039fbb7 100644
--- a/usr.bin/du/du.1
+++ b/usr.bin/du/du.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: du.1,v 1.7 1998/06/22 21:33:56 millert Exp $
+.\" $OpenBSD: du.1,v 1.8 1998/09/23 04:32:38 aaron Exp $
.\" $NetBSD: du.1,v 1.6 1996/10/18 07:20:31 thorpej Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -49,7 +49,9 @@
.Sh DESCRIPTION
The
.Nm du
-utility displays the file system block usage for each file argument
+utility displays the file system block usage for each
+.Ar file
+argument
and for each directory in the file hierarchy rooted in each directory
argument. Note that the system block usage is usually greater than
the actual size of the file.
@@ -91,7 +93,7 @@ This option exists solely for conformance with
Filesystem mount points are not traversed.
.El
.Pp
-.Nm Du
+.Nm du
counts the storage used by symbolic links and not the files they
reference unless the
.Fl H
diff --git a/usr.bin/elf2aout/elf2aout.1 b/usr.bin/elf2aout/elf2aout.1
index c9147cbe8b1..0fb639b291b 100644
--- a/usr.bin/elf2aout/elf2aout.1
+++ b/usr.bin/elf2aout/elf2aout.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: elf2aout.1,v 1.3 1998/06/12 12:09:44 d Exp $
+.\" $OpenBSD: elf2aout.1,v 1.4 1998/09/23 04:32:38 aaron Exp $
.\"
.\" Copyright (c) 1996 Per Fogelstrom
.\"
@@ -40,15 +40,15 @@
.Nm elf2aout
.Op Ar elfexec
.Oo
-.Ar ecoffexec
+.Ar aoutexec
.Oc
.Sh DESCRIPTION
.Nm elf2aout
-reads and convert the file specified as
+reads and converts the file specified as
.Ar elfexec
to a.out format, into file
-.Ar aoutexec
-, suitable for bootstrapping certain
+.Ar aoutexec ,
+suitable for bootstrapping certain
.Nm MIPS
systems.
The systems currently requiring this
diff --git a/usr.bin/elf2ecoff/elf2ecoff.1 b/usr.bin/elf2ecoff/elf2ecoff.1
index 3b1a1e5b6f7..3b60e6fa1e3 100644
--- a/usr.bin/elf2ecoff/elf2ecoff.1
+++ b/usr.bin/elf2ecoff/elf2ecoff.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: elf2ecoff.1,v 1.1 1996/10/02 21:52:32 pefo Exp $
+.\" $OpenBSD: elf2ecoff.1,v 1.2 1998/09/23 04:32:39 aaron Exp $
.\"
.\" Copyright (c) 1996 Per Fogelstrom
.\"
@@ -44,16 +44,16 @@
.Oc
.Sh DESCRIPTION
.Nm elf2ecoff
-reads and convert the file specified as
+reads and converts the file specified as
.Ar elfexec
to ecoff format, into file
-.Ar ecoffexec
-, suitable for bootstrapping certain
+.Ar ecoffexec ,
+suitable for bootstrapping certain
.Nm MIPS
-systems. Systems requiering this
-conversion is the
+systems. Systems requiring this
+conversion are the
.Nm arc
and
-.Nm pmax.
+.Nm pmax .
.Sh DIAGNOSTICS
If the conversion fails a diagnostic message is printed to explain the cause.
diff --git a/usr.bin/elf2olf/elf2olf.1 b/usr.bin/elf2olf/elf2olf.1
index 8432b9c6d54..2ecb0e36281 100644
--- a/usr.bin/elf2olf/elf2olf.1
+++ b/usr.bin/elf2olf/elf2olf.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: elf2olf.1,v 1.4 1998/03/10 04:51:00 millert Exp $
+.\" $OpenBSD: elf2olf.1,v 1.5 1998/09/23 04:32:39 aaron Exp $
.\"
.\" Copyright (c) 1996, 1997 Erik Theisen.
.\" All rights reserved.
@@ -25,7 +25,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" @(#)$Id: elf2olf.1,v 1.4 1998/03/10 04:51:00 millert Exp $
+.\" @(#)$Id: elf2olf.1,v 1.5 1998/09/23 04:32:39 aaron Exp $
.\"
.Dd May 5, 1997
.Dt ELF2OLF 1
@@ -38,10 +38,10 @@
.Nm elf2olf
.Op Fl v
.Op Fl o Ar opsys
-.Ar module ...
+.Ar module Op Ar ...
.Nm olf2elf
.Op Fl v
-.Ar file ...
+.Ar file Op Ar ...
.Sh DESCRIPTION
The
.Nm elf2olf
@@ -86,7 +86,7 @@ The
.Nm elf2olf
and
.Nm olf2elf
-utilities exit 0 on success, and >0 if an error occurs.
+utilities exit 0 on success or >0 if an error occurred.
.Sh BUGS
The
.Em ELF
@@ -109,5 +109,5 @@ The
.Nm elf2olf
and
.Nm olf2elf
-utility first appeared in
+utilities first appeared in
.Ox 2.1 .
diff --git a/usr.bin/encrypt/encrypt.1 b/usr.bin/encrypt/encrypt.1
index 985f836bb10..15533004ac4 100644
--- a/usr.bin/encrypt/encrypt.1
+++ b/usr.bin/encrypt/encrypt.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: encrypt.1,v 1.7 1998/09/05 17:41:47 deraadt Exp $
+.\" $OpenBSD: encrypt.1,v 1.8 1998/09/23 04:32:39 aaron Exp $
.\"
.\" Copyright (c) 1996, Jason Downs. All rights reserved.
.\"
@@ -68,7 +68,7 @@ is specified,
.Nm encrypt
reads one string per line from standard input, encrypting each one
with the chosen algorithm from above. In case that no specific algorithm
-was given as command line option, the default will be looked up from
+was given as a command line option, the default will be looked up from
.Ar passwd.conf(5) .
.Pp
For MD5 and Blowfish a new random salt is automatically generated for each
@@ -84,8 +84,8 @@ standard input is more secure.
.El
.Sh SEE ALSO
.Xr crypt 3 ,
-.Xr passwd.conf 5 ,
-.Xr pw_getconf 3
+.Xr pw_getconf 3 ,
+.Xr passwd.conf 5
.Sh HISTORY
.Nm encrypt
first appeared in
diff --git a/usr.bin/env/env.1 b/usr.bin/env/env.1
index a4e86efecba..333395b881d 100644
--- a/usr.bin/env/env.1
+++ b/usr.bin/env/env.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: env.1,v 1.3 1996/06/26 05:32:39 deraadt Exp $
+.\" $OpenBSD: env.1,v 1.4 1998/09/23 04:32:39 aaron Exp $
.\" Copyright (c) 1980, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -46,7 +46,7 @@
.Op Ar name=value ...
.Oo
.Ar utility
-.Op argument ...
+.Op Ar argument ...
.Oc
.Sh DESCRIPTION
.Nm env
@@ -60,8 +60,9 @@ an environment variable,
.Ar name ,
with a value of
.Ar value .
-The option
-.Sq Fl i
+The
+.Fl i
+option
causes
.Nm env
to completely ignore the environment
@@ -81,7 +82,7 @@ If the
is invoked, the exit status of
.Nm env
shall be the exit status of
-.Ar utility;
+.Ar utility ;
otherwise, the
.Nm env
utility exits with one of the following values:
@@ -89,7 +90,7 @@ utility exits with one of the following values:
.It 0
The
.Nm env
-utility completed successfully
+utility completed successfully.
.It 1-125
An error occurred in the
.Nm env
@@ -116,8 +117,8 @@ The
utility conforms to
.St -p1003.2-92 .
.Sh BUGS
-.Nm Env
+.Nm env
doesn't handle commands with equal
-.Pq Dq =
+.Pq Sq =
signs in their
names, for obvious reasons.
diff --git a/usr.bin/error/error.1 b/usr.bin/error/error.1
index 64b1582ffdd..d242e67758f 100644
--- a/usr.bin/error/error.1
+++ b/usr.bin/error/error.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: error.1,v 1.4 1998/08/30 22:45:17 deraadt Exp $
+.\" $OpenBSD: error.1,v 1.5 1998/09/23 04:32:39 aaron Exp $
.\" $NetBSD: error.1,v 1.3 1995/09/02 06:15:20 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -48,9 +48,9 @@
.Op Fl v
.Op Fl t Ar suffixlist
.Op Fl I Ar ignorefile
-.Op name
+.Op Ar name
.Sh DESCRIPTION
-.Nm Error
+.Nm error
analyzes and optionally disperses the diagnostic error messages
produced by a number of compilers and language processors to the source
file and line where the errors occurred. It can replace the painful,
@@ -88,7 +88,7 @@ can't be found, try
or
.Xr \&ed 1
from standard places.
-.It Fl t
+.It Fl t Ar suffixlist
Take the following argument as a suffix list.
Files whose suffixes do not appear in the suffix list are not touched.
The suffix list is dot separated, and ``*'' wildcards work.
@@ -106,25 +106,25 @@ regarding the error categorization.
Not too useful.
.El
.Pp
-.Nm Error
+.Nm error
looks at the error messages,
either from the specified file
.Ar name
or from the standard input,
and attempts to determine which
language processor produced each error message,
-determines the source file and line number to which the error message refers,
-determines if the error message is to be ignored or not,
+the source file and line number to which the error message refers,
+if the error message is to be ignored or not,
and inserts the (possibly slightly modified) error message into
the source file as a comment on the line preceding to which the
line the error message refers.
Error messages which can't be categorized by language processor
or content are not inserted into any file,
but are sent to the standard output.
-.Nm Error
+.Nm error
touches source files only after all input has been read.
.Pp
-.Nm Error
+.Nm error
is intended to be run
with its standard input
connected via a pipe to the error message source.
@@ -143,7 +143,7 @@ by whatever programs
.Xr make 1
runs when making lint.
.Pp
-.Nm Error
+.Nm error
knows about the error messages produced by:
.Xr make 1 ,
.Xr \&cc 1 ,
@@ -157,26 +157,25 @@ knows about the error messages produced by:
.Xr f77 1 ,
and
.Em DEC Western Research Modula\-2 .
-.Nm Error
+.Nm error
knows a standard format for error messages produced by
the language processors,
so is sensitive to changes in these formats.
-For all languages except
-.Em Pascal ,
+For all languages except Pascal,
error messages are restricted to be on one line.
Some error messages refer to more than one line in more than
-one files;
+one file;
.Nm error
will duplicate the error message and insert it at
all of the places referenced.
.Pp
-.Nm Error
+.Nm error
will do one of six things with error messages.
.Bl -tag -width Em synchronize
.It Em synchronize
Some language processors produce short errors describing
which file it is processing.
-.Nm Error
+.Nm error
uses these to determine the file name for languages that
don't include the file name in each error message.
These synchronization messages are consumed entirely by
@@ -189,7 +188,7 @@ that refer to one of the two
libraries,
.Pa /usr/libdata/lint/llib-lc
and
-.Pa /usr/libdata/lint/llib-port
+.Pa /usr/libdata/lint/llib-port ,
are discarded,
to prevent accidentally touching these libraries.
Again, these error messages are consumed entirely by
@@ -231,7 +230,7 @@ the file they refer to.
Other error messages are consumed entirely by
.Nm error
or are written to the standard output.
-.Nm Error
+.Nm error
inserts the error messages into the source file on the line
preceding the line the language processor found in error.
Each error message is turned into a one line comment for the
@@ -255,7 +254,7 @@ To avoid this, programs with comments and source
on the same line should be formatted
so that language statements appear before comments.
.Pp
-.Nm Error
+.Nm error
catches interrupt and terminate signals,
and if in the insertion phase,
will orderly terminate what it is doing.
@@ -277,7 +276,6 @@ appeared in
.Sh AUTHOR
Robert Henry
.Sh BUGS
-.Pp
Opens the teletype directly to do user querying.
.Pp
Source files with links make a new copy of the file with
@@ -288,7 +286,7 @@ may cause
.Nm error
to not understand the error message.
.Pp
-.Nm Error ,
+.Nm error ,
since it is purely mechanical,
will not filter out subsequent errors caused by `floodgating'
initiated by one syntactically trivial error.
@@ -299,9 +297,9 @@ Pascal error messages belong after the lines affected
the point of error is also disturbed by
.Nm error .
.Pp
-.Nm Error
+.Nm error
was designed for work on
-.Tn CRT Ns 's
+.Tn CRT Ns s
at reasonably high speed.
It is less pleasant on slow speed terminals, and has never been
used on hardcopy terminals.
diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1
index 43a83d56773..b9b17b49b7f 100644
--- a/usr.bin/expand/expand.1
+++ b/usr.bin/expand/expand.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: expand.1,v 1.2 1996/06/26 05:32:47 deraadt Exp $
+.\" $OpenBSD: expand.1,v 1.3 1998/09/23 04:32:39 aaron Exp $
.\" $NetBSD: expand.1,v 1.3 1995/09/02 06:19:45 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -44,31 +44,31 @@
.Sh SYNOPSIS
.Nm expand
.Op Fl Ns Ar tabstop
-.Op Fl Ns Ar tab1,tab2,...,tabn
-.Ar
+.Op Fl Ns Ar tab1 , tab2 , ... , tabn
+.Ar file Op Ar ...
.Nm unexpand
.Op Fl a
-.Ar
+.Ar file Op Ar ...
.Sh DESCRIPTION
-.Nm Expand
+.Nm expand
processes the named files or the standard input writing
the standard output with tabs changed into blanks.
Backspace characters are preserved into the output and decrement
the column count for tab calculations.
-.Nm Expand
+.Nm expand
is useful for pre-processing character files
(before sorting, looking at specific columns, etc.) that
contain tabs.
.Pp
If a single
.Ar tabstop
-argument is given, then tabs are set
+argument is given, tabs are set
.Ar tabstop
spaces apart instead of the default 8.
If multiple tabstops are given then the tabs are set at those
specific columns.
.Pp
-.Nm Unexpand
+.Nm unexpand
puts tabs back into the data from the standard input or the named
files and writes the result on the standard output.
.Pp
@@ -80,7 +80,7 @@ only):
By default, only leading blanks and tabs
are reconverted to maximal strings of tabs. If the
.Fl a
-option is given, then tabs are inserted whenever they would compress the
+option is given, tabs are inserted whenever they would compress the
resultant file by replacing two or more characters.
.El
.Sh HISTORY