summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr.bin/apply/apply.16
-rw-r--r--usr.bin/ar/ar.1135
-rw-r--r--usr.bin/at/at.112
-rw-r--r--usr.bin/aucat/aucat.16
-rw-r--r--usr.bin/audioctl/audioctl.18
-rw-r--r--usr.bin/awk/awk.116
-rw-r--r--usr.bin/banner/banner.120
-rw-r--r--usr.bin/basename/basename.14
-rw-r--r--usr.bin/basename/dirname.16
-rw-r--r--usr.bin/bdes/bdes.14
-rw-r--r--usr.bin/biff/biff.16
-rw-r--r--usr.bin/cal/cal.14
-rw-r--r--usr.bin/cap_mkdb/cap_mkdb.118
-rw-r--r--usr.bin/cdio/cdio.146
-rw-r--r--usr.bin/checknr/checknr.16
-rw-r--r--usr.bin/chpass/chpass.14
-rw-r--r--usr.bin/cksum/cksum.110
-rw-r--r--usr.bin/cmp/cmp.14
-rw-r--r--usr.bin/col/col.150
-rw-r--r--usr.bin/colcrt/colcrt.115
-rw-r--r--usr.bin/colrm/colrm.16
-rw-r--r--usr.bin/column/column.16
-rw-r--r--usr.bin/comm/comm.112
-rw-r--r--usr.bin/compress/compress.16
-rw-r--r--usr.bin/ctags/ctags.16
-rw-r--r--usr.bin/cut/cut.14
-rw-r--r--usr.bin/du/du.110
-rw-r--r--usr.bin/elf2aout/elf2aout.14
-rw-r--r--usr.bin/elf2ecoff/elf2ecoff.14
-rw-r--r--usr.bin/elf2olf/elf2olf.18
-rw-r--r--usr.bin/encrypt/encrypt.18
-rw-r--r--usr.bin/env/env.146
-rw-r--r--usr.bin/error/error.14
-rw-r--r--usr.bin/expand/expand.14
-rw-r--r--usr.bin/false/false.110
-rw-r--r--usr.bin/file/file.144
-rw-r--r--usr.bin/file2c/file2c.18
-rw-r--r--usr.bin/find/find.1326
-rw-r--r--usr.bin/finger/finger.14
-rw-r--r--usr.bin/fold/fold.116
-rw-r--r--usr.bin/from/from.110
-rw-r--r--usr.bin/fsplit/fsplit.16
-rw-r--r--usr.bin/fstat/fstat.16
-rw-r--r--usr.bin/ftp/ftp.118
-rw-r--r--usr.bin/gencat/gencat.16
-rw-r--r--usr.bin/getconf/getconf.114
-rw-r--r--usr.bin/gprof/gprof.116
-rw-r--r--usr.bin/head/head.112
-rw-r--r--usr.bin/hexdump/hexdump.118
-rw-r--r--usr.bin/id/id.14
-rw-r--r--usr.bin/indent/indent.122
-rw-r--r--usr.bin/ipcrm/ipcrm.112
-rw-r--r--usr.bin/kdump/kdump.110
-rw-r--r--usr.bin/ktrace/ktrace.112
-rw-r--r--usr.bin/last/last.114
-rw-r--r--usr.bin/lastcomm/lastcomm.14
-rw-r--r--usr.bin/learn/src/learn.122
-rw-r--r--usr.bin/lex/flex.118
-rw-r--r--usr.bin/lndir/lndir.144
-rw-r--r--usr.bin/locate/locate/locate.1154
-rw-r--r--usr.bin/locate/locate/locate.updatedb.86
-rw-r--r--usr.bin/lock/lock.18
-rw-r--r--usr.bin/logger/logger.122
-rw-r--r--usr.bin/login/login.126
-rw-r--r--usr.bin/logname/logname.114
-rw-r--r--usr.bin/look/look.112
-rw-r--r--usr.bin/mail/mail.118
-rw-r--r--usr.bin/make/make.1205
-rw-r--r--usr.bin/man/man.158
-rw-r--r--usr.bin/man/man.conf.56
-rw-r--r--usr.bin/midiplay/midiplay.16
-rw-r--r--usr.bin/mkdep/mkdep.118
-rw-r--r--usr.bin/more/more.116
-rw-r--r--usr.bin/msgs/msgs.14
-rw-r--r--usr.bin/nc/nc.142
-rw-r--r--usr.bin/netstat/netstat.112
-rw-r--r--usr.bin/newsyslog/newsyslog.884
-rw-r--r--usr.bin/nfsstat/nfsstat.110
-rw-r--r--usr.bin/nice/nice.146
-rw-r--r--usr.bin/nm/nm.16
-rw-r--r--usr.bin/nohup/nohup.112
-rw-r--r--usr.bin/oldrdist/oldrdist.14
-rw-r--r--usr.bin/pagesize/pagesize.14
-rw-r--r--usr.bin/passwd/passwd.118
-rw-r--r--usr.bin/paste/paste.14
-rw-r--r--usr.bin/patch/patch.16
-rw-r--r--usr.bin/pr/pr.126
-rw-r--r--usr.bin/printf/printf.118
-rw-r--r--usr.bin/quota/quota.16
-rw-r--r--usr.bin/rdist/rdist.1170
-rw-r--r--usr.bin/rdistd/rdistd.14
-rw-r--r--usr.bin/renice/renice.810
-rw-r--r--usr.bin/rlogin/rlogin.14
-rw-r--r--usr.bin/rpcinfo/rpcinfo.84
-rw-r--r--usr.bin/rsh/rsh.14
-rw-r--r--usr.bin/rup/rup.116
-rw-r--r--usr.bin/ruptime/ruptime.14
-rw-r--r--usr.bin/rusers/rusers.14
-rw-r--r--usr.bin/rwall/rwall.14
-rw-r--r--usr.bin/rwho/rwho.14
-rw-r--r--usr.bin/script/script.118
-rw-r--r--usr.bin/shar/shar.14
-rw-r--r--usr.bin/size/size.18
-rw-r--r--usr.bin/skey/skey.16
-rw-r--r--usr.bin/skeyaudit/skeyaudit.16
-rw-r--r--usr.bin/soelim/soelim.14
-rw-r--r--usr.bin/sort/sort.110
-rw-r--r--usr.bin/split/split.14
-rw-r--r--usr.bin/strings/strings.120
-rw-r--r--usr.bin/su/su.160
-rw-r--r--usr.bin/sup/src/sup.163
-rw-r--r--usr.bin/sup/src/supservers.872
-rw-r--r--usr.bin/systat/systat.112
-rw-r--r--usr.bin/tail/tail.18
-rw-r--r--usr.bin/talk/talk.14
-rw-r--r--usr.bin/tcopy/tcopy.14
-rw-r--r--usr.bin/telnet/telnet.196
-rw-r--r--usr.bin/tftp/tftp.18
-rw-r--r--usr.bin/tic/tic.18
-rw-r--r--usr.bin/time/time.132
-rw-r--r--usr.bin/tip/tip.1194
-rw-r--r--usr.bin/tn3270/mset/map3270.56
-rw-r--r--usr.bin/tn3270/mset/mset.14
-rw-r--r--usr.bin/tn3270/tn3270/tn3270.16
-rw-r--r--usr.bin/top/top.116
-rw-r--r--usr.bin/tput/tput.14
-rw-r--r--usr.bin/true/true.18
-rw-r--r--usr.bin/tty/tty.14
-rw-r--r--usr.bin/ul/ul.16
-rw-r--r--usr.bin/uname/uname.18
-rw-r--r--usr.bin/unifdef/unifdef.14
-rw-r--r--usr.bin/units/units.148
-rw-r--r--usr.bin/unvis/unvis.14
-rw-r--r--usr.bin/users/users.14
-rw-r--r--usr.bin/uuencode/uuencode.114
-rw-r--r--usr.bin/vacation/vacation.14
-rw-r--r--usr.bin/vgrind/vgrind.156
-rw-r--r--usr.bin/vi/docs/USD.doc/vi.man/vi.14
-rw-r--r--usr.bin/vis/vis.14
-rw-r--r--usr.bin/vmstat/vmstat.84
-rw-r--r--usr.bin/w/uptime.14
-rw-r--r--usr.bin/w/w.112
-rw-r--r--usr.bin/wall/wall.14
-rw-r--r--usr.bin/what/what.14
-rw-r--r--usr.bin/whatis/whatis.14
-rw-r--r--usr.bin/which/whereis.14
-rw-r--r--usr.bin/who/who.118
-rw-r--r--usr.bin/whois/whois.14
-rw-r--r--usr.bin/window/window.1188
-rw-r--r--usr.bin/write/write.14
-rw-r--r--usr.bin/xinstall/install.116
-rw-r--r--usr.bin/xstr/xstr.126
-rw-r--r--usr.bin/yacc/yyfix.14
-rw-r--r--usr.bin/yes/yes.14
-rw-r--r--usr.bin/ypcat/ypcat.110
-rw-r--r--usr.bin/ypmatch/ypmatch.110
-rw-r--r--usr.bin/ypwhich/ypwhich.110
157 files changed, 1882 insertions, 1576 deletions
diff --git a/usr.bin/apply/apply.1 b/usr.bin/apply/apply.1
index 0004b38ee1b..c9eac39e3d0 100644
--- a/usr.bin/apply/apply.1
+++ b/usr.bin/apply/apply.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: apply.1,v 1.7 1998/09/23 04:32:33 aaron Exp $
+.\" $OpenBSD: apply.1,v 1.8 1999/06/05 01:21:16 aaron Exp $
.\" $NetBSD: apply.1,v 1.4 1996/03/18 23:16:57 jtc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd April 4, 1994
.Dt APPLY 1
-.Os BSD 4.2
+.Os
.Sh NAME
.Nm apply
.Nd apply a command to a set of arguments
@@ -134,5 +134,5 @@ commands in single quotes
.Sh HISTORY
The
.Nm
-command appeared in
+command appeared in
.Bx 4.2 .
diff --git a/usr.bin/ar/ar.1 b/usr.bin/ar/ar.1
index 0ec76b3ee4b..d48d67db4ef 100644
--- a/usr.bin/ar/ar.1
+++ b/usr.bin/ar/ar.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ar.1,v 1.4 1998/09/23 04:32:34 aaron Exp $
+.\" $OpenBSD: ar.1,v 1.5 1999/06/05 01:21:17 aaron Exp $
.\" $NetBSD: ar.1,v 1.7 1995/08/18 15:05:11 pk Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -38,23 +38,23 @@
.\" @(#)ar.1 8.1 (Berkeley) 6/29/93
.\"
.Dd June 29, 1993
-.Dt AR 1
+.Dt AR 1
.Os
.Sh NAME
-.Nm ar
+.Nm ar
.Nd create and maintain library archives
.Sh SYNOPSIS
.Nm ar
-.Fl d
-.Op Fl \Tv
+.Fl d
+.Op Fl \Tv
.Ar archive file ...
.Nm ar
.Fl m
-.Op Fl \Tv
+.Op Fl \Tv
.Ar archive file ...
.Nm ar
.Fl m
-.Op Fl abiTv
+.Op Fl abiTv
.Ar position archive file ...
.Nm ar
.Fl p
@@ -85,13 +85,15 @@
.Op Ar file ...
.Sh DESCRIPTION
The
-.Nm ar
+.Nm
utility creates and maintains groups of files combined into an archive.
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
+.Pq Ql /
+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.
@@ -99,12 +101,14 @@ in the archive, only the last component of the path will be compared.
All informational and error messages use the path listed on the command
line, if any was specified, otherwise the name in the archive is used.
If multiple files in the archive have the same name, and paths are listed
-on the command line to ``select'' archive files for an operation, only the
+on the command line to
+.Dq select
+archive files for an operation, only the
.Em first
file with a matching name will be selected.
.Pp
The normal use of
-.Nm ar
+.Nm
is for the creation and maintenance of libraries suitable for use with
the loader (see
.Xr ld 1 )
@@ -112,9 +116,9 @@ although it is not restricted to this purpose.
The options are as follows:
.Bl -tag -width indent
.It Fl a
-A positioning modifier used with the options
-.Fl r
-and
+A positioning modifier used with the options
+.Fl r
+and
.Fl m .
The files are entered or moved
.Em after
@@ -123,8 +127,8 @@ the archive member
which must be specified.
.It Fl b
A positioning modifier used with the options
-.Fl r
-and
+.Fl r
+and
.Fl m .
The files are entered or moved
.Em before
@@ -134,25 +138,25 @@ which must be specified.
.It Fl c
Whenever an archive is created, an informational message to that effect
is written to standard error.
-If the
+If the
.Fl c
option is specified,
-.Nm ar
+.Nm
creates the archive silently.
.It Fl C
Prevent extracted files from replacing like-named files in the file system.
.It Fl d
Delete the specified archive files.
.It Fl i
-Identical to the
+Identical to the
.Fl b
option.
.It Fl m
Move the specified archive files within the archive.
-If one of the options
-.Fl a ,
-.Fl b
-or
+If one of the options
+.Fl a ,
+.Fl b
+or
.Fl i
are specified, the files are moved before or after the
.Ar position
@@ -171,7 +175,7 @@ are written in the order they appear in the archive.
.It Fl q
(Quickly) append the specified files to the archive.
If the archive does not exist a new archive file is created.
-Much faster than the
+Much faster than the
.Fl r
option, when creating a large archive
piece-by-piece, as no checking is done to see if the files already
@@ -181,10 +185,10 @@ Replace or add the specified files to the archive.
If the archive does not exist a new archive file is created.
Files that replace existing files do not change the order of the files
within the archive.
-New files are appended to the archive unless one of the options
+New files are appended to the archive unless one of the options
.Fl a ,
.Fl b
-or
+or
.Fl i
is specified.
.It Fl T
@@ -206,58 +210,73 @@ each on a separate line.
If no files are specified, all files in the archive are listed.
.It Fl u
Update files.
-When used with the
+When used with the
.Fl r
option, files in the archive will be replaced
only if the disk file has a newer modification time than the file in
the archive.
-When used with the
+When used with the
.Fl x
option, files in the archive will be extracted
only if the archive file has a newer modification time than the file
on disk.
.It Fl v
Provide verbose output.
-When used with the
-.Fl d ,
-.Fl m ,
-.Fl q
-or
+When used with the
+.Fl d ,
+.Fl m ,
+.Fl q
+or
.Fl x
options,
-.Nm ar
+.Nm
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.
-When used with the
+option letter, a dash
+.Pq Ql -
+and the file name.
+When used with the
.Fl r
option,
-.Nm ar
-displays the description as above, but the initial letter is an ``a'' if
-the file is added to the archive and an ``r'' if the file replaces a file
+.Nm
+displays the description as above, but the initial letter is an
+.Sq a
+if
+the file is added to the archive and an
+.Sq r
+if the file replaces a file
already in the archive.
.Pp
-When used with the
-.Fl p
+When used with the
+.Fl p
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
+.Pq Ql <
+and
+greater-than
+.Pq Ql >
+characters.
.Pp
-When used with the
+When used with the
.Fl t
option,
-.Nm ar
-displays an ``ls -l'' style listing of information about the members of
+.Nm
+displays an
+.Dq ls -l
+style listing of information about the members of
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 IDs, separated by a single slash
+.Pq Ql / ,
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.
+format
+.Dq %b %e %H:%M %Y ) ,
+and the name of the file.
.It Fl x
Extract the specified archive members into the files named by the command
line arguments.
@@ -267,7 +286,7 @@ the current directory.
If the file does not exist, it is created; if it does exist, the owner
and group will be unchanged.
The file access and modification times are the time of the extraction
-(but see the
+(but see the
.Fl o
option).
The file permissions will be set to those of the file when it was entered
@@ -276,7 +295,7 @@ extracted file or the super-user.
.El
.Pp
The
-.Nm ar
+.Nm
utility exits 0 on success or >0 if an error occurred.
.Sh ENVIRONMENT
.Bl -tag -width indent -compact
@@ -292,18 +311,18 @@ temporary file names
.El
.Sh COMPATIBILITY
By default,
-.Nm ar
+.Nm
writes archives that may be incompatible with historic archives, as
the format used for storing archive members with names longer than
fifteen characters has changed.
This implementation of
-.Nm ar
+.Nm
is backward compatible with previous versions of
-.Nm ar
-in that it can read and write (using the
+.Nm
+in that it can read and write (using the
.Fl T
option) historic archives.
-The
+The
.Fl T
option is provided for compatibility only, and will be deleted
in a future release.
@@ -312,12 +331,12 @@ See
for more information.
.Sh STANDARDS
The
-.Nm ar
-utility is expected to offer a superset of the
+.Nm
+utility is expected to offer a superset of the
.St -p1003.2
functionality.
.Sh SEE ALSO
-.Xr ld 1 ,
+.Xr ld 1 ,
.Xr ranlib 1 ,
.Xr strmode 3 ,
.Xr ar 5
diff --git a/usr.bin/at/at.1 b/usr.bin/at/at.1
index f3d4befef87..49d9c8609f1 100644
--- a/usr.bin/at/at.1
+++ b/usr.bin/at/at.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: at.1,v 1.9 1999/03/21 04:04:41 alex Exp $
+.\" $OpenBSD: at.1,v 1.10 1999/06/05 01:21:17 aaron Exp $
.\" $FreeBSD: at.man,v 1.6 1997/02/22 19:54:05 peter Exp $
.Dd April 12, 1995
.Dt AT 1
@@ -132,7 +132,7 @@ An
.Nm at
or
.Nm batch
-command invoked from a
+command invoked from a
.Xr su 1
shell will retain the current user ID.
The user will be mailed standard error and standard output from his
@@ -140,7 +140,7 @@ commands, if any. Mail will be sent using the command
.Xr sendmail 8 .
If
.Nm at
-is executed from a
+is executed from a
.Xr su 1
shell, the owner of the login shell will receive the mail.
.Pp
@@ -166,7 +166,7 @@ to use
If neither exists, only the superuser is allowed use of
.Nm at .
.Pp
-An empty
+An empty
.Pa /var/at/at.deny
means that every user is allowed use these commands.
This is the default configuration.
@@ -179,7 +179,7 @@ Uses the specified queue.
A queue designation consists of a single letter. Valid queue designations
range from
.Nm a
-to
+to
.Nm z
and
.Nm A
@@ -248,7 +248,7 @@ job-creation lock file
If the file
.Pa /var/run/utmp
is not available or corrupted, or if the user is not logged on at the
-time
+time
.Nm at
is invoked, the mail is sent to the user ID found
in the environment variable
diff --git a/usr.bin/aucat/aucat.1 b/usr.bin/aucat/aucat.1
index 252ff4729c6..70d3fef0516 100644
--- a/usr.bin/aucat/aucat.1
+++ b/usr.bin/aucat/aucat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: aucat.1,v 1.4 1998/09/23 04:32:34 aaron Exp $
+.\" $OpenBSD: aucat.1,v 1.5 1999/06/05 01:21:18 aaron Exp $
.\"
.\" Copyright (c) 1997 Kenneth Stailey. All rights reserved.
.\"
@@ -36,10 +36,10 @@
.\"
.Dd Jan 2, 1997
.Dt AUCAT 1
-.Os OpenBSD 2.0
+.Os
.Sh NAME
.Nm aucat
-.Nd concatenate and play audio files
+.Nd concatenate and play audio files
.Sh SYNOPSIS
.Nm aucat
.Op Ar
diff --git a/usr.bin/audioctl/audioctl.1 b/usr.bin/audioctl/audioctl.1
index 1835f117075..18fdb8e4952 100644
--- a/usr.bin/audioctl/audioctl.1
+++ b/usr.bin/audioctl/audioctl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: audioctl.1,v 1.6 1998/12/16 02:38:48 aaron Exp $
+.\" $OpenBSD: audioctl.1,v 1.7 1999/06/05 01:21:18 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.
@@ -24,7 +24,7 @@
.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -56,13 +56,13 @@
.Ar name=value
.Op Ar ...
.Sh DESCRIPTION
-The
+The
.Nm
command displays or sets various audio system driver variables.
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
+If the
.Fl a
flag is specified, all variables for the device are printed.
If the
diff --git a/usr.bin/awk/awk.1 b/usr.bin/awk/awk.1
index c524b4d48f4..f15b1122bf0 100644
--- a/usr.bin/awk/awk.1
+++ b/usr.bin/awk/awk.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: awk.1,v 1.5 1998/03/03 01:56:00 angelos Exp $
+.\" $OpenBSD: awk.1,v 1.6 1999/06/05 01:21:18 aaron Exp $
.de EX
.nf
.ft CW
@@ -58,7 +58,7 @@ matches the pattern.
Each line is matched against the
pattern portion of every pattern-action statement;
the associated action is performed for each matched pattern.
-The file name
+The file name
.B \-
means the standard input.
Any
@@ -102,7 +102,7 @@ If
is null, the input line is split into one field per character.
.PP
To compensate for inadequate implementation of storage management,
-the
+the
.B \-mr
option can be used to set the maximum size of the input record,
and the
@@ -113,7 +113,7 @@ A pattern-action statement has the form
.IP
.IB pattern " { " action " }
.PP
-A missing
+A missing
.BI { " action " }
means print the line;
a missing pattern always matches.
@@ -217,7 +217,7 @@ The mathematical functions
.BR sin ,
.BR cos ,
and
-.BR atan2
+.BR atan2
are built in.
Other built-in functions:
.TF length
@@ -246,7 +246,7 @@ the
substring of
.I s
that begins at position
-.IR m
+.IR m
counted from 1.
.TP
.BI index( s , " t" )
@@ -374,7 +374,7 @@ Patterns are arbitrary Boolean combinations
of regular expressions and
relational expressions.
Regular expressions are as in
-.IR egrep ;
+.IR egrep ;
see
.IR grep (1).
Isolated regular expressions
@@ -534,7 +534,7 @@ BEGIN { # Simulate echo(1)
.fi
.EE
.SH SEE ALSO
-.IR lex (1),
+.IR lex (1),
.IR sed (1)
.br
A. V. Aho, B. W. Kernighan, P. J. Weinberger,
diff --git a/usr.bin/banner/banner.1 b/usr.bin/banner/banner.1
index 825cdd6f5ed..53edd504886 100644
--- a/usr.bin/banner/banner.1
+++ b/usr.bin/banner/banner.1
@@ -1,16 +1,16 @@
-.\" $OpenBSD: banner.1,v 1.3 1998/09/23 04:32:35 aaron Exp $
+.\" $OpenBSD: banner.1,v 1.4 1999/06/05 01:21:19 aaron Exp $
.\" $NetBSD: banner.1,v 1.1.1.1 1995/04/09 05:53:04 cgd Exp $
.\"
.\" @(#)Copyright (c) 1995, Simon J. Gerraty.
.\"
.\" This is free software. It comes with NO WARRANTY.
-.\" Permission to use, modify and distribute this source code
+.\" Permission to use, modify and distribute this source code
.\" is granted subject to the following conditions.
-.\" 1/ that the above copyright notice and this notice
-.\" are preserved in all copies and that due credit be given
+.\" 1/ that the above copyright notice and this notice
+.\" are preserved in all copies and that due credit be given
.\" to the author.
-.\" 2/ that any changes to this code are clearly commented
-.\" as such so that the author does not get blamed for bugs
+.\" 2/ that any changes to this code are clearly commented
+.\" as such so that the author does not get blamed for bugs
.\" other than his own.
.\"
.\" Please send copies of changes and bug-fixes to:
@@ -20,16 +20,16 @@
.Dt BANNER 1
.Os
.Sh NAME
-.Nm banner
+.Nm banner
.Nd print strings in large letters
.Sh SYNOPSIS
.Nm banner
.Ar string
.Op Ar ...
.Sh DESCRIPTION
-.Nm banner
-prints up to 10 chars of each
+.Nm
+prints up to 10 characters of each
.Ar string
in large letters on the standard output.
.Sh SEE ALSO
-.Xr banner 6
+.Xr echo 1
diff --git a/usr.bin/basename/basename.1 b/usr.bin/basename/basename.1
index 9cbb8e44f1a..220d246a01b 100644
--- a/usr.bin/basename/basename.1
+++ b/usr.bin/basename/basename.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: basename.1,v 1.5 1998/09/23 04:32:35 aaron Exp $
+.\" $OpenBSD: basename.1,v 1.6 1999/06/05 01:21:19 aaron Exp $
.\" $NetBSD: basename.1,v 1.9 1995/03/25 18:17:45 glass Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
@@ -59,7 +59,7 @@ if given.
The resulting filename is written to the standard output.
A non-existent suffix is ignored.
.Pp
-.Sh EXAMPLES
+.Sh EXAMPLES
The following line sets the shell variable
.Ev FOO
to
diff --git a/usr.bin/basename/dirname.1 b/usr.bin/basename/dirname.1
index 5832a39bd7d..2d6ed16d1b7 100644
--- a/usr.bin/basename/dirname.1
+++ b/usr.bin/basename/dirname.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: dirname.1,v 1.2 1998/09/23 04:32:35 aaron Exp $
+.\" $OpenBSD: dirname.1,v 1.3 1999/06/05 01:21:19 aaron Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -51,9 +51,9 @@ deletes the filename portion, beginning
with the last slash
.Pq Sq \&/
character to the end of
-.Ar string ,
+.Ar string ,
and writes the result to the standard output.
-.Sh EXAMPLES
+.Sh EXAMPLES
The following line sets the shell variable
.Ev FOO
to
diff --git a/usr.bin/bdes/bdes.1 b/usr.bin/bdes/bdes.1
index e18f937f5e4..db8974ee21a 100644
--- a/usr.bin/bdes/bdes.1
+++ b/usr.bin/bdes/bdes.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: bdes.1,v 1.4 1999/03/10 21:25:29 pjanzen Exp $
+.\" $OpenBSD: bdes.1,v 1.5 1999/06/05 01:21:19 aaron Exp $
.\" $NetBSD: bdes.1,v 1.1 1995/07/24 04:30:51 cgd Exp $
.\"
.\" Copyright (c) 1991, 1993
@@ -51,7 +51,7 @@ bdes [ \-abdp ] [ \-F N ] [ \-f N ] [ \-k key ]
.fi
.SH DESCRIPTION
.I Bdes
-implements all DES modes of operation described in FIPS PUB 81,
+implements all DES modes of operation described in FIPS PUB 81,
including alternative cipher feedback mode and both authentication
modes.
.I Bdes
diff --git a/usr.bin/biff/biff.1 b/usr.bin/biff/biff.1
index 7b6f631ac69..5571064f58e 100644
--- a/usr.bin/biff/biff.1
+++ b/usr.bin/biff/biff.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: biff.1,v 1.4 1998/09/23 04:32:35 aaron Exp $
+.\" $OpenBSD: biff.1,v 1.5 1999/06/05 01:21:19 aaron Exp $
.\" $NetBSD: biff.1,v 1.3 1995/03/26 02:34:21 glass Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt BIFF 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm biff
.Nd "be notified if mail arrives and who it is from"
@@ -85,7 +85,7 @@ variable of
.Sh HISTORY
The
.Nm
-command appeared in
+command appeared in
.Bx 4.0 .
.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 99e900ef48f..98cf08a451e 100644
--- a/usr.bin/cal/cal.1
+++ b/usr.bin/cal/cal.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cal.1,v 1.6 1998/09/23 04:32:35 aaron Exp $
+.\" $OpenBSD: cal.1,v 1.7 1999/06/05 01:21:20 aaron Exp $
.\" $NetBSD: cal.1,v 1.6 1995/09/02 05:34:20 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -90,5 +90,5 @@ functionality.
.Sh HISTORY
A
.Nm
-command appeared in
+command appeared in
.At v6 .
diff --git a/usr.bin/cap_mkdb/cap_mkdb.1 b/usr.bin/cap_mkdb/cap_mkdb.1
index 5443d45e67b..c4c3265906f 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.7 1999/03/05 04:47:45 tholo Exp $
+.\" $OpenBSD: cap_mkdb.1,v 1.8 1999/06/05 01:21:20 aaron Exp $
.\" $NetBSD: cap_mkdb.1,v 1.4 1995/03/26 03:59:36 glass Exp $
.\"
.\" Copyright (c) 1992, 1993
@@ -50,9 +50,9 @@
.Op Ar file2 ...
.Pp
.Sh DESCRIPTION
-.Nm cap_mkdb
+.Nm
builds a hashed database out of the
-.Xr getcap 3
+.Xr getcap 3
or
.Xr terminfo 5
logical database constructed by the concatenation of the specified
@@ -60,13 +60,15 @@ files.
.Pp
The database is named by the basename of the first file argument and
the string
-.Dq .db .
+.Dq .db .
The
.Xr getcap 3
routines can access the database in this form much more quickly
than they can the original text file(s).
.Pp
-The ``tc'' capabilities of the records are expanded before the
+The
+.Dq tc
+capabilities of the records are expanded before the
record is stored into the database.
.Pp
The options are as follows:
@@ -90,7 +92,9 @@ the record (not including the trailing colon
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
+is okay, and a 1 means that there was a
+.Dq tc
+capability in the record
that couldn't be expanded.
.Pp
The second type is a key which consists of one of the names from the
@@ -105,7 +109,7 @@ pair of the first type which has the real data associated with the
name.
.Sh RETURN VALUE
The
-.Nm cap_mkdb
+.Nm
utility exits 0 on success or >0 if an error occurred.
.Sh SEE ALSO
.Xr dbopen 3 ,
diff --git a/usr.bin/cdio/cdio.1 b/usr.bin/cdio/cdio.1
index faaa7cc0dc8..fa20425f63a 100644
--- a/usr.bin/cdio/cdio.1
+++ b/usr.bin/cdio/cdio.1
@@ -1,7 +1,7 @@
-.\" $OpenBSD: cdio.1,v 1.13 1998/09/23 04:32:36 aaron Exp $
+.\" $OpenBSD: cdio.1,v 1.14 1999/06/05 01:21:20 aaron Exp $
.Dd July 3, 1995
.Dt CDIO 1
-.Os OpenBSD 2.0
+.Os
.Sh NAME
.Nm cdio
.Nd compact disc control utility
@@ -13,20 +13,24 @@
.Op Ar command args ...
.Sh DESCRIPTION
The
-.Nm cdio
+.Nm
program controls audio features of a CD drive. The
.Ar device
is a name such
-as ``cd0'', ``acd0'', or ``mcd0''.
+as
+.Dq cd0 ,
+.Dq acd0 ,
+or
+.Dq mcd0 .
.Pp
If a
.Ar device
-is not specified, the environment variable
+is not specified, the environment variable
.Ev DISC
will be used to find the CD device.
.Pp
If no command is given,
-.Nm cdio
+.Nm
enters an interactive mode, reading commands from the standard input.
.Pp
The following options are available:
@@ -53,24 +57,24 @@ need be specified. The word
may be omitted.
.Bl -tag -width Cm
.It Cm play Ar first_track Op Ar last_track
-Play from track
-.Nm first_track
+Play from track
+.Ar first_track
to track
-.Nm last_track.
+.Ar last_track .
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
+(MSF) defined by
.Ar start_m
-in minutes,
+in minutes,
.Ar start_s,
-in seconds and
+in seconds and
.Ar start_f
(frame number) to the absolute address defined by
.Ar end_m
-in minutes,
+in minutes,
.Ar end_s,
-in seconds and
+in seconds and
.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.
@@ -90,7 +94,7 @@ Play the previous track. If we're at the first track, restart.
Replay the current track again.
.It Cm resume
Resume playing. Used after the
-.Nm pause
+.Cm pause
command.
.It Cm stop
Stop the disc.
@@ -99,11 +103,11 @@ Eject the disc.
.It Cm close
Inject the disc.
.It Cm volume Ar left_channel Ar right_channel
-Set the volume of the left channel to
+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.
+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.
.It Cm volume Ar mono
@@ -134,7 +138,7 @@ the current CD device. This is the equivalent of quitting
.Nm
and restarting with a different device.
.It Cm reset
-Perform the hardware reset of the device.
+Perform a hardware reset of the device.
.It Cm set Ar msf
Set minute-second-frame ioctl mode (default).
.It Cm set Ar lba
@@ -153,7 +157,7 @@ Andrey A.\ Chernov,
Serge V.\ Vakulenko
.Sh HISTORY
The
-.Nm cdio
+.Nm
command is based on
.Nm cdcontrol ,
which first appeared in FreeBSD 2.1.
diff --git a/usr.bin/checknr/checknr.1 b/usr.bin/checknr/checknr.1
index 62c8a35309d..68bbe619012 100644
--- a/usr.bin/checknr/checknr.1
+++ b/usr.bin/checknr/checknr.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: checknr.1,v 1.4 1998/09/23 04:32:36 aaron Exp $
+.\" $OpenBSD: checknr.1,v 1.5 1999/06/05 01:21:20 aaron Exp $
.\" $NetBSD: checknr.1,v 1.5 1995/03/26 04:10:14 glass Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt CHECKNR 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm checknr
.Nd check nroff/troff files
@@ -157,5 +157,5 @@ such as conditionals.
.Sh HISTORY
The
.Nm
-command appeared in
+command appeared in
.Bx 4.0 .
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 61c5760d6a3..461f346a6e7 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: chpass.1,v 1.10 1999/05/16 19:57:55 alex Exp $
+.\" $OpenBSD: chpass.1,v 1.11 1999/06/05 01:21:20 aaron Exp $
.\" $NetBSD: chpass.1,v 1.7 1996/05/15 21:50:40 jtc Exp $
.\"
.\" Copyright (c) 1988, 1990, 1993
@@ -233,5 +233,5 @@ User information should (and eventually will) be stored elsewhere.
.Sh HISTORY
The
.Nm
-command appeared in
+command appeared in
.Bx 4.3 Reno .
diff --git a/usr.bin/cksum/cksum.1 b/usr.bin/cksum/cksum.1
index a998f17199d..2cbacfa886e 100644
--- a/usr.bin/cksum/cksum.1
+++ b/usr.bin/cksum/cksum.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cksum.1,v 1.7 1998/09/23 04:32:37 aaron Exp $
+.\" $OpenBSD: cksum.1,v 1.8 1999/06/05 01:21:21 aaron Exp $
.\" $NetBSD: cksum.1,v 1.8 1995/09/02 05:45:15 jtc Exp $
.\"
.\" Copyright (c) 1991, 1993
@@ -39,7 +39,7 @@
.\"
.Dd April 28, 1995
.Dt CKSUM 1
-.Os BSD 4.4
+.Os
.Sh NAME
.Nm cksum
.Nd display file checksums and block counts
@@ -75,7 +75,7 @@ Use historic algorithms instead of the (superior) default one.
.Pp
Algorithm 1 is the algorithm used by historic
.Bx
-systems as the
+systems as the
.Xr sum 1
algorithm and by historic
.At V
@@ -159,8 +159,8 @@ and
utilities exit 0 on success or >0 if an error occurred.
.Sh WARNING
Do not use
-.Nm sum
-or
+.Nm sum
+or
.Nm cksum
to detect hostile binary modifications. An attacker
can trivially produce backdoored daemons which have the same CRC as the
diff --git a/usr.bin/cmp/cmp.1 b/usr.bin/cmp/cmp.1
index 06fd8f12a36..5def9c4ca45 100644
--- a/usr.bin/cmp/cmp.1
+++ b/usr.bin/cmp/cmp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cmp.1,v 1.4 1998/09/23 04:32:37 aaron Exp $
+.\" $OpenBSD: cmp.1,v 1.5 1999/06/05 01:21:21 aaron Exp $
.\" $NetBSD: cmp.1,v 1.4 1995/09/08 03:22:55 tls Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
@@ -72,7 +72,7 @@ status only.
.Pp
The optional arguments
.Ar skip1
-and
+and
.Ar skip2
are the byte offsets from the beginning of
.Ar file1
diff --git a/usr.bin/col/col.1 b/usr.bin/col/col.1
index c232b694b42..d0e06654e0c 100644
--- a/usr.bin/col/col.1
+++ b/usr.bin/col/col.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: col.1,v 1.3 1998/09/23 04:32:37 aaron Exp $
+.\" $OpenBSD: col.1,v 1.4 1999/06/05 01:21:21 aaron Exp $
.\" $NetBSD: col.1,v 1.4 1995/03/26 05:25:52 glass Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -48,26 +48,28 @@
.Op Fl bfx
.Op Fl l Ar num
.Sh DESCRIPTION
-.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.
+.Nm
+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 whitespace characters with tabs where possible.
This can be useful in processing the output of
.Xr nroff 1
and
.Xr tbl 1 .
.Pp
-.Nm col
+.Nm
reads from the standard input and writes to the standard output.
.Pp
The options are as follows:
-.Bl -tag -width "-l num "
+.Bl -tag -width "-l num"
.It Fl b
Do not output any backspaces, printing only the last character
written to each column position.
.It Fl f
-Forward half line feeds are permitted (``fine'' mode).
-Normally characters printed on a half line boundary are printed
+Forward half-line feeds are permitted
+.Pf ( Ns Dq fine
+mode).
+Normally characters printed on a half-line boundary are printed
on the following line.
.It Fl x
Output multiple spaces instead of tabs.
@@ -79,44 +81,44 @@ By default, 128 lines are buffered.
.El
.Pp
The control sequences for carriage motion that
-.Nm col
+.Nm
understands and their decimal values are listed in the following
table:
.Pp
.Bl -tag -width "carriage return" -compact
.It ESC\-7
-reverse line feed (escape then 7)
+Reverse line feed (escape then 7).
.It ESC\-8
-half reverse line feed (escape then 8)
+Half reverse line feed (escape then 8).
.It ESC\-9
-half forward line feed (escape then 9)
+Half forward line feed (escape then 9).
.It backspace
-moves back one column (8); ignored in the first column
+Moves back one column (8); ignored in the first column.
.It carriage return
(13)
.It newline
-forward line feed (10); also does carriage return
+Forward line feed (10); also does carriage return.
.It shift in
-shift to normal character set (15)
+Shift to normal character set (15).
.It shift out
-shift to alternate character set (14)
+Shift to alternate character set (14).
.It space
-moves forward one column (32)
+Moves forward one column (32).
.It tab
-moves forward to next tab stop (9)
+Moves forward to next tab stop (9).
.It vertical tab
-reverse line feed (11)
+Reverse line feed (11).
.El
.Pp
All unrecognized control characters and escape sequences are
discarded.
.Pp
-.Nm col
+.Nm
keeps track of the character set as characters are read and makes
sure the character set is correct when they are output.
.Pp
If the input attempts to back up to the last flushed line,
-.Nm col
+.Nm
will display a warning message.
.Sh SEE ALSO
.Xr expand 1 ,
@@ -124,6 +126,6 @@ will display a warning message.
.Xr tbl 1
.Sh HISTORY
A
-.Nm col
-command appeared in
+.Nm
+command appeared in
.At v6 .
diff --git a/usr.bin/colcrt/colcrt.1 b/usr.bin/colcrt/colcrt.1
index 4a4063162aa..1f750a0907d 100644
--- a/usr.bin/colcrt/colcrt.1
+++ b/usr.bin/colcrt/colcrt.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: colcrt.1,v 1.3 1998/09/23 04:32:37 aaron Exp $
+.\" $OpenBSD: colcrt.1,v 1.4 1999/06/05 01:21:21 aaron Exp $
.\" $NetBSD: colcrt.1,v 1.3 1995/03/26 05:30:59 glass Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 30, 1993
.Dt COLCRT 1
-.Os BSD 3
+.Os
.Sh NAME
.Nm colcrt
.Nd filter nroff output for CRT previewing
@@ -50,7 +50,8 @@
provides virtual half-line and reverse line feed sequences
for terminals without such capability, and on which overstriking
is destructive.
-Half-line characters and underlining (changed to dashing `\-')
+Half-line characters and underlining (changed to dashing
+.Sq - )
are placed on new lines in between the normal output lines.
.Pp
Available options:
@@ -94,11 +95,11 @@ Can't back up more than 102 lines.
.Pp
General overstriking is lost;
as a special case
-.Ql \&|
+.Ql |
overstruck with
-.Ql \-
+.Ql -
or underline becomes
-.Ql \&+ .
+.Ql + .
.Pp
Lines are trimmed to 132 characters.
.Pp
@@ -107,5 +108,5 @@ in documents which are already double-spaced.
.Sh HISTORY
The
.Nm
-command appeared in
+command appeared in
.Bx 3.0 .
diff --git a/usr.bin/colrm/colrm.1 b/usr.bin/colrm/colrm.1
index c3c3a28a303..9d56dc4768b 100644
--- a/usr.bin/colrm/colrm.1
+++ b/usr.bin/colrm/colrm.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: colrm.1,v 1.3 1998/09/23 04:32:37 aaron Exp $
+.\" $OpenBSD: colrm.1,v 1.4 1999/06/05 01:21:21 aaron Exp $
.\" $NetBSD: colrm.1,v 1.3 1995/03/26 09:04:01 glass Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt COLRM 1
-.Os BSD 3
+.Os
.Sh NAME
.Nm colrm
.Nd remove columns from a file
@@ -77,5 +77,5 @@ Backspace characters decrement the column count by one.
.Sh HISTORY
The
.Nm colrm
-command appeared in
+command appeared in
.Bx 3.0 .
diff --git a/usr.bin/column/column.1 b/usr.bin/column/column.1
index dfff7cbbd08..e4b6d93a2e4 100644
--- a/usr.bin/column/column.1
+++ b/usr.bin/column/column.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: column.1,v 1.5 1999/06/01 22:11:42 aaron Exp $
+.\" $OpenBSD: column.1,v 1.6 1999/06/05 01:21:21 aaron Exp $
.\" $NetBSD: column.1,v 1.3 1995/03/26 09:08:28 glass Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -77,7 +77,7 @@ Useful for pretty-printing displays.
Fill columns before filling rows.
.El
.Pp
-The
+The
.Nm
utility exits 0 on success or >0 if an error occurred.
.Sh ENVIRONMENT
@@ -98,5 +98,5 @@ the screen if no other information is available.
.Sh HISTORY
The
.Nm
-command appeared in
+command appeared in
.Bx 4.3 Reno .
diff --git a/usr.bin/comm/comm.1 b/usr.bin/comm/comm.1
index 93093a1afb3..cad3d9764b7 100644
--- a/usr.bin/comm/comm.1
+++ b/usr.bin/comm/comm.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: comm.1,v 1.4 1999/02/17 03:35:49 deraadt Exp $
+.\" $OpenBSD: comm.1,v 1.5 1999/06/05 01:21:22 aaron Exp $
.\" $NetBSD: comm.1,v 1.4 1995/03/26 09:25:50 glass Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -49,7 +49,7 @@
.Ar file1 file2
.Sh DESCRIPTION
The
-.Nm comm
+.Nm
utility reads
.Ar file1
and
@@ -82,7 +82,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
assumes that the files are lexically sorted; all characters
participate in line comparisons.
.\" .Sh ENVIRONMENT
@@ -95,7 +95,7 @@ participate in line comparisons.
.\" .El
.Sh DIAGNOSTICS
The
-.Nm comm
+.Nm
utility exits 0 on success or >0 if an error occurred.
.Sh SEE ALSO
.Xr cmp 1 ,
@@ -104,6 +104,6 @@ utility exits 0 on success or >0 if an error occurred.
.Xr uniq 1
.Sh STANDARDS
The
-.Nm comm
-utility conforms to
+.Nm
+utility conforms to
.St -p1003.2-92 .
diff --git a/usr.bin/compress/compress.1 b/usr.bin/compress/compress.1
index 1ea33dc407a..54d0a1f8aa7 100644
--- a/usr.bin/compress/compress.1
+++ b/usr.bin/compress/compress.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: compress.1,v 1.6 1998/09/23 04:32:38 aaron Exp $
+.\" $OpenBSD: compress.1,v 1.7 1999/06/05 01:21:22 aaron Exp $
.\" $NetBSD: compress.1,v 1.5 1995/03/26 09:44:34 glass Exp $
.\"
.\" Copyright (c) 1986, 1990, 1993
@@ -40,7 +40,7 @@
.\"
.Dd April 18, 1994
.Dt COMPRESS 1
-.Os BSD 4.3
+.Os
.Sh NAME
.Nm compress ,
.\".Nm uncompress ,
@@ -56,7 +56,7 @@
.Nm uncompress
.Op Fl cftoqv
.Op Fl o Ar filename
-.Op Ar
+.Op Ar
.\".Nm zcat
.\".Op Ar
.Sh DESCRIPTION
diff --git a/usr.bin/ctags/ctags.1 b/usr.bin/ctags/ctags.1
index 7b02b212f67..cbd4fcdef7f 100644
--- a/usr.bin/ctags/ctags.1
+++ b/usr.bin/ctags/ctags.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ctags.1,v 1.4 1999/02/27 17:01:27 deraadt Exp $
+.\" $OpenBSD: ctags.1,v 1.5 1999/06/05 01:21:22 aaron Exp $
.\" $NetBSD: ctags.1,v 1.4 1995/03/26 20:14:04 glass Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt CTAGS 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm ctags
.Nd create a tags file
@@ -213,5 +213,5 @@ will similarly be noted.
.Sh HISTORY
The
.Nm
-command appeared in
+command appeared in
.Bx 3.0 .
diff --git a/usr.bin/cut/cut.1 b/usr.bin/cut/cut.1
index 5fb43ca8978..586dd2632bb 100644
--- a/usr.bin/cut/cut.1
+++ b/usr.bin/cut/cut.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cut.1,v 1.3 1998/09/23 04:32:38 aaron Exp $
+.\" $OpenBSD: cut.1,v 1.4 1999/06/05 01:21:22 aaron Exp $
.\" $NetBSD: cut.1,v 1.6 1995/10/02 20:19:26 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -89,7 +89,7 @@ input line.
The options are as follows:
.Bl -tag -width Fl
.It Fl b Ar list
-The
+The
.Ar list
specifies byte positions.
.It Fl c Ar list
diff --git a/usr.bin/du/du.1 b/usr.bin/du/du.1
index 5c86039fbb7..0943077a5f4 100644
--- a/usr.bin/du/du.1
+++ b/usr.bin/du/du.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: du.1,v 1.8 1998/09/23 04:32:38 aaron Exp $
+.\" $OpenBSD: du.1,v 1.9 1999/06/05 01:21:22 aaron Exp $
.\" $NetBSD: du.1,v 1.6 1996/10/18 07:20:31 thorpej Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -97,9 +97,9 @@ Filesystem mount points are not traversed.
counts the storage used by symbolic links and not the files they
reference unless the
.Fl H
-or
-.Fl L
-option is specified.
+or
+.Fl L
+option is specified.
If either the
.Fl H
or
@@ -123,7 +123,7 @@ execution.
.It Ev BLOCKSIZE
If the environment variable
.Ev BLOCKSIZE
-is set, and the
+is set, and the
.Fl k
option is not specified, the block counts will be displayed in units of that
size block.
diff --git a/usr.bin/elf2aout/elf2aout.1 b/usr.bin/elf2aout/elf2aout.1
index 0fb639b291b..4f067c2cf77 100644
--- a/usr.bin/elf2aout/elf2aout.1
+++ b/usr.bin/elf2aout/elf2aout.1
@@ -1,7 +1,7 @@
-.\" $OpenBSD: elf2aout.1,v 1.4 1998/09/23 04:32:38 aaron Exp $
+.\" $OpenBSD: elf2aout.1,v 1.5 1999/06/05 01:21:23 aaron Exp $
.\"
.\" Copyright (c) 1996 Per Fogelstrom
-.\"
+.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
diff --git a/usr.bin/elf2ecoff/elf2ecoff.1 b/usr.bin/elf2ecoff/elf2ecoff.1
index f76228ccf99..3775bb0574a 100644
--- a/usr.bin/elf2ecoff/elf2ecoff.1
+++ b/usr.bin/elf2ecoff/elf2ecoff.1
@@ -1,7 +1,7 @@
-.\" $OpenBSD: elf2ecoff.1,v 1.3 1998/11/09 06:32:12 millert Exp $
+.\" $OpenBSD: elf2ecoff.1,v 1.4 1999/06/05 01:21:23 aaron Exp $
.\"
.\" Copyright (c) 1996 Per Fogelstrom
-.\"
+.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
diff --git a/usr.bin/elf2olf/elf2olf.1 b/usr.bin/elf2olf/elf2olf.1
index 2ecb0e36281..ce492c3539e 100644
--- a/usr.bin/elf2olf/elf2olf.1
+++ b/usr.bin/elf2olf/elf2olf.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: elf2olf.1,v 1.5 1998/09/23 04:32:39 aaron Exp $
+.\" $OpenBSD: elf2olf.1,v 1.6 1999/06/05 01:21:23 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.5 1998/09/23 04:32:39 aaron Exp $
+.\" @(#)$Id: elf2olf.1,v 1.6 1999/06/05 01:21:23 aaron Exp $
.\"
.Dd May 5, 1997
.Dt ELF2OLF 1
@@ -62,7 +62,7 @@ The options are as follows:
.It Fl v
Operate in verbose mode.
.It Fl o Ar opsys
-Specifies the operating system
+Specifies the operating system
.Em OLF
tag
.Em "opsys"
@@ -88,7 +88,7 @@ and
.Nm olf2elf
utilities exit 0 on success or >0 if an error occurred.
.Sh BUGS
-The
+The
.Em ELF
version 1 object module format lacks any real method to determine the native
operating system for any given binary thus mandating the existance of these
diff --git a/usr.bin/encrypt/encrypt.1 b/usr.bin/encrypt/encrypt.1
index 851d8b3c5a4..48058ef2396 100644
--- a/usr.bin/encrypt/encrypt.1
+++ b/usr.bin/encrypt/encrypt.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: encrypt.1,v 1.10 1999/05/20 00:05:39 alex Exp $
+.\" $OpenBSD: encrypt.1,v 1.11 1999/06/05 01:21:23 aaron Exp $
.\"
.\" Copyright (c) 1996, Jason Downs. All rights reserved.
.\"
@@ -25,7 +25,7 @@
.\"
.Dd May 18, 1999
.Dt ENCRYPT 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm encrypt
.Nd encrypt passwords from the command line or standard input
@@ -76,7 +76,7 @@ was given as a command line option, the default will be looked up from
For MD5 and Blowfish a new random salt is automatically generated for each
password.
.Pp
-Specifying the
+Specifying the
.Ar string
on the command line should be discouraged; using the
standard input is more secure.
@@ -95,5 +95,5 @@ first appeared in
.Pp
A
.Nm makekey
-command appeared in
+command appeared in
.At v7 .
diff --git a/usr.bin/env/env.1 b/usr.bin/env/env.1
index 333395b881d..66c1e0752e8 100644
--- a/usr.bin/env/env.1
+++ b/usr.bin/env/env.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: env.1,v 1.4 1998/09/23 04:32:39 aaron Exp $
+.\" $OpenBSD: env.1,v 1.5 1999/06/05 01:21:23 aaron Exp $
.\" Copyright (c) 1980, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -43,18 +43,20 @@
.Sh SYNOPSIS
.Nm env
.Op Fl i
-.Op Ar name=value ...
+.Oo
+.Ar name Ns No = Ns Ar value ...
+.Oc
.Oo
.Ar utility
.Op Ar argument ...
.Oc
.Sh DESCRIPTION
-.Nm env
+.Nm
executes
.Ar utility
after modifying the environment as
specified on the command line. The option
-.Ar name=value
+.Ar name Ns No = Ns Ar value
specifies
an environment variable,
.Ar name ,
@@ -64,60 +66,60 @@ The
.Fl i
option
causes
-.Nm env
+.Nm
to completely ignore the environment
it inherits.
.Pp
-If no
+If no
.Ar utility
is specified,
-.Nm env
+.Nm
prints out the names and values
-of the variables in the environment, with one
-.Ar name=value
+of the variables in the environment, with one
+.Ar name Ns No = Ns Ar value
pair per line.
.Sh DIAGNOSTICS
-If the
+If the
.Ar utility
-is invoked, the exit status of
-.Nm env
+is invoked, the exit status of
+.Nm
shall be the exit status of
.Ar utility ;
otherwise, the
-.Nm env
+.Nm
utility exits with one of the following values:
.Bl -tag -width Ds
.It 0
-The
-.Nm env
+The
+.Nm
utility completed successfully.
.It 1-125
An error occurred in the
-.Nm env
+.Nm
utility.
.It 126
The utility specified by
-.Ar utility
+.Ar utility
was found, but could not be invoked.
.It 127
The utility specified by
-.Ar utility
+.Ar utility
could not be found.
.El
.Sh COMPATIBILITY
-The historic
-.Fl
+The historic
+.Fl
option has been deprecated but is still supported in this implementation.
.Sh SEE ALSO
.Xr execvp 3 ,
.Xr environ 7
.Sh STANDARDS
The
-.Nm env
+.Nm
utility conforms to
.St -p1003.2-92 .
.Sh BUGS
-.Nm env
+.Nm
doesn't handle commands with equal
.Pq Sq =
signs in their
diff --git a/usr.bin/error/error.1 b/usr.bin/error/error.1
index d242e67758f..941aa9341d7 100644
--- a/usr.bin/error/error.1
+++ b/usr.bin/error/error.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: error.1,v 1.5 1998/09/23 04:32:39 aaron Exp $
+.\" $OpenBSD: error.1,v 1.6 1999/06/05 01:21:24 aaron Exp $
.\" $NetBSD: error.1,v 1.3 1995/09/02 06:15:20 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt ERROR 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm error
.Nd analyze and disperse compiler error messages
diff --git a/usr.bin/expand/expand.1 b/usr.bin/expand/expand.1
index 5850769d5d5..ba1f4d12725 100644
--- a/usr.bin/expand/expand.1
+++ b/usr.bin/expand/expand.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: expand.1,v 1.4 1999/02/11 23:08:24 deraadt Exp $
+.\" $OpenBSD: expand.1,v 1.5 1999/06/05 01:21:24 aaron Exp $
.\" $NetBSD: expand.1,v 1.3 1995/09/02 06:19:45 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 9, 1993
.Dt EXPAND 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm expand ,
.Nm unexpand
diff --git a/usr.bin/false/false.1 b/usr.bin/false/false.1
index dd731e19c5d..210bc6492cd 100644
--- a/usr.bin/false/false.1
+++ b/usr.bin/false/false.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: false.1,v 1.3 1998/09/26 19:54:41 aaron Exp $
+.\" $OpenBSD: false.1,v 1.4 1999/06/05 01:21:24 aaron Exp $
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -37,7 +37,7 @@
.\"
.Dd July 24, 1991
.Dt FALSE 1
-.Os BSD 4.2
+.Os
.Sh NAME
.Nm false
.Nd return false value
@@ -45,7 +45,7 @@
.Nm false
.Sh DESCRIPTION
The
-.Nm false
+.Nm
utility always exits with a non-zero exit code.
.Sh SEE ALSO
.Xr csh 1 ,
@@ -53,6 +53,6 @@ utility always exits with a non-zero exit code.
.Xr true 1
.Sh STANDARDS
The
-.Nm false
-utility conforms to
+.Nm
+utility conforms to
.St -p1003.2-92 .
diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index 4d6052aa849..109f3d02c58 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: file.1,v 1.5 1999/03/30 01:21:22 ian Exp $
+.\" $OpenBSD: file.1,v 1.6 1999/06/05 01:21:24 aaron Exp $
.TH FILE 1 "Copyrighted but distributable"
.SH NAME
file
@@ -12,7 +12,7 @@ file
.B \-f
namefile ]
[
-.B \-m
+.B \-m
magicfiles ]
file ...
.SH DESCRIPTION
@@ -44,7 +44,7 @@ Exceptions are well-known file formats (core files, tar archives)
that are known to contain binary data.
When modifying the file
.I /etc/magic
-or the program itself,
+or the program itself,
.B "preserve these keywords" .
People depend on knowing that all the readable files in a directory
have the word ``text'' printed.
@@ -67,7 +67,7 @@ The magic number tests are used to check for files with data in
particular fixed formats.
The canonical example of this is a binary executable (compiled program)
.I a.out
-file, whose format is defined in
+file, whose format is defined in
.I a.out.h
and possibly
.I exec.h
@@ -82,7 +82,7 @@ The information in these files is read from the magic file
.I /etc/magic.
.PP
If an argument appears to be an
-.SM ASCII
+.SM ASCII
file,
.B file
attempts to guess its language.
@@ -93,16 +93,16 @@ For example, the keyword
.B .br
indicates that the file is most likely a
.BR troff (1)
-input file, just as the keyword
+input file, just as the keyword
.B struct
indicates a C program.
These tests are less reliable than the previous
two groups, so they are performed last.
The language test routines also test for some miscellany
-(such as
+(such as
.BR tar (1)
archives) and determine whether an unknown file should be
-labelled as `ascii text' or `data'.
+labelled as `ascii text' or `data'.
.SH OPTIONS
.TP 8
.B \-v
@@ -117,16 +117,16 @@ Try to look inside compressed files.
.TP 8
.B \-c
Cause a checking printout of the parsed form of the magic file.
-This is usually used in conjunction with
+This is usually used in conjunction with
.B \-m
to debug a new magic file before installing it.
.TP 8
.B \-f namefile
-Read the names of the files to be examined from
+Read the names of the files to be examined from
.I namefile
-(one per line)
+(one per line)
before the argument list.
-Either
+Either
.I namefile
or at least one filename argument must be present;
to test the standard input, use ``-'' as a filename argument.
@@ -151,12 +151,12 @@ can be used to set the default magic number files.
.SH STANDARDS CONFORMANCE
This program is believed to exceed the System V Interface Definition
of FILE(CMD), as near as one can determine from the vague language
-contained therein.
+contained therein.
Its behaviour is mostly compatible with the System V program of the same name.
This version knows more magic, however, so it will produce
-different (albeit more accurate) output in many cases.
+different (albeit more accurate) output in many cases.
.PP
-The one significant difference
+The one significant difference
between this version and System V
is that this version treats any white space
as a delimiter, so that spaces in pattern strings must be escaped.
@@ -191,7 +191,7 @@ The magic file entries have been collected from various sources,
mainly USENET, and contributed by various authors.
Christos Zoulas (address below) will collect additional
or corrected magic file entries.
-A consolidation of magic file entries
+A consolidation of magic file entries
will be distributed periodically.
.PP
The order of entries in the magic file is significant.
@@ -201,10 +201,10 @@ If your old
.B file
command uses a magic file,
keep the old magic file around for comparison purposes
-(rename it to
+(rename it to
.IR /etc/magic.orig ).
.SH HISTORY
-There has been a
+There has been a
.B file
command in every \s-1UNIX\s0 since at least Research Version 6
(man page dated January, 1975).
@@ -303,11 +303,11 @@ commands vs man page macros.
Regular expression support would make this easy.
.PP
The program doesn't grok \s-2FORTRAN\s0.
-It should be able to figure \s-2FORTRAN\s0 by seeing some keywords which
+It should be able to figure \s-2FORTRAN\s0 by seeing some keywords which
appear indented at the start of line.
Regular expression support would make this easy.
.PP
-The list of keywords in
+The list of keywords in
.I ascmagic
probably belongs in the Magic file.
This could be done by using some keyword like `*' for the offset value.
@@ -319,12 +319,12 @@ have fetched it. Complain about conflicts in the magic file entries.
Make a rule that the magic entries sort based on file offset rather
than position within the magic file?
.PP
-The program should provide a way to give an estimate
+The program should provide a way to give an estimate
of ``how good'' a guess is.
We end up removing guesses (e.g. ``From '' as first 5 chars of file) because
they are not as good as other guesses (e.g. ``Newsgroups:'' versus
"Return-Path:"). Still, if the others don't pan out, it should be
-possible to use the first guess.
+possible to use the first guess.
.PP
This program is slower than some vendors' file commands.
.PP
diff --git a/usr.bin/file2c/file2c.1 b/usr.bin/file2c/file2c.1
index 09bfe427afa..485bfe84cb1 100644
--- a/usr.bin/file2c/file2c.1
+++ b/usr.bin/file2c/file2c.1
@@ -5,7 +5,7 @@
.\" this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
.\" ---------------------------------------------------------------------------
.\"
-.\" $Id: file2c.1,v 1.3 1998/11/04 22:36:40 aaron Exp $
+.\" $Id: file2c.1,v 1.4 1999/06/05 01:21:24 aaron Exp $
.\"
.Dd Jan 28, 1995
.Dt FILE2C 1
@@ -23,10 +23,10 @@ The
utility reads a file from stdin and writes it to stdout, converting each
byte to its decimal representation on the fly.
.Pp
-If the first
+If the first
+.Op string
+is present, it is printed before the data. If the second
.Op string
-is present, it is printed before the data. If the second
-.Op string
is present, it is printed after the data.
.Pp
This program is used to embed binary or other files into C source files,
diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index b80046ee63e..01331d4f3ce 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: find.1,v 1.21 1999/05/26 03:29:58 aaron Exp $
+.\" $OpenBSD: find.1,v 1.22 1999/06/05 01:21:25 aaron Exp $
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -48,45 +48,49 @@
.Op Ar file ...
.Ar expression
.Sh DESCRIPTION
-.Nm find
+.Nm
recursively descends the directory tree for each
.Ar file
listed, evaluating an
.Ar expression
-(composed of the ``primaries'' and ``operands'' listed below) in terms
+(composed of the
+.Dq primaries
+and
+.Dq operands
+listed below) in terms
of each file in the tree.
.Pp
The options are as follows:
.Bl -tag -width Ds
.It Fl H
Causes the file information and file type (see
-.Xr stat 2 )
-returned for each symbolic link encountered on the command line to be
+.Xr stat 2 )
+returned for each symbolic link encountered on the command line to be
those of the file referenced by the link, not the link itself.
If the referenced file does not exist, the file information and type will
-be for the link itself. File information of all symbolic links not on
+be for the link itself. File information of all symbolic links not on
the command line is that of the link itself.
.It Fl d
Causes
-.Nm find
-to perform a depth\-first traversal, i.e. directories
-are visited in post\-order and all entries in a directory will be acted
+.Nm
+to perform a depth-first traversal, i.e., directories
+are visited in post-order and all entries in a directory will be acted
on before the directory itself.
By default,
-.Nm find
-visits directories in pre\-order, i.e. before their contents.
+.Nm
+visits directories in pre-order, i.e., before their contents.
Note, the default is
-.Ar not
-a breadth\-first traversal.
+.Em not
+a breadth-first traversal.
.It Fl f Ar file
Specifies a file hierarchy for
-.Nm find
+.Nm
to traverse.
File hierarchies may also be specified as the operands immediately
following the options.
.It Fl h
Causes the file information and file type (see
-.Xr stat 2 ) ,
+.Xr stat 2 )
returned for each symbolic link to be those of the file referenced by the
link, not the link itself.
If the referenced file does not exist, the file information and type will
@@ -100,8 +104,15 @@ If a file name contains any of the delimiting characters used by
.Xr xargs ,
a diagnostic message is displayed on standard error, and the file
is skipped.
-The delimiting characters include single (``''') and double (``"'')
-quotes, backslash (``\e''), space, tab and newline (``\en'') characters.
+The delimiting characters include single
+.Pq Ql '
+and double
+.Pq Ql \&"
+quotes, backslash
+.Pq Ql \e ,
+space, tab, and newline
+.Pq Sq \en
+characters.
As an alternative, the
.Fl print0
function may be used safely in conjunction with the
@@ -110,7 +121,7 @@ argument to
.Xr xargs 1 .
.It Fl x
Prevents
-.Nm
+.Nm
from descending into directories that have a device number different
than that of the file from which the descent began.
.It Fl W
@@ -120,68 +131,74 @@ take whiteouts into account when scanning directories.
.El
.Sh PRIMARIES
.Bl -tag -width Ds
-.It Ic -amin Ar n
+.It Ic -amin Ar n
True if the difference between the file last access time and the time
-.Nm find
+.Nm
was started, rounded up to the next full minute, is
.Ar n
minutes.
-.It Ic -atime Ar n
+.It Ic -atime Ar n
True if the difference between the file last access time and the time
-.Nm find
-was started, rounded up to the next full 24\-hour period, is
+.Nm
+was started, rounded up to the next full 24-hour period, is
.Ar n
-24\-hour periods.
-.It Ic -cmin Ar n
+24-hour periods.
+.It Ic -cmin Ar n
True if the difference between the time of last change of file status
information and the time
-.Nm find
+.Nm
was started, rounded up to the next full minute, is
.Ar n
minutes.
-.It Ic -ctime Ar n
+.It Ic -ctime Ar n
True if the difference between the time of last change of file status
information and the time
-.Nm find
-was started, rounded up to the next full 24\-hour period, is
+.Nm
+was started, rounded up to the next full 24-hour period, is
.Ar n
-24\-hour periods.
+24-hour periods.
.It Ic -empty
True if the current file or directory is empty.
-.It Ic -exec Ar utility Op argument ... ;
+.It Ic -exec Ar utility Op argument ... ;
True if the program named
.Ar utility
returns a zero value as its exit status.
Optional arguments may be passed to the utility.
-The expression must be terminated by a semicolon (`;').
-If the string ``{}'' appears anywhere in the utility name or the
+The expression must be terminated by a semicolon
+.Pq Ql \&; .
+If the string
+.Qq {}
+appears anywhere in the utility name or the
arguments it is replaced by the pathname of the current file.
.Ar utility
will be executed from the directory from which
-.Nm find
+.Nm
was executed.
-.It Ic -execdir Ar utility Op argument ... ;
-The
-.Ic \&-execdir
-primary is identical to the
+.It Ic -execdir Ar utility Op argument ... ;
+Identical to the
.Ic -exec
primary with the exception that
.Ar utility
will be executed from the directory that holds
the current file. The filename substituted for
-the string ``{}'' is not qualified.
+the string
+.Qq {}
+is not qualified.
.It Ic -follow
Follow symbolic links.
-.It Ic -fstype Ar type
+.It Ic -fstype Ar type
True if the file is contained in a file system of type
.Ar type .
-Two special file system types are recognized: ``local'' and ``rdonly''.
+Two special file system types are recognized:
+.Dq local
+and
+.Dq rdonly .
These do not describe actual file system types;
the former matches any file system physically mounted on the system where
-.Nm find
-is being executed, and the latter matches any file system which is
+.Nm
+is being executed whereas the latter matches any file system which is
mounted read-only.
-.It Ic -group Ar gname
+.It Ic -group Ar gname
True if the file belongs to the group
.Ar gname .
If
@@ -189,80 +206,96 @@ If
is numeric and there is no such group name, then
.Ar gname
is treated as a group ID.
-.It Ic -inum Ar n
+.It Ic -inum Ar n
True if the file has inode number
.Ar n .
-.It Ic -links Ar n
+.It Ic -links Ar n
True if the file has
.Ar n
links.
.It Ic -ls
This primary always evaluates to true.
The following information for the current file is written to standard output:
-its inode number, size in 512\-byte blocks, file permissions, number of hard
+its inode number, size in 512-byte blocks, file permissions, number of hard
links, owner, group, size in bytes, last modification time, and pathname.
If the file is a block or character special file, the major and minor numbers
will be displayed instead of the size in bytes.
-If the file is a symbolic link, the pathname of the linked\-to file will be
-displayed preceded by ``\->''.
-The format is identical to that produced by ``ls \-dgils''.
+If the file is a symbolic link, the pathname of the linked-to file will be
+displayed preceded by
+.Dq \-> .
+The format is identical to that produced by
+.Dq ls \-dgils .
.It Ic -maxdepth Ar n
True if the current search depth is less than or equal to what is specified in
.Ar n .
.It Ic -mindepth Ar n
True if the current search depth is at least what is specified in
.Ar n .
-.It Ic -mmin Ar n
+.It Ic -mmin Ar n
True if the difference between the file last modification time and the time
-.Nm find
+.Nm
was started, rounded up to the next full minute, is
.Ar n
minutes.
-.It Ic -mtime Ar n
+.It Ic -mtime Ar n
True if the difference between the file last modification time and the time
-.Nm find
-was started, rounded up to the next full 24\-hour period, is
+.Nm
+was started, rounded up to the next full 24-hour period, is
.Ar n
-24\-hour periods.
-.It Ic \&-ok Ar utility Ns Op argument ... ;
-The
-.Ic \&-ok
-primary is identical to the
-.Ic -exec
-primary with the exception that
-.Nm find
-requests user affirmation for the execution of
-.Ar utility
-by printing
-a message to the terminal and reading a response.
-If the response is other than ``y'' the command is not executed and the
-value of the
-.Ic \&ok
-expression is false.
-.It Ic -name Ar pattern
+24-hour periods.
+.It Ic -name Ar pattern
True if the last component of the pathname being examined matches
.Ar pattern .
-Special shell pattern matching characters (``['', ``]'', ``*'', and ``?'')
+Special shell pattern matching characters
+.Pf ( Ql [ ,
+.Ql \&] ,
+.Ql * ,
+and
+.Ql ? )
may be used as part of
.Ar pattern .
These characters may be matched explicitly by escaping them with a
-backslash (`\e').
-.It Ic -newer Ar file
+backslash
+.Pq Ql \e .
+.It Ic -newer Ar file
True if the current file has a more recent last modification time than
.Ar file .
.It Ic -nouser
True if the file belongs to an unknown user.
.It Ic -nogroup
True if the file belongs to an unknown group.
-.It Ic -path Ar pattern
+.It Ic \&-ok Ar utility Op argument ... ;
+Identical to the
+.Ic -exec
+primary with the exception that
+.Nm
+requests user affirmation for the execution of
+.Ar utility
+by printing
+a message to the terminal and reading a response.
+If the response is other than
+.Sq y
+the command is not executed and the
+value of the
+.Ic \&ok
+expression is false.
+.It Ic -path Ar pattern
True if the pathname being examined matches
.Ar pattern .
-Special shell pattern matching characters (``['', ``]'', ``*'', and ``?'')
+Special shell pattern matching characters
+.Pf ( Ql [ ,
+.Ql \&] ,
+.Ql * ,
+and
+.Ql ? )
may be used as part of
.Ar pattern .
These characters may be matched explicitly by escaping them with a
-backslash (`\e').
-Slashes (`/') are treated as normal characters and do not have to be
+backslash
+.Pq Ql \e .
+Slashes
+.Pq Ql /
+are treated as normal characters and do not have to be
matched explicitly.
.It Xo
.Ic -perm
@@ -291,15 +324,19 @@ If the mode is octal, only bits 07777
.Dv S_IRWXO )
of the file's mode bits participate
in the comparison.
-If the mode is preceded by a dash (``\-''), this primary evaluates to true
+If the mode is preceded by a dash
+.Pq Sq \- ,
+this primary evaluates to true
if at least all of the bits in the mode are set in the file's mode bits.
-If the mode is not preceded by a dash (``\-''), this primary evaluates to
+If the mode is not preceded by a dash, this primary evaluates to
true if the bits in the mode exactly match the file's mode bits.
-Note, the first character of a symbolic mode may not be a dash (``\-'').
+Note, the first character of a symbolic mode may not be a dash.
.It Ic -print
This primary always evaluates to true.
It prints the pathname of the current file to standard output, followed
-by a newline (``\en'') character.
+by a newline
+.Pq Ql \en
+character.
If neither
.Ic -exec ,
.Ic -ls ,
@@ -307,7 +344,7 @@ If neither
nor
.Ic -print0
is specified, the given expression shall be effectively replaced by
-.Cm \&( Ns Ar given\& expression Ns Cm \&)
+.Cm \&( Ns Ar given\& expression Ns Cm \&)
.Ic -print .
.It Ic -print0
This primary always evaluates to true.
@@ -316,29 +353,31 @@ by a null character.
.It Ic -prune
This primary always evaluates to true.
It causes
-.Nm find
+.Nm
to not descend into the current file.
Note, the
.Ic -prune
primary has no effect if the
.Fl d
option was specified.
-.It Ic -size Ar n Ns Op Cm c
-True if the file's size, rounded up, in 512\-byte blocks is
+.It Ic -size Ar n Ns Op Cm c
+True if the file's size, rounded up, in 512-byte blocks is
.Ar n .
If
.Ar n
-is followed by a ``c'', then the primary is true if the
+is followed by a
+.Sq c ,
+then the primary is true if the
file's size is
.Ar n
bytes.
-.It Ic -type Ar t
+.It Ic -type Ar t
True if the file is of the specified type.
Possible file types are as follows:
.Pp
.Bl -tag -width flag -offset indent -compact
.It Cm W
-whiteout (currently, these won't even be visible without also specifying
+whiteout (currently, these won't even be visible without also specifying
.Fl W )
.It Cm b
block special
@@ -356,7 +395,7 @@ FIFO
socket
.El
.Pp
-.It Ic -user Ar uname
+.It Ic -user Ar uname
True if the file belongs to the user
.Ar uname .
If
@@ -367,25 +406,32 @@ is treated as a user ID.
.El
.Pp
All primaries which take a numeric argument allow the number to be
-preceded by a plus sign (``+'') or a minus sign (``\-'').
-A preceding plus sign means ``more than n'', a preceding minus sign means
-``less than n'', and neither means ``exactly n'' .
+preceded by a plus sign
+.Pq Ql +
+or a minus sign
+.Pq Ql \- .
+A preceding plus sign means
+.Dq more than n ,
+a preceding minus sign means
+.Dq less than n ,
+and neither means
+.Dq exactly n .
.Sh OPERATORS
The primaries may be combined using the following operators.
The operators are listed in order of decreasing precedence.
-.Bl -tag -width (expression)
-.It Cm \&( Ns Ar expression Ns Cm \&)
+.Bl -tag -width (expression)
+.It Cm \&( Ns Ar expression Ns Cm \&)
This evaluates to true if the parenthesized expression evaluates to
true.
.Pp
-.It Cm \&! Ns Ar expression
+.It Cm \&! Ns Ar expression
This is the unary
.Tn NOT
operator.
It evaluates to true if the expression is false.
.Pp
-.It Ar expression Cm -and Ar expression
-.It Ar expression expression
+.It Ar expression Cm -and Ar expression
+.It Ar expression expression
The
.Cm -and
operator is the logical
@@ -396,7 +442,7 @@ have to be specified.
The expression evaluates to true if both expressions are true.
The second expression is not evaluated if the first expression is false.
.Pp
-.It Ar expression Cm -or Ar expression
+.It Ar expression Cm -or Ar expression
The
.Cm -or
operator is the logical
@@ -408,24 +454,33 @@ The second expression is not evaluated if the first expression is true.
.El
.Pp
All operands and primaries must be separate arguments to
-.Nm find .
+.Nm find .
Primaries which themselves take arguments expect each argument
to be a separate argument to
-.Nm find .
+.Nm find .
.Sh EXAMPLES
The following examples are shown as given to the shell:
.Bl -tag -width findx
.It Li "find / \e! -name \*q*.c\*q -print"
-Print out a list of all the files whose names do not end in ``.c''.
+Print out a list of all the files whose names do not end in
+.Dq .c .
.It Li "find / -newer ttt -user wnj -print"
-Print out a list of all the files owned by user ``wnj'' that are newer
-than the file ``ttt''.
+Print out a list of all the files owned by user
+.Dq wnj
+that are newer
+than the file
+.Dq ttt .
.It Li "find / \e! \e( -newer ttt -user wnj \e) -print"
-Print out a list of all the files which are not both newer than ``ttt''
-and owned by ``wnj''.
+Print out a list of all the files which are not both newer than
+.Dq ttt
+and owned by
+.Dq wnj .
.It Li "find / \e( -newer ttt -or -user wnj \e) -print"
-Print out a list of all the files that are either owned by ``wnj'' or
-that are newer than ``ttt''.
+Print out a list of all the files that are either owned by
+.Dq wnj
+or
+that are newer than
+.Dq ttt .
.El
.Sh SEE ALSO
.Xr chmod 1 ,
@@ -438,7 +493,7 @@ that are newer than ``ttt''.
.Xr symlink 7
.Sh STANDARDS
The
-.Nm find
+.Nm
utility syntax is a superset of the syntax specified by the
.St -p1003.2
standard.
@@ -474,40 +529,67 @@ and
These primaries always evaluated to true.
As they were really global variables that took effect before the traversal
began, some legal expressions could have unexpected results.
-An example is the expression ``\-print \-o \-depth''.
-As \-print always evaluates to true, the standard order of evaluation
-implies that \-depth would never be evaluated.
+An example is the expression
+.Dq \-print \-o \-depth .
+As
+.Cm \-print
+always evaluates to true, the standard order of evaluation
+implies that
+.Cm \-depth
+would never be evaluated.
This is not the case.
.Pp
-The operator ``-or'' was implemented as ``\-o'', and the operator ``-and''
-was implemented as ``\-a''.
+The operator
+.Cm -or
+was implemented as
+.Cm \-o ,
+and the operator
+.Cm -and
+was implemented as
+.Cm \-a .
.Pp
Historic implementations of the
.Ic -exec
and
.Ic -ok
-primaries did not replace the string ``{}'' in the utility name or the
+primaries did not replace the string
+.Qq {}
+in the utility name or the
utility arguments if it had preceding or following non-whitespace characters.
This version replaces it no matter where in the utility name or arguments
it appears.
.Sh BUGS
The special characters used by
-.Nm find
+.Nm
are also special characters to many shell programs.
-In particular, the characters ``*'', ``['', ``]'', ``?'', ``('', ``)'',
-``!'', ``\e'' and ``;'' may have to be escaped from the shell.
+In particular, the characters
+.Ql * ,
+.Ql [ ,
+.Ql \&] ,
+.Ql ? ,
+.Ql ( ,
+.Ql \&) ,
+.Ql ! ,
+.Ql \e ,
+and
+.Ql \&;
+may have to be escaped from the shell.
.Pp
As there is no delimiter separating options and file names or file
names and the
.Ar expression ,
-it is difficult to specify files named ``-xdev'' or ``!''.
+it is difficult to specify files named
+.Dq -xdev
+or
+.Dq ! .
These problems are handled by the
.Fl f
option and the
.Xr getopt 3
-``--'' construct.
+.Dq \-\-
+construct.
.Pp
The
.Fl W
-option is probably not the most elegant way to handle whiteouts, it may
+option is probably not the most elegant way to handle whiteouts. It may
be replaced by a more sophisticated algorithm eventually.
diff --git a/usr.bin/finger/finger.1 b/usr.bin/finger/finger.1
index f059a48fd37..09900a19962 100644
--- a/usr.bin/finger/finger.1
+++ b/usr.bin/finger/finger.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: finger.1,v 1.8 1999/05/16 19:57:56 alex Exp $
+.\" $OpenBSD: finger.1,v 1.9 1999/06/05 01:21:25 aaron Exp $
.\"
.\" Copyright (c) 1989, 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -35,7 +35,7 @@
.\"
.Dd July 27, 1991
.Dt FINGER 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm finger
.Nd user information lookup program
diff --git a/usr.bin/fold/fold.1 b/usr.bin/fold/fold.1
index b5f3e601e91..d812fb0595e 100644
--- a/usr.bin/fold/fold.1
+++ b/usr.bin/fold/fold.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fold.1,v 1.3 1998/09/26 19:54:44 aaron Exp $
+.\" $OpenBSD: fold.1,v 1.4 1999/06/05 01:21:25 aaron Exp $
.\" $NetBSD: fold.1,v 1.5 1995/09/01 01:42:42 jtc Exp $
.\"
.\" Copyright (c) 1980, 1993
@@ -46,7 +46,7 @@
.Op Fl w Ar width
.Ar file Op Ar ...
.Sh DESCRIPTION
-.Nm fold
+.Nm
is a filter which folds the contents of the specified files,
or the standard input if no files are specified,
breaking the lines to have a maximum of 80 characters.
@@ -60,20 +60,20 @@ in bytes rather than column positions.
.It Fl s
Fold line after the last blank character within the first
.Ar width
-column positions (or bytes).
+column positions (or bytes).
.It Fl w
Specifies a line width to use instead of the default 80 characters.
.El
.Pp
-The
-.Nm fold
+The
+.Nm
utility exits 0 on success or >0 if an error occurred.
.Sh SEE ALSO
.Xr expand 1
.Sh STANDARDS
-The
-.Nm fold
-utility conforms to
+The
+.Nm
+utility conforms to
.St -p1003.2-92 .
.Sh BUGS
If underlining is present it may be messed up by folding.
diff --git a/usr.bin/from/from.1 b/usr.bin/from/from.1
index a63f7db22c5..1606dc89ffb 100644
--- a/usr.bin/from/from.1
+++ b/usr.bin/from/from.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: from.1,v 1.3 1998/09/26 19:54:45 aaron Exp $
+.\" $OpenBSD: from.1,v 1.4 1999/06/05 01:21:25 aaron Exp $
.\" $NetBSD: from.1,v 1.4 1995/09/01 01:39:09 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd December 30, 1993
.Dt FROM 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm from
.Nd print names of those who have sent mail
@@ -50,9 +50,9 @@
prints
out the mail header lines from the invoker's mailbox.
.Pp
-Options:
+The available options are as follows:
.Bl -tag -width Fl
-.It Fl f Ar file
+.It Fl f Ar file
The supplied file
is examined instead of the invoker's mailbox.
If the
@@ -60,7 +60,7 @@ If the
option is used, the
.Ar user
argument should not be used.
-.It Fl s Ar sender
+.It Fl s Ar sender
Only mail from addresses containing
the
supplied string are printed.
diff --git a/usr.bin/fsplit/fsplit.1 b/usr.bin/fsplit/fsplit.1
index 5ad7511de58..6de643720bb 100644
--- a/usr.bin/fsplit/fsplit.1
+++ b/usr.bin/fsplit/fsplit.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fsplit.1,v 1.4 1998/11/11 23:01:43 aaron Exp $
+.\" $OpenBSD: fsplit.1,v 1.5 1999/06/05 01:21:25 aaron Exp $
.\" $NetBSD: fsplit.1,v 1.3 1995/09/28 05:15:06 perry Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
@@ -38,7 +38,7 @@
.\"
.Dd June 6, 1993
.Dt FSPLIT 1
-.Os BSD 4.2
+.Os
.Sh NAME
.Nm fsplit
.Nd split a multi-routine Fortran file into individual files
@@ -69,7 +69,7 @@ where
.Ar zzzNNN.f
does not already exist.
.Bl -tag -width Fl
-.It Fl e Ar efile
+.It Fl e Ar efile
Normally each subprogram unit is split into a separate file. When the
.Fl e
option is used, only the specified subprogram units are split into separate
diff --git a/usr.bin/fstat/fstat.1 b/usr.bin/fstat/fstat.1
index 22abd3d7dd5..92d6de47a8d 100644
--- a/usr.bin/fstat/fstat.1
+++ b/usr.bin/fstat/fstat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: fstat.1,v 1.10 1998/09/26 19:54:46 aaron Exp $
+.\" $OpenBSD: fstat.1,v 1.11 1999/06/05 01:21:25 aaron Exp $
.\" Copyright (c) 1987, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -34,7 +34,7 @@
.\"
.Dd February 25, 1994
.Dt FSTAT 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm fstat
.Nd file status
@@ -188,7 +188,7 @@ For TCP, it is the address of the tcpcb, and for UDP, the inpcb (socket pcb).
For Unix domain sockets, it's the address of the socket pcb and the address
of the connected pcb (if connected).
Otherwise the protocol number and address of the socket itself are printed.
-The attempt is to make enough information available to
+The attempt is to make enough information available to
permit further analysis without duplicating
.Xr netstat 1 .
.Pp
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index fdb2c436a0d..03699d4f837 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ftp.1,v 1.24 1999/02/09 17:43:04 deraadt Exp $
+.\" $OpenBSD: ftp.1,v 1.25 1999/06/05 01:21:26 aaron Exp $
.\" $NetBSD: ftp.1,v 1.22 1997/08/18 10:20:22 lukem Exp $
.\"
.\" Copyright (c) 1985, 1989, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd August 18, 1997
.Dt FTP 1
-.Os BSD 4.2
+.Os
.Sh NAME
.Nm ftp
.Nd
@@ -348,11 +348,11 @@ The current settings for
and
.Ic structure
are used while transferring the file.
-.It Ic gate Op Ar host Op Ar port
+.It Ic gate Op Ar host Op Ar port
Toggle gate-ftp mode.
This will not be permitted if the gate-ftp server hasn't been set
(either explicitly by the user, or from the
-.Ev FTPSERVER
+.Ev FTPSERVER
environment variable).
If
.Ar host
@@ -679,7 +679,7 @@ server (see below).
Retrieve
.Ic file
and display with the program defined in
-.Ev PAGER
+.Ev PAGER
(which defaults to
.Xr more 1 ).
.It Ic passive
@@ -1047,7 +1047,7 @@ on the command line.
.Pp
The following formats are valid syntax for an auto-fetch element:
.Bl -tag -width "ftp://[user:password@]host[:port]/file"
-.It host:/file
+.It host:/file
.Dq Classic
ftp format
.It ftp://[user:password@]host[:port]/file
@@ -1086,7 +1086,7 @@ connection creation and deletion.
.Pp
If
.Ic file
-contains a glob character and globbing is enabled,
+contains a glob character and globbing is enabled,
(see
.Ic glob ) ,
then the equivalent of
@@ -1325,7 +1325,7 @@ auto-login process.
.El
.Sh COMMAND LINE EDITING
.Nm
-supports interactive command line editing, via the
+supports interactive command line editing, via the
.Xr editline 3
library.
It is enabled with the
@@ -1377,7 +1377,7 @@ Port to use when connecting to gate-ftp server when
is enabled.
Default is port returned by a
.Fn getservbyname
-lookup of
+lookup of
.Dq ftpgate/tcp .
.It Ev HOME
For default location of a
diff --git a/usr.bin/gencat/gencat.1 b/usr.bin/gencat/gencat.1
index 0d496a0563f..22bc401d4e5 100644
--- a/usr.bin/gencat/gencat.1
+++ b/usr.bin/gencat/gencat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: gencat.1,v 1.7 1998/12/16 02:38:49 aaron Exp $
+.\" $OpenBSD: gencat.1,v 1.8 1999/06/05 01:21:26 aaron Exp $
.\"
.\" Copyright (c) 1997 Ken Stailey
.\"
@@ -24,7 +24,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: gencat.1,v 1.7 1998/12/16 02:38:49 aaron Exp $
+.\" $Id: gencat.1,v 1.8 1999/06/05 01:21:26 aaron Exp $
.\"
.Dd June 11, 1997
.Dt GENCAT 1
@@ -156,7 +156,7 @@ If the character following the backslash is not one of those specified,
the backslash is ignored.
.Pp
The
-.Nm
+.Nm
utility exits 0 on success, or >0 if an error occurs.
.Sh SEE ALSO
.Xr catclose 3 ,
diff --git a/usr.bin/getconf/getconf.1 b/usr.bin/getconf/getconf.1
index b59535089e3..b3073e4954b 100644
--- a/usr.bin/getconf/getconf.1
+++ b/usr.bin/getconf/getconf.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: getconf.1,v 1.4 1998/09/26 19:54:50 aaron Exp $
+.\" $OpenBSD: getconf.1,v 1.5 1999/06/05 01:21:26 aaron Exp $
.\" $NetBSD: getconf.1,v 1.2 1996/04/20 01:15:12 jtc Exp $
.\"
.\" Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -45,20 +45,20 @@
.Op Ar pathname
.Sh DESCRIPTION
The
-.Nm getconf
-utility writes the current value of a configurable system limit or
+.Nm
+utility writes the current value of a configurable system limit or
option variable to the standard output.
.Pp
The
.Ar name
argument specifies the system variable to be queried.
-The
-.Ar pathname
+The
+.Ar pathname
argument must be supplied for system variables associated with a
pathname.
.Sh RETURN VALUE
The
-.Nm getconf
+.Nm
utility exits 0 on success or >0 if an error occurred.
.Sh SEE ALSO
.Xr pathconf 2 ,
@@ -66,6 +66,6 @@ utility exits 0 on success or >0 if an error occurred.
.Xr sysconf 3
.Sh STANDARDS
The
-.Nm getconf
+.Nm
utility conforms to
.St -p1003.2-92 .
diff --git a/usr.bin/gprof/gprof.1 b/usr.bin/gprof/gprof.1
index 6a72ecac7ef..b3b140de5ee 100644
--- a/usr.bin/gprof/gprof.1
+++ b/usr.bin/gprof/gprof.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: gprof.1,v 1.10 1998/11/18 02:11:15 aaron Exp $
+.\" $OpenBSD: gprof.1,v 1.11 1999/06/05 01:21:27 aaron Exp $
.\" $NetBSD: gprof.1,v 1.6 1995/11/21 22:24:55 jtc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt GPROF 1
-.Os BSD 4.2
+.Os
.Sh NAME
.Nm gprof
.Nd display call graph profile data
@@ -121,10 +121,10 @@ Find a minimal set of arcs that can be broken to eliminate all cycles with
.Ar count
or more members.
Caution: the algorithm used to break cycles is exponential,
-so using this option may cause
+so using this option may cause
.Nm gprof
to run for a very long time.
-.It Fl e Ar name
+.It Fl e Ar name
Suppresses the printing of the graph profile entry for routine
.Ar name
and all its descendants
@@ -137,7 +137,7 @@ Only one
may be given with each
.Fl e
option.
-.It Fl E Ar name
+.It Fl E Ar name
Suppresses the printing of the graph profile entry for routine
.Ar name
(and its descendants) as
@@ -151,7 +151,7 @@ above, and also excludes the time spent in
.Fl E
.Ar mcleanup
is the default.)
-.It Fl f Ar name
+.It Fl f Ar name
Prints the graph profile entry of only the specified routine
.Ar name
and its descendants.
@@ -163,7 +163,7 @@ Only one
may be given with each
.Fl f
option.
-.It Fl F Ar name
+.It Fl F Ar name
Prints the graph profile entry of only the routine
.Ar name
and its descendants (as
@@ -185,7 +185,7 @@ overrides
the
.Fl E
option.
-.It Fl k Ar fromname Ar toname
+.It Fl k Ar fromname Ar toname
Will delete any arcs from routine
.Ar fromname
to routine
diff --git a/usr.bin/head/head.1 b/usr.bin/head/head.1
index 49b00844837..88832fb3088 100644
--- a/usr.bin/head/head.1
+++ b/usr.bin/head/head.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: head.1,v 1.2 1996/06/26 05:34:15 deraadt Exp $
+.\" $OpenBSD: head.1,v 1.3 1999/06/05 01:21:27 aaron Exp $
.\" Copyright (c) 1980, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -51,18 +51,18 @@ If
is omitted it defaults to
10.
.Sh COMPATIBILITY
-The historic command line syntax of
-.Nm head
+The historic command line syntax of
+.Nm
is supported by this implementation.
.Sh SEE ALSO
.Xr tail 1
.Sh STANDARDS
-The
-.Nm head
+The
+.Nm
utility conforms to
.St -p1003.2-92 .
.Sh HISTORY
The
-.Nm head
+.Nm
utility appeared in
.Bx 3.0 .
diff --git a/usr.bin/hexdump/hexdump.1 b/usr.bin/hexdump/hexdump.1
index 89bd1d0a461..54e7a7fa850 100644
--- a/usr.bin/hexdump/hexdump.1
+++ b/usr.bin/hexdump/hexdump.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: hexdump.1,v 1.6 1998/11/04 22:36:40 aaron Exp $
+.\" $OpenBSD: hexdump.1,v 1.7 1999/06/05 01:21:26 aaron Exp $
.\" Copyright (c) 1989, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -72,14 +72,14 @@ data per line.
Display the input offset in hexadecimal, followed by eight
space-separated, five column, zero-filled, two-byte units
of input data, in unsigned decimal, per line.
-.It Fl e Ar format_string
+.It Fl e Ar format_string
Specify a format string to be used for displaying data.
-.It Fl f Ar format_file
+.It Fl f Ar format_file
Specify a file that contains one or more newline separated format strings.
Empty lines and lines whose first non-blank character is a hash mark
.Pq Dq \&#
are ignored.
-.It Fl n Ar length
+.It Fl n Ar length
Interpret only
.Ar length
bytes of input.
@@ -88,7 +88,7 @@ bytes of input.
Display the input offset in hexadecimal, followed by eight
space-separated, six column, zero-filled, two byte quantities of
input data, in octal, per line.
-.It Fl s Ar offset
+.It Fl s Ar offset
Skip
.Ar offset
bytes from the beginning of the input.
@@ -201,7 +201,7 @@ described in the C standard are supported:
.Nm hexdump
also supports the following additional conversion strings:
.Bl -tag -width Fl
-.It Cm \&_a Ns Op Cm dox
+.It Cm \&_a Ns Op Cm dox
Display the input offset, cumulative across input files, of the
next byte to be displayed.
The appended characters
@@ -211,7 +211,7 @@ and
.Cm x
specify the display base
as decimal, octal or hexadecimal respectively.
-.It Cm \&_A Ns Op Cm dox
+.It Cm \&_A Ns Op Cm dox
Identical to the
.Cm \&_a
conversion string except that it is only performed
@@ -248,12 +248,12 @@ are as follows:
One byte counts only.
.It Xo
.Li \&%d , \&%i , \&%o ,
-.Li \&%u , \&%X , \&%x
+.Li \&%u , \&%X , \&%x
.Xc
Four byte default, one and two byte counts supported.
.It Xo
.Li \&%E , \&%e , \&%f ,
-.Li \&%G , \&%g
+.Li \&%G , \&%g
.Xc
Eight byte default, four byte counts supported.
.El
diff --git a/usr.bin/id/id.1 b/usr.bin/id/id.1
index 92b5245113b..0f2c3fb557c 100644
--- a/usr.bin/id/id.1
+++ b/usr.bin/id/id.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: id.1,v 1.4 1998/09/26 19:54:52 aaron Exp $
+.\" $OpenBSD: id.1,v 1.5 1999/06/05 01:21:27 aaron Exp $
.\" $NetBSD: id.1,v 1.5 1995/09/28 08:05:40 perry Exp $
.\"
.\" Copyright (c) 1991, 1993, 1994
@@ -39,7 +39,7 @@
.\"
.Dd May, 5, 1994
.Dt ID 1
-.Os BSD 4.4
+.Os
.Sh NAME
.Nm id
.Nd return user identity
diff --git a/usr.bin/indent/indent.1 b/usr.bin/indent/indent.1
index 237d4cfb4e4..0f4138f392b 100644
--- a/usr.bin/indent/indent.1
+++ b/usr.bin/indent/indent.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: indent.1,v 1.5 1998/09/26 19:54:53 aaron Exp $
+.\" $OpenBSD: indent.1,v 1.6 1999/06/05 01:21:27 aaron Exp $
.\" Copyright (c) 1980, 1990 The Regents of the University of California.
.\" Copyright (c) 1985 Sun Microsystems, Inc.
.\" Copyright (c) 1976 Board of Trustees of the University of Illinois.
@@ -36,7 +36,7 @@
.\"
.Dd July 24, 1991
.Dt INDENT 1
-.Os BSD 4.2
+.Os
.Sh NAME
.Nm indent
.Nd indent and format C program source
@@ -188,7 +188,7 @@ code. The default is
Enables (disables) forcing `else's to cuddle up to the immediately preceding
`}'. The default is
.Fl \&ce .
-.It Fl \&ci Ns Ar n
+.It Fl \&ci Ns Ar n
Sets the continuation indent to be
.Ar n .
Continuation
@@ -200,7 +200,7 @@ is in effect.
.Fl \&ci
defaults to the same value as
.Fl i .
-.It Fl cli Ns Ar n
+.It Fl cli Ns Ar n
Causes case labels to be indented
.Ar n
tab stops to the right of the containing
@@ -210,7 +210,7 @@ statement.
causes case labels to be indented half a tab stop. The
default is
.Fl cli0 .
-.It Fl d Ns Ar n
+.It Fl d Ns Ar n
Controls the placement of comments which are not to the
right of code. The default
.Fl \&d\&1
@@ -219,7 +219,7 @@ left of code. Specifying
.Fl \&d\&0
lines up these comments with the code. See the section on comment
indentation below.
-.It Fl \&di Ns Ar n
+.It Fl \&di Ns Ar n
Specifies the indentation, in character positions, from a declaration keyword
to the following identifier. The default is
.Fl di16 .
@@ -247,13 +247,13 @@ hand formatted by the programmer. In such cases,
should be
used. The default is
.Fl fc1 .
-.It Fl i Ns Ar n
+.It Fl i Ns Ar n
The number of spaces for one indentation level. The default is 8.
.It Fl \&ip , nip
Enables (disables) the indentation of parameter declarations from the left
margin. The default is
.Fl \&ip .
-.It Fl l Ns Ar n
+.It Fl l Ns Ar n
Maximum length of an output line. The default is 75.
.It Fl \&lp , nlp
Lines up code surrounded by parenthesis in continuation lines. If a line
@@ -317,7 +317,7 @@ get rid of blank lines after declarations. Default:
Causes
.Nm indent
to take its input from stdin, and put its output to stdout.
-.It Fl T Ns Ar typename
+.It Fl T Ns Ar typename
Adds
.Ar typename
to the list of type keywords. Names accumulate:
@@ -390,13 +390,13 @@ line as possible. Blank lines break paragraphs.
.Ss Comment indentation
If a comment is on a line with code it is started in the `comment column',
which is set by the
-.Fl c Ns Ns Ar n
+.Fl c Ns Ns Ar n
command line parameter. Otherwise, the comment is started at
.Ar n
indentation levels less than where code is currently being placed, where
.Ar n
is specified by the
-.Fl d Ns Ns Ar n
+.Fl d Ns Ns Ar n
command line parameter. If the code on a line extends past the comment
column, the comment starts further to the right, and the right margin may be
automatically extended in extreme cases.
diff --git a/usr.bin/ipcrm/ipcrm.1 b/usr.bin/ipcrm/ipcrm.1
index 882ec267f5a..c70bd448196 100644
--- a/usr.bin/ipcrm/ipcrm.1
+++ b/usr.bin/ipcrm/ipcrm.1
@@ -1,7 +1,7 @@
-.\" $OpenBSD: ipcrm.1,v 1.3 1998/09/26 19:54:54 aaron Exp $
+.\" $OpenBSD: ipcrm.1,v 1.4 1999/06/05 01:21:27 aaron Exp $
.\" Copyright (c) 1994 Adam Glass
.\" All rights reserved.
-.\"
+.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
@@ -9,7 +9,7 @@
.\" notice, this list of conditions and the following disclaimer.
.\" 2. The name of the Author may not be used to endorse or promote products
.\" derived from this software without specific prior written permission.
-.\"
+.\"
.\" THIS SOFTWARE IS PROVIDED BY Adam Glass ``AS IS'' AND
.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -21,7 +21,7 @@
.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
-.\"
+.\"
.\""
.Dd August 8th, 1994
.Dt IPCRM 1
@@ -61,11 +61,11 @@ Removes the semaphore set associated with ID
.Nm semid
from the system.
.It Fl Q Ar msgkey
-Remove the message queue associated with key
+Remove the message queue associated with key
.Nm msgkey
from the system.
.It Fl M Ar shmkey
-Mark the shared memory segment associated with key
+Mark the shared memory segment associated with key
.Nm shmkey
for removal.
This marked segment will be destroyed after the last detach.
diff --git a/usr.bin/kdump/kdump.1 b/usr.bin/kdump/kdump.1
index 889bb496b98..250f95bb42a 100644
--- a/usr.bin/kdump/kdump.1
+++ b/usr.bin/kdump/kdump.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: kdump.1,v 1.4 1998/09/26 19:54:56 aaron Exp $
+.\" $OpenBSD: kdump.1,v 1.5 1999/06/05 01:21:28 aaron Exp $
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -34,7 +34,7 @@
.\"
.Dd June 6, 1993
.Dt KDUMP 1
-.Os BSD 4.4
+.Os
.Sh NAME
.Nm kdump
.Nd display kernel trace data
@@ -60,13 +60,13 @@ The options are as follows:
Display all numbers in decimal.
.It Fl e Ar emulation
Interpret system call maps assuming the named emulation instead of "bsd".
-.It Fl f Ar file
+.It Fl f Ar file
Display the specified file instead of
.Pa ktrace.out .
.It Fl l
Loop reading the trace file, once the end-of-file is reached, waiting for
more data.
-.It Fl m Ar maxdata
+.It Fl m Ar maxdata
Display at most
.Ar maxdata
bytes when decoding
@@ -89,7 +89,7 @@ easily amenable to further processing.
Display relative timestamps (time since previous entry).
.It Fl T
Display absolute timestamps for each entry (seconds since epoch).
-.It Fl t Ar cnis
+.It Fl t Ar cnis
See the
.Fl t
option of
diff --git a/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1
index 9a65f3fd13e..0d7b47798a5 100644
--- a/usr.bin/ktrace/ktrace.1
+++ b/usr.bin/ktrace/ktrace.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ktrace.1,v 1.6 1998/09/26 19:54:56 aaron Exp $
+.\" $OpenBSD: ktrace.1,v 1.7 1999/06/05 01:21:28 aaron Exp $
.\" Copyright (c) 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -34,7 +34,7 @@
.\"
.Dd June 6, 1993
.Dt KTRACE 1
-.Os BSD 4.4
+.Os
.Sh NAME
.Nm ktrace
.Nd enable kernel process tracing
@@ -85,23 +85,23 @@ Clear the trace points associated with the specified file or processes.
.It Fl d
Descendants; perform the operation for all current children of the
designated processes.
-.It Fl f Ar file
+.It Fl f Ar file
Log trace records to
.Ar file
instead of
.Pa ktrace.out .
-.It Fl g Ar pgid
+.It Fl g Ar pgid
Enable (disable) tracing on all processes in the process group (only one
.Fl g
flag is permitted).
.It Fl i
Inherit; pass the trace flags to all future children of the designated
processes.
-.It Fl p Ar pid
+.It Fl p Ar pid
Enable (disable) tracing on the indicated process ID (only one
.Fl p
flag is permitted).
-.It Fl t Ar trstr
+.It Fl t Ar trstr
The string argument represents the kernel trace points, one per letter.
The following table equates the letters with the tracepoints:
.Pp
diff --git a/usr.bin/last/last.1 b/usr.bin/last/last.1
index be0c0c5daf3..260e79605d9 100644
--- a/usr.bin/last/last.1
+++ b/usr.bin/last/last.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: last.1,v 1.9 1999/03/11 01:35:06 pjanzen Exp $
+.\" $OpenBSD: last.1,v 1.10 1999/06/05 01:21:28 aaron Exp $
.\" $NetBSD: last.1,v 1.3 1994/12/21 22:41:23 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt LAST 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm last
.Nd indicate last logins of users and ttys
@@ -57,8 +57,8 @@ will either (1) list the sessions of specified
.Ar users ,
.Ar ttys ,
and
-.Ar hosts ,
-in reverse time order,
+.Ar hosts ,
+in reverse time order,
or (2) list the users logged in at a specified snapshot date & time
in reverse time order. Each line of output contains
the user name, the tty from which the session was conducted, any
@@ -96,15 +96,15 @@ names may be names or internet numbers.
.It Fl T
Display better time information, including seconds.
.It Fl d Ar date
-Specify the snapshot date & time.
+Specify the snapshot date & time.
All users logged in at the snapshot date & time will
be reported.
-This may be used with the
+This may be used with the
.Fl f
option to derive the results from stored wtmp files.
When this argument is provided, all other options except for
.Fl f
-and
+and
.Fl n
are ignored.
The argument should be in the form
diff --git a/usr.bin/lastcomm/lastcomm.1 b/usr.bin/lastcomm/lastcomm.1
index 6feba7f4356..996d0a93c03 100644
--- a/usr.bin/lastcomm/lastcomm.1
+++ b/usr.bin/lastcomm/lastcomm.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: lastcomm.1,v 1.10 1999/05/16 19:57:57 alex Exp $
+.\" $OpenBSD: lastcomm.1,v 1.11 1999/06/05 01:21:30 aaron Exp $
.\" $NetBSD: lastcomm.1,v 1.5 1995/10/22 01:43:41 ghudson Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt LASTCOMM 1
-.Os BSD 3
+.Os
.Sh NAME
.Nm lastcomm
.Nd show last commands executed in reverse order
diff --git a/usr.bin/learn/src/learn.1 b/usr.bin/learn/src/learn.1
index 0927ab30768..a867b223c8c 100644
--- a/usr.bin/learn/src/learn.1
+++ b/usr.bin/learn/src/learn.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: learn.1,v 1.3 1999/05/12 13:26:51 aaron Exp $
+.\" $OpenBSD: learn.1,v 1.4 1999/06/05 01:21:36 aaron Exp $
.\"
.\" Copyright (c) 1998 Ian Darwin
.\"
@@ -31,12 +31,12 @@
.\"
.Dd January 30, 1979
.Dt LEARN 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm learn
.Nd computer based learning
.Sh SYNOPSIS
-.Nm learn
+.Nm learn
.Op lesson
.Sh DESCRIPTION
This is a resurrection of the learn command from V7 UNIX, circa 1979.
@@ -44,12 +44,12 @@ The program works fine, but many of the lessons are quite antiquated.
It remains for others to write new lessons describing current
versions of UNIX-like systems.
.Sh FILES
-.Nm /usr/libdata/learn/*
-.Nd lesson files.
-.br
-.Nm /tmp/pl**
-.Nd playground directory created for each invocation.
-Removed at end of run.
+.Bl -tag -width "/usr/libdata/learn/*" -compact
+.It Pa /usr/libdata/learn/*
+lesson files
+.It Pa /tmp/pl*
+playground directory created for each invocation, removed at end of run
+.El
.Sh SEE ALSO
Learn \- Computer-Aided Instruction on UNIX,
(Second Edition), Brian W. Kernighan and Michael E. Lesk.
@@ -57,7 +57,9 @@ January 30, 1979
.Pp
The version described there created the "play" directory for each
user under the lesson file directory; this version creates
-a directory under /tmp for each user.
+a directory under
+.Pa /tmp
+for each user.
.Sh HISTORY
The program originated in Seventh Edition UNIX.
A lightly revised version of the program was released by
diff --git a/usr.bin/lex/flex.1 b/usr.bin/lex/flex.1
index 8deaae0e31c..7002a4f3a75 100644
--- a/usr.bin/lex/flex.1
+++ b/usr.bin/lex/flex.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: flex.1,v 1.6 1999/05/12 13:26:51 aaron Exp $
+.\" $OpenBSD: flex.1,v 1.7 1999/06/05 01:21:30 aaron Exp $
.\"
.TH FLEX 1 "April 1995" "Version 2.5"
.SH NAME
@@ -216,7 +216,7 @@ A somewhat more complicated example:
yyin = fopen( argv[0], "r" );
else
yyin = stdin;
-
+
yylex();
}
@@ -704,7 +704,7 @@ a single blank, and throws away whitespace found at the end of a line:
.PP
If the action contains a '{', then the action spans till the balancing '}'
is found, and the action may cross multiple lines.
-.I flex
+.I flex
knows about C strings and comments and won't be fooled by braces found
within them, but also allows actions to begin with
.B %{
@@ -1902,7 +1902,7 @@ interactive to avoid problems due to waiting to fill buffers
(see the discussion of the
.B \-I
flag below). A non-zero value
-in the macro invocation marks the buffer as interactive, a zero
+in the macro invocation marks the buffer as interactive, a zero
value as non-interactive. Note that use of this macro overrides
.B %option always-interactive
or
@@ -2121,7 +2121,7 @@ The result is large but fast. This option is equivalent to
generates a "help" summary of
.I flex's
options to
-.I stdout
+.I stdout
and then exits.
.B \-?
and
@@ -2417,7 +2417,7 @@ and 8-bit scanners.
specifies that you want flex to generate a C++
scanner class. See the section on Generating C++ Scanners below for
details.
-.TP
+.TP
.B \-C[aefFmr]
controls the degree of table compression and, more generally, trade-offs
between small scanners and fast scanners.
@@ -2875,7 +2875,7 @@ It is a particularly expensive option.
Getting rid of backing up is messy and often may be an enormous
amount of work for a complicated scanner. In principal, one begins
by using the
-.B \-b
+.B \-b
flag to generate a
.I lex.backup
file. For example, on the input
@@ -3145,7 +3145,7 @@ one which doesn't include a newline:
Compiled with
.B \-Cf,
this is about as fast as one can get a
-.I flex
+.I flex
scanner to go for this particular problem.
.PP
A final note:
@@ -3471,7 +3471,7 @@ for the other.
.PP
IMPORTANT: the present form of the scanning class is
.I experimental
-and may change considerably between major releases.
+and may change considerably between major releases.
.SH INCOMPATIBILITIES WITH LEX AND POSIX
.I flex
is a rewrite of the AT&T Unix
diff --git a/usr.bin/lndir/lndir.1 b/usr.bin/lndir/lndir.1
index a196b2bc4b0..ff69a83ee5d 100644
--- a/usr.bin/lndir/lndir.1
+++ b/usr.bin/lndir/lndir.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: lndir.1,v 1.7 1998/09/26 19:54:58 aaron Exp $
+.\" $OpenBSD: lndir.1,v 1.8 1999/06/05 01:21:31 aaron Exp $
.\"
.\" Copyright (c) 1997, Jason Downs. All rights reserved.
.\"
@@ -33,7 +33,7 @@
.\" $XConsortium: lndir.man /main/9 1995/12/15 14:00:35 gildea $
.\"
.\" Copyright (c) 1993, 1994 X Consortium
-.\"
+.\"
.\" Permission is hereby granted, free of charge, to any person obtaining
.\" a copy of this software and associated documentation files (the
.\" "Software"), to deal in the Software without restriction, including
@@ -41,10 +41,10 @@
.\" distribute, sublicense, and/or sell copies of the Software, and to
.\" permit persons to whom the Software is furnished to do so, subject to
.\" the following conditions:
-.\"
+.\"
.\" The above copyright notice and this permission notice shall be
.\" included in all copies or substantial portions of the Software.
-.\"
+.\"
.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
.\" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -52,15 +52,15 @@
.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
.\" OTHER DEALINGS IN THE SOFTWARE.
-.\"
+.\"
.\" Except as contained in this notice, the name of the X Consortium shall
.\" not be used in advertising or otherwise to promote the sale, use or
.\" other dealings in this Software without prior written authorization
.\" from the X Consortium.
-.\"
+.\"
.Dd June 21, 1997
.Dt LNDIR 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm lndir
.Nd create a shadow directory of symbolic links to another directory tree
@@ -74,13 +74,13 @@
.Sh DESCRIPTION
The
.Nm lndir
-program makes a shadow copy
-.Ar todir
+program makes a shadow copy
+.Ar todir
of a directory tree
-.Ar fromdir,
+.Ar fromdir,
except that the shadow is not
populated with real files but instead with symbolic links pointing at
-the real files in the
+the real files in the
.Ar fromdir
directory tree. This is usually useful for maintaining source code for
different machine architectures. You create a shadow directory
@@ -90,7 +90,7 @@ the object files will be in the shadow directory, while the
source files in the shadow directory are just symlinks to the real
files.
.Pp
-This scheme has the advantage that if you update the source, you need not
+This scheme has the advantage that if you update the source, you need not
propagate the change to the other architectures by hand, since all
source in all shadow directories are symlinks to the real thing: just cd
to the shadow directory and recompile away.
@@ -102,7 +102,7 @@ argument is optional and defaults to the current directory. The
argument may be relative (e.g., ../src) and is relative to
.Ar todir
(not the current directory).
-.Pp
+.Pp
.\" CVS.adm is used by the Concurrent Versions System.
Note that RCS, SCCS, CVS and CVS.adm directories are not shadowed, in
addition to any specified on the command line with
@@ -117,13 +117,13 @@ checked that they have the correct link.
Deleting files is a more painful problem; the symlinks will
just point into never never land.
.Pp
-If a file in
+If a file in
.Ar fromdir
-is a symbolic link,
+is a symbolic link,
.Nm lndir
-will make the same link in
+will make the same link in
.Ar todir
-rather than making a link back to the (symbolic link) entry in
+rather than making a link back to the (symbolic link) entry in
.Ar fromdir .
The
.Fl i
@@ -132,7 +132,7 @@ flag changes this behavior.
.Bl -tag -width XxXXXXXXXXXXXX
.It Fl e Ar exceptfile
Add the specified file to the list of excluded files/directories. This is
-effective in all directories searched by
+effective in all directories searched by
.Nm lndir .
This option may be specified as many times as needed.
.It Fl s
@@ -140,11 +140,11 @@ Suppresses status messages normally output as
.Nm lndir
descends into each subdirectory.
.It Fl i
-Causes the program to not treat symbolic links in
+Causes the program to not treat symbolic links in
.Ar fromdir
-specially. The link created in
+specially. The link created in
.Ar todir
-will point back to the corresponding (symbolic link) file in
+will point back to the corresponding (symbolic link) file in
.Ar fromdir .
If the link is to a directory, this is almost certainly the wrong thing.
.Pp
@@ -154,7 +154,7 @@ had in X11R6. Its use is not recommended.
.El
.Sh DIAGNOSTICS
The program displays the name of each subdirectory it enters, followed
-by a colon. The
+by a colon. The
.Fl s
option suppresses these messages.
.Pp
diff --git a/usr.bin/locate/locate/locate.1 b/usr.bin/locate/locate/locate.1
index c06303335ec..c022c952ab4 100644
--- a/usr.bin/locate/locate/locate.1
+++ b/usr.bin/locate/locate/locate.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: locate.1,v 1.8 1998/12/16 02:38:49 aaron Exp $
+.\" $OpenBSD: locate.1,v 1.9 1999/06/05 01:21:31 aaron Exp $
.\"
.\" Copyright (c) 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
.\" Copyright (c) 1990, 1993
@@ -33,11 +33,11 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)locate.1 8.1 (Berkeley) 6/6/93
-.\" $Id: locate.1,v 1.8 1998/12/16 02:38:49 aaron Exp $
+.\" $Id: locate.1,v 1.9 1999/06/05 01:21:31 aaron Exp $
.\"
.Dd June 6, 1993
.Dt LOCATE 1
-.Os BSD 4.4
+.Os
.Sh NAME
.Nm locate
.Nd find filenames quickly
@@ -45,37 +45,52 @@
.Nm locate
.Op Fl Scims
.Op Fl l Ar limit
-.Op Fl d Ar database
+.Op Fl d Ar database
.Ar pattern Op Ar ...
.Sh DESCRIPTION
.Nm locate
searches a database for all pathnames which match the specified
.Ar pattern .
-The database is recomputed periodically (usually weekly or daily),
+The database is recomputed periodically (usually weekly or daily),
and contains the pathnames
of all files which are publicly accessible.
.Pp
-Shell globbing and quoting characters (``*'', ``?'', ``\e'', ``[''
-and ``]'')
+Shell globbing and quoting characters
+.Pf ( Ql * ,
+.Ql ? ,
+.Ql \e ,
+.Ql [ ,
+and
+.Ql \&] )
may be used in
-.Ar pattern ,
+.Ar pattern ,
although they will have to be escaped from the shell.
-Preceding any character with a backslash (``\e'') eliminates any special
-meaning which it may have.
+Preceding any character with a backslash
+.Pq Ql \e
+eliminates any special meaning which it may have.
The matching differs in that no characters must be matched explicitly,
-including slashes (``/'').
+including slashes
+.Pq Ql / .
+.Pp
+As a special case, a pattern containing no globbing characters
+.Pq Dq foo
+is matched as though it were
+.Dq *foo* .
.Pp
-As a special case, a pattern containing no globbing characters (``foo'')
-is matched as though it were ``*foo*''.
-
Historically,
-.Nm locate
+.Nm
stores only characters between 32 and 127. The
-current implementation stores all characters except newline ('\\n') and
-NUL ('\\0'). The 8-bit character support does not waste extra space for
-plain ASCII file names. Characters less than 32 or greater than 127
+current implementation stores all characters except newline
+.Pq Ql \en
+and
+NUL
+.Pq Ql \e0 .
+The 8-bit character support does not waste extra space for
+plain
+.Tn ASCII
+file names. Characters less than 32 or greater than 127
are stored as 2 bytes.
-
+.Pp
The following options are available:
.Bl -tag -width 10n indent
.It Fl S
@@ -86,63 +101,74 @@ Suppress normal output; instead print a count of matching file names.
Search in
.Ar database
instead the default file name database.
-Multiple
+Multiple
.Fl d
-options are allowed. Each additional
+options are allowed. Each additional
.Fl d
option adds the specified database to the list
of databases to be searched.
-
+.Pp
.Ar database
may be a colon-separated list of databases. A single colon is a reference
to the default database.
-
+.Pp
$ locate -d $HOME/lib/mydb: foo
-
-will first search string ``foo'' in
+.Pp
+will first search for the string
+.Dq foo
+in
.Pa $HOME/lib/mydb
-and then in
+and then in
.Pa /var/db/locate.database .
-
+.Pp
$ locate -d $HOME/lib/mydb::/cdrom/locate.database foo
-
-will first search string ``foo'' in
+.Pp
+will first search for the string
+.Dq foo
+in
.Pa $HOME/lib/mydb
-and then in
+and then in
.Pa /var/db/locate.database
-and then in
+and then in
.Pa /cdrom/locate.database .
-
-
-``$ locate -d db1 -d db2 -d db3 pattern'' is the same as
-
-``$ locate -d db1:db2:db3 pattern'' or
-
-``$ locate -d db1:db2 -d db3 pattern''.
-
+.Pp
+$ locate -d db1 -d db2 -d db3 pattern
+.Pp
+is the same as
+.Pp
+$ locate -d db1:db2:db3 pattern
+.Pp
+or
+.Pp
+$ locate -d db1:db2 -d db3 pattern
+.Pp
If
-.Ar -
-is given as the database name, standard input will be read instead.
-For example, you can compress your database
-and use:
-
+.Ql \-
+is given as the
+.Ar database
+name, standard input will be read instead.
+For example, you can compress your database
+and use:
+.Pp
$ zcat database.gz | locate -d - pattern
-
+.Pp
This might be useful on machines with a fast CPU, little RAM and slow
-I/O. Note: you can only use
-.Ar one
+I/O.
+.Sy Note:
+You can only use
+.Em one
pattern for stdin.
.It Fl i
Ignore case distinctions in both the pattern and the database.
.It Fl l Ar number
-Limit output to
+Limit output to
.Ar number
of file names and exit.
.It Fl m
-Use
-.Xr mmap 2
-instead of the
-.Xr stdio 3
+Use
+.Xr mmap 2
+instead of the
+.Xr stdio 3
library. This is the default behavior. Usually faster in most cases.
.It Fl s
Use the
@@ -156,13 +182,13 @@ locate database
.It Pa /usr/libexec/locate.updatedb
script to update the locate database
.It Pa /etc/weekly
-script that usually starts the database rebuild
+script that starts the database rebuild
.El
.Sh ENVIRONMENT
.Bl -tag -width LOCATE_PATH -compact
.It Ev LOCATE_PATH
-Path to the locate database if set and not empty, ignored if the
-.Fl d
+Path to the locate database if set and not empty; ignored if the
+.Fl d
option was specified.
.El
.Sh SEE ALSO
@@ -179,17 +205,17 @@ option was specified.
.Re
.Sh BUGS
.Nm
-may fail to list some files that are present, or may
+may fail to list some files that are present, or may
list files that have been removed from the system. This is because
.Nm
only reports files that are present in a periodically reconstructed
database (typically rebuilt once a week by the
-.Pa /etc/weekly
+.Pa /etc/weekly
script).
Use
.Xr find 1
to locate files that are of a more transitory nature.
-
+.Pp
The
.Nm
database is built by user
@@ -198,15 +224,15 @@ using
.Xr find 1 .
This will
skip directories which are not readable by user
-.Dq nobody ,
+.Dq nobody ,
group
.Dq nobody ,
or
the world.
-E.g. if your HOME directory is not world-readable, your files will
-.Ar not
+e.g., if your home directory is not world-readable, your files will
+.Em not
appear in the database.
-
+.Pp
The
.Nm
database is not byte order independent. It is not possible
@@ -214,9 +240,9 @@ to share the databases between machines with different byte order.
The current
.Nm
implementation understands databases in host byte order or
-network byte order. So a little-endian machine can understand
+network byte order. So a little-endian machine can't understand
a locate database which was built on an big-endian machine.
-
+.Pp
.Sh HISTORY
The
.Nm locate
diff --git a/usr.bin/locate/locate/locate.updatedb.8 b/usr.bin/locate/locate/locate.updatedb.8
index e0c39146e45..bd1140f3405 100644
--- a/usr.bin/locate/locate/locate.updatedb.8
+++ b/usr.bin/locate/locate/locate.updatedb.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: locate.updatedb.8,v 1.7 1999/05/23 14:11:30 aaron Exp $
+.\" $OpenBSD: locate.updatedb.8,v 1.8 1999/06/05 01:21:31 aaron Exp $
.\"
.\" Copyright (c) 1996
.\" Mike Pritchard <mpp@FreeBSD.org>. All rights reserved.
@@ -61,7 +61,9 @@ The available options are as follows:
Sets the directory temporary files are stored in.
.It Fl -fcodes
Use the named file as the find codes database. If the file
-name ``-'' is given, the database will be sent to standard output.
+name
+.Ql \-
+is given, the database will be sent to standard output.
.It Fl -searchpaths
Sets the list of directories to be put in the database.
.It Fl -prunepaths
diff --git a/usr.bin/lock/lock.1 b/usr.bin/lock/lock.1
index d2ebe5a17c2..9e8063d3d03 100644
--- a/usr.bin/lock/lock.1
+++ b/usr.bin/lock/lock.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: lock.1,v 1.5 1998/11/11 23:01:44 aaron Exp $
+.\" $OpenBSD: lock.1,v 1.6 1999/06/05 01:21:31 aaron Exp $
.\" $NetBSD: lock.1,v 1.4 1994/12/22 01:16:21 jtc Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
@@ -46,7 +46,7 @@
.Op Fl p
.Op Fl t Ar timeout
.Sh DESCRIPTION
-.Nm lock
+.Nm
requests a password from the user, reads it again for verification
and then will normally not relinquish the terminal until the password is
repeated.
@@ -66,7 +66,7 @@ to unlock the terminal. To do this the user should enter "s/key"
at the unlock "Key:" prompt. The user will then be issued an S/Key
challange to which they may respond with a six-word S/Key one-time
password.
-.It Fl t Ar timeout
+.It Fl t Ar timeout
The time limit (default 15 minutes) is changed to
.Ar timeout
minutes.
@@ -75,6 +75,6 @@ minutes.
.Xr skey 1
.Sh HISTORY
The
-.Nm lock
+.Nm
command appeared in
.Bx 3.0 .
diff --git a/usr.bin/logger/logger.1 b/usr.bin/logger/logger.1
index 58edc0cdae8..5d65dcfb6c5 100644
--- a/usr.bin/logger/logger.1
+++ b/usr.bin/logger/logger.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: logger.1,v 1.4 1998/11/11 23:01:45 aaron Exp $
+.\" $OpenBSD: logger.1,v 1.5 1999/06/05 01:21:32 aaron Exp $
.\" $NetBSD: logger.1,v 1.4 1994/12/22 06:26:59 jtc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt LOGGER 1
-.Os BSD 4.3
+.Os
.Sh NAME
.Nm logger
.Nd make entries in the system log
@@ -60,21 +60,25 @@ Log the process ID of the logger process
with each line.
.It Fl s
Log the message to standard error, as well as the system log.
-.It Fl f Ar file
+.It Fl f Ar file
Log the specified file.
-.It Fl p Ar pri
+.It Fl p Ar pri
Enter the message with the specified priority.
-The priority may be specified numerically or as a ``facility.level''
+The priority may be specified numerically or as a
+.Dq facility.level
pair.
-For example, ``\-p local3.info'' logs the message(s) as
+For example,
+.Dq \-p local3.info
+logs the message(s) as
.Ar info Ns rmational
level in the
.Ar local3
facility.
-The default is ``user.notice.''
-.It Fl t Ar tag
+The default is
+.Dq user.notice .
+.It Fl t Ar tag
Mark every line in the log with the specified
-.Ar tag .
+.Ar tag .
.It Ar message
Write the message to log; if not specified, and the
.Fl f
diff --git a/usr.bin/login/login.1 b/usr.bin/login/login.1
index 51e99acd997..15d2bf6acbc 100644
--- a/usr.bin/login/login.1
+++ b/usr.bin/login/login.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: login.1,v 1.8 1999/04/20 23:05:41 pjanzen Exp $
+.\" $OpenBSD: login.1,v 1.9 1999/06/05 01:21:32 aaron Exp $
.\" $NetBSD: login.1,v 1.7 1995/08/31 22:52:33 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd May 5, 1994
.Dt LOGIN 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm login
.Nd log into the computer
@@ -47,12 +47,12 @@
.Op Ar user
.Sh DESCRIPTION
The
-.Nm login
+.Nm
utility logs users (and pseudo-users) into the computer system.
.Pp
If no user is specified, or if a user is specified and authentication
of the user fails,
-.Nm login
+.Nm
prompts for a user name.
Authentication of users is done via passwords.
Alternately, the user can enter the password "s/key", in which case
@@ -79,7 +79,7 @@ It is used by various daemons such as
This option may only be used by the super-user.
.It Fl p
By default,
-.Nm login
+.Nm
discards any previous environment.
The
.Fl p
@@ -89,7 +89,7 @@ option disables this behavior.
If the file
.Pa /etc/nologin
exists,
-.Nm login
+.Nm
displays its contents to the user and exits.
This is used by
.Xr shutdown 8
@@ -98,18 +98,18 @@ to prevent users from logging in when the system is about to go down.
If the file
.Pa /etc/fbtab
exists,
-.Nm login
+.Nm
changes the protection and ownership of certain devices specified in this
file.
.Pp
If the file
.Pa /var/log/failedlogin
exists,
-.Nm login
+.Nm
will record failed login attempts in this file.
.Pp
Immediately after logging a user in,
-.Nm login
+.Nm
displays the system copyright notice, the date and time the user last
logged in, the date and time of the last unsuccessful login (if the file
.Pa /var/log/failedlogin
@@ -119,14 +119,14 @@ If the file
exists in the user's home directory, all of these messages are suppressed.
This is to simplify logins for non-human users, such as
.Xr uucp 1 .
-.Nm login
+.Nm
then records an entry in the
.Xr wtmp 5
and
.Xr utmp 5
files and executes the user's command interpreter.
.Pp
-.Nm login
+.Nm
enters information into the environment (see
.Xr environ 7 )
specifying the user's home directory
@@ -146,7 +146,7 @@ The standard shells,
and
.Xr sh 1 ,
do not fork before executing the
-.Nm login
+.Nm
utility.
.Sh FILES
.Bl -tag -width /var/log/failedlogin -compact
@@ -180,6 +180,6 @@ makes login quieter
.Xr environ 7
.Sh HISTORY
A
-.Nm login
+.Nm
utility appeared in
.At v6 .
diff --git a/usr.bin/logname/logname.1 b/usr.bin/logname/logname.1
index 9c78703c57a..961251577a8 100644
--- a/usr.bin/logname/logname.1
+++ b/usr.bin/logname/logname.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: logname.1,v 1.5 1998/09/26 19:55:01 aaron Exp $
+.\" $OpenBSD: logname.1,v 1.6 1999/06/05 01:21:32 aaron Exp $
.\" $NetBSD: logname.1,v 1.5 1995/07/25 18:31:12 jtc Exp $
.\"
.\" Copyright (c) 1991, 1993
@@ -39,7 +39,7 @@
.\"
.Dd June, 9, 1993
.Dt LOGNAME 1
-.Os BSD 4.4
+.Os
.Sh NAME
.Nm logname
.Nd display user's login name
@@ -47,12 +47,12 @@
.Nm logname
.Sh DESCRIPTION
The
-.Nm logname
+.Nm
utility writes the user's login name to standard output followed by
a newline.
.Pp
The
-.Nm logname
+.Nm
utility explicitly ignores the
.Ev LOGNAME
and
@@ -61,7 +61,7 @@ environment variables
because the environment cannot be trusted.
.Pp
The
-.Nm logname
+.Nm
utility exits 0 on success or >0 if an error occurred.
.Sh SEE ALSO
.Xr who 1 ,
@@ -69,8 +69,8 @@ utility exits 0 on success or >0 if an error occurred.
.Xr getlogin 2
.Sh STANDARDS
The
-.Nm logname
-utility conforms to
+.Nm
+utility conforms to
.St -p1003.2-92 .
.Sh HISTORY
The
diff --git a/usr.bin/look/look.1 b/usr.bin/look/look.1
index 902cf96a790..1cee52c29b7 100644
--- a/usr.bin/look/look.1
+++ b/usr.bin/look/look.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: look.1,v 1.3 1998/09/26 19:55:01 aaron Exp $
+.\" $OpenBSD: look.1,v 1.4 1999/06/05 01:21:32 aaron Exp $
.\" $NetBSD: look.1,v 1.3 1994/12/23 01:10:59 jtc Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -47,15 +47,15 @@
.Ar string
.Op Ar file
.Sh DESCRIPTION
-The
-.Nm look
+The
+.Nm
utility displays any lines in
.Ar file
which contain
.Ar string
as a prefix.
As
-.Nm look
+.Nm
performs a binary search, the lines in
.Ar file
must be sorted.
@@ -84,7 +84,7 @@ are compared.
.El
.Pp
The
-.Nm look
+.Nm
utility exits 0 if one or more lines were found and displayed,
1 if no lines were found, and >1 if an error occurred.
.Sh FILES
@@ -103,5 +103,5 @@ option was specified.
This was incorrect and the current man page matches the historic
implementation.
.Sh HISTORY
-.Nm look
+.Nm
appeared in Version 7 AT&T Unix.
diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index e8a9135b522..5db7d0cea54 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mail.1,v 1.23 1999/05/12 13:26:51 aaron Exp $
+.\" $OpenBSD: mail.1,v 1.24 1999/06/05 01:21:33 aaron Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -35,7 +35,7 @@
.\"
.Dd April 28, 1995
.Dt MAIL 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm mail ,
.Nm mailx ,
@@ -118,16 +118,16 @@ except that locking is done.
.El
.Ss Startup actions
At startup time,
-.Nm mail
+.Nm mail
will execute commands in the system command files
-.Pa /usr/share/misc/mail.rc ,
+.Pa /usr/share/misc/mail.rc ,
.Pa /usr/local/etc/mail.rc
and
-.Pa /etc/mail.rc
+.Pa /etc/mail.rc
in order unless explicitly told not to by using the
.Fl n
-option. Next, the commands in the user's personal command file
-.Pa ~/.mailrc
+option. Next, the commands in the user's personal command file
+.Pa ~/.mailrc
are executed.
.Nm mail
then examines its command line options to determine whether the user
@@ -304,7 +304,7 @@ feature.
(These options are summarized below.)
.Sh SUMMARY
(Adapted from the
-.Dq Mail Reference Manual . )
+.Dq Mail Reference Manual . )
.Pp
Each command is typed on a line by itself, and may take arguments
following the command word.
@@ -1045,7 +1045,7 @@ If defined, gives the pathname of the file used to record all outgoing
mail.
If not defined, then outgoing mail is not so saved.
.It Ar indentprefix
-String used by the
+String used by the
.Ic \&~m
tilde escape for indenting messages, in place of the normal tab character
.Pq Sq ^I
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index d08619a51b8..a3afcb8d1e1 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: make.1,v 1.18 1999/05/16 21:53:31 espie Exp $
+.\" $OpenBSD: make.1,v 1.19 1999/06/05 01:21:33 aaron Exp $
.\" $NetBSD: make.1,v 1.18 1997/03/10 21:19:53 christos Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
.Nm make
.Nd maintain program dependencies
.Sh SYNOPSIS
-.Nm
+.Nm make
.Op Fl BPSeiknqrst
.Op Fl D Ar variable
.Op Fl d Ar flags
@@ -52,10 +52,10 @@
.Op Fl m Ar directory
.Ek
.Op Fl V Ar variable
-.Op Ar variable=value
+.Op Ar variable Ns No = Ns Ar value
.Op Ar target ...
.Sh DESCRIPTION
-.Nm make
+.Nm
is a program designed to simplify the maintenance of other programs.
Its input is a list of specifications as to the files upon which programs
and other files depend.
@@ -74,7 +74,7 @@ exists, it is read (see
.Pp
This manual page is intended as a reference document only.
For a more thorough introduction to
-.Nm make
+.Nm
and makefiles, please refer to
.%T "Make \- A Tutorial" .
.Pp
@@ -92,7 +92,7 @@ Define
to be 1, in the global context.
.It Fl d Ar flags
Turn on debugging, and specify which portions of
-.Nm make
+.Nm
are to print debugging information.
.Ar flags
is one or more of the following:
@@ -137,7 +137,7 @@ and
If
.Ar makefile
is
-.Ql Fl ,
+.Ql \- ,
standard input is read.
Multiple makefiles may be specified, and are read in the order specified.
.It Fl I Ar directory
@@ -148,11 +148,11 @@ option) is automatically included as part of this list.
.It Fl i
Ignore non-zero exit of shell commands in the makefile.
Equivalent to specifying
-.Ql Fl
+.Ql \-
before each command line in the makefile.
.It Fl j Ar max_jobs
Specify the maximum number of jobs that
-.Nm make
+.Nm
may have running at any one time. Turns compatibility mode off, unless the
.Ar B
flag is also specified.
@@ -172,9 +172,9 @@ option).
Display the commands that would have been executed, but do not actually
execute them.
.It Fl P
-Collate the output of a given job and display it only when the job finishes,
-instead of mixing the output of parallel jobs together.
-This option has no effect unless
+Collate the output of a given job and display it only when the job finishes,
+instead of mixing the output of parallel jobs together.
+This option has no effect unless
.Fl j
is used too.
.It Fl q
@@ -224,7 +224,9 @@ line are compressed into a single space.
.Sh FILE DEPENDENCY SPECIFICATIONS
Dependency lines consist of one or more targets, an operator, and zero
or more sources.
-This creates a relationship where the targets ``depend'' on the sources
+This creates a relationship where the targets
+.Dq depend
+on the sources
and are usually created from them.
The exact relationship between the target and the source is determined
by the operator that separates them.
@@ -236,7 +238,7 @@ those of any of its sources.
Sources for a target accumulate over dependency lines when this operator
is used.
The target is removed if
-.Nm make
+.Nm
is interrupted.
.It Ic \&!
Targets are always re-created, but not until all sources have been
@@ -244,7 +246,7 @@ examined and re-created as necessary.
Sources for a target accumulate over dependency lines when this operator
is used.
The target is removed if
-.Nm make
+.Nm
is interrupted.
.It Ic \&::
If no sources are specified, the target is always re-created.
@@ -253,7 +255,7 @@ been modified more recently than the target.
Sources for a target do not accumulate over dependency lines when this
operator is used.
The target will not be removed if
-.Nm make
+.Nm
is interrupted.
.El
.Pp
@@ -299,7 +301,7 @@ A
causes any non-zero exit status of the command line to be ignored.
.Sh VARIABLE ASSIGNMENTS
Variables in
-.Nm make
+.Nm
are much like variables in the shell, and, by tradition,
consist of all upper-case letters.
The five operators that can be used to assign values to variables are as
@@ -368,7 +370,9 @@ The name of the archive file; also known as
.Ql Va \&! .
.It Va .IMPSRC
The name/path of the source from which the target is to be transformed
-(the ``implied'' source); also known as
+(the
+.Dq implied
+source); also known as
.Ql Va \&< .
.It Va .MEMBER
The name of the archive member; also known as
@@ -421,8 +425,8 @@ and
.El
.Pp
In addition,
-.Nm make
-sets or knows about the following internal variables, or environment
+.Nm
+sets or knows about the following internal variables, or environment
variables:
.Bl -tag -width MAKEFLAGS
.It Va \&$
@@ -434,50 +438,52 @@ expands to a single dollar
sign.
.It Va .MAKE
The name that
-.Nm make
+.Nm
was executed with
.Pq Va argv Ns Op 0 .
.It Va .CURDIR
A path to the directory where
-.Nm make
+.Nm
was executed.
.It Va .OBJDIR
A path to the directory where the targets are built.
At startup,
-.Nm make
+.Nm
searches for an alternate directory to place target files -- it
will attempt to change into this special directory.
-First, if
-.Ev MAKEOBJDIRPREFIX
-is defined,
-.Nm make
+First, if
+.Ev MAKEOBJDIRPREFIX
+is defined,
+.Nm
prepends its contents to the current directory name and tries for
the resulting directory. If that fails,
-.Nm make
+.Nm
remains in the current directory.
-If
+If
.Ev MAKEOBJDIRPREFIX
is not defined,
-.Nm make
+.Nm
checks
-.Ev MAKEOBJDIR
-and tries to change into that directory. Should that fail,
-.Nm make
-remains in the current directory. If
+.Ev MAKEOBJDIR
+and tries to change into that directory. Should that fail,
+.Nm
+remains in the current directory. If
.Ev MAKEOBJDIR
is not defined, it tries to change into the directory named
.Pa obj.${MACHINE}
-(see
-.Va MACHINE
-variable). If it still has found no special directory,
-.Nm make
+(see
+.Va MACHINE
+variable). If it still has found no special directory,
+.Nm
next tries the directory named
.Pa obj .
If this fails,
-.Nm make
-tries to prepend /usr/obj to the current directory name.
+.Nm
+tries to prepend
+.Pa /usr/obj
+to the current directory name.
Finally, if none of these directories are available
-.Nm make
+.Nm
will settle for and use the current directory.
.It Va .MAKEFLAGS
The environment variable
@@ -485,26 +491,26 @@ The environment variable
may contain anything that
may be specified on
.Nm make Ns 's
-command line. Its contents are stored in
+command line. Its contents are stored in
.Nm make Ns 's
-.Va .MAKEFLAGS
+.Va .MAKEFLAGS
variable.
Anything specified on
.Nm make Ns 's
command line is appended to the
.Va .MAKEFLAGS
variable which is then
-entered into the environment as
+entered into the environment as
.Ev MAKEFLAGS
for all programs which
-.Nm make
+.Nm
executes.
.It Va MFLAGS
-A shorter synonym for
+A shorter synonym for
.Va .MAKEFLAGS .
.It Ev PWD
Alternate path to the current directory.
-.Nm make
+.Nm
normally sets
.Ql Va .CURDIR
to the canonical path given by
@@ -512,7 +518,7 @@ to the canonical path given by
However, if the environment variable
.Ev PWD
is set and gives a path to the current directory, then
-.Nm make
+.Nm
sets
.Ql Va .CURDIR
to the value of
@@ -522,38 +528,40 @@ instead.
is always set to the value of
.Ql Va .OBJDIR
for all programs which
-.Nm make
+.Nm
executes.
.It Va .TARGETS
-List of targets
-.Nm make
+List of targets
+.Nm
is currently building.
.It Va .INCLUDES
-See
+See
.Ic .INCLUDES
special target
.It Va .LIBS
-See
+See
.Ic .LIBS
special target
.It Va MACHINE
-Name of the machine architecture
-.Nm make
+Name of the machine architecture
+.Nm
is running on, obtained from the
.Ev MACHINE
-environment variable, or through
+environment variable, or through
.Xr uname 2
if not defined.
.It Va MACHINE_ARCH
Name of the machine architecture
-.Nm make
+.Nm
was compiled for, obtained from the
-.Ev MACHINE_ARCH
+.Ev MACHINE_ARCH
environment variable, or defined at compilation time.
.El
.Pp
Variable expansion may be modified to select or modify each word of the
-variable (where a ``word'' is whitespace delimited sequence of characters).
+variable (where a
+.Dq word
+is whitespace delimited sequence of characters).
The general format of a variable expansion is as follows:
.Pp
.Dl {variable[:modifier[:...]]}
@@ -816,7 +824,7 @@ of higher precedence than
.El
.Pp
As in C,
-.Nm make
+.Nm
will only evaluate a conditional as far as is necessary to determine
its value.
Parentheses may be used to change the order of evaluation.
@@ -871,21 +879,26 @@ If no relational operator is given, it is assumed that the expanded
variable is being compared against 0.
.Pp
When
-.Nm make
+.Nm
is evaluating one of these conditional expressions, and it encounters
-a word it doesn't recognize, either the ``make'' or ``defined''
+a word it doesn't recognize, either the
+.Dq make
+or
+.Dq defined
expression is applied to it, depending on the form of the conditional.
If the form is
.Ql Ic .ifdef
or
.Ql Ic .ifndef ,
-the ``defined'' expression
-is applied.
+the
+.Dq defined
+expression is applied.
Similarly, if the form is
.Ql Ic .ifmake
or
.Ql Ic .ifnmake ,
-the ``make''
+the
+.Dq make
expression is applied.
.Pp
If the conditional evaluates to true the parsing of the makefile continues
@@ -933,7 +946,7 @@ Ignore any errors from the commands associated with this target, exactly
as if they all were preceded by a dash
.Pq Ql \- .
.It Ic .MADE
-Mark all sources of this target as being up-to-date.
+Mark all sources of this target as being up-to-date.
.It Ic .MAKE
Execute the commands associated with this target even if the
.Fl n
@@ -944,18 +957,18 @@ Normally used to mark recursive
.Nm make Ns 's .
.It Ic .NOTMAIN
Normally
-.Nm make
+.Nm
selects the first target it encounters as the default target to be built
if no target was specified.
This source prevents this target from being selected.
.It Ic .OPTIONAL
If a target is marked with this attribute and
-.Nm make
+.Nm
can't figure out how to create it, it will ignore this fact and assume
the file isn't needed or already exists.
.It Ic .PRECIOUS
When
-.Nm make
+.Nm
is interrupted, it removes any partially made targets.
This source prevents the target from being removed.
.It Ic .SILENT
@@ -994,7 +1007,7 @@ This is sort of a
.Ic .USE
rule for any target (that was used only as a
source) that
-.Nm make
+.Nm
can't figure out any other way to create.
Only the shell script is used.
The
@@ -1019,31 +1032,31 @@ file. The suffix must have already been declared with
.Ic .SUFFIXES ,
any suffix so declared will have the directories on its search path (see
.Ic .PATH )
-placed in the
+placed in the
.Va .INCLUDES
-special variable, each preceded by a
-.Fl I
+special variable, each preceded by a
+.Fl I
flag.
.It Ic .INTERRUPT
If
-.Nm make
+.Nm
is interrupted, the commands for this target will be executed.
.It Ic .LIBS
-This does for libraries what
-.Ic .INCLUDES
+This does for libraries what
+.Ic .INCLUDES
does for include files, except that the flag used is
.Fl L .
.It Ic .MAIN
If no target is specified when
-.Nm make
+.Nm
is invoked, this target will be built. This is always set, either
-explicitly, or implicitly when
-.Nm make
+explicitly, or implicitly when
+.Nm
selects the default target, to give the user a way to refer to the default
target on the command line.
.It Ic .MAKEFLAGS
This target provides a way to specify flags for
-.Nm make
+.Nm
when the makefile is used.
The flags are as if typed to the shell, though the
.Fl f
@@ -1071,8 +1084,8 @@ deleted.
.It Ic .PATH\fIsuffix\fR
The sources are directories which are to be searched for suffixed files
not found in the current directory.
-.Nm make
-first searches the suffixed search path, before reverting to the default
+.Nm
+first searches the suffixed search path, before reverting to the default
path if the file is not found there.
.It Ic .PHONY
Apply the
@@ -1100,24 +1113,24 @@ Each source specifies a suffix to
.Nm make .
If no sources are specified, any previous specified suffices are deleted.
.Sh COMPATIBILITY
-Older versions of
-.Nm make
-used
+Older versions of
+.Nm
+used
.Ev MAKE
-instead of
+instead of
.Ev MAKEFLAGS .
This was removed for POSIX compatibility.
-The internal variable
+The internal variable
.Va MAKE
is set to the same value as
.Va .MAKE ,
support for this may be removed in the future.
.Pp
-Most of the more esoteric features of
-.Nm make
+Most of the more esoteric features of
+.Nm
should probably be avoided for greater compatibility.
.Sh ENVIRONMENT
-.Nm make
+.Nm
uses the following environment variables, if they exist:
.Ev MACHINE ,
.Ev MACHINE_ARCH ,
@@ -1141,25 +1154,25 @@ system makefile
.It Pa /usr/share/mk
system makefile directory
.IT Pa /usr/obj
-default
+default
.Ev MAKEOBJDIRPREFIX directory.
.El
.Sh BUGS
The determination of
.Va .OBJDIR
-is contorted to the point of absurdity.
+is contorted to the point of absurdity.
.Pp
In the presence of several
.Ic .MAIN
special targets,
-.Nm make
+.Nm
silently ignores all but the first.
.Pp
.Va .TARGETS
is not set to the default target when
-.Nm make
+.Nm
is invoked without a target name and no
-.Ic MAIN
+.Ic MAIN
special target exists.
.Pp
The evaluation of
@@ -1184,6 +1197,6 @@ won't work, and should be rewritten the other way around.
.Xr mkdep 1
.Sh HISTORY
A
-.Nm make
+.Nm
command appeared in
.At v7 .
diff --git a/usr.bin/man/man.1 b/usr.bin/man/man.1
index c904c3b12f2..765d12b381f 100644
--- a/usr.bin/man/man.1
+++ b/usr.bin/man/man.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: man.1,v 1.8 1998/09/26 19:55:06 aaron Exp $
+.\" $OpenBSD: man.1,v 1.9 1999/06/05 01:21:33 aaron Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -55,7 +55,7 @@
.Fl f Ar filename
.Sh DESCRIPTION
The
-.Nm man
+.Nm
utility
displays the
.Bx
@@ -93,7 +93,7 @@ and
combination.
(Normally, only the first manual page found is displayed.)
.It Fl C Ar file
-Use the specified
+Use the specified
.Ar file
instead of the default configuration file.
This permits users to configure their own manual environment.
@@ -111,24 +111,30 @@ Display only the
lines of the requested manual pages.
.It Fl M Ar path
Override the list of standard directories which
-.Nm man
+.Nm
searches for manual pages.
The supplied
.Ar path
-must be a colon (``:'') separated list of directories.
+must be a colon
+.Pq Ql \&:
+separated list of directories.
This search path may also be set using the environment variable
.Ev MANPATH .
The subdirectories to be searched, and their search order,
-is specified by the ``_subdir'' line in the
-.Nm man
+is specified by the
+.Dq _subdir
+line in the
+.Nm
configuration file.
.It Fl m Ar path
Augment the list of standard directories which
-.Nm man
+.Nm
searches for manual pages.
The supplied
.Ar path
-must be a colon (``:'') separated list of directories.
+must be a colon
+.Pq Ql \&:
+separated list of directories.
These directories will be searched before the standard directories or
the directories specified using the
.Fl M
@@ -136,20 +142,24 @@ option or the
.Ev MANPATH
environment variable.
The subdirectories to be searched, and their search order,
-is specified by the ``_subdir'' line in the
-.Nm man
+is specified by the
+.Dq _subdir
+line in the
+.Nm
configuration file.
.It Fl s Ar section
Another way of specifying the section, for compatibility with
-.Nm man
+.Nm
on other operating systems.
.It Fl S Ar subsection
Specifies the machine-dependent subsection. This overrides the
.Ev MACHINE
-environment variable. See the ``ENVIRONMENT'' section below.
+environment variable. See the
+.Sx ENVIRONMENT
+section below.
.It Fl w
List the pathnames of the manual pages which
-.Nm man
+.Nm
would display for the specified
.Ar section
and
@@ -166,10 +176,10 @@ works.
The optional
.Ar section
argument restricts the directories that
-.Nm man
+.Nm
will search.
The
-.Nm man
+.Nm
configuration file (see
.Xr man.conf 5 )
specifies the possible
@@ -177,13 +187,13 @@ specifies the possible
values that are currently available.
If only a single argument is specified or if the first argument is
not a valid section,
-.Nm man
+.Nm
assumes that the argument is the name of a manual page to be displayed.
.Sh ENVIRONMENT
.Bl -tag -width MANPATHX
.It Ev MACHINE
As some manual pages are intended only for specific architectures,
-.Nm man
+.Nm
searches any subdirectories,
with the same name as the current architecture,
in every directory which it searches.
@@ -194,15 +204,19 @@ variable
to the name of a specific architecture.
.It Ev MANPATH
The standard search path used by
-.Nm man
+.Nm
may be overridden by specifying a path in the
.Ev MANPATH
environment
variable.
-The format of the path is a colon (``:'') separated list of directories.
+The format of the path is a colon
+.Pq Ql \&:
+separated list of directories.
The subdirectories to be searched as well as their search order
-is specified by the ``_subdir'' line in the
-.Nm man
+is specified by the
+.Dq _subdir
+line in the
+.Nm
configuration file.
.It Ev PAGER
Any value of the environment variable
diff --git a/usr.bin/man/man.conf.5 b/usr.bin/man/man.conf.5
index c4ba83e43fd..9d9a1bef821 100644
--- a/usr.bin/man/man.conf.5
+++ b/usr.bin/man/man.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: man.conf.5,v 1.4 1998/11/11 23:01:45 aaron Exp $
+.\" $OpenBSD: man.conf.5,v 1.5 1999/06/05 01:21:33 aaron Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -158,8 +158,8 @@ By default, the command
will search for
``mktemp.<any_digit>'' and ``mktemp.tbl''
in the directories
-.Dq Pa /usr/share/man/cat1 ,
-.Dq Pa /usr/share/man/cat2 ,
+.Dq Pa /usr/share/man/cat1 ,
+.Dq Pa /usr/share/man/cat2 ,
and
.Dq Pa /usr/share/man/cat3 .
If on a machine of type ``vax'', the subdirectory ``vax'' in each
diff --git a/usr.bin/midiplay/midiplay.1 b/usr.bin/midiplay/midiplay.1
index 0ebc5c3e3bc..31c00c5fc57 100644
--- a/usr.bin/midiplay/midiplay.1
+++ b/usr.bin/midiplay/midiplay.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: midiplay.1,v 1.2 1999/04/02 15:12:18 aaron Exp $
+.\" $OpenBSD: midiplay.1,v 1.3 1999/06/05 01:21:53 aaron Exp $
.\" $NetBSD: midiplay.1,v 1.3 1998/08/13 18:26:36 augustss Exp $
.\" Copyright (c) 1998 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
@@ -50,7 +50,7 @@
.Op Fl x
.Op Ar file ...
.Sh DESCRIPTION
-The
+The
.Nm
command plays MIDI files using the sequencer device.
If no file name is given it will play from standard input, otherwise
diff --git a/usr.bin/mkdep/mkdep.1 b/usr.bin/mkdep/mkdep.1
index 96b72a6bf34..af8c813c1cf 100644
--- a/usr.bin/mkdep/mkdep.1
+++ b/usr.bin/mkdep/mkdep.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mkdep.1,v 1.3 1998/09/26 19:55:08 aaron Exp $
+.\" $OpenBSD: mkdep.1,v 1.4 1999/06/05 01:21:34 aaron Exp $
.\" $NetBSD: mkdep.1,v 1.3 1994/12/23 07:34:56 jtc Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt MKDEP 1
-.Os BSD 4.2
+.Os
.Sh NAME
.Nm mkdep
.Nd construct Makefile dependency list
@@ -47,10 +47,11 @@
.Op Ar flags
.Ar file Op Ar ...
.Sh DESCRIPTION
-.Nm mkdep
+.Nm
takes a set of flags for the C compiler and a list
of C source files as arguments and constructs a set of include
-file dependencies which are written into the file ``.depend''.
+file dependencies which are written into the file
+.Pa .depend .
An example of its use in a Makefile might be:
.Bd -literal -offset indent
CFLAGS= -O -I../include
@@ -71,12 +72,13 @@ so that multiple
.Nm mkdep Ns 's
may be run from a single Makefile.
.It Fl f Ar file
-Write the include file dependencies to
+Write the include file dependencies to
.Ar file ,
-instead of the default ``.depend''.
+instead of the default
+.Pa .depend .
.It Fl p
Cause
-.Nm mkdep
+.Nm
to produce dependencies of the form:
.Bd -literal -offset indent
program: program.c
@@ -101,6 +103,6 @@ file containing list of dependencies
.El
.Sh HISTORY
The
-.Nm mkdep
+.Nm
command appeared in
.Bx 4.3 Tahoe .
diff --git a/usr.bin/more/more.1 b/usr.bin/more/more.1
index f0471de3eff..0df060716ad 100644
--- a/usr.bin/more/more.1
+++ b/usr.bin/more/more.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: more.1,v 1.7 1996/10/14 15:23:53 etheisen Exp $
+.\" $OpenBSD: more.1,v 1.8 1999/06/05 01:21:34 aaron Exp $
.\" Copyright (c) 1980 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -45,7 +45,7 @@ more, page \- file perusal filter for crt viewing
.B \-\fIn\fP
]
[
-.B +\fIlinenumber\fP
+.B +\fIlinenumber\fP
]
[
.B +/\fIpattern\fP
@@ -72,10 +72,10 @@ will use instead of the default.
.TP
.B \-c
.I More
-will draw each page by beginning at the top of the screen and erasing
+will draw each page by beginning at the top of the screen and erasing
each line just before it draws on it.
-This avoids scrolling the screen, making it easier to read while
-.I more
+This avoids scrolling the screen, making it easier to read while
+.I more
is writing.
This option will be ignored if the terminal does not have the ability
to clear to the end of a line.
@@ -261,7 +261,7 @@ same as b
.IP "q or Q"
Exit from
.I more.
-.PP
+.PP
.IP =
Display the current line number.
.PP
@@ -299,7 +299,7 @@ If no search has been performed in the current file, this command
goes back to the beginning of the file.
.PP
.IP !command
-invoke a shell with \fIcommand\|\fP.
+invoke a shell with \fIcommand\|\fP.
The characters `%' and `!' in "command" are replaced with the
current file name and the previous shell command respectively.
If there is no current file name, `%' is not expanded.
@@ -325,7 +325,7 @@ is not reading from a file, the bell is rung and nothing else happens.
display the current file name and line number.
.PP
.IP ":q or :Q"
-exit from
+exit from
.I more
(same as q or Q).
.PP
diff --git a/usr.bin/msgs/msgs.1 b/usr.bin/msgs/msgs.1
index 77f4ef04b2b..35d58aa068c 100644
--- a/usr.bin/msgs/msgs.1
+++ b/usr.bin/msgs/msgs.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: msgs.1,v 1.5 1999/05/13 12:59:29 aaron Exp $
+.\" $OpenBSD: msgs.1,v 1.6 1999/06/05 01:21:34 aaron Exp $
.\" $NetBSD: msgs.1,v 1.5 1995/09/28 06:57:39 tls Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd April 28, 1995
.Dt MSGS 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm msgs
.Nd system messages and junk mail program
diff --git a/usr.bin/nc/nc.1 b/usr.bin/nc/nc.1
index 8d87051c73c..1c0cd6fa482 100644
--- a/usr.bin/nc/nc.1
+++ b/usr.bin/nc/nc.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nc.1,v 1.5 1998/09/28 06:57:35 millert Exp $
+.\" $OpenBSD: nc.1,v 1.6 1999/06/05 01:21:34 aaron Exp $
.\"
.\" Copyright (c) 1996 David Sacerdote
.\" All rights reserved.
@@ -39,14 +39,14 @@
.Op Fl i Ar interval
.Op Fl lnrtuvz
.Op Fl o Ar filename
-.Op Fl p Ar source port
+.Op Fl p Ar source port
.Op Fl s Ar ip address
-.Op Fl w Ar timeout
+.Op Fl w Ar timeout
.Op Ar hostname
.Op Ar port[s...]
.Sh DESCRIPTION
The
-.Nm nc
+.Nm
(or
.Nm netcat )
utility is used for just about anything under the sun
@@ -54,11 +54,11 @@ involving TCP or UDP. It can open TCP connections, send UDP packets,
listen on arbitrary TCP and UDP ports, do port scanning, and source
routing. Unlike
.Xr telnet 1 ,
-.Nm nc
+.Nm
scripts nicely, and separates error messages onto standard error instead
-of sending them to standard output, as
-.Xr telnet 1
-does with some.
+of sending them to standard output, as
+.Xr telnet 1
+does with some.
.Pp
Destination ports can be single integers, names as listed in
.Xr services 5 ,
@@ -66,7 +66,7 @@ or ranges. Ranges are in the form nn-mm, and several separate ports and/or
ranges may be specified on the command line.
.Pp
Common uses include:
-.Bl -bullet
+.Bl -bullet
.It
simple TCP proxies
.It
@@ -84,7 +84,7 @@ The options are as follows:
.It Fl e Ar command
Execute the specified command, using data from the network for stdin,
and sending stdout and stderr to the network. This option is only present if
-.Nm nc
+.Nm
was compiled with the GAPING_SECURITY_HOLE compile time option, since it
allows users to make arbitrary programs available to anyone on the network.
.It Fl g Ar intermediate-host
@@ -98,7 +98,7 @@ Specifies a delay time interval between lines of text sent and received.
Also causes a delay time between connections to multiple ports.
.It Fl l
Is used to specify that
-.Nm nc
+.Nm
should listen for an incoming connection, rather than initiate a
connection to a remote host. Any hostname/IP address and port arguments
restrict the source of inbound connections to only that address and
@@ -112,7 +112,7 @@ Each line begins with ``<'' or ``>''. ``<'' means "from the net" and ``>''
means "to the net".
.It Fl p Ar port
Specifies the source port
-.Nm nc
+.Nm
should use, subject to privilege restrictions and availability.
.It Fl r
Specifies that source and/or destination ports should be chosen semi-randomly
@@ -125,37 +125,37 @@ On some platforms, this can be used for UDP spoofing by using
to bring up a dummy interface with the desired source IP address.
.It Fl t
Causes
-.Nm nc
+.Nm
to send RFC854 DON'T and WON'T responses to RFC854 DO
and WILL requests. This makes it possible to use
-.Nm nc
+.Nm
to script telnet sessions. The presence of this option can be
enabled or disabled as a compile-time option.
.It Fl u
-Use UDP instead of TCP.
+Use UDP instead of TCP.
On most platforms,
-.Nm nc
+.Nm
will behave as if a connection is established until it receives an
ICMP packet indicating that there is no program listening to what it
sends.
.It Fl v
Verbose. Cause
-.Nm nc
+.Nm
to display connection information. Using
.Fl v
more than once will cause
-.Nm nc
+.Nm
to become even more verbose.
.It Fl w Ar timeout
Specifies the number of seconds
-.Nm nc
+.Nm
should wait before deciding that
an attempt to establish a connection is hopeless.
Also used to specify how long to wait for more network data after standard
input closes.
.It Fl z
Specifies that
-.Nm nc
+.Nm
should just scan for listening
daemons, without sending any data to them. Diagnostic messages about refused
connections will not be
@@ -191,7 +191,7 @@ diagnostic messages on stderr.
.It Li "nc -v -z example.host 20-30"
Attempt to open TCP connections to ports 20 through 30 of
example.host, and report which ones
-.Nm nc
+.Nm
was able to connect to.
.It Li "nc -v -u -z -w 3 example.host 20-30"
Send UDP packets to ports 20-30 of example.host, and report which ones
diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1
index f8884eca99c..c48935f8380 100644
--- a/usr.bin/netstat/netstat.1
+++ b/usr.bin/netstat/netstat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: netstat.1,v 1.15 1999/05/16 19:57:59 alex Exp $
+.\" $OpenBSD: netstat.1,v 1.16 1999/06/05 01:21:34 aaron Exp $
.\" $NetBSD: netstat.1,v 1.11 1995/10/03 21:42:43 thorpej Exp $
.\"
.\" Copyright (c) 1983, 1990, 1992, 1993
@@ -36,7 +36,7 @@
.\"
.Dd April 18, 1994
.Dt NETSTAT 1
-.Os BSD 4.2
+.Os
.Sh NAME
.Nm netstat
.Nd show network status
@@ -95,7 +95,7 @@ With either interface display (option
.Fl i
or an interval, as described below),
show the number of dropped packets.
-.It Fl f Ar address_family
+.It Fl f Ar address_family
Limit statistics or address control block reports to those
of the specified
.Ar address_family .
@@ -132,7 +132,7 @@ By default, show the IP Multicast virtual-interface and routing tables.
If the
.Fl s
option is also present, show multicast routing statistics.
-.It Fl I Ar interface
+.It Fl I Ar interface
Show information about the specified interface;
used with a
.Ar wait
@@ -163,7 +163,7 @@ Show network addresses as numbers (normally
interprets addresses and attempts to display them
symbolically).
This option may be used with any of the display formats.
-.It Fl p Ar protocol
+.It Fl p Ar protocol
Show statistics about
.Ar protocol ,
which is either a well-known name for a protocol or an alias for it. Some
@@ -236,7 +236,7 @@ The mapping between letters and flags is:
.Bl -column XXXX RTF_BLACKHOLE
1 RTF_PROTO1 Protocol specific routing flag #1.
2 RTF_PROTO2 Protocol specific routing flag #2.
-B RTF_BLACKHOLE Just discard pkts (during updates).
+B RTF_BLACKHOLE Just discard pkts (during updates).
C RTF_CLONING Generate new routes on use.
D RTF_DYNAMIC Created dynamically (by redirect).
G RTF_GATEWAY Destination requires forwarding by intermediary.
diff --git a/usr.bin/newsyslog/newsyslog.8 b/usr.bin/newsyslog/newsyslog.8
index 7617c06ea4e..09e26d8466d 100644
--- a/usr.bin/newsyslog/newsyslog.8
+++ b/usr.bin/newsyslog/newsyslog.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: newsyslog.8,v 1.12 1999/05/23 14:11:30 aaron Exp $
+.\" $OpenBSD: newsyslog.8,v 1.13 1999/06/05 01:21:35 aaron Exp $
.\"
.\" Copyright (c) 1997, Jason Downs. All rights reserved.
.\"
@@ -35,7 +35,7 @@
.\" from: @(#)newsyslog.8
.\"
.\" Copyright 1988, 1989 by the Massachusetts Institute of Technology
-.\"
+.\"
.\" Permission to use, copy, modify, and distribute this software
.\" and its documentation for any purpose and without fee is
.\" hereby granted, provided that the above copyright notice
@@ -59,45 +59,53 @@
.Op Fl vmnr
.Op Fl f Ar configuration file
.Sh DESCRIPTION
-.Nm newsyslog
+.Nm
is a program that should be scheduled to run periodically by
.Xr cron 8 .
When it is executed it archives log files if necessary. If a log file
-is determined to require archiving,
-.Nm newsyslog
-rearranges the files so that ``logfile'' is empty, ``logfile.0'' has
-the last period's logs in it, ``logfile.1'' has the next to last
+is determined to require archiving,
+.Nm
+rearranges the files so that
+.Pa logfile
+is empty,
+.Pa logfile.0
+has
+the last period's logs in it,
+.Pa logfile.1
+has the next to last
period's logs in it, and so on, up to a user-specified number of
archived logs. Optionally the archived logs can be compressed to save
-space.
+space.
.Pp
A log can be archived because of two reasons. The log file can have
grown bigger than a preset size in kilobytes, or a preset number of
hours may have elapsed since the last log archive. The granularity of
-.Nm newsyslog
+.Nm
is dependent on how often it is scheduled to run in
.Xr cron 8 .
Since the program is quite fast, it may be scheduled to run every hour
without any ill effects.
.Pp
-When starting up,
-.Nm newsyslog
+When starting up,
+.Nm
reads in a configuration file to determine which logs should be looked
-at. By default, this configuration file is
+at. By default, this configuration file is
.Pa /etc/newsyslog.conf .
Each line of the file contains information about a particular log file
that should be handled by
.Nm newsyslog .
Each line has five mandatory fields and up to three optional fields, with a
whitespace separating each field. Blank lines or lines beginning with
-``#'' are ignored. The fields of the configuration file are as
-follows:
+.Ql #
+are ignored. The fields of the configuration file are as
+follows:
.Bl -tag -width XXXXXXXXXXXXXXXX
.It logfile name
The full pathname of the system log file to be archived.
.It owner.group of archives (optional)
-Specify an ownership and group for the archive file. The "." is essential,
-even if the
+Specify an ownership and group for the archive file. The
+.Ql \&.
+is essential, even if the
.Ar owner
or
.Ar group
@@ -109,32 +117,42 @@ Octal mode of created log files and archives.
Specify the number of archives to be kept besides the log file itself.
.It size of archives
When the size of the log file reaches this point, the log file becomes trimmed
-as described above. If this field is replaced by a ``*'', then the size of
+as described above. If this field is replaced by a
+.Ql * ,
+then the size of
the log file is not taken into account when determining when to trim the
log file.
.It archive interval
Specify the time separation between the trimming of the log file. If this
-field is replaced by a ``*'', the number of hours since the last time the
+field is replaced by a
+.Ql * ,
+the number of hours since the last time the
log was trimmed will not be taken into consideration.
.It flags (optional)
The
.Ar flags
field specifies if the archives should have any special processing
-done to the archived log files. The ``Z'' flag will make the archive
+done to the archived log files. The
+.Sq Z
+flag will make the archive
files compressed to save space using
.Xr gzip 1
or
.Xr compress 1 ,
-depending on compilation options. The ``B'' flag means that the file is a
+depending on compilation options. The
+.Sq B
+flag means that the file is a
binary file, and so the ASCII message which
-.Nm newsyslog
+.Nm
inserts to indicate the fact that the logs have been turned over
-should not be included. The ``M'' flag marks this entry as a monitored
+should not be included. The
+.Sq M
+flag marks this entry as a monitored
log file.
.It monitor notification (optional)
Specify the account that should receive notification messages if this is
a monitored log file. Notification messages are sent as email; the operator
-deserves what they get if they mark the
+deserves what they get if they mark the
.Xr sendmail 8
log file as monitored.
.It pid file (optional)
@@ -148,33 +166,35 @@ The following options can be used with
.Nm newsyslog :
.Bl -tag -width XXX
.It Fl f Ar config-file
-Instructs newsyslog to use
+Instructs newsyslog to use
.Ar config-file
instead of
.Pa /etc/newsyslog.conf
for its configuration file.
.It Fl v
-Places
-.Nm newsyslog
+Places
+.Nm
in verbose mode. In this mode it will print out each log and its
reasons for either trimming that log or skipping it.
.It Fl n
Causes
-.Nm newsyslog
+.Nm
not to trim the logs, but to print out what it would do if this option
were not specified.
.It Fl r
Removes the restriction that
-.Nm newsyslog
-must be running as root. Of course,
-.Nm newsyslog
+.Nm
+must be running as root. Of course,
+.Nm
will not be able to send a HUP signal to
.Xr syslogd 8 ,
so this option should only be used in debugging.
.It Fl m
Places
-.Nm newsyslog
-in monitoring mode; only entries marked with an ``M'' in flags are processed,
+.Nm
+in monitoring mode; only entries marked with an
+.Sq M
+in flags are processed,
and notifications sent if any have changed. Without this option, monitored
entries are not processed.
.El
diff --git a/usr.bin/nfsstat/nfsstat.1 b/usr.bin/nfsstat/nfsstat.1
index 4ad753c6f1e..8069b5bbf53 100644
--- a/usr.bin/nfsstat/nfsstat.1
+++ b/usr.bin/nfsstat/nfsstat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nfsstat.1,v 1.5 1998/09/27 16:57:48 aaron Exp $
+.\" $OpenBSD: nfsstat.1,v 1.6 1999/06/05 01:21:35 aaron Exp $
.\" $NetBSD: nfsstat.1,v 1.8 1996/03/03 17:21:28 thorpej Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt NFSSTAT 1
-.Os BSD 4.4
+.Os
.Sh NAME
.Nm nfsstat
.Nd display
@@ -50,7 +50,7 @@ statistics
.Op Fl s
.Op Fl c
.Sh DESCRIPTION
-.Nm nfsstat
+.Nm
displays statistics kept about
.Tn NFS
client and server activity.
@@ -89,9 +89,9 @@ default memory file
.Xr systat 1 ,
.Xr iostat 8 ,
.Xr pstat 8 ,
-.Xr vmstat 8
+.Xr vmstat 8
.Sh HISTORY
The
-.Nm nfsstat
+.Nm
command appeared in
.Bx 4.4 .
diff --git a/usr.bin/nice/nice.1 b/usr.bin/nice/nice.1
index b72cb229132..32114ec6f34 100644
--- a/usr.bin/nice/nice.1
+++ b/usr.bin/nice/nice.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nice.1,v 1.4 1998/09/27 16:57:48 aaron Exp $
+.\" $OpenBSD: nice.1,v 1.5 1999/06/05 01:21:35 aaron Exp $
.\" $NetBSD: nice.1,v 1.6 1995/08/31 23:30:57 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt NICE 1
-.Os
+.Os
.Sh NAME
.Nm nice
.Nd execute a utility with an altered scheduling priority
@@ -46,53 +46,53 @@
.Ar utility
.Op Ar argument ...
.Sh DESCRIPTION
-.Nm nice
+.Nm
runs
.Ar utility
at an altered scheduling priority.
-If an
-.Ar increment
+If an
+.Ar increment
is given, it is used; otherwise
an increment of 10 is assumed.
The super-user can run utilities with priorities higher than normal by using
-a negative
+a negative
.Ar increment .
The priority can be adjusted over a
-range of -20 (the highest) to 20 (the lowest).
+range of \-20 (the highest) to 20 (the lowest).
.Pp
Available options:
.Bl -tag -width indent
.It Fl n Ar increment
A positive or negative decimal integer used to modify the system scheduling
-priority of
+priority of
.Ar utility .
.El
.Sh DIAGNOSTICS
The
-.Nm nice
+.Nm
utility shall exit with one of the following values:
.Bl -tag -width indent
-.It 1-125
-An error occurred in the
-.Nm nice
+.It 1\-125
+An error occurred in the
+.Nm
utility.
.It 126
-The
+The
.Ar utility
was found but could not be invoked.
.It 127
-The
+The
.Ar utility
could not be found.
.El
.Pp
-Otherwise, the exit status of
-.Nm nice
-shall be that of
+Otherwise, the exit status of
+.Nm
+shall be that of
.Ar utility .
.Sh COMPATIBILITY
-The historic
-.Fl Ns Ar increment
+The historic
+.Fl Ns Ar increment
option has been deprecated but is still supported in this implementation.
.Sh SEE ALSO
.Xr csh 1 ,
@@ -101,16 +101,16 @@ option has been deprecated but is still supported in this implementation.
.Xr renice 8
.Sh STANDARDS
The
-.Nm nice
-utility conforms to
+.Nm
+utility conforms to
.St -p1003.2-92 .
.Sh HISTORY
A
-.Nm nice
+.Nm
utility appeared in
.At v6 .
.Sh BUGS
-.Nm nice
+.Nm
is built into
.Xr csh 1
with a slightly different syntax than described here. The form
diff --git a/usr.bin/nm/nm.1 b/usr.bin/nm/nm.1
index 31d262febbf..567ec6ce417 100644
--- a/usr.bin/nm/nm.1
+++ b/usr.bin/nm/nm.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nm.1,v 1.3 1998/09/27 16:57:48 aaron Exp $
+.\" $OpenBSD: nm.1,v 1.4 1999/06/05 01:21:35 aaron Exp $
.\" $NetBSD: nm.1,v 1.3 1995/08/31 23:41:58 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt NM 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm nm
.Nd display name list (symbol table)
@@ -49,7 +49,7 @@ The symbol table (name list) of each object in
.Ar file(s)
is displayed.
If a library (archive) is given,
-.Nm
+.Nm
displays a list for each
object archive member.
If
diff --git a/usr.bin/nohup/nohup.1 b/usr.bin/nohup/nohup.1
index 4678bb34692..2836097b7c7 100644
--- a/usr.bin/nohup/nohup.1
+++ b/usr.bin/nohup/nohup.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nohup.1,v 1.4 1998/11/04 22:36:40 aaron Exp $
+.\" $OpenBSD: nohup.1,v 1.5 1999/06/05 01:21:35 aaron Exp $
.\" $NetBSD: nohup.1,v 1.5 1995/08/31 23:35:24 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -56,7 +56,7 @@ with
its arguments
and at this time sets the signal
.Dv SIGHUP
-to be ignored.
+to be ignored.
If the standard output is a terminal, the standard output is
appended to the file
.Pa nohup.out
@@ -80,7 +80,7 @@ to create the file.
The
.Nm nohup
utility shall exit with one of the following values:
-.Bl -tag -width Ds
+.Bl -tag -width Ds
.It 126
The
.Ar utility
@@ -88,13 +88,13 @@ was found but could not be invoked.
.It 127
The
.Ar utility
-could not be found or an error occurred in
+could not be found or an error occurred in
.Nm nohup .
.El
.Pp
-Otherwise, the exit status of
+Otherwise, the exit status of
.Nm nohup
-shall be that of
+shall be that of
.Ar utility .
.Sh SEE ALSO
.Xr signal 3
diff --git a/usr.bin/oldrdist/oldrdist.1 b/usr.bin/oldrdist/oldrdist.1
index d91069300f2..566b7732bf8 100644
--- a/usr.bin/oldrdist/oldrdist.1
+++ b/usr.bin/oldrdist/oldrdist.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: oldrdist.1,v 1.4 1998/11/11 23:01:46 aaron Exp $
+.\" $OpenBSD: oldrdist.1,v 1.5 1999/06/05 01:21:35 aaron Exp $
.\" Copyright (c) 1985, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -34,7 +34,7 @@
.\"
.Dd December 30, 1993
.Dt RDIST 1
-.Os BSD 4.3
+.Os
.Sh NAME
.Nm rdist
.Nd remote file distribution program
diff --git a/usr.bin/pagesize/pagesize.1 b/usr.bin/pagesize/pagesize.1
index 917cecc3eed..d903d0e74a8 100644
--- a/usr.bin/pagesize/pagesize.1
+++ b/usr.bin/pagesize/pagesize.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pagesize.1,v 1.4 1998/09/27 16:57:49 aaron Exp $
+.\" $OpenBSD: pagesize.1,v 1.5 1999/06/05 01:21:36 aaron Exp $
.\" $NetBSD: pagesize.1,v 1.4 1995/08/31 23:38:50 jtc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt PAGESIZE 1
-.Os BSD 4.2
+.Os
.Sh NAME
.Nm pagesize
.Nd print system page size
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index 496820e21c6..2702266d0c5 100644
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: passwd.1,v 1.7 1998/09/27 16:57:49 aaron Exp $
+.\" $OpenBSD: passwd.1,v 1.8 1999/06/05 01:21:36 aaron Exp $
.\" Copyright (c) 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -34,7 +34,7 @@
.\"
.Dd July 24, 1991
.Dt PASSWD 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm passwd
.Nd modify a user's password
@@ -84,21 +84,21 @@ communicates the new password information to
the Kerberos authenticating host.
.El
.Pp
-The following flags are only used when the
+The following flags are only used when the
.Fl k
flag is specified:
.Bl -tag -width flag
.It Fl n Ar name
-Specifies a
+Specifies a
.Ar name
that will be used as the principal name rather than the username
of the user running
.Nm passwd .
-(This is determined from the ticket file if it exists; otherwise,
+(This is determined from the ticket file if it exists; otherwise,
it is determined from the Unix user ID.)
.It Fl i Ar instance
-Specifies an
-.Ar instance
+Specifies an
+.Ar instance
to use rather than a null instance.
.It Fl r Ar realm
Specifies a
@@ -126,13 +126,13 @@ if only the local password is modified.
.Pp
Which type of cipher is used to encrypt the password information
depends on the configuration in
-.Xr passwd.conf 5 .
+.Xr passwd.conf 5 .
It can be different for local and YP passwords.
.Sh FILES
.Bl -tag -width /etc/master.passwd -compact
.It Pa /etc/master.passwd
user database
-.It Pa /etc/passwd
+.It Pa /etc/passwd
a Version 7 format password file
.It Pa /etc/passwd.XXXXXX
temporary copy of the password file
diff --git a/usr.bin/paste/paste.1 b/usr.bin/paste/paste.1
index 315022d8e24..a4ecf7ccc0e 100644
--- a/usr.bin/paste/paste.1
+++ b/usr.bin/paste/paste.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: paste.1,v 1.3 1998/09/27 16:57:49 aaron Exp $
+.\" $OpenBSD: paste.1,v 1.4 1999/06/05 01:21:36 aaron Exp $
.\" Copyright (c) 1989, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -59,7 +59,7 @@ of empty lines.
.Pp
The options are as follows:
.Bl -tag -width Fl
-.It Fl d Ar list
+.It Fl d Ar list
Use one or more of the provided characters to replace the newline
characters instead of the default tab.
The characters in
diff --git a/usr.bin/patch/patch.1 b/usr.bin/patch/patch.1
index 18beb6e46f7..4df0eb332eb 100644
--- a/usr.bin/patch/patch.1
+++ b/usr.bin/patch/patch.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: patch.1,v 1.3 1998/11/25 00:30:25 espie Exp $ -*- nroff -*-
+.\" $OpenBSD: patch.1,v 1.4 1999/06/05 01:21:36 aaron Exp $ -*- nroff -*-
.rn '' }`
.de Sh
.br
@@ -460,7 +460,7 @@ patches out of order without some warning.
Second, make sure you've specified the filenames right, either in a
context diff header, or with an Index: line.
If you are patching something in a subdirectory, be sure to tell the patch
-user to specify a
+user to specify a
.B \-p
switch as needed.
Third, you can create a file by sending out a diff that compares a
@@ -511,7 +511,7 @@ swapped code, but that would take an extra pass.
Check patch mode (
.BR -C )
will fail if you try to check several patches in succession that build on
-each other. The whole code of
+each other. The whole code of
.I patch
would have to be restructured to keep temporary files around so that it can
handle this situation.
diff --git a/usr.bin/pr/pr.1 b/usr.bin/pr/pr.1
index f4dd67a2c78..3f7a60a071b 100644
--- a/usr.bin/pr/pr.1
+++ b/usr.bin/pr/pr.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pr.1,v 1.7 1999/03/11 01:35:06 pjanzen Exp $
+.\" $OpenBSD: pr.1,v 1.8 1999/06/05 01:21:37 aaron Exp $
.\" Copyright (c) 1991 Keith Muller.
.\" Copyright (c) 1993
.\" The Regents of the University of California. All rights reserved.
@@ -38,7 +38,7 @@
.\"
.Dd June 6, 1993
.Dt PR 1
-.Os BSD 4.4
+.Os
.Sh NAME
.Nm pr
.Nd print files
@@ -149,11 +149,11 @@ are positive decimal integers and
is a non-negative decimal integer.
.Bl -tag -width 4n
.It Ar \&+page
-Begin output at page number
+Begin output at page number
.Ar page
of the formatted input.
.It Fl Ar column
-Produce output that is
+Produce output that is
.Ar columns
wide (default is 1) that is written vertically
down each column in the order in which the text
@@ -169,7 +169,7 @@ When used with
.Fl t ,
the minimum number of lines is used to display the output.
.It Fl a
-Modify the effect of the
+Modify the effect of the
.Fl column
option so that the columns are filled across the page in a round-robin order
(e.g., when column is 2, the first input line heads column
@@ -188,15 +188,15 @@ found in the input.
Expand each input
.Em <tab>
to the next greater column
-position specified by the formula
+position specified by the formula
.Ar n*gap+1 ,
-where
+where
.Em n
is an integer > 0.
If
.Ar gap
is zero or is omitted the default is 8.
-All
+All
.Em <tab>
characters in the input are expanded into the appropriate
number of
@@ -217,7 +217,7 @@ Same as the
.Fl F
option.
.It Fl h Ar header
-Use the string
+Use the string
.Ar header
to replace the
.Ar file name
@@ -246,12 +246,12 @@ is specified, it is used as the output
.Em <tab>
character.
.It Fl l Ar lines
-Override the 66 line default and reset the page length to
+Override the 66 line default and reset the page length to
.Ar lines .
If
.Ar lines
is not greater than the sum of both the header and trailer
-depths (in lines), the
+depths (in lines), the
.Nm pr
utility suppresses output of both the header and trailer, as if the
.Fl t
@@ -274,7 +274,7 @@ are assumed.
Provide
.Ar width
digit line numbering.
-The default for
+The default for
.Ar width ,
if not specified, is 5.
The number occupies the first
@@ -307,7 +307,7 @@ Separate text columns by the single character
.Ar char
instead of by the appropriate number of
.Em <space>s
-(default for
+(default for
.Ar char
is the
.Em <tab>
diff --git a/usr.bin/printf/printf.1 b/usr.bin/printf/printf.1
index e40af5bb4d3..1ffdebbb813 100644
--- a/usr.bin/printf/printf.1
+++ b/usr.bin/printf/printf.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: printf.1,v 1.6 1998/11/30 01:48:02 aaron Exp $
+.\" $OpenBSD: printf.1,v 1.7 1999/06/05 01:21:37 aaron Exp $
.\" Copyright (c) 1989, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -42,7 +42,7 @@
.Nm printf
.Nd formatted output
.Sh SYNOPSIS
-.Nm printf
+.Nm printf
.Ar format
.Op Ar arguments ...
.Sh DESCRIPTION
@@ -71,7 +71,7 @@ otherwise it is evaluated as a C constant, with the following extensions:
.It
A leading plus or minus sign is allowed.
.It
-If the leading character is a single or double quote, the value is the
+If the leading character is a single or double quote, the value is the
.Tn ASCII
code of the next character.
.El
@@ -81,7 +81,7 @@ The format string is reused as often as necessary to satisfy the
Any extra format specifications are evaluated with zero or the null
string.
.Pp
-Character escape sequences are in backslash notation as defined in
+Character escape sequences are in backslash notation as defined in
.St -ansiC .
The characters and their meanings
are as follows:
@@ -106,7 +106,7 @@ Write a <vertical tab> character.
Write a <single quote> character.
.It Cm \e\e
Write a backslash character.
-.It Cm \e Ns Ar num
+.It Cm \e Ns Ar num
Write an 8-bit character whose
.Tn ASCII
value is the 1-, 2-, or 3-digit
@@ -195,7 +195,7 @@ followed by an optional digit string giving a
which specifies the number of digits to appear after the decimal point,
for
.Cm e
-and
+and
.Cm f
formats, or the maximum number of characters to be printed
from a string; if the digit string is missing, the precision is treated
@@ -226,7 +226,7 @@ respectively.
.It Cm f
The
.Ar argument
-is printed in the style
+is printed in the style
.Sm off
.Pf [\-]ddd Cm \&. No ddd
.Sm on
@@ -238,7 +238,7 @@ is explicitly 0, no digits and no decimal point are printed.
.It Cm eE
The
.Ar argument
-is printed in the style
+is printed in the style
.Sm off
.Pf [\-]d Cm \&. No ddd Cm e No \\*(Pmdd
.Sm on
@@ -292,7 +292,7 @@ exits 0 on success or 1 on failure.
.Sh STANDARDS
The
.Nm printf
-utility conforms to
+utility conforms to
.St -p1003.2-92 .
.Sh BUGS
Since arguments are translated from
diff --git a/usr.bin/quota/quota.1 b/usr.bin/quota/quota.1
index 9430404bdd6..03328460334 100644
--- a/usr.bin/quota/quota.1
+++ b/usr.bin/quota/quota.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: quota.1,v 1.6 1998/11/11 23:01:46 aaron Exp $
+.\" $OpenBSD: quota.1,v 1.7 1999/06/05 01:21:37 aaron Exp $
.\" Copyright (c) 1983, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -37,7 +37,7 @@
.\"
.Dd June 6, 1993
.Dt QUOTA 1
-.Os BSD 4.2
+.Os
.Sh NAME
.Nm quota
.Nd display disk usage and limits
@@ -62,7 +62,7 @@ By default only the user quotas are printed.
Options:
.Bl -tag -width Ds
.It Fl g
-Print group quotas for the group
+Print group quotas for the group
of which the user is a member.
The optional
.Fl u
diff --git a/usr.bin/rdist/rdist.1 b/usr.bin/rdist/rdist.1
index 5510ab39997..18055ee41fe 100644
--- a/usr.bin/rdist/rdist.1
+++ b/usr.bin/rdist/rdist.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rdist.1,v 1.7 1998/07/24 20:49:04 deraadt Exp $
+.\" $OpenBSD: rdist.1,v 1.8 1999/06/05 01:21:37 aaron Exp $
.\"
.\" Copyright (c) 1983 Regents of the University of California.
.\" All rights reserved.
@@ -40,49 +40,49 @@
rdist \- remote file distribution client program
.SH SYNOPSIS
.B rdist
-[
+[
.B \-DFn
]
-[
-.B \-A
+[
+.B \-A
+.I num
+]
+[
+.B \-a
.I num
-]
-[
-.B \-a
-.I num
]
-[
-.B \-d
-.I var=value
-]
-[
+[
+.B \-d
+.I var=value
+]
+[
.B \-l
.I <local logopts>
-]
-[
+]
+[
.B \-L
.I <remote logopts>
-]
-[
-.B \-f
-.I distfile
-]
-[
-.B \-M
+]
+[
+.B \-f
+.I distfile
+]
+[
+.B \-M
.I maxproc
-]
-[
-.B \-m
-.I host
]
-[
+[
+.B \-m
+.I host
+]
+[
.B \-o
.I distopts
]
-[
-.B \-t
-.I timeout
-]
+[
+.B \-t
+.I timeout
+]
[
.B \-p
.I <rdistd-path>
@@ -91,14 +91,14 @@ rdist \- remote file distribution client program
.B \-P
.I <rsh-path>
]
-[
+[
.I name ...
]
.PP
.B rdist
.B \-DFn
-.B -c
-.I name ...
+.B -c
+.I name ...
.I [login@]host[:dest]
.PP
.B rdist
@@ -108,7 +108,7 @@ rdist \- remote file distribution client program
.B \-V
.SH DESCRIPTION
.I Rdist
-is a program to maintain identical copies of files over multiple hosts.
+is a program to maintain identical copies of files over multiple hosts.
It preserves the owner, group, mode, and mtime of files if possible and
can update programs that are executing.
.I Rdist
@@ -158,11 +158,11 @@ which used this option to put
into server mode.
If
.I rdist
-is started with the
+is started with the
.B \-Server
command line option, it will attempt to exec (run) the old version of
.I rdist.
-This option will only work if
+This option will only work if
.I rdist
was compiled with the location of the old rdist
(usually either
@@ -174,7 +174,7 @@ and that program is available at run time.
.I Rdist
can use either the
.I rcmd(3)
-function call or the
+function call or the
.I rsh(1c),
remote shell, command to access each target host.
The method used is selected at compile-time.
@@ -183,7 +183,7 @@ If the
method is used and
the target host is the string
.B localhost
-and
+and
the remote user name is the same as the local user name,
.I rdist
will run the command
@@ -204,7 +204,7 @@ run will run the command
.RE
.sp
.fi
-where
+where
.I host
is the name of the target host,
.I remuser
@@ -213,16 +213,16 @@ is the name of the user to make the connection as and,
is the rdist server command on the target host as shown below.
.PP
If the
-.I rcmd(3)
+.I rcmd(3)
method is used, then
.I rdist
makes the connection to the target host itself and runs
-the
+the
.I rdistd
server program as shown below.
The default, and preferred method, is to use
.I rsh(1c)
-to make the connection to target hosts. This allows
+to make the connection to target hosts. This allows
.I rdist
to be run without being setuid to ``root''.
.PP
@@ -248,7 +248,7 @@ if the
.I \-p
option was specified.
If no
-.B \-p
+.B \-p
option is included,
or the
.I <rdistd path>
@@ -256,7 +256,7 @@ is a simple filename,
.I rdistd
or
.I <rdistd path>
-must be somewhere in the
+must be somewhere in the
.B $PATH
of the user running
.B rdist
@@ -265,13 +265,13 @@ on the remote (target) host.
.TP
.B "\-A \fInum\fR"
Set the minimum number of free files (inodes) on a filesystem that must exist
-for
+for
.I rdist
to update or install a file.
.TP
.B "\-a \fInum\fR"
Set the minimum amount of free space (in bytes) on a filesystem that must exist
-for
+for
.I rdist
to update or install a file.
.TP
@@ -291,7 +291,7 @@ can be the empty string, one name, or a list of names surrounded by
parentheses and separated by tabs and/or spaces.
.TP
.B \-F
-Do not fork any child
+Do not fork any child
.I rdist
processes.
All clients are updated sequentially.
@@ -299,7 +299,7 @@ All clients are updated sequentially.
.B "\-f \fIdistfile\fR"
Set the name of the distfile to use to be
.I distfile .
-If
+If
.I distfile
is specified as
``\-'' (dash)
@@ -307,7 +307,7 @@ then read from standard input (stdin).
.TP
.B "\-l \fIlogopts\fR"
Set local logging options.
-See the section
+See the section
.B "MESSAGE LOGGING"
for details on the syntax for
.I logopts.
@@ -318,7 +318,7 @@ Set remote logging options.
is the same as for local logging
except the values are passed to the remote
server (\fIrdistd\fR).
-See the section
+See the section
.B "MESSAGE LOGGING"
for details on the syntax for
.I logopts.
@@ -360,24 +360,24 @@ name. Normally, only the last component of a name is used when renaming files.
This will preserve the directory structure of the files being
copied instead of flattening the directory structure. For example,
rdisting a list of files such as
-.I /path/dir1/f1
+.I /path/dir1/f1
and
-.I /path/dir2/f2
-to
-.I /tmp/dir
+.I /path/dir2/f2
+to
+.I /tmp/dir
would create
-files
-.I /tmp/dir/path/dir1/f1
-and
-.I /tmp/dir/path/dir2/f2
-instead of
-.I /tmp/dir/dir1/f1
-and
+files
+.I /tmp/dir/path/dir1/f1
+and
+.I /tmp/dir/path/dir2/f2
+instead of
+.I /tmp/dir/dir1/f1
+and
.I /tmp/dir/dir2/f2.
.IP \fBnoexec\fR
-Automatically exclude executable files that are in
+Automatically exclude executable files that are in
.I a.out(5)
-format from being checked or updated.
+format from being checked or updated.
.IP \fByounger\fR
Younger mode. Files are normally updated if their
.I mtime
@@ -435,7 +435,7 @@ Do not check file and directory permission modes.
The permission mode is only set when the file is updated.
.IP \fBnodescend\fR
Do not descend into a directory.
-Normally
+Normally
.I rdist
will recursively check directories.
If this option is enabled, then any files listed in the
@@ -465,19 +465,19 @@ only be enabled for targets likely to contain sparse files.
Set the path where the rdistd server is searched for on the target host.
.TP
.B "\-P \fI<rsh-path>\fR"
-Set the path to the
+Set the path to the
.I rsh(1c)
command.
The
.I rsh-path
may be a colon separated list of possible pathnames.
In this case, the first component of the path to exist is used.
-i.e.
+i.e.
.B "/usr/ucb/rsh:/usr/bin/remsh",
.B /usr/bsd/rsh.
.TP
.B "\-t \fItimeout\fR"
-Set the timeout period (in seconds) for waiting for responses from the remote
+Set the timeout period (in seconds) for waiting for responses from the remote
.I rdist
server.
The default is 900 seconds.
@@ -490,13 +490,13 @@ uses a collection of predefined message
.B facilities
that each contain a list of message
.B types
-specifying which types of messages to send to that
+specifying which types of messages to send to that
.I facility.
The local client (\fIrdist\fR) and the remote server (\fIrdistd\fR) each
maintain
their own copy of what types of messages to log to what facilities.
.LP
-The
+The
.B \-l
.I logopts
option to
@@ -504,7 +504,7 @@ option to
tells
.I rdist
what logging options to use locally.
-The
+The
.B \-L
.I logopts
option to
@@ -528,12 +528,12 @@ The valid facility names are:
.IP \fBstdout\fR
Messages to standard output.
.IP \fBfile\fR
-Log to a file. To specify the file name, use the format
+Log to a file. To specify the file name, use the format
``\fBfile=\fIfilename\fB=\fItypes\fR''.
e.g.
.B "``file=/tmp/rdist.log=all,debug''.
.IP \fBsyslog\fR
-Use the
+Use the
.I syslogd(8)
facility.
.IP \fBnotify\fR
@@ -543,7 +543,7 @@ Use the internal
facility.
This facility is used in conjunction with the
.B notify
-keyword in a
+keyword in a
.I distfile
to specify what messages are mailed to the
.B notify
@@ -551,12 +551,12 @@ address.
.RE
.LP
.I types
-should be a comma separated list of message types. Each message type
+should be a comma separated list of message types. Each message type
specified enables that message level. This is unlike the
.I syslog(3)
system facility which uses an ascending order scheme.
The following
-are the valid
+are the valid
.I types:
.RS
.IP \fBchange\fR
@@ -594,7 +594,7 @@ Here is a sample command line option:
.fi
This entry will set local message logging to have all but debug
messages sent to standard output, change and notice messages will
-be sent to
+be sent to
.I syslog(3),
and all messages will be written to the file
.B /tmp/rdist.log.
@@ -754,7 +754,7 @@ command is used to specify
commands that are to be executed on the
remote host after the file in \fIname list\fP is updated or installed.
If the \fIname list\fP is omitted then the shell commands will be executed
-for every file updated or installed.
+for every file updated or installed.
.I String
starts and ends with `"' and can cross multiple lines in
.I distfile.
@@ -765,7 +765,7 @@ The
.I special
command can be used to rebuild private databases, etc.
after a program has been updated.
-The following environment variables are set for each
+The following environment variables are set for each
.I special
command:
.IP \fBFILE\fR
@@ -781,7 +781,7 @@ command is similar to the
.I special
command, except it is executed only when the entire command is completed
instead of after each file is updated.
-The list of files is placed in the environment variable
+The list of files is placed in the environment variable
.B $FILES.
Each file name in
.B $FILES
@@ -830,7 +830,7 @@ ${FILES} :: stamp.cory
.fi
.SH ENVIRONMENT
.IP TMPDIR
-Name of temporary directory to use. Default is
+Name of temporary directory to use. Default is
.B /tmp.
.IP RSH
Name of the default remote shell program to use. Default is
@@ -851,8 +851,8 @@ $TMPDIR/rdist* \- temporary file for update lists
.SH NOTES
.LP
If the basename of a file (the last component in the pathname)
-is ".", then
-.B rdist
+is ".", then
+.B rdist
assumes the remote (destination) name is a directory.
i.e.
.B /tmp/.
@@ -876,7 +876,7 @@ facility.
aborts on files which have a negative mtime (before Jan 1, 1970).
.PP
If a hardlinked file is listed more than once in the same target,
-then
-.I rdist
+then
+.I rdist
will report missing links.
Only one instance of a link should be listed in each target.
diff --git a/usr.bin/rdistd/rdistd.1 b/usr.bin/rdistd/rdistd.1
index 1128cea2064..429e7639d38 100644
--- a/usr.bin/rdistd/rdistd.1
+++ b/usr.bin/rdistd/rdistd.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rdistd.1,v 1.4 1998/06/26 21:20:50 millert Exp $
+.\" $OpenBSD: rdistd.1,v 1.5 1999/06/05 01:21:38 aaron Exp $
.\"
.\" Copyright (c) 1983 Regents of the University of California.
.\" All rights reserved.
@@ -62,7 +62,7 @@ The
argument must be specified.
The option is required so that
.I rdistd
-is not accidentally started
+is not accidentally started
since
it
normally resides somewhere in a normal user's
diff --git a/usr.bin/renice/renice.8 b/usr.bin/renice/renice.8
index 7a0e7f5ac10..94e3027bbd4 100644
--- a/usr.bin/renice/renice.8
+++ b/usr.bin/renice/renice.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: renice.8,v 1.7 1999/05/23 14:11:30 aaron Exp $
+.\" $OpenBSD: renice.8,v 1.8 1999/06/05 01:21:38 aaron Exp $
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -54,8 +54,8 @@
.Ar user ...
.Oc
.Sh DESCRIPTION
-.Nm renice
-alters the
+.Nm
+alters the
scheduling
.Ar priority
(an integer) of one or more running processes.
@@ -65,7 +65,7 @@ parameters (pid, pgrp and user) are interpreted as process IDs, process group
IDs, or user names.
.Nm renice Ns ing
a process group causes all processes in the process group
-to have their scheduling priority altered.
+to have their scheduling priority altered.
.Nm renice Ns ing
a user causes all processes owned by the user to have
their scheduling priority altered.
@@ -76,7 +76,7 @@ Options supported by
.Nm renice :
.Bl -tag -width Ds
.It Fl g
-Force
+Force
.Ar who
parameters to be interpreted as process group IDs.
.It Fl u
diff --git a/usr.bin/rlogin/rlogin.1 b/usr.bin/rlogin/rlogin.1
index 63da1a808f0..e186860fc84 100644
--- a/usr.bin/rlogin/rlogin.1
+++ b/usr.bin/rlogin/rlogin.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rlogin.1,v 1.4 1998/09/27 16:57:51 aaron Exp $
+.\" $OpenBSD: rlogin.1,v 1.5 1999/06/05 01:21:38 aaron Exp $
.\" $NetBSD: rlogin.1,v 1.4 1995/08/18 15:07:35 pk Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt RLOGIN 1
-.Os BSD 4.2
+.Os
.Sh NAME
.Nm rlogin
.Nd remote login
diff --git a/usr.bin/rpcinfo/rpcinfo.8 b/usr.bin/rpcinfo/rpcinfo.8
index 0109c4d6849..6a03620afec 100644
--- a/usr.bin/rpcinfo/rpcinfo.8
+++ b/usr.bin/rpcinfo/rpcinfo.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rpcinfo.8,v 1.3 1998/09/27 16:57:51 aaron Exp $
+.\" $OpenBSD: rpcinfo.8,v 1.4 1999/06/05 01:21:38 aaron Exp $
.\" from: @(#)rpcinfo.8c 2.2 88/08/03 4.0 RPCSRC; from 1.24 88/02/25 SMI
.\"
.Dd December 17, 1987
@@ -18,7 +18,7 @@
.Op Ar version
.Nm rpcinfo
.Op Fl n Ar portnum
-.Fl t Ar host
+.Fl t Ar host
.Ar program
.Op Ar version
.Nm rpcinfo
diff --git a/usr.bin/rsh/rsh.1 b/usr.bin/rsh/rsh.1
index 7bc72c83243..89f2f4831a7 100644
--- a/usr.bin/rsh/rsh.1
+++ b/usr.bin/rsh/rsh.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rsh.1,v 1.4 1998/09/27 16:57:51 aaron Exp $
+.\" $OpenBSD: rsh.1,v 1.5 1999/06/05 01:21:38 aaron Exp $
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -34,7 +34,7 @@
.\"
.Dd July 24, 1991
.Dt RSH 1
-.Os BSD 4.2
+.Os
.Sh NAME
.Nm rsh
.Nd remote shell
diff --git a/usr.bin/rup/rup.1 b/usr.bin/rup/rup.1
index 1e2f9efacae..5ffc3f4796b 100644
--- a/usr.bin/rup/rup.1
+++ b/usr.bin/rup/rup.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rup.1,v 1.3 1998/09/07 16:44:33 aaron Exp $
+.\" $OpenBSD: rup.1,v 1.4 1999/06/05 01:21:38 aaron Exp $
.\" -*- nroff -*-
.\"
.\" Copyright (c) 1985, 1991 The Regents of the University of California.
@@ -35,18 +35,18 @@
.\"
.Dd June 7, 1993
.Dt RUP 1
-.Os BSD 4.3
+.Os
.Sh NAME
-.Nm rup
+.Nm rup
.Nd remote status display
.Sh SYNOPSIS
-.Nm rup
+.Nm rup
.Op Fl dhlt
.Op Ar host ...
.Sh DESCRIPTION
-.Nm rup
+.Nm
displays a summary of the current system status of a particular
-.Em host
+.Em host
or all hosts on the local network.
The output shows the current time of day, how long the system has
been up,
@@ -71,7 +71,7 @@ The
.Xr rpc.rstatd 8
daemon must be running on the remote host for this command to
work.
-.Nm rup
+.Nm
uses an RPC protocol defined in /usr/include/rpcsvc/rstat.x.
.Sh EXAMPLE
.Bd -unfilled -offset indent -compact
@@ -101,7 +101,7 @@ and cannot accommodate any RPC-based services. The host may be down.
.Xr rpc.rstatd 8
.Sh HISTORY
The
-.Nm rup
+.Nm
command
appeared in
.Tn SunOS .
diff --git a/usr.bin/ruptime/ruptime.1 b/usr.bin/ruptime/ruptime.1
index df3ee176b71..3ac58d40109 100644
--- a/usr.bin/ruptime/ruptime.1
+++ b/usr.bin/ruptime/ruptime.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ruptime.1,v 1.4 1998/09/27 16:57:51 aaron Exp $
+.\" $OpenBSD: ruptime.1,v 1.5 1999/06/05 01:21:39 aaron Exp $
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -34,7 +34,7 @@
.\"
.Dd April 23, 1991
.Dt RUPTIME 1
-.Os BSD 4.2
+.Os
.Sh NAME
.Nm ruptime
.Nd show host status of local machines
diff --git a/usr.bin/rusers/rusers.1 b/usr.bin/rusers/rusers.1
index e265ae173cf..1726bc9017e 100644
--- a/usr.bin/rusers/rusers.1
+++ b/usr.bin/rusers/rusers.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rusers.1,v 1.3 1998/09/27 16:57:52 aaron Exp $
+.\" $OpenBSD: rusers.1,v 1.4 1999/06/05 01:21:39 aaron Exp $
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -34,7 +34,7 @@
.\"
.Dd April 23, 1991
.Dt RUSERS 1
-.Os BSD 4.2
+.Os
.Sh NAME
.Nm rusers
.Nd who is logged in to machines on local network
diff --git a/usr.bin/rwall/rwall.1 b/usr.bin/rwall/rwall.1
index ac0ca58eec7..376378cd908 100644
--- a/usr.bin/rwall/rwall.1
+++ b/usr.bin/rwall/rwall.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rwall.1,v 1.2 1996/06/26 05:38:58 deraadt Exp $
+.\" $OpenBSD: rwall.1,v 1.3 1999/06/05 01:21:39 aaron Exp $
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -34,7 +34,7 @@
.\"
.Dd April 23, 1991
.Dt RWALL 1
-.Os BSD 4.2
+.Os
.Sh NAME
.Nm rwall
.Nd send a message to users logged on a host
diff --git a/usr.bin/rwho/rwho.1 b/usr.bin/rwho/rwho.1
index 7ef073f9e0b..882c0f11668 100644
--- a/usr.bin/rwho/rwho.1
+++ b/usr.bin/rwho/rwho.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rwho.1,v 1.3 1998/09/27 16:57:52 aaron Exp $
+.\" $OpenBSD: rwho.1,v 1.4 1999/06/05 01:21:39 aaron Exp $
.\" Copyright (c) 1983, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -34,7 +34,7 @@
.\"
.Dd April 23, 1991
.Dt RWHO 1
-.Os BSD 4.2
+.Os
.Sh NAME
.Nm rwho
.Nd who is logged in on local machines
diff --git a/usr.bin/script/script.1 b/usr.bin/script/script.1
index f9c52cc8498..08e61123583 100644
--- a/usr.bin/script/script.1
+++ b/usr.bin/script/script.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: script.1,v 1.3 1998/09/27 16:57:52 aaron Exp $
+.\" $OpenBSD: script.1,v 1.4 1999/06/05 01:21:39 aaron Exp $
.\" $NetBSD: script.1,v 1.3 1994/12/21 08:55:41 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt SCRIPT 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm script
.Nd make typescript of terminal session
@@ -45,10 +45,10 @@
.Op Fl a
.Op Ar file
.Sh DESCRIPTION
-.Nm script
+.Nm
makes a typescript of everything printed on your terminal.
It is useful for students who need a hardcopy record of an interactive
-session as proof of an assignment, as the typescript file
+session as proof of an assignment, as the typescript file
can be printed out later with
.Xr lpr 1 .
.Pp
@@ -77,7 +77,7 @@ to exit
the Bourne shell
.Pf ( Xr sh 1 ) ,
and
-.Em exit ,
+.Em exit ,
.Em logout
or
.Em control-d
@@ -90,7 +90,7 @@ C-shell,
Certain interactive commands, such as
.Xr vi 1 ,
create garbage in the typescript file.
-.Nm script
+.Nm
works best with commands that do not manipulate the
screen, the results are meant to emulate a hardcopy
terminal.
@@ -102,7 +102,7 @@ The following environment variable is utilized by
If the variable
.Ev SHELL
exists, the shell forked by
-.Nm script
+.Nm
will be that shell. If
.Ev SHELL
is not set, the Bourne shell
@@ -115,11 +115,11 @@ is assumed. (Most shells set this variable automatically.)
mechanism)
.Sh HISTORY
The
-.Nm script
+.Nm
command appeared in
.Bx 3.0 .
.Sh BUGS
-.Nm script
+.Nm
places
.Em everything
in the log file, including linefeeds and backspaces.
diff --git a/usr.bin/shar/shar.1 b/usr.bin/shar/shar.1
index d5f457cc4fa..1aea8fff4dc 100644
--- a/usr.bin/shar/shar.1
+++ b/usr.bin/shar/shar.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: shar.1,v 1.3 1998/09/27 16:57:52 aaron Exp $
+.\" $OpenBSD: shar.1,v 1.4 1999/06/05 01:21:40 aaron Exp $
.\" $NetBSD: shar.1,v 1.4 1995/08/18 14:55:40 pk Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt SHAR 1
-.Os BSD 4.4
+.Os
.Sh NAME
.Nm shar
.Nd create a shell archive of files
diff --git a/usr.bin/size/size.1 b/usr.bin/size/size.1
index fa17fa21247..06ab8371b0f 100644
--- a/usr.bin/size/size.1
+++ b/usr.bin/size/size.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: size.1,v 1.5 1998/09/27 16:57:53 aaron Exp $
+.\" $OpenBSD: size.1,v 1.6 1999/06/05 01:21:40 aaron Exp $
.\" $NetBSD: size.1,v 1.6 1996/01/14 23:07:11 pk Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
@@ -46,7 +46,7 @@
.Op Fl w
.Ar file Op Ar ...
.Sh DESCRIPTION
-.Nm size
+.Nm
displays the text, data and bss segment sizes of the specified
.Ar file(s)
in bytes (in decimal), and the sum of the three segments (in
@@ -75,6 +75,6 @@ object files.
.Xr a.out 5
.Sh HISTORY
A
-.Nm size
-command appeared in
+.Nm
+command appeared in
.At v6 .
diff --git a/usr.bin/skey/skey.1 b/usr.bin/skey/skey.1
index 088f80d0ab5..68e06cee4af 100644
--- a/usr.bin/skey/skey.1
+++ b/usr.bin/skey/skey.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: skey.1,v 1.14 1999/05/16 19:57:59 alex Exp $
+.\" $OpenBSD: skey.1,v 1.15 1999/06/05 01:21:40 aaron Exp $
.\" @(#)skey.1 1.1 10/28/93
.\"
.Dd 28 October 1993
@@ -26,7 +26,7 @@ is RFC 1938 compliant.
.Pp
When
.Nm skey
-is invoked as
+is invoked as
.Nm otp-method ,
.Nm skey
will use
@@ -74,7 +74,7 @@ Selects RMD-160 (160 bit Ripe Message Digest) as the hash algorithm.
.sp 0
OMEN US HORN OMIT BACK AHOY
.sp 0
- %
+ %
.Sh SEE ALSO
.Xr login 1 ,
.Xr skeyinfo 1 ,
diff --git a/usr.bin/skeyaudit/skeyaudit.1 b/usr.bin/skeyaudit/skeyaudit.1
index 8b4b26ec622..85984d83abc 100644
--- a/usr.bin/skeyaudit/skeyaudit.1
+++ b/usr.bin/skeyaudit/skeyaudit.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: skeyaudit.1,v 1.3 1998/09/27 16:57:53 aaron Exp $
+.\" $OpenBSD: skeyaudit.1,v 1.4 1999/06/05 01:21:40 aaron Exp $
.\"
.\"
.Dd 22 July 1997
@@ -13,7 +13,7 @@
.Op Fl i
.Op Fl l Ar limit
.Sh DESCRIPTION
-.Nm skeyaudit
+.Nm
searches through the file
.Dq Pa /etc/skeykeys
for users whose S/Key sequence number is less than
@@ -33,7 +33,7 @@ is useful to run regularly via
.It Fl i
Interactive mode. Don't send mail, just print to standard output.
.It Fl l Ar limit
-The limit used to determine whether or not a user should
+The limit used to determine whether or not a user should
be notified. The default is to notify if there are fewer
than 12 keys left.
.Sh FILES
diff --git a/usr.bin/soelim/soelim.1 b/usr.bin/soelim/soelim.1
index 7cc6755124b..ae0207bff4e 100644
--- a/usr.bin/soelim/soelim.1
+++ b/usr.bin/soelim/soelim.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: soelim.1,v 1.3 1998/09/27 16:57:53 aaron Exp $
+.\" $OpenBSD: soelim.1,v 1.4 1999/06/05 01:21:40 aaron Exp $
.\" $NetBSD: soelim.1,v 1.3 1994/12/21 08:11:24 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt SOELIM 1
-.Os BSD 3
+.Os
.Sh NAME
.Nm soelim
.Nd eliminate \&.so's from nroff input
diff --git a/usr.bin/sort/sort.1 b/usr.bin/sort/sort.1
index 65cde008fcc..8cd9d220bd3 100644
--- a/usr.bin/sort/sort.1
+++ b/usr.bin/sort/sort.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sort.1,v 1.4 1999/06/01 22:13:43 aaron Exp $
+.\" $OpenBSD: sort.1,v 1.5 1999/06/05 01:21:40 aaron Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -202,7 +202,7 @@ The default record separator is newline.
.It Fl k Ar field1[,field2]
Designates the starting position,
.Ar field1 ,
-and optional ending position,
+and optional ending position,
.Ar field2 ,
of a key field.
The
@@ -298,10 +298,10 @@ character (including separators) of the
field.
A missing
.Em \&.n
-indicates the last character of the
+indicates the last character of the
.Em m Ns th
field;
-.Em m
+.Em m
= \&0
designates the end of a line.
Thus the option
@@ -314,7 +314,7 @@ when
is omitted,
.Fl k Ar v.x,w
is synonymous with
-.Cm \(pl Ns Ar v-\&1.x-\&1
+.Cm \(pl Ns Ar v-\&1.x-\&1
.Fl Ns Ar w+1.0 .
The obsolescent
.Cm \(pl Ns Ar pos1
diff --git a/usr.bin/split/split.1 b/usr.bin/split/split.1
index c2d0022974c..c851d477323 100644
--- a/usr.bin/split/split.1
+++ b/usr.bin/split/split.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: split.1,v 1.3 1999/02/04 03:53:48 millert Exp $
+.\" $OpenBSD: split.1,v 1.4 1999/06/05 01:21:41 aaron Exp $
.\" $NetBSD: split.1,v 1.5 1994/12/21 08:20:35 jtc Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993, 1994
@@ -91,7 +91,7 @@ of the input file which is to be split.
If a second additional argument is specified, it is used as a prefix
for the names of the files into which the file is split.
In this case, each file into which the file is split is named by the
-prefix followed by a lexically ordered suffix in the range of
+prefix followed by a lexically ordered suffix in the range of
.Dq Li aa-zz .
.Pp
If the
diff --git a/usr.bin/strings/strings.1 b/usr.bin/strings/strings.1
index 3a956ea3516..1ca6a5d40fa 100644
--- a/usr.bin/strings/strings.1
+++ b/usr.bin/strings/strings.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: strings.1,v 1.3 1998/09/27 16:57:54 aaron Exp $
+.\" $OpenBSD: strings.1,v 1.4 1999/06/05 01:21:41 aaron Exp $
.\" $NetBSD: strings.1,v 1.4 1994/12/10 11:54:28 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -47,7 +47,7 @@
.Op Fl t Ar radix
.Op Ar file ...
.Sh DESCRIPTION
-.Nm strings
+.Nm
displays the sequences of printable characters in each of the specified
files, or in the standard input, by default.
By default, a sequence must be at least four characters in length
@@ -57,12 +57,12 @@ The options are as follows:
.Bl -tag -width Ds
.It Fl a
By default,
-.Nm strings
+.Nm
only searches the text and data segments of object files.
The
.Fl a
option causes
-.Nm strings
+.Nm
to search the entire object file.
.It Fl f
Each string is preceded by the name of the file
@@ -76,16 +76,16 @@ Each string is preceded by its octal offset in the file.
.It Fl t Ar radix
Each string is preceded by its offset in the file. The first character of
.Ar radix
-determines the radix of the offset:
+determines the radix of the offset:
.Sq o
-for octal;
+for octal;
.Sq d
-for decimal; or
+for decimal; or
.Sq x
for hexadecimal.
.El
.Pp
-.Nm strings
+.Nm
is useful for identifying random binaries, among other things.
.Sh SEE ALSO
.Xr hexdump 1 ,
@@ -100,11 +100,11 @@ Historic implementations of
.Nm
only search the initialized data portion of the object file.
This was reasonable as strings were normally stored there.
-Given new compiler technology which installs strings in the
+Given new compiler technology which installs strings in the
text portion of the object file, the default behavior was
changed.
.Sh STANDARDS
-The
+The
.Nm
utility conforms to
.St -p1003.2-92 .
diff --git a/usr.bin/su/su.1 b/usr.bin/su/su.1
index 90b8e411202..bbc267f50f0 100644
--- a/usr.bin/su/su.1
+++ b/usr.bin/su/su.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: su.1,v 1.7 1998/09/27 16:57:54 aaron Exp $
+.\" $OpenBSD: su.1,v 1.8 1999/06/05 01:21:41 aaron Exp $
.\" Copyright (c) 1988, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -43,7 +43,7 @@
.Op Fl Kflm
.Op Ar login Op Ar "shell arguments"
.Sh DESCRIPTION
-.Nm su
+.Nm
requests the Kerberos password for
.Ar login
(or for
@@ -54,12 +54,12 @@ A shell is then executed, and any additional
.Ar "shell arguments"
after the login name
are passed to the shell.
-.Nm su
+.Nm
will resort to the local password file to find the password for
.Ar login
if there is a Kerberos error or if Kerberos is not installed.
If
-.Nm su
+.Nm
is executed by root, no password is requested and a shell
with the appropriate user ID is executed; no additional Kerberos tickets
are obtained.
@@ -122,7 +122,7 @@ is set to
.Ev TERM
is imported from your current environment.
The invoked shell is the target login's, and
-.Nm su
+.Nm
will change directory to the target login's home directory.
.It Fl m
Leave the environment unmodified.
@@ -132,7 +132,7 @@ shell (as defined by
.Xr getusershell 3 )
and the caller's real UID is
non-zero,
-.Nm su
+.Nm
will fail.
.El
.Pp
@@ -142,22 +142,22 @@ and
.Fl m
options are mutually exclusive; the last one specified
overrides any previous ones.
-.Pp
-If the optional
+.Pp
+If the optional
.Ar "shell arguments"
-are provided on the command line, they are passed to the login shell of
+are provided on the command line, they are passed to the login shell of
the target login. This allows it to pass arbitrary commands via
-the
-.Fl c
+the
+.Fl c
option as understood by most shells. Note that
-.Fl c
+.Fl c
usually expects a single argument only; you have to quote it when
-passing multiple words.
+passing multiple words.
.Pp
If group 0 (normally
.Dq wheel )
has users listed then only those users can
-.Nm su
+.Nm
to
.Dq root .
It is not sufficient to change a user's
@@ -169,7 +169,7 @@ group; they must explicitly be listed in
If no one is in the
.Dq wheel
group, it is ignored, and anyone who knows the root password is permitted to
-.Nm su
+.Nm
to
.Dq root .
.Pp
@@ -177,23 +177,23 @@ By default (unless the prompt is reset by a startup file) the super-user
prompt is set to
.Dq Sy \&#
to remind one of its awesome power.
-.Sh EXAMPLES
-.Bl -tag -width 5n -compact
-.It Li "su bin -c makewhatis"
-Runs the command
-.Li makewhatis
-as user
-.Li bin .
-You will be asked for bin's password unless your real UID is 0.
+.Sh EXAMPLES
+.Bl -tag -width 5n -compact
+.It Li "su bin -c makewhatis"
+Runs the command
+.Li makewhatis
+as user
+.Li bin .
+You will be asked for bin's password unless your real UID is 0.
.Pp
.It Li "su bin -c 'makewhatis /usr/local/man'"
-Same as above, but the target command consists of more than a
-single word.
+Same as above, but the target command consists of more than a
+single word.
.Pp
-.It Li "su -l foo"
-Pretend a login for user
-.Li foo .
-.El
+.It Li "su -l foo"
+Pretend a login for user
+.Li foo .
+.El
.Sh SEE ALSO
.Xr csh 1 ,
.Xr kerberos 1 ,
@@ -218,7 +218,7 @@ Provides terminal type which may be retained for the substituted
user ID.
.It Ev LOGNAME
The user ID is always the effective ID (the target user ID) after an
-.Nm su
+.Nm
unless the user ID is 0 (root).
.It Ev USER
Same as
diff --git a/usr.bin/sup/src/sup.1 b/usr.bin/sup/src/sup.1
index 10ef0cd0535..a760adbdc22 100644
--- a/usr.bin/sup/src/sup.1
+++ b/usr.bin/sup/src/sup.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sup.1,v 1.6 1999/05/12 13:26:52 aaron Exp $
+.\" $OpenBSD: sup.1,v 1.7 1999/06/05 01:21:41 aaron Exp $
.\"
.\" Copyright (c) 1992 Carnegie Mellon University
.\" All Rights Reserved.
@@ -8,7 +8,7 @@
.\" notice and this permission notice appear in all copies of the
.\" software, derivative works or modified versions, and any portions
.\" thereof, and that both notices appear in supporting documentation.
-.\"
+.\"
.\" CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
.\" CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
.\" ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
@@ -25,6 +25,13 @@
.\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
.\" HISTORY
.\" $Log: sup.1,v $
+.\" Revision 1.7 1999/06/05 01:21:41 aaron
+.\" - remove trailing white space
+.\" - remove arguments from .Os macros
+.\" - remove arguments from .Nm macros, where appropriate
+.\" - some more Dq/Sq/Ql insanity
+.\" - still lots to do in the usr.bin tree... :/
+.\"
.\" Revision 1.6 1999/05/12 13:26:52 aaron
.\" grammar police: do not hyphenate compound words that act as adjectives if the
.\" first word ends in -ly
@@ -60,25 +67,25 @@
.\"
.\" Revision 1.4 92/08/11 12:08:40 mrt
.\" .TP
-.\" Add description of releases and use-rel-suffix
+.\" Add description of releases and use-rel-suffix
.\" [92/07/31 mrt]
-.\"
+.\"
.\" Revision 1.3 92/02/08 18:24:31 mja
.\" Added description of -k and -K switches and "keep" option.
.\" [92/01/17 vdelvecc]
-.\"
+.\"
.\" 10-May-86 Glenn Marcy (gm0w) at Carnegie-Mellon University
.\" Replaced reference to /usr/cmu with /usr/cs.
-.\"
+.\"
.\" 29-Mar-86 Glenn Marcy (gm0w) at Carnegie-Mellon University
.\" Updated manual entry to version 5.14 of sup.
-.\"
+.\"
.\" 14-Jan-86 Glenn Marcy (gm0w) at Carnegie-Mellon University
.\" Updated manual entry to version 5.7 of sup.
-.\"
+.\"
.\" 04-Apr-85 Steven Shafer (sas) at Carnegie-Mellon University
.\" Created.
-.\"
+.\"
.TH SUP 1 02/08/92
.CM 4
.SH "NAME"
@@ -109,7 +116,7 @@ In both of these cases, it only makes sense to sup one release of the
collections. Releases have also been used in private or external sups to
provide subsets of collections where it makes sense to pick up several
of the releases. For example the Mach 3.0 kernel sources has a default
-release of machine independent sources and separate releases of
+release of machine independent sources and separate releases of
machine dependent sources for each supported platform.
In performing an upgrade, the file server constructs a list of
@@ -184,7 +191,7 @@ flag should be sufficient.
.B -b
If the
.B -b
-flag if given, or the
+flag if given, or the
.B backup
supfile
option is specified, the contents of regular files
@@ -202,14 +209,14 @@ will create a copy of the current version of a file immediately
before a new copy is received from the file server; the copy is
given the same name as the original file but is put into a directory
called
-.B
+.B
BACKUP
within the directory containing the original file.
For example,
-.B
+.B
/usr/sas/src/foo.c
would have a backup copy called
-.B
+.B
/usr/sas/src/BACKUP/foo.c.
There is no provision for automatically maintaining multiple old
versions of files; you would have to do this yourself.
@@ -226,7 +233,7 @@ supfile option.
.B -d
Files that are no longer in the collection on the
repository will be deleted if present on the local
-machine and were put there by a previous sup.
+machine and were put there by a previous sup.
This may also be specified in a supfile with the
.B delete
option.
@@ -319,7 +326,7 @@ printed by
will normally only upgrade files that have
changed on the repository since the last time an
upgrade was performed. That is, if the file in the
-repository is newer than the date stored in the
+repository is newer than the date stored in the
.I when
file on the client. The
.B -o
@@ -342,13 +349,13 @@ supfile option.
.TP
.B -z
Normally sup transfers files directly without any
-other processing, but with the
+other processing, but with the
.B -z
flag, or the
.B compress
-supfile option, sup will compress the file
+supfile option, sup will compress the file
before sending it across the network and
-uncompress it and restore all the correct
+uncompress it and restore all the correct
file attributes at the receiving end.
.TP
.B -Z
@@ -447,8 +454,8 @@ If a collection contains multiple releases, you need to specify which
release you want. You can only specify one release per line, so
if you want multiple releases from the same collections, you will need
to specify the collection more than once. In this case, you should use
-the
-.I use-rel-suffix
+the
+.I use-rel-suffix
ption in the supfile
to keep the last and when files for the two releases separate.
.TP
@@ -462,7 +469,7 @@ directory.
Each collection may also have an associated
.I prefix directory
which is used instead of the base directory to specify in what
-directory files within the collection will be placed.
+directory files within the collection will be placed.
.TP
.BI host= hostname
.br
@@ -526,7 +533,7 @@ anonymous account.
.TP
.BI notify= address
If you use the
-.B
+.B
-m
option to receive log messages by mail, you can have the mail
sent to different user, possibly on another host, than the user
@@ -566,7 +573,7 @@ As described above under the
flag.
.TP
.B use-rel-suffix
-Causes the release name to be used as a suffix to the
+Causes the release name to be used as a suffix to the
.I last
and
.I when
@@ -627,9 +634,9 @@ can be used to grant access to all hosts on the local
network. The host name may be a numeric network address
or a network name. If a crypt appears on the same line as
the host name, that crypt will be used for that host. Otherwise,
-the crypt appearing in the
+the crypt appearing in the
.I crypt
-file, if any will be used.
+file, if any will be used.
.TP
.B crypt
If you wish to use the
@@ -650,7 +657,7 @@ file collection, in a format described below.
.B releases
This file describes any releases that the collection may have. Each
line starts with the release name and then may specify any of the following
-files:
+files:
.I prefix=<dirname>
to use a different parent directory for the files in this release.
.I list=<listname>
@@ -783,7 +790,7 @@ and will be replaced by the name of the file that was upgraded.
For example, if you say
\fBexecute ranlib %s (libc.a)\fR,
then whenever libc.a is upgraded, the client machine will execute
-.B
+.B
ranlib libc.a.
As described above, the client must invoke
.I sup
diff --git a/usr.bin/sup/src/supservers.8 b/usr.bin/sup/src/supservers.8
index 956ad7a4b0c..32b0e169a5f 100644
--- a/usr.bin/sup/src/supservers.8
+++ b/usr.bin/sup/src/supservers.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: supservers.8,v 1.5 1998/09/07 16:44:33 aaron Exp $
+.\" $OpenBSD: supservers.8,v 1.6 1999/06/05 01:21:41 aaron Exp $
.\"
.\" Copyright (c) 1992 Carnegie Mellon University
.\" All Rights Reserved.
@@ -8,7 +8,7 @@
.\" notice and this permission notice appear in all copies of the
.\" software, derivative works or modified versions, and any portions
.\" thereof, and that both notices appear in supporting documentation.
-.\"
+.\"
.\" CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
.\" CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
.\" ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
@@ -28,7 +28,7 @@
.\" Revision 1.3 92/08/11 12:08:50 mrt
.\" Documented -C switch
.\" [92/08/11 mrt]
-.\"
+.\"
.TH SUPSERVERS 8 1/16/86
.CM 1
.SH "NAME"
@@ -36,50 +36,50 @@ supfilesrv, supscan \- sup server processes
.SH "SYNOPSIS"
supfilesrv
[
-.I
+.I
-l
] [
-.I
+.I
-q
] [
-.I
+.I
-N
] [
-.I
+.I
-P
] [
.I -C MaxChildren
] [
.I -O lockdir
-]
+]
.br
supscan [
-.I
+.I
-v
] [
-.I
+.I
-s
] [
-.I
+.I
collection
] [
-.I
+.I
basedir
]
.SH "DESCRIPTION"
-.I
+.I
Supfilesrv
is the server processes used to interact with
-.I
+.I
sup
client processes via the IP/TCP network protocol.
This server
normally is expected to be running on server machines at all times.
Each machine with files of interest to users on other machines is
expected to be a file server and should run
-.I
+.I
supfilesrv.
-
+
A file server machine will service requests for both "private" and
"system" file collections.
No special action is necessary to support
@@ -98,10 +98,10 @@ the name of the host machine acting as file server for that collection.
Details of setting up a file collection for the file server are
described in the manual entry for
-.I
+.I
sup(1).
-.I
+.I
Supfilesrv
generally runs as a network server process that listens for connections,
and for each connection (double-)forks a process to handle the interaction
@@ -118,15 +118,15 @@ active server processes. The -N "network debugging" flag can be used
to produce voluminous messages describing the network communication
progress and status. The more -N switches that you use the more output
you get. Use 3 (separated by spaces: -N -N -N) to get a complete record
-of all network messages. Log messages are printed by
+of all network messages. Log messages are printed by
.I syslog
-on
+on
.I daemon.log .
To suppress
log messages, the -q "quiet" flag can be used.
-Normally the
+Normally the
.I supfilesrv
will only respond to 3 requests simultaneously, forking a child
process for each client. If it gets additional requests it will respond
@@ -134,7 +134,7 @@ with the error FSSETUPBUSY. The -C MaxChildren switch can be used
to increase (or decrease) this number.
-The -O lockdir switch is used to make
+The -O lockdir switch is used to make
.I supfilesrv
allow only one active connection at a time from any client ip address.
This is accomplished by each serving process obtaining exclusive lock,
@@ -151,44 +151,44 @@ comes in before the first one completes.
.SH "SUPSCAN"
It is possible to pre-compile a list of the files in a collection
to make
-.I
+.I
supfilesrv
service that collection much faster. This can be done by running
-.I
+.I
supscan
on the desired collection on the repository machine. This produces a
list of all the files in the collection at the time of the
-.I
+.I
supscan;
subsequent upgrades will be based on this list of files rather than
actually scanning the disk at the time of the upgrade. Of course,
the upgrade will consequently bring the client machine up to the status
of the repository machine as of the time of the
-.I
+.I
supscan
rather than as of the time of the upgrade; hence, if
-.I
+.I
supscan
is used, it should be run periodically on the
collection.
This facility is useful for extremely large file collections
that are upgraded many times per day, such as the CMU UNIX system
software. The "verbose" flag
-.I
+.I
-v
will cause
-.I
+.I
supscan
to produce output messages as it scans the files in the collection.
The "system" flag
-.I
+.I
-s
will cause
-.I
+.I
supscan
to scan all system collections residing on the current host.
The
-.I
+.I
basedir
parameter must be specified if the collection is a private
collection whose base directory is not the default.
@@ -205,18 +205,18 @@ host list file for system sups.
.TP
<base-directory>/sup/<collection>/*
files used by file server (see
-.I
+.I
sup(1))
.TP
<base-directory>/sup/<collection>/list
list file used by
-.I
+.I
supscan
to create file list
.TP
<base-directory>/sup/<collection>/scan
file list created by
-.I
+.I
supscan
from list file
.i0
@@ -225,7 +225,7 @@ from list file
.SH "SEE ALSO"
sup(1)
.br
-.I
+.I
The SUP Software Upgrade Protocol,
S.
A.
diff --git a/usr.bin/systat/systat.1 b/usr.bin/systat/systat.1
index 3c5410a6018..2566b228ad8 100644
--- a/usr.bin/systat/systat.1
+++ b/usr.bin/systat/systat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: systat.1,v 1.11 1999/05/16 19:58:00 alex Exp $
+.\" $OpenBSD: systat.1,v 1.12 1999/06/05 01:21:42 aaron Exp $
.\" $NetBSD: systat.1,v 1.6 1996/05/10 23:16:39 thorpej Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd December 30, 1993
.Dt SYSTAT 1
-.Os BSD 4.3
+.Os
.Sh NAME
.Nm systat
.Nd display system statistics on a crt
@@ -189,7 +189,7 @@ display; the minimum unambiguous prefix may be supplied.
.Bl -tag -width Fl -compact
.It Cm numbers
Show the disk
-.Tn I/O
+.Tn I/O
statistics in numeric form. Values are
displayed in numeric columns which scroll downward.
.It Cm bars
@@ -201,11 +201,11 @@ Toggle the display of time in disk activity (the default is to
not display time).
.El
.It Ic swap
-Show information about swap space usage on all the
+Show information about swap space usage on all the
swap areas compiled into the kernel.
The first column is the device name of the partition.
The next column is the total space available in the partition.
-The
+The
.Ar Used
column indicates the total blocks used so far;
the graph shows the percentage of space in use on each partition.
@@ -249,7 +249,7 @@ a bar graph showing the amount of
system (shown as `='), user (shown as `>'),
nice (shown as `-'), and idle time (shown as ` ').
.Pp
-To the right of the Proc display are statistics about
+To the right of the Proc display are statistics about
Context switches (`Csw'), Traps (`Trp'), Syscalls (`Sys'),
Interrupts (`Int'), Soft interrupts (`Sof'), and Faults (`Flt')
which have occurred during the last refresh interval.
diff --git a/usr.bin/tail/tail.1 b/usr.bin/tail/tail.1
index 26efbc509f3..45b15147754 100644
--- a/usr.bin/tail/tail.1
+++ b/usr.bin/tail/tail.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tail.1,v 1.6 1998/12/16 02:38:50 aaron Exp $
+.\" $OpenBSD: tail.1,v 1.7 1999/06/05 01:21:42 aaron Exp $
.\" $NetBSD: tail.1,v 1.4 1994/11/23 07:42:13 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993
@@ -39,7 +39,7 @@
.\"
.Dd June 6, 1993
.Dt TAIL 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm tail
.Nd display the last part of a file
@@ -142,8 +142,8 @@ utility exits 0 on success or >0 if an error occurred.
.Sh STANDARDS
The
.Nm
-utility is expected to be a superset of the
-.St -p1003.2-92
+utility is expected to be a superset of the
+.St -p1003.2-92
specification.
In particular, the
.Fl b
diff --git a/usr.bin/talk/talk.1 b/usr.bin/talk/talk.1
index c8a7d8d161c..7800e41ab21 100644
--- a/usr.bin/talk/talk.1
+++ b/usr.bin/talk/talk.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: talk.1,v 1.5 1999/03/22 23:41:55 pjanzen Exp $
+.\" $OpenBSD: talk.1,v 1.6 1999/06/05 01:21:42 aaron Exp $
.\" $NetBSD: talk.1,v 1.3 1994/12/09 02:14:23 jtc Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt TALK 1
-.Os BSD 4.2
+.Os
.Sh NAME
.Nm talk
.Nd talk to another user
diff --git a/usr.bin/tcopy/tcopy.1 b/usr.bin/tcopy/tcopy.1
index 89ec5ac0950..6afe62d9520 100644
--- a/usr.bin/tcopy/tcopy.1
+++ b/usr.bin/tcopy/tcopy.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tcopy.1,v 1.4 1998/10/30 00:24:38 aaron Exp $
+.\" $OpenBSD: tcopy.1,v 1.5 1999/06/05 01:21:42 aaron Exp $
.\" $NetBSD: tcopy.1,v 1.4 1997/04/15 07:23:07 lukem Exp $
.\"
.\" Copyright (c) 1985, 1990, 1991, 1993
@@ -36,7 +36,7 @@
.\"
.Dd April 17, 1994
.Dt TCOPY 1
-.Os BSD 4.3
+.Os
.Sh NAME
.Nm tcopy
.Nd copy and/or verify mag tapes
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index 95a589e4549..0676045769d 100644
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: telnet.1,v 1.15 1999/02/21 02:50:04 aaron Exp $
+.\" $OpenBSD: telnet.1,v 1.16 1999/06/05 01:21:42 aaron Exp $
.\" $NetBSD: telnet.1,v 1.5 1996/02/28 21:04:12 thorpej Exp $
.\"
.\" Copyright (c) 1983, 1990, 1993
@@ -36,10 +36,10 @@
.\"
.Dd February 3, 1994
.Dt TELNET 1
-.Os BSD 4.2
+.Os
.Sh NAME
.Nm telnet
-.Nd user interface to the
+.Nd user interface to the
.Tn TELNET
protocol
.Sh SYNOPSIS
@@ -70,7 +70,7 @@ protocol
The
.Nm telnet
command
-is used to communicate with another host using the
+is used to communicate with another host using the
.Tn TELNET
protocol.
If
@@ -114,7 +114,7 @@ or, on systems that support it, a symbolic
TOS name found in the
.Pa /etc/iptos
file.
-.It Fl X Ar atype
+.It Fl X Ar atype
Disables the
.Ar atype
type of authentication.
@@ -152,7 +152,7 @@ Sets the initial value of the
.Ic debug
toggle to
.Dv TRUE .
-.It Fl e Ar escapechar
+.It Fl e Ar escapechar
Sets the initial
.Nm
escape character to
@@ -176,7 +176,7 @@ realm
instead of the remote host's realm, as determined
by
.Xr krb_realmofhost 3 .
-.It Fl l Ar user
+.It Fl l Ar user
When connecting to the remote system, if the remote system
understands the
.Ev ENVIRON
@@ -189,7 +189,7 @@ option.
This option may also be used with the
.Ic open
command.
-.It Fl n Ar tracefile
+.It Fl n Ar tracefile
Opens
.Ar tracefile
for recording trace information.
@@ -233,7 +233,7 @@ either ``character at a time''
or ``old line by line''
depending on what the remote system supports.
.Pp
-When
+When
.Dv LINEMODE
is enabled, character processing is done on the
local system, under the control of the remote system. When input
@@ -252,7 +252,7 @@ to turn off and on the local echo
(this would mostly be used to enter passwords
without the password being echoed).
.Pp
-If the
+If the
.Dv LINEMODE
option is enabled, or if the
.Ic localchars
@@ -267,7 +267,7 @@ and
characters are trapped locally, and sent as
.Tn TELNET
protocol sequences to the remote side.
-If
+If
.Dv LINEMODE
has ever been enabled, then the user's
.Ic susp
@@ -278,9 +278,9 @@ are also sent as
protocol sequences,
and
.Ic quit
-is sent as a
+is sent as a
.Dv TELNET ABORT
-instead of
+instead of
.Dv BREAK .
There are options (see
.Ic toggle
@@ -328,7 +328,7 @@ and
.Ic display
commands).
.Bl -tag -width "mode type"
-.It Ic auth Ar argument Op Ar ...
+.It Ic auth Ar argument Op Ar ...
The
.Ic auth
command manipulates the information sent through the
@@ -358,7 +358,7 @@ authentication.
Close a
.Tn TELNET
session and return to command mode.
-.It Ic display Ar argument Op Ar ...
+.It Ic display Ar argument Op Ar ...
Displays all, or some, of the
.Ic set
and
@@ -439,7 +439,7 @@ or
.Ic encrypt stop
commands.
.El
-.It Ic environ Ar arguments Op Ar ...
+.It Ic environ Ar arguments Op Ar ...
The
.Ic environ
command is used to manipulate the
@@ -464,7 +464,7 @@ Valid arguments for the
.Ic environ
command are:
.Bl -tag -width Fl
-.It Ic define Ar variable value
+.It Ic define Ar variable value
Define the variable
.Ar variable
to have a value of
@@ -474,15 +474,15 @@ The
.Ar value
may be enclosed in single or double quotes so
that tabs and spaces may be included.
-.It Ic undefine Ar variable
+.It Ic undefine Ar variable
Remove
.Ar variable
from the list of environment variables.
-.It Ic export Ar variable
+.It Ic export Ar variable
Mark the variable
.Ar variable
to be exported to the remote side.
-.It Ic unexport Ar variable
+.It Ic unexport Ar variable
Mark the variable
.Ar variable
to not be exported unless
@@ -516,7 +516,7 @@ If the remote side also supports the concept of
suspending a user's session for later reattachment,
the logout argument indicates that you
should terminate the session immediately.
-.It Ic mode Ar type
+.It Ic mode Ar type
.Ar type
is one of several options, depending on the state of the
.Tn TELNET
@@ -537,40 +537,40 @@ Enable the
option, or, if the remote side does not understand the
.Dv LINEMODE
option, then attempt to enter ``old-line-by-line'' mode.
-.It Ic isig Pq Ic \-isig
-Attempt to enable (disable) the
+.It Ic isig Pq Ic \-isig
+Attempt to enable (disable) the
.Dv TRAPSIG
-mode of the
+mode of the
.Dv LINEMODE
option.
-This requires that the
+This requires that the
.Dv LINEMODE
option be enabled.
-.It Ic edit Pq Ic \-edit
-Attempt to enable (disable) the
+.It Ic edit Pq Ic \-edit
+Attempt to enable (disable) the
.Dv EDIT
-mode of the
+mode of the
.Dv LINEMODE
option.
-This requires that the
+This requires that the
.Dv LINEMODE
option be enabled.
-.It Ic softtabs Pq Ic \-softtabs
-Attempt to enable (disable) the
+.It Ic softtabs Pq Ic \-softtabs
+Attempt to enable (disable) the
.Dv SOFT_TAB
-mode of the
+mode of the
.Dv LINEMODE
option.
-This requires that the
+This requires that the
.Dv LINEMODE
option be enabled.
-.It Ic litecho Pq Ic \-litecho
-Attempt to enable (disable) the
+.It Ic litecho Pq Ic \-litecho
+Attempt to enable (disable) the
.Dv LIT_ECHO
-mode of the
+mode of the
.Dv LINEMODE
option.
-This requires that the
+This requires that the
.Dv LINEMODE
option be enabled.
.It Ic \&?
@@ -627,7 +627,7 @@ Close any open
session and exit
.Nm telnet .
An end-of-file (in command mode) will also close a session and exit.
-.It Ic send Ar arguments
+.It Ic send Ar arguments
Sends one or more special character sequences to the remote host.
The following are the arguments which may be specified
(more than one argument may be specified at a time):
@@ -796,8 +796,8 @@ Prints out help information for the
.Ic send
command.
.El
-.It Ic set Ar argument value
-.It Ic unset Ar argument value
+.It Ic set Ar argument value
+.It Ic unset Ar argument value
The
.Ic set
command will set any one of a number of
@@ -1125,16 +1125,16 @@ Displays the legal
.Pq Ic unset
commands.
.El
-.It Ic slc Ar state
+.It Ic slc Ar state
The
.Ic slc
command (Set Local Characters) is used to set
or change the state of the special
-characters when the
+characters when the
.Dv TELNET LINEMODE
option has
been enabled. Special characters are characters that get
-mapped to
+mapped to
.Tn TELNET
commands sequences (like
.Ic ip
@@ -1160,7 +1160,7 @@ was started.
.It Ic import
Switch to the remote defaults for the special characters.
The remote default characters are those of the remote system
-at the time when the
+at the time when the
.Tn TELNET
connection was established.
.It Ic \&?
@@ -1173,7 +1173,7 @@ Show the current status of
.Nm telnet .
This includes the peer one is connected to, as well
as the current mode.
-.It Ic toggle Ar arguments Op Ar ...
+.It Ic toggle Ar arguments Op Ar ...
Toggle (between
.Dv TRUE
and
@@ -1438,13 +1438,13 @@ Suspend
.Nm telnet .
This command only works when the user is using the
.Xr csh 1 .
-.It Ic \&! Op Ar command
+.It Ic \&! Op Ar command
Execute a single command in a subshell on the local
system. If
.Ar command
is omitted, then an interactive
subshell is invoked.
-.It Ic \&? Op Ar command
+.It Ic \&? Op Ar command
Get help. With no arguments,
.Nm telnet
prints a help summary.
@@ -1479,7 +1479,7 @@ command appeared in
On some remote systems, echo has to be turned off manually when in
``old line by line'' mode.
.Pp
-In ``old line by line'' mode or
+In ``old line by line'' mode or
.Dv LINEMODE
the terminal's
.Ic eof
diff --git a/usr.bin/tftp/tftp.1 b/usr.bin/tftp/tftp.1
index af56a7d77a9..41685c8bd51 100644
--- a/usr.bin/tftp/tftp.1
+++ b/usr.bin/tftp/tftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tftp.1,v 1.3 1998/10/30 00:24:39 aaron Exp $
+.\" $OpenBSD: tftp.1,v 1.4 1999/06/05 01:21:43 aaron Exp $
.\" $NetBSD: tftp.1,v 1.5 1995/08/18 14:45:44 pk Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
@@ -36,7 +36,7 @@
.\"
.Dd April 18, 1994
.Dt TFTP 1
-.Os BSD 4.3
+.Os
.Sh NAME
.Nm tftp
.Nd trivial file transfer program
@@ -92,7 +92,7 @@ does not maintain connections between transfers; thus, the
.Ic connect
command does not actually create a connection,
but merely remembers what host is to be used for transfers.
-You do not have to use the
+You do not have to use the
.Ic connect
command; the remote host can be specified as part of the
.Ic get
@@ -115,7 +115,7 @@ If the latter form is used,
the last hostname specified becomes the default for future transfers.
.Pp
.It Ic mode Ar transfer-mode
-Set the mode for transfers;
+Set the mode for transfers;
.Ar transfer-mode
may be one of
.Ic ascii
diff --git a/usr.bin/tic/tic.1 b/usr.bin/tic/tic.1
index 06000fdaa39..40f48fbb449 100644
--- a/usr.bin/tic/tic.1
+++ b/usr.bin/tic/tic.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tic.1,v 1.6 1999/03/11 21:08:09 millert Exp $
+.\" $OpenBSD: tic.1,v 1.7 1999/06/05 01:21:43 aaron Exp $
.\"
.\"***************************************************************************
.\" Copyright (c) 1998,1999 Free Software Foundation, Inc. *
@@ -118,10 +118,10 @@ Force source translation to terminfo format
using the long C variable names listed in <\fBterm.h\fR>
.TP
\fB-N\fR
-Disable smart defaults.
-Normally, when translating from termcap to terminfo, the compiler makes
+Disable smart defaults.
+Normally, when translating from termcap to terminfo, the compiler makes
a number of assumptions about the defaults of string capabilities
-\fBreset1_string\fR, \fBcarriage_return\fR, \fBcursor_left\fR,
+\fBreset1_string\fR, \fBcarriage_return\fR, \fBcursor_left\fR,
\fBcursor_down\fR, \fBscroll_forward\fR, \fBtab\fR, \fBnewline\fR,
\fBkey_backspace\fR, \fBkey_left\fR, and \fBkey_down\fR, then attempts
to use obsolete termcap capabilities to deduce correct values. It also
diff --git a/usr.bin/time/time.1 b/usr.bin/time/time.1
index 1eb6d7596b9..6ecb57db4d5 100644
--- a/usr.bin/time/time.1
+++ b/usr.bin/time/time.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: time.1,v 1.6 1998/11/04 22:36:41 aaron Exp $
+.\" $OpenBSD: time.1,v 1.7 1999/06/05 01:21:43 aaron Exp $
.\" $NetBSD: time.1,v 1.5 1994/12/08 09:36:57 jtc Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -45,20 +45,18 @@
.Op Fl lp
.Ar utility
.Sh DESCRIPTION
-The
-.Nm time
-utility
+.Nm
executes and
times
.Ar utility .
After the
.Ar utility
finishes,
-.Nm time
+.Nm
writes the total time elapsed,
the time consumed by system overhead,
-and the time used to execute
-.Ar utility
+and the time used to execute
+.Ar utility
to the standard error stream.
Times are reported in seconds.
.Pp
@@ -84,26 +82,26 @@ to
users.
.Sh DIAGNOSTICS
The
-.Nm time
+.Nm
utility shall exit with one of the following values:
.Bl -tag -width indent
-.It 1-125
-An error occurred in the
-.Nm time
+.It 1\-125
+An error occurred in the
+.Nm
utility.
.It 126
-The
+The
.Ar utility
was found but could not be invoked.
.It 127
-The
+The
.Ar utility
could not be found.
.El
.Pp
-Otherwise, the exit status of
-.Nm time
-shall be that of
+Otherwise, the exit status of
+.Nm
+shall be that of
.Ar utility .
.Sh SEE ALSO
.Xr csh 1 ,
@@ -115,7 +113,7 @@ shall be that of
.Sh STANDARDS
The
.Nm
-utility conforms to
+utility conforms to
.St -p1003.2-92 .
.Sh BUGS
The granularity of seconds on microprocessors is crude and
diff --git a/usr.bin/tip/tip.1 b/usr.bin/tip/tip.1
index c08e400f588..759d771d599 100644
--- a/usr.bin/tip/tip.1
+++ b/usr.bin/tip/tip.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tip.1,v 1.5 1998/11/11 23:01:47 aaron Exp $
+.\" $OpenBSD: tip.1,v 1.6 1999/06/05 01:21:43 aaron Exp $
.\" $NetBSD: tip.1,v 1.7 1994/12/08 09:31:05 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -36,19 +36,19 @@
.\"
.Dd April 18, 1994
.Dt TIP 1
-.Os BSD 4
+.Os
.Sh NAME
-.Nm tip
+.Nm tip
.\" .Nm cu
.Nd connect to a remote system
.Sh SYNOPSIS
.Nm tip
.Op Fl nv
-.Fl Ns Ns Ar speed
+.Fl Ns Ns Ar speed
.Ar system\-name
.Nm tip
.Op Fl nv
-.Fl Ns Ns Ar speed
+.Fl Ns Ns Ar speed
.Ar phone\-number
.\" .Nm cu
.\" .Ar phone\-number
@@ -76,7 +76,7 @@ on the machine (or equivalent) to which you wish to connect.
.\" describes only
.\" .Nm tip .
.Pp
-Available options:
+The options are as follows:
.Bl -tag -width indent
.It Fl v
Set verbose mode.
@@ -85,7 +85,9 @@ No escape (disable tilde).
.El
.Pp
Typed characters are normally transmitted directly to the remote
-machine (which does the echoing as well). A tilde (`~') appearing
+machine (which does the echoing as well). A tilde
+.Pq Ql ~
+appearing
as the first character of a line is an escape signal; the following
are recognized:
.Bl -tag -width flag
@@ -93,7 +95,7 @@ are recognized:
Drop the connection and exit
(you may still be logged in on the
remote machine).
-.It Ic \&~c Op Ar name
+.It Ic \&~c Op Ar name
Change directory to
.Ar name
(no argument
@@ -110,26 +112,41 @@ Copy file from remote to local.
.Nm tip
prompts first for the name of the file to be sent, then for
a command to be executed on the remote machine.
-.It Ic \&~p Ar from Op Ar to
+.It Ic \&~p Ar from Op Ar to
Send a file to a remote
.Ux
host. The put command causes the remote
.Ux
-system to run the command string ``cat > 'to''', while
+system to run the command string
+.Dq cat > 'to' ,
+while
.Nm tip
-sends it the ``from''
-file. If the ``to'' file isn't specified the ``from'' file name is used.
-This command is actually a
+sends it the
+.Dq from
+file. If the
+.Dq to
+file isn't specified the
+.Dq from
+file name is used.
+this command is actually a
.Ux
-specific version of the ``~>'' command.
-.It Ic \&~t Ar from Op Ar to
+specific version of the
+.Ic ~>
+command.
+.It Ic \&~t Ar from Op Ar to
Take a file from a remote
.Ux
host.
-As in the put command the ``to'' file
-defaults to the ``from'' file name if it isn't specified.
+As in the put command the
+.Dq to
+file
+defaults to the
+.Dq from
+file name if it isn't specified.
The remote host
-executes the command string ``cat 'from';echo ^A'' to send the file to
+executes the command string
+.Dq cat 'from';echo ^A
+to send the file to
.Nm tip .
.It Ic \&~|
Pipe the output from a remote command to a local
@@ -166,27 +183,29 @@ For systems which don't support the
necessary
.Fn ioctl
call the break is simulated by a sequence of line speed changes
-and
-.Dv DEL
-characters.
+and DEL characters.
.It Ic \&~s
Set a variable (see the discussion below).
.It Ic \&~^Z
Stop
-.Nm tip
+.Nm
(only available with job control).
.It Ic \&~^Y
-Stop only the ``local side'' of
-.Nm tip
+Stop only the
+.Dq local side
+of
+.Nm
(only available with job control);
-the ``remote side'' of
+the
+.Dq remote side
+of
.Nm tip ,
the side that displays output from the remote host, is left running.
.It Ic \&~?
Get a summary of the tilde escapes.
.El
.Pp
-.Nm tip
+.Nm
uses the file
.Pa /etc/remote
to find how to reach a particular
@@ -201,7 +220,7 @@ to be used may be specified on the command line, e.g.
.Ql "tip -300 mds" .
.Pp
When
-.Nm tip
+.Nm
establishes a connection it sends out a
connection message to the remote system; the default value, if any,
is defined in
@@ -210,37 +229,45 @@ is defined in
.Xr remote 5 ) .
.Pp
When
-.Nm tip
+.Nm
prompts for an argument (e.g. during setup of
a file transfer) the line typed may be edited with the standard
erase and kill characters. A null line in response to a prompt,
or an interrupt, will abort the dialogue and return you to the
remote machine.
.Pp
-.Nm tip
+.Nm
guards against multiple users connecting to a remote system
by opening modems and terminal lines with exclusive access,
and by honoring the locking protocol used by
.Xr uucico 8 .
.Pp
During file transfers
-.Nm tip
+.Nm
provides a running count of the number of lines transferred.
-When using the ~> and ~< commands, the ``eofread'' and ``eofwrite''
+When using the
+.Ic ~>
+and
+.Ic ~<
+commands, the
+.Dq eofread
+and
+.Dq eofwrite
variables are used to recognize end-of-file when reading, and
specify end-of-file when writing (see below). File transfers
normally depend on tandem mode for flow control. If the remote
-system does not support tandem mode, ``echocheck'' may be set
-to indicate
-.Nm tip
+system does not support tandem mode,
+.Dq echocheck
+may be set to indicate
+.Nm
should synchronize with the remote system on the echo of each
transmitted character.
.Pp
When
-.Nm tip
+.Nm
must dial a phone number to connect to a system it will print
various messages indicating its actions.
-.Nm tip
+.Nm
supports the
.Tn DEC DN Ns-11
and
@@ -252,35 +279,46 @@ and
Ventel 212+, Racal-Vadic 3451, and
Bizcomp 1031 and 1032 integral call unit/modems.
.Ss VARIABLES
-.Nm tip
+.Nm
maintains a set of variables
which control its operation.
Some of these variables are read-only to normal users (root is allowed
to change anything of interest). Variables may be displayed
-and set through the ``s'' escape. The syntax for variables is patterned
-after
-.Xr vi 1
+and set through the
+.Sq s
+escape. The syntax for variables is patterned after
+.Xr vi 1
and
-.Xr Mail 1 .
-Supplying ``all''
+.Xr Mail 1 .
+Supplying
+.Dq all
as an argument to the set command displays all variables readable by
the user. Alternatively, the user may request display of a particular
-variable by attaching a `?' to the end. For example ``escape?''
+variable by attaching a
+.Ql ?
+to the end. For example
+.Dq escape?
displays the current escape character.
.Pp
Variables are numeric, string, character, or boolean values. Boolean
variables are set merely by specifying their name; they may be reset
-by prepending a `!' to the name. Other variable types are set by
-concatenating an `=' and the value. The entire assignment must not
+by prepending a
+.Ql !
+to the name. Other variable types are set by
+concatenating an
+.Ql =
+and the value. The entire assignment must not
have any blanks in it. A single set command may be used to interrogate
as well as set a number of variables.
Variables may be initialized at run time by placing set commands
-(without the ``~s'' prefix in a file
+(without the
+.Ql ~s
+prefix in a file
.Pa .tiprc
in one's home directory). The
.Fl v
option causes
-.Nm tip
+.Nm
to display the sets as they are made.
Certain common variables have abbreviations.
The following is a list of common variables,
@@ -304,30 +342,36 @@ waiting for the echo of the last character transmitted; default is
.Ar off .
.It Ar eofread
(str) The set of characters which signify an end-of-transmission
-during a ~< file transfer command; abbreviated
+during a
+.Ic ~<
+file transfer command; abbreviated
.Ar eofr .
.It Ar eofwrite
-(str) The string sent to indicate end-of-transmission during
-a ~> file transfer command; abbreviated
+(str) The string sent to indicate end-of-transmission during a
+.Ic ~>
+file transfer command; abbreviated
.Ar eofw .
.It Ar eol
(str) The set of characters which indicate an end-of-line.
-.Nm tip
+.Nm
will recognize escape characters only after an end-of-line.
.It Ar escape
(char) The command prefix (escape) character; abbreviated
-.Ar es ;
-default value is `~'.
+.Ar es ;
+default value is
+.Ql ~ .
.It Ar exceptions
(str) The set of characters which should not be discarded
due to the beautification switch; abbreviated
.Ar ex ;
-default value is ``\et\en\ef\eb''.
+default value is
+.Dq \et\en\ef\eb .
.It Ar force
(char) The character used to force literal data transmission;
abbreviated
.Ar fo ;
-default value is `^P'.
+default value is
+.Ql ^P .
.It Ar framesize
(num) The amount of data (in bytes) to buffer between file system
writes when receiving files; abbreviated
@@ -338,29 +382,33 @@ writes when receiving files; abbreviated
.It Ar prompt
(char) The character which indicates an end-of-line on the remote
host; abbreviated
-.Ar pr ;
-default value is `\en'. This value is used to synchronize during
+.Ar pr ;
+default value is
+.Ql \en .
+This value is used to synchronize during
data transfers. The count of lines transferred during a file transfer
command is based on receipt of this character.
.It Ar raise
(bool) Upper case mapping mode; abbreviated
-.Ar ra ;
+.Ar ra ;
default value is
.Ar off .
When this mode is enabled, all lower case letters will be mapped to
upper case by
-.Nm tip
+.Nm
for transmission to the remote machine.
.It Ar raisechar
(char) The input character used to toggle upper case mapping mode;
abbreviated
-.Ar rc ;
-default value is `^A'.
+.Ar rc ;
+default value is
+.Ql ^A .
.It Ar record
(str) The name of the file in which a session script is recorded;
abbreviated
-.Ar rec ;
-default value is ``tip.record''.
+.Ar rec ;
+default value is
+.Dq tip.record .
.It Ar script
(bool) Session scripting mode; abbreviated
.Ar sc ;
@@ -370,7 +418,7 @@ When
.Ar script
is
.Li true,
-.Nm tip
+.Nm
will record everything transmitted by the remote machine in
the script record file specified in
.Ar record .
@@ -396,21 +444,25 @@ Each tab is expanded to 8 spaces.
default is
.Ar true .
When verbose mode is enabled,
-.Nm tip
+.Nm
prints messages while dialing, shows the current number
of lines transferred during a file transfer operations,
and more.
.El
.Sh ENVIRONMENT
-.Nm tip
+.Nm
uses the following environment variables:
.Bl -tag -width Fl
.It Ev SHELL
-(str) The name of the shell to use for the ~! command; default
-value is ``/bin/sh'', or taken from the environment.
+(str) The name of the shell to use for the
+.Ic ~!
+command; default value is
+.Dq /bin/sh ,
+or taken from the environment.
.It Ev HOME
-(str) The home directory to use for the ~c command; default
-value is taken from the environment.
+(str) The home directory to use for the
+.Ic ~c
+command; default value is taken from the environment.
.It Ev HOST
Check for a default host if none specified.
.El
@@ -447,7 +499,7 @@ Diagnostics are, hopefully, self-explanatory.
.Xr remote 5
.Sh HISTORY
The
-.Nm tip
+.Nm
appeared command in
.Bx 4.2 .
.Sh BUGS
diff --git a/usr.bin/tn3270/mset/map3270.5 b/usr.bin/tn3270/mset/map3270.5
index faf9803b5e2..ebb67f7e928 100644
--- a/usr.bin/tn3270/mset/map3270.5
+++ b/usr.bin/tn3270/mset/map3270.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: map3270.5,v 1.4 1998/10/30 00:24:39 aaron Exp $
+.\" $OpenBSD: map3270.5,v 1.5 1999/06/05 01:21:43 aaron Exp $
.\" Copyright (c) 1986 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -102,7 +102,7 @@ A caret
the ``control'' character of whatever the character is.
So, `^a'
represents control-a, ie: hexadecimal 1
-(note that `^A' would generate the same code).
+(note that `^A' would generate the same code).
To generate
.B rubout
(DEL),
@@ -332,7 +332,7 @@ Greg Minshall
doesn't yet understand how to process all the functions
available in
.I map3270;
-when such a function is requested
+when such a function is requested
.I tn3270
will beep at you.
.PP
diff --git a/usr.bin/tn3270/mset/mset.1 b/usr.bin/tn3270/mset/mset.1
index 080dcfa446c..b65a038f07a 100644
--- a/usr.bin/tn3270/mset/mset.1
+++ b/usr.bin/tn3270/mset/mset.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mset.1,v 1.6 1998/11/11 23:01:47 aaron Exp $
+.\" $OpenBSD: mset.1,v 1.7 1999/06/05 01:21:44 aaron Exp $
.\" Copyright (c) 1986, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -34,7 +34,7 @@
.\"
.Dd July 27, 1991
.Dt MSET 1
-.Os BSD 4.3
+.Os
.Sh NAME
.Nm mset
.Nd retrieve
diff --git a/usr.bin/tn3270/tn3270/tn3270.1 b/usr.bin/tn3270/tn3270/tn3270.1
index a87a6d99ded..c926fa7c964 100644
--- a/usr.bin/tn3270/tn3270/tn3270.1
+++ b/usr.bin/tn3270/tn3270/tn3270.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tn3270.1,v 1.5 1999/05/16 19:58:01 alex Exp $
+.\" $OpenBSD: tn3270.1,v 1.6 1999/06/05 01:21:44 aaron Exp $
.\" Copyright (c) 1986, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -34,7 +34,7 @@
.\"
.Dd July 27, 1991
.Dt TN3270 1
-.Os BSD 4.3
+.Os
.Sh NAME
.Nm tn3270
.Nd full-screen remote login to
@@ -312,7 +312,7 @@ Information on these can be found in
also checks
.Ev SHELL ,
.Ev KEYBD
-and
+and
.Ev API3270 .
.Sh SEE ALSO
.Xr mset 1 ,
diff --git a/usr.bin/top/top.1 b/usr.bin/top/top.1
index 83ccc414b66..1400171679f 100644
--- a/usr.bin/top/top.1
+++ b/usr.bin/top/top.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: top.1,v 1.9 1999/05/16 19:58:04 alex Exp $
+.\" $OpenBSD: top.1,v 1.10 1999/06/05 01:21:44 aaron Exp $
.\"
.\" Copyright (c) 1997, Jason Downs. All rights reserved.
.\"
@@ -32,7 +32,7 @@
.\"
.Dd August 14, 1997
.Dt TOP 1
-.Os OpenBSD
+.Os
.Sh NAME
.Nm top
.Nd display and update information about the top CPU processes
@@ -60,10 +60,10 @@ processes will be displayed instead of the default.
makes a distinction between terminals that support advanced capabilities
and those that do not. This
distinction affects the choice of defaults for certain options. In the
-remainder of this document, an
+remainder of this document, an
.Em intelligent
terminal is one that supports cursor addressing, clear screen, and clear
-to end of line. Conversely, a
+to end of line. Conversely, a
.Em dumb
terminal is one that does not support such features. If the output of
.Nm
@@ -94,7 +94,7 @@ intelligent terminal.
Do not display idle processes.
By default, top displays both active and idle processes.
.It Fl n
-Use
+Use
.Em non-interactive
mode. This is identical to
.Em batch
@@ -176,9 +176,9 @@ and
are actually toggles. A second specification of any of these options
will negate the first. Thus a user who has the environment variable
.Ev TOP
-set to
+set to
.Dq -I
-may use the command
+may use the command
.Dq top -I
to see idle processes.
.Sh INTERACTIVE MODE
@@ -197,7 +197,7 @@ is between displays; that is, while it is waiting for
seconds to elapse. If this is the case, the command will be
processed and the display will be updated immediately thereafter
(reflecting any changes that the command may have specified). This
-happens even if the command was incorrect. If a key is pressed while
+happens even if the command was incorrect. If a key is pressed while
.Nm
is in the middle of updating the display, it will finish the update and
then process the command. Some commands require additional information,
diff --git a/usr.bin/tput/tput.1 b/usr.bin/tput/tput.1
index 8a6623a5c90..b9476a52da0 100644
--- a/usr.bin/tput/tput.1
+++ b/usr.bin/tput/tput.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tput.1,v 1.5 1999/03/06 20:27:42 millert Exp $
+.\" $OpenBSD: tput.1,v 1.6 1999/06/05 01:21:44 aaron Exp $
.\" $NetBSD: tput.1,v 1.4 1994/12/07 08:49:10 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd March 19, 1994
.Dt TPUT 1
-.Os BSD 4.4
+.Os
.Sh NAME
.Nm tput
.Nd terminal capability interface
diff --git a/usr.bin/true/true.1 b/usr.bin/true/true.1
index 220a918ebae..d95e6f74b65 100644
--- a/usr.bin/true/true.1
+++ b/usr.bin/true/true.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: true.1,v 1.3 1998/10/30 00:24:40 aaron Exp $
+.\" $OpenBSD: true.1,v 1.4 1999/06/05 01:21:44 aaron Exp $
.\" Copyright (c) 1983, 1985, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -45,7 +45,7 @@
.Nm true
.Sh DESCRIPTION
The
-.Nm true
+.Nm
utility always returns with exit code 0.
.Sh SEE ALSO
.Xr csh 1 ,
@@ -53,6 +53,6 @@ utility always returns with exit code 0.
.Xr sh 1
.Sh STANDARDS
The
-.Nm true
-utility conforms to
+.Nm
+utility conforms to
.St -p1003.2-92 .
diff --git a/usr.bin/tty/tty.1 b/usr.bin/tty/tty.1
index a7487338471..d60e4e7fd6e 100644
--- a/usr.bin/tty/tty.1
+++ b/usr.bin/tty/tty.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tty.1,v 1.3 1998/10/30 00:24:41 aaron Exp $
+.\" $OpenBSD: tty.1,v 1.4 1999/06/05 01:21:44 aaron Exp $
.\" $NetBSD: tty.1,v 1.4 1994/12/07 00:46:55 jtc Exp $
.\"
.\" Copyright (c) 1990, 1993
@@ -76,5 +76,5 @@ not a terminal, or >1 if an error occurred.
.Sh STANDARDS
The
.Nm tty
-utility conforms to
+utility conforms to
.St -p1003.2-92 .
diff --git a/usr.bin/ul/ul.1 b/usr.bin/ul/ul.1
index 76e536c47b0..4eead962602 100644
--- a/usr.bin/ul/ul.1
+++ b/usr.bin/ul/ul.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ul.1,v 1.3 1998/10/30 00:24:41 aaron Exp $
+.\" $OpenBSD: ul.1,v 1.4 1999/06/05 01:21:45 aaron Exp $
.\" $NetBSD: ul.1,v 1.3 1994/12/07 00:28:23 jtc Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt UL 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm ul
.Nd do underlining
@@ -92,7 +92,7 @@ specified in
or as set during the login process by the user in their
.Pa login
file (see
-.Xr setenv 1 ) .
+.Xr setenv 1 ) .
.El
.Sh SEE ALSO
.Xr colcrt 1 ,
diff --git a/usr.bin/uname/uname.1 b/usr.bin/uname/uname.1
index 19d7380a3f6..2101ece0a06 100644
--- a/usr.bin/uname/uname.1
+++ b/usr.bin/uname/uname.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uname.1,v 1.4 1998/10/30 00:24:41 aaron Exp $
+.\" $OpenBSD: uname.1,v 1.5 1999/06/05 01:21:45 aaron Exp $
.\" Copyright (c) 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -49,9 +49,9 @@ to the standard output.
.Pp
The following options are available:
.Bl -tag -width indent
-.It Fl a
+.It Fl a
Behave as though all of the options
-.Fl mnrsv
+.Fl mnrsv
were specified.
.It Fl m
Print the machine hardware name.
@@ -69,7 +69,7 @@ Print the operating system release.
Print the operating system version.
.El
.Pp
-If no options are specified,
+If no options are specified,
.Nm uname
prints the operating system name as if the
.Fl s
diff --git a/usr.bin/unifdef/unifdef.1 b/usr.bin/unifdef/unifdef.1
index 5dfa29e9a07..aebf1314211 100644
--- a/usr.bin/unifdef/unifdef.1
+++ b/usr.bin/unifdef/unifdef.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: unifdef.1,v 1.3 1998/10/30 00:24:41 aaron Exp $
+.\" $OpenBSD: unifdef.1,v 1.4 1999/06/05 01:21:45 aaron Exp $
.\" $NetBSD: unifdef.1,v 1.4 1994/12/07 00:33:48 jtc Exp $
.\"
.\" Copyright (c) 1985, 1991, 1993
@@ -39,7 +39,7 @@
.\"
.Dd April 1, 1994
.Dt UNIFDEF 1
-.Os BSD 4.3
+.Os
.Sh NAME
.Nm unifdef
.Nd remove ifdef'ed lines
diff --git a/usr.bin/units/units.1 b/usr.bin/units/units.1
index 7ccd46cb723..d077d0a0817 100644
--- a/usr.bin/units/units.1
+++ b/usr.bin/units/units.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: units.1,v 1.7 1998/12/16 02:38:50 aaron Exp $
+.\" $OpenBSD: units.1,v 1.8 1999/06/05 01:21:45 aaron Exp $
.\" converted to new format by deraadt@openbsd.org
.Dd July 14, 1993
.Dt UNITS 1
@@ -11,16 +11,16 @@
.Op Fl f Ar filename
.Op Fl q
.Op Fl v
-.Ar from-unit
+.Ar from-unit
.Ar to-unit
.Sh ARGUMENTS
.Bl -tag -width Ds
.It Fl f Ar filename
Specifies the name of the units data file to load.
-.It Fl q
+.It Fl q
Suppresses prompting of the user for units and the display of statistics
about the number of units loaded.
-.It Fl v
+.It Fl v
Prints the version number.
.It Ar from-unit Ar to-unit
Allows a single unit conversion to be done directly from the command
@@ -28,7 +28,7 @@ line. No prompting will occur. The units program will print out
only the result of this single conversion.
.El
.Sh DESCRIPTION
-The units program converts quantities expression in various scales to
+The units program converts quantities expression in various scales to
their equivalents in other scales. The units program can only
handle multiplicative scale changes. It cannot convert Centigrade
to Fahrenheit, for example. It works interactively by prompting
@@ -46,19 +46,29 @@ the user for input:
/ 3785.4118
.fi
.Pp
-Powers of units can be specified using the '^' character as shown in
-the example, or by simple concatenation: 'cm3' is equivalent to 'cm^3'.
+Powers of units can be specified using the
+.Ql ^
+character as shown in
+the example, or by simple concatenation:
+.Dq cm3
+is equivalent to
+.Dq cm^3 .
Multiplication of units can be specified by using spaces, a dash or
-an asterisk. Division of units is indicated by the slash ('/').
-Note that multiplication has a higher precedence than division,
-so 'm/s/s' is the same as 'm/s^2' or 'm/s s'.
+an asterisk. Division of units is indicated by the slash
+.Pq Ql / .
+Note that multiplication has a higher precedence than division, so
+.Dq m/s/s
+is the same as
+.Dq m/s^2
+or
+.Dq m/s s .
If the user enters incompatible unit types, the units program will
print a message indicating that the units are not conformable and
it will display the reduced form for each unit:
.Pp
.nf
You have: ergs/hour
- You want: fathoms kg^2 / day
+ You want: fathoms kg^2 / day
conformability error
2.7777778e-11 kg m^2 / sec^3
2.1166667e-05 kg^2 m / sec
@@ -94,20 +104,24 @@ US counterparts are prefixed with 'br', and currency is prefixed with
its country name: 'belgiumfranc', 'britainpound'. When searching for
a unit, if the specified string does not appear exactly as a unit
name, then the units program will try to remove a trailing 's' or
-a trailing 'es' and check again for a match.
+a trailing 'es' and check again for a match.
.Pp
All of these definitions can be read in the standard units file, or you
can supply your own file. A unit is specified on a single line by
giving its name and an equivalence. One should be careful to define
new units in terms of old ones so that a reduction leads to the
-primitive units which are marked with '!' characters.
+primitive units which are marked with
+.Ql !
+characters.
The units program will not detect infinite loops that could be caused
by careless unit definitions.
.Pp
-Prefixes are defined in the same way as standard units, but with
-a trailing dash at the end of the prefix name.
+Prefixes are defined in the same way as standard units, but with
+a trailing dash at the end of the prefix name.
.Sh BUGS
-The effect of including a '/' in a prefix is surprising.
+The effect of including a
+.Ql /
+in a prefix is surprising.
.Pp
Exponents entered by the user can be only one digit.
You can work around this by multiplying several terms.
@@ -121,7 +135,7 @@ of the units converted and on the length of the data file.
.Pp
The program should use a hash table to store units so that
it doesn't take so long to load the units list and check
-for duplication.
+for duplication.
.Sh FILES
/usr/share/misc/units.lib - the standard units library
.Sh AUTHOR
diff --git a/usr.bin/unvis/unvis.1 b/usr.bin/unvis/unvis.1
index 960b0912b54..7d17bccd508 100644
--- a/usr.bin/unvis/unvis.1
+++ b/usr.bin/unvis/unvis.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: unvis.1,v 1.3 1998/10/30 00:24:41 aaron Exp $
+.\" $OpenBSD: unvis.1,v 1.4 1999/06/05 01:21:45 aaron Exp $
.\" $NetBSD: unvis.1,v 1.3 1994/12/06 07:36:08 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt UNVIS 1
-.Os BSD 4.4
+.Os
.Sh NAME
.Nm unvis
.Nd "revert a visual representation of data back to original form"
diff --git a/usr.bin/users/users.1 b/usr.bin/users/users.1
index 37cdb08f7df..7a19341d9c5 100644
--- a/usr.bin/users/users.1
+++ b/usr.bin/users/users.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: users.1,v 1.3 1998/10/30 00:24:41 aaron Exp $
+.\" $OpenBSD: users.1,v 1.4 1999/06/05 01:21:46 aaron Exp $
.\" $NetBSD: users.1,v 1.4 1994/12/06 07:32:27 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt USERS 1
-.Os BSD 3
+.Os
.Sh NAME
.Nm users
.Nd list current users
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index 5372b9b250b..4c4098b72f5 100644
--- a/usr.bin/uuencode/uuencode.1
+++ b/usr.bin/uuencode/uuencode.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uuencode.1,v 1.5 1998/10/30 00:24:42 aaron Exp $
+.\" $OpenBSD: uuencode.1,v 1.6 1999/06/05 01:21:46 aaron Exp $
.\" $NetBSD: uuencode.1,v 1.4 1994/11/17 07:39:42 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt UUENCODE 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm uuencode ,
.Nm uudecode
@@ -96,10 +96,10 @@ tar cf \- src_tree \&| compress \&|
uuencode src_tree.tar.Z \&| mail sys1!sys2!user
.Ed
.Sh DIAGNOSTICS
-The
+The
.Nm uudecode
-and
-.Nm uuencode
+and
+.Nm uuencode
utilities exit 0 on success or >0 if an error occurred.
.Sh SEE ALSO
.Xr compress 1 ,
@@ -107,11 +107,11 @@ utilities exit 0 on success or >0 if an error occurred.
.Xr uucp 1 ,
.Xr uuencode 5
.Sh STANDARDS
-The
+The
.Nm uudecode
and
.Nm uuencode
-utilities conform to
+utilities conform to
.St -p1003.2-92 .
.Sh HISTORY
The
diff --git a/usr.bin/vacation/vacation.1 b/usr.bin/vacation/vacation.1
index d14afd2ada0..b9279b24676 100644
--- a/usr.bin/vacation/vacation.1
+++ b/usr.bin/vacation/vacation.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vacation.1,v 1.7 1999/06/03 20:20:25 marc Exp $
+.\" $OpenBSD: vacation.1,v 1.8 1999/06/05 01:21:46 aaron Exp $
.\" $NetBSD: vacation.1,v 1.5 1995/08/31 21:57:08 jtc Exp $
.\"
.\" Copyright (c) 1985, 1987, 1990, 1991, 1993
@@ -36,7 +36,7 @@
.\"
.Dd April 28, 1995
.Dt VACATION 1
-.Os BSD 4.3
+.Os
.Sh NAME
.Nm vacation
.Nd return ``I am not here'' indication
diff --git a/usr.bin/vgrind/vgrind.1 b/usr.bin/vgrind/vgrind.1
index 6248c4a6b71..df58a6021b8 100644
--- a/usr.bin/vgrind/vgrind.1
+++ b/usr.bin/vgrind/vgrind.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vgrind.1,v 1.3 1998/10/30 00:24:42 aaron Exp $
+.\" $OpenBSD: vgrind.1,v 1.4 1999/06/05 01:21:46 aaron Exp $
.\" $NetBSD: vgrind.1,v 1.4 1994/11/17 08:28:04 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -36,13 +36,13 @@
.\"
.Dd June 6, 1993
.Dt VGRIND 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm vgrind
.Nd grind nice listings of programs
.Sh SYNOPSIS
.Nm vgrind
-.Op Fl
+.Op Fl
.Op Fl W
.Op Fl d Ar file
.Op Fl f
@@ -54,23 +54,23 @@
.Op Fl x
.Ar name Ar ...
.Sh DESCRIPTION
-.Nm vgrind
-formats the program sources which are arguments
+.Nm
+formats the program sources which are arguments
in a nice style using
.Xr troff 1 .
Comments are placed in italics, keywords in bold face,
and the name of the current function is listed down the margin of each
page as it is encountered.
.Pp
-.Nm vgrind
+.Nm
runs in two basic modes, filter mode (see the
.Fl f
-option) or regular mode. In filter mode
-.Nm vgrind
+option) or regular mode. In filter mode
+.Nm
acts as a filter in a manner similar to
.Xr tbl 1 .
The standard input is passed directly to the standard output except
-for lines bracketed by the
+for lines bracketed by the
.Em troff-like
macros:
.Bl -tag -width Ds
@@ -81,26 +81,26 @@ ends processing
.El
.Pp
These lines are formatted as described above. The output from this
-filter can be passed to
+filter can be passed to
.Xr troff 1
-for output. There need be no particular ordering with
+for output. There need be no particular ordering with
.Xr eqn 1
or
.Xr tbl 1 .
.Pp
-In regular mode
-.Nm vgrind
-accepts input files, processes them, and passes them to
+In regular mode
+.Nm
+accepts input files, processes them, and passes them to
.Xr troff 1
-for output.
+for output.
.Pp
-In both modes
-.Nm vgrind
+In both modes
+.Nm
passes any lines beginning with a decimal point without conversion.
.Pp
The options are:
.Bl -tag -width Ar
-.It Fl
+.It Fl
Forces input to be taken from standard input (default if
.Fl f
is specified).
@@ -150,15 +150,17 @@ Similar to the same option in
.Xr troff 1
causing formatted text to go to the standard output
.It Fl x
-Outputs the index file in a ``pretty'' format.
-The index file itself is produced whenever
-.Nm vgrind
-is run with a file called
+Outputs the index file in a
+.Dq pretty
+format.
+The index file itself is produced whenever
+.Nm
+is run with a file called
.Pa index
in the current directory.
The index of function
-definitions can then be run off by giving
-.Nm vgrind
+definitions can then be run off by giving
+.Nm
the
.Fl x
option and the file
@@ -184,7 +186,7 @@ language descriptions
.Sh BUGS
vfontedpr assumes that a certain programming style is followed:
.Pp
-For
+For
.Tn C
\- function names can be preceded on a line only by spaces, tabs, or an
asterisk. The parenthesized arguments must also be on the same line.
@@ -206,10 +208,10 @@ name comment mechanisms will fail.
.Pp
More generally, arbitrary formatting styles for programs mostly look bad.
The use of spaces to align source code fails miserably; if you plan to
-.Nm vgrind
+.Nm
your program you should use tabs. This is somewhat inevitable since the
font used by
-.Nm vgrind
+.Nm
is variable width.
.Pp
The mechanism of
diff --git a/usr.bin/vi/docs/USD.doc/vi.man/vi.1 b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
index 9bce8ab36b5..d853621fe91 100644
--- a/usr.bin/vi/docs/USD.doc/vi.man/vi.1
+++ b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
@@ -4,7 +4,7 @@
.\" Keith Bostic. All rights reserved.
.\"
.\" This document may not be republished without written permission from
-.\" Keith Bostic.
+.\" Keith Bostic.
.\"
.\" See the LICENSE file for redistribution information.
.\"
@@ -279,7 +279,7 @@ Once you've entered input mode using the one of the
.BR \&a ,
.BR \&i ,
.BR \&O
-or
+or
.B \&o
commands, use
.B <escape>
diff --git a/usr.bin/vis/vis.1 b/usr.bin/vis/vis.1
index e30e1e809fe..c565c80060a 100644
--- a/usr.bin/vis/vis.1
+++ b/usr.bin/vis/vis.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vis.1,v 1.4 1998/11/03 05:07:31 aaron Exp $
+.\" $OpenBSD: vis.1,v 1.5 1999/06/05 01:21:49 aaron Exp $
.\" $NetBSD: vis.1,v 1.5 1994/11/17 07:56:00 jtc Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993, 1994
@@ -36,7 +36,7 @@
.\"
.Dd April 19, 1994
.Dt VIS 1
-.Os BSD 4.4
+.Os
.Sh NAME
.Nm vis
.Nd display non-printable characters in a visual format
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index bb20fae596c..8d609e1ad23 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vmstat.8,v 1.12 1998/11/11 23:01:51 aaron Exp $
+.\" $OpenBSD: vmstat.8,v 1.13 1999/06/05 01:21:49 aaron Exp $
.\" $NetBSD: vmstat.8,v 1.12 1996/05/10 23:19:30 thorpej Exp $
.\"
.\" Copyright (c) 1986, 1993
@@ -77,7 +77,7 @@ involved in each.
Report on the number of interrupts taken by each device since system
startup.
.It Fl M Ar core
-Extract values associated with the name list from the specified core
+Extract values associated with the name list from the specified core
instead of the default
.Pa /dev/mem .
.It Fl N Ar system
diff --git a/usr.bin/w/uptime.1 b/usr.bin/w/uptime.1
index 40933ee6b0c..a6396b08bed 100644
--- a/usr.bin/w/uptime.1
+++ b/usr.bin/w/uptime.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uptime.1,v 1.3 1996/07/08 22:09:44 ccappuc Exp $
+.\" $OpenBSD: uptime.1,v 1.4 1999/06/05 01:21:49 aaron Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -35,7 +35,7 @@
.\"
.Dd April 18, 1994
.Dt UPTIME 1
-.Os BSD 3
+.Os
.Sh NAME
.Nm uptime
.Nd show how long system has been running
diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1
index 056afa4d0ee..b4787e10872 100644
--- a/usr.bin/w/w.1
+++ b/usr.bin/w/w.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: w.1,v 1.7 1998/10/30 00:24:43 aaron Exp $
+.\" $OpenBSD: w.1,v 1.8 1999/06/05 01:21:50 aaron Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -35,7 +35,7 @@
.\"
.Dd June 6, 1993
.Dt W 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm w
.Nd "display users who are logged on and what they are doing"
@@ -47,7 +47,7 @@
.Op Ar user
.Sh DESCRIPTION
The
-.Nm w
+.Nm
utility prints a summary of the current activity on the system,
including what each user is doing.
The first line displays the current time of day, how long the system has
@@ -103,7 +103,7 @@ This fails, for example, in critical sections of programs like the shell
and editor, or when faulty programs running in the background fork and fail
to ignore interrupts.
(In cases where no process can be found,
-.Nm w
+.Nm
prints
.Dq \- . )
.Pp
@@ -121,8 +121,8 @@ Sometimes processes, typically those in the background, are printed with
null or garbaged arguments.
In these cases, the name of the command is printed in parentheses.
.Pp
-The
-.Nm w
+The
+.Nm
utility does not know about the new conventions for detection of background
jobs.
It will sometimes find a background job instead of the right one.
diff --git a/usr.bin/wall/wall.1 b/usr.bin/wall/wall.1
index 61c013755af..9ab409920de 100644
--- a/usr.bin/wall/wall.1
+++ b/usr.bin/wall/wall.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wall.1,v 1.4 1998/10/30 00:24:43 aaron Exp $
+.\" $OpenBSD: wall.1,v 1.5 1999/06/05 01:21:50 aaron Exp $
.\" $NetBSD: wall.1,v 1.3 1994/11/17 07:17:57 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt WALL 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm wall
.Nd write a message to users
diff --git a/usr.bin/what/what.1 b/usr.bin/what/what.1
index 0d52ab94faf..ab835eeb21c 100644
--- a/usr.bin/what/what.1
+++ b/usr.bin/what/what.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: what.1,v 1.3 1998/10/30 00:24:43 aaron Exp $
+.\" $OpenBSD: what.1,v 1.4 1999/06/05 01:21:50 aaron Exp $
.\" $NetBSD: what.1,v 1.3 1994/11/17 06:59:38 jtc Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt WHAT 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm what
.Nd "show what versions of object modules were used to construct a file"
diff --git a/usr.bin/whatis/whatis.1 b/usr.bin/whatis/whatis.1
index 2319f0fc4d3..08811b283da 100644
--- a/usr.bin/whatis/whatis.1
+++ b/usr.bin/whatis/whatis.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: whatis.1,v 1.3 1998/10/30 00:24:43 aaron Exp $
+.\" $OpenBSD: whatis.1,v 1.4 1999/06/05 01:21:50 aaron Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -35,7 +35,7 @@
.\"
.Dd June 6, 1993
.Dt WHATIS 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm whatis
.Nd describe what a command is
diff --git a/usr.bin/which/whereis.1 b/usr.bin/which/whereis.1
index 4551a36d4d1..2bb200289a1 100644
--- a/usr.bin/which/whereis.1
+++ b/usr.bin/which/whereis.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: whereis.1,v 1.3 1998/10/30 00:24:43 aaron Exp $
+.\" $OpenBSD: whereis.1,v 1.4 1999/06/05 01:21:50 aaron Exp $
.\" $NetBSD: whereis.1,v 1.4 1995/08/31 21:54:51 jtc Exp $
.\"
.\" Copyright (c) 1993
@@ -36,7 +36,7 @@
.\"
.Dd April 27, 1995
.Dt WHEREIS 1
-.Os BSD 3
+.Os
.Sh NAME
.Nm whereis
.Nd locate programs
diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index 210c2536857..bbe2a1865c5 100644
--- a/usr.bin/who/who.1
+++ b/usr.bin/who/who.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: who.1,v 1.6 1998/11/11 23:01:51 aaron Exp $
+.\" $OpenBSD: who.1,v 1.7 1999/06/05 01:21:50 aaron Exp $
.\" $NetBSD: who.1,v 1.5 1994/12/07 04:28:47 jtc Exp $
.\"
.\" Copyright (c) 1986, 1991, 1993
@@ -43,12 +43,12 @@
.Sh SYNOPSIS
.Nm who
.Op Fl mTu
-.Op Ar file
+.Op Ar file
.Nm who
.Ar am i
.Sh DESCRIPTION
-The
-.Nm who
+The
+.Nm
utility displays a list of all users currently logged on, showing for
each user the login name, tty name, the date and time of login, and
hostname if not local.
@@ -59,7 +59,7 @@ Available options:
Only print information about the current terminal. This is the
.Tn POSIX
way of saying
-.Nm who
+.Nm
.Ar am i .
.It Fl q
(Quick.) List only the names and the number of users currently
@@ -67,9 +67,9 @@ logged on. When this option is used, all other options are ignored.
.It Fl T
Print a character after the user name indicating the state of the
terminal line:
-.Sq +
+.Sq +
if the terminal is writable;
-.Sq -
+.Sq \-
if it is not;
and
.Sq ?
@@ -79,10 +79,10 @@ Print the idle time for each user.
.It Fl H
Write column headings above the regular output.
.It Ar \&am I
-Returns the invoker's real user name.
+Returns the invoker's real user name.
.It Ar file
By default,
-.Nm who
+.Nm
gathers information from the file
.Pa /var/run/utmp .
An alternate
diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index de6da7d8bf8..b6926b30ea8 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: whois.1,v 1.4 1998/10/30 00:24:44 aaron Exp $
+.\" $OpenBSD: whois.1,v 1.5 1999/06/05 01:21:51 aaron Exp $
.\" $NetBSD: whois.1,v 1.5 1995/08/31 21:51:32 jtc Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 20, 1994
.Dt WHOIS 1
-.Os BSD 4.3
+.Os
.Sh NAME
.Nm whois
.Nd Internet domain name and network number directory service
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index 2f286107636..43ab0010e1b 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: window.1,v 1.6 1999/05/12 21:58:32 aaron Exp $
+.\" $OpenBSD: window.1,v 1.7 1999/06/05 01:21:51 aaron Exp $
.\" $NetBSD: window.1,v 1.3 1995/09/28 10:35:05 tls Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
@@ -39,7 +39,7 @@
.\"
.Dd December 30, 1993
.Dt WINDOW 1
-.Os BSD 4.3
+.Os
.Sh NAME
.Nm window
.Nd window environment
@@ -51,7 +51,7 @@
.Op Fl e Ar escape-char
.Op Fl c Ar command
.Sh DESCRIPTION
-.Nm window
+.Nm
implements a window environment on
.Tn ASCII
terminals.
@@ -68,7 +68,7 @@ input from the keyboard, but all windows can simultaneously send output
to the display.
.Pp
When
-.Nm window
+.Nm
starts up, the commands (see long commands below)
contained in the file
.Pa .windowrc
@@ -89,17 +89,17 @@ Ignore
.Pa .windowrc
and create the two default
windows instead.
-.It Fl e Ar escape-char
+.It Fl e Ar escape-char
Set the escape character to
-.Ar escape-char .
-.Ar Escape-char
+.Ar escape-char .
+.Ar escape-char
can be a single character, or in the form
.Ic ^X
where
.Ar X
is any character, meaning
-.No control\- Ns Ar X .
-.It Fl c Ar command
+.No control\- Ns Ar X .
+.It Fl c Ar command
Execute the string
.Ar command
as a long command (see below)
@@ -107,7 +107,7 @@ before doing anything else.
.El
.Pp
Windows can overlap and are framed as necessary. Each window
-is named by one of the digits ``1'' to ``9''. This one-character
+is named by one of the digits 1\-9. This one-character
identifier, as well as a user definable label string, are displayed
with the window on the top edge of its frame. A window can be
designated to be in the
@@ -160,7 +160,7 @@ uses
this information to redraw its display.
.Ss Operation
During normal execution,
-.Nm window
+.Nm
can be in one of two states:
conversation mode and command mode. In conversation mode, the
terminal's real cursor is placed at the cursor position of a particular
@@ -170,13 +170,13 @@ on top of all other windows, except those in foreground. In addition,
it is set apart by highlighting its identifier and label in reverse video.
.Pp
Typing
-.Nm window Ns 's
+.Nm window Ns 's
escape character (normally
.Ic ^P )
in conversation
mode switches it into command mode. In command mode, the top line of
the terminal screen becomes the command prompt window, and
-.Nm window
+.Nm
interprets input from the keyboard as commands to manipulate windows.
.Pp
There are two types of commands: short commands are usually one or two
@@ -189,11 +189,11 @@ below).
.Ss Short Commands
Below,
.Ar \&#
-represents one of the digits ``1'' to ``9''
+represents one of the digits 1\-9
corresponding to the windows 1 to 9.
.Ic ^X
means
-.No control\- Ns Ar X ,
+.No control\- Ns Ar X ,
where
.Ar X
is any character. In particular,
@@ -209,7 +209,7 @@ Select window
.Ar #
as the current window
and return to conversation mode.
-.It Ic \&% Ns Ar #
+.It Ic \&% Ns Ar #
Select window
.Ar #
but stay in command mode.
@@ -226,7 +226,7 @@ current window. Thus, typing two
.Ic ^P Ns 's
in conversation
mode sends one to the current window. If the
-.Nm window
+.Nm
escape is changed to some other character, that
character takes the place of
.Ic ^P
@@ -237,18 +237,28 @@ List a short summary of commands.
Refresh the screen.
.It Ic q
Exit
-.Nm window .
+.Nm window .
Confirmation is requested.
.It Ic ^Z
Suspend
-.Nm window .
+.Nm window .
.It Ic w
Create a new window. The user is prompted for the positions
of the upper left and lower right corners of the window.
-The cursor is placed on the screen and the keys ``h'', ``j'',
-``k'', and ``l''
+The cursor is placed on the screen and the keys
+.Sq h ,
+.Sq j ,
+.Sq k ,
+and
+.Sq l
move the cursor left, down, up, and right, respectively.
-The keys ``H'', ``J'', ``K'', and ``L'' move the cursor to the respective
+The keys
+.Sq H ,
+.Sq J ,
+.Sq K ,
+and
+.Sq L
+move the cursor to the respective
limits of the screen. Typing a number before the movement keys
repeats the movement that number of times. Return enters the cursor position
as the upper left corner of the window. The lower right corner
@@ -265,7 +275,7 @@ is used (see
command below).
.Pp
Only fully visible windows can be created this way.
-.It Ic c Ns Ar #
+.It Ic c Ns Ar #
Close window
.Ar # .
The process in the window is sent
@@ -274,7 +284,7 @@ the hangup signal (see
.Xr Csh 1
should
handle this signal correctly and cause no problems.
-.It Ic m Ns Ar #
+.It Ic m Ns Ar #
Move window
.Ar #
to another location. A box in the shape
@@ -284,11 +294,11 @@ those for the
.Ic w
command are used to position the box. The
window can be moved partially off-screen.
-.It Ic M Ns Ar #
+.It Ic M Ns Ar #
Move window
.Ar #
to its previous position.
-.It Ic s Ns Ar #
+.It Ic s Ns Ar #
Change the size of window
.Ar # .
The user is prompted
@@ -299,7 +309,7 @@ keys used in
and
.Ic m
are used to enter the position.
-.It Ic S Ns Ar #
+.It Ic S Ns Ar #
Change window
.Ar #
to its previous size.
@@ -347,29 +357,49 @@ similar to that of C. Numeric and string expressions and variables
are supported, as well as conditional statements.
.Pp
There are two data types: string and number. A string is a sequence
-of letters or digits beginning with a letter. ``_'' and ``.'' are
-considered letters. Alternately, non-alphanumeric characters can
-be included in strings by quoting them in ``"'' or escaping them
-with ``\\''. In addition, the ``\\'' sequences of C are supported,
-both inside and outside quotes (e.g., ``\\n'' is a new line,
-``\\r'' a carriage return). For example, these are legal strings:
+of letters or digits beginning with a letter.
+.Ql _
+and
+.Ql \&.
+are considered letters. Alternately, non-alphanumeric characters can
+be included in strings by quoting them in
+.Ql \&"
+or escaping them with
+.Ql \e .
+In addition, the
+.Ql \e
+sequences of C are supported,
+both inside and outside quotes (e.g.,
+.Ql \en
+is a newline,
+.Ql \er
+a carriage return). For example, these are legal strings:
abcde01234, "&#$^*&#", ab"$#"cd, ab\\$\\#cd, "/usr/ucb/window".
.Pp
A number is an integer value in one of three forms:
-a decimal number, an octal number preceded by ``0'',
-or a hexadecimal number preceded by ``0x'' or ``0X''. The natural
+a decimal number, an octal number preceded by
+.Sq 0 ,
+or a hexadecimal number preceded by
+.Sq 0x
+or
+.Sq 0X .
+The natural
machine integer size is used (i.e., the signed integer type
of the C compiler). As in C, a non-zero number represents
a boolean true.
.Pp
-The character ``#'' begins a comment which terminates at the
-end of the line.
+The character
+.Ql #
+begins a comment which terminates at the end of the line.
.Pp
A statement is either a conditional or an expression. Expression
-statements are terminated with a new line or ``;''. To continue
-an expression on the next line, terminate the first line with ``\\''.
+statements are terminated with a new line or
+.Ql \&; .
+To continue
+an expression on the next line, terminate the first line with
+.Ql \e .
.Ss Conditional Statement
-.Nm window
+.Nm
has a single control structure:
the fully bracketed if statement in the form
.Pp
@@ -396,7 +426,7 @@ be repeated any number of times.
must be numeric.
.Ss Expressions
Expressions in
-.Nm window
+.Nm
are similar to those in the
C language, with most C operators supported on numeric
operands. In addition, some are overloaded to operate on strings.
@@ -417,12 +447,12 @@ The operators in order of increasing precedence:
.Aq Va expr2
.Xc
Assignment. The variable of name
-.Aq Va expr1 ,
+.Aq Va expr1 ,
which must be string valued,
is assigned the result of
-.Aq Va expr2 .
+.Aq Va expr2 .
Returns the value of
-.Aq Va expr2 .
+.Aq Va expr2 .
.It Xo
.Aq Va expr1
.Ic ?
@@ -431,19 +461,19 @@ Returns the value of
.Aq Va expr3
.Xc
Returns the value of
-.Aq Va expr2
+.Aq Va expr2
if
-.Aq Va expr1
+.Aq Va expr1
evaluates true
(non-zero numeric value); returns the value of
-.Aq Va expr3
+.Aq Va expr3
otherwise. Only
one of
-.Aq Va expr2
+.Aq Va expr2
and
-.Aq Va expr3
+.Aq Va expr3
is evaluated.
-.Aq Va Expr1
+.Aq Va Expr1
must
be numeric.
.It Xo
@@ -453,9 +483,9 @@ be numeric.
.Xc
Logical or. Numeric values only. Short circuit evaluation is supported
(i.e., if
-.Aq Va expr1
+.Aq Va expr1
evaluates true, then
-.Aq Va expr2
+.Aq Va expr2
is not evaluated).
.It Xo
.Aq Va expr1
@@ -538,7 +568,9 @@ in place of its value).
.Ic -
.Aq Va expr2
.Xc
-Addition and subtraction on numbers. For ``+'', if one
+Addition and subtraction on numbers. For
+.Ql + ,
+if one
argument is a string, then the other is converted to a string,
and the result is the concatenation of the two strings.
.It Xo
@@ -561,7 +593,9 @@ Multiplication, division, modulo. Numbers only.
.Ic \&$? Ns Aq Va expr
.Xc
The first three are unary minus, bitwise complement and logical complement
-on numbers only. The operator, ``$'', takes
+on numbers only. The operator,
+.Ql $ ,
+takes
.Aq Va expr
and returns
the value of the variable of that name. If
@@ -570,7 +604,8 @@ is numeric
with value
.Ar n
and it appears within an alias macro (see below),
-then it refers to the nth argument of the alias invocation. ``$?''
+then it refers to the nth argument of the alias invocation.
+.Ql $?
tests for the existence of the variable
.Aq Va expr ,
and returns 1
@@ -582,7 +617,7 @@ Function call.
.Aq Va Expr
must be a string that is the unique
prefix of the name of a built-in
-.Nm window
+.Nm
function
or the full name of a user defined alias macro. In the case of a built-in
function,
@@ -605,8 +640,9 @@ Only the first argument form is valid for user defined aliases. Aliases
are defined using the
.Ic alias
built-in function (see below). Arguments
-are accessed via a variant of the variable mechanism (see ``$'' operator
-above).
+are accessed via a variant of the variable mechanism (see the
+.Ql $
+operator above).
.Pp
Most functions return value, but some are used for side effect
only and so must be used as statements. When a function or an alias is used
@@ -643,7 +679,7 @@ listed. Otherwise,
.Aq Ar string
is defined as an alias,
with expansion
-.Aq Ar string\-list > .
+.Aq Ar string\-list > .
The previous definition of
.Aq Ar string ,
if any, is returned. Default for
@@ -696,7 +732,7 @@ Set the default value of the
.Ar smooth
argument
to the command
-.Nm window
+.Nm
(see below). The argument
is a boolean flag (one of
.Ar on ,
@@ -716,7 +752,7 @@ The initial value is 1 (true).
Write the list of strings,
.Aq Ar string-list ,
to
-.Nm window ,
+.Nm window ,
separated
by spaces and terminated with a new line. The strings are only
displayed in the window, the processes in the window are not
@@ -738,30 +774,30 @@ meaning
.No control\- Ns Ar X .
.It Xo
.Ic foreground Ns ( Bq Ar window ,
-.Bq Ar flag )
+.Bq Ar flag )
.Xc
Move
-.Nm window
+.Nm
in or out of foreground.
.Ar Flag
is a boolean value. The old foreground flag
is returned. Default for
-.Nm window
+.Nm
is the current window,
default for
.Ar flag
is no change.
.It Xo
.Ic label Ns ( Bq Ar window ,
-.Bq Ar label )
+.Bq Ar label )
.Xc
Set the label of
-.Nm window
+.Nm
to
.Ar label .
Returns the old
label as a string. Default for
-.Nm window
+.Nm
is the current
window, default for
.Ar label
@@ -772,7 +808,7 @@ No arguments. List the identifiers and labels of all windows. No
value is returned.
.It Ic select Ns Pq Bq Ar window
Make
-.Nm window
+.Nm
the current window. The previous current window
is returned. Default is no change.
.It Ic source Ns Pq Ar filename
@@ -814,12 +850,12 @@ No arguments. List all variables. No value is returned.
.Bq Ar ncol ,
.Bq Ar nline ,
.Bq Ar label ,
-.Bq Ar pty ,
+.Bq Ar pty ,
.Bq Ar frame ,
.Bq Ar mapnl ,
.Bq Ar keepopen ,
.Bq Ar smooth ,
-.Bq Ar shell ) .
+.Bq Ar shell ) .
.Xc
Open a window with upper left corner at
.Ar row ,
@@ -871,7 +907,7 @@ command (see above).
is a list of strings that will be used as the shell
program to place in the window (default is the program specified
by
-.Ar default_shell ,
+.Ar default_shell ,
see above). The created window's identifier
is returned as a number.
.It Xo
@@ -881,7 +917,7 @@ is returned as a number.
Send the list of strings,
.Aq Ar string-list ,
to
-.Nm window ,
+.Nm window ,
separated
by spaces but not terminated with a new line. The strings are actually
given to the window as input. No value is returned. Default
@@ -890,7 +926,7 @@ is the current window.
.Ss Predefined Variables
These variables are for information only. Redefining them does
not affect the internal operation of
-.Nm window .
+.Nm window .
.Bl -tag -width modes
.It Ar baud
The baud rate as a number between 50 and 38400.
@@ -927,7 +963,7 @@ field of the terminal's
.Ev TERMCAP
entry, is used.
.Sh ENVIRONMENT
-.Nm window
+.Nm
utilizes these environment variables:
.Ev HOME ,
.Ev SHELL ,
@@ -938,12 +974,12 @@ utilizes these environment variables:
.Bl -tag -width /dev/[pt]ty[pq]? -compact
.It Pa ~/.windowrc
startup command file
-.It Pa /dev/[pt]ty[pq]?
+.It Pa /dev/[pt]ty[pq]?
pseudo-terminal devices
.El
.Sh HISTORY
The
-.Nm window
+.Nm
command appeared in
.Bx 4.3 .
.Sh DIAGNOSTICS
diff --git a/usr.bin/write/write.1 b/usr.bin/write/write.1
index cf40558f1a2..c748db80143 100644
--- a/usr.bin/write/write.1
+++ b/usr.bin/write/write.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: write.1,v 1.4 1998/10/30 00:24:44 aaron Exp $
+.\" $OpenBSD: write.1,v 1.5 1999/06/05 01:21:51 aaron Exp $
.\" Copyright (c) 1989, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -104,7 +104,7 @@ over.
.Xr who 1
.Sh BUGS
The
-.Ql EOF
+.Ql EOF
message seen when the other
.Nm write
terminates is indistinguishable from that party simply typing
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index 855135c8681..38619467a2f 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: install.1,v 1.8 1999/01/26 04:09:35 millert Exp $
+.\" $OpenBSD: install.1,v 1.9 1999/06/05 01:21:51 aaron Exp $
.\" $NetBSD: install.1,v 1.4 1994/11/14 04:57:17 jtc Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt INSTALL 1
-.Os BSD 4.2
+.Os
.Sh NAME
.Nm install
.Nd install binaries
@@ -75,10 +75,10 @@ If the destination is a directory, then the
is moved into
.Ar directory
with its original filename.
-If the target file already exists, it is
+If the target file already exists, it is
either renamed to
.Ar file.old
-if the
+if the
.Fl b
option is given
or overwritten
@@ -89,14 +89,14 @@ option's argument.
.Bl -tag -width Ds
.It Fl b
Backup any existing files before overwriting them by renaming
-them to
+them to
.Ar file.old . See
.Fl B
for specifying a different backup suffix.
.It Fl B Ar suffix
-Use
+Use
.Ar suffix
-as the backup suffix if
+as the backup suffix if
.Fl b
is given.
.It Fl C
@@ -108,7 +108,7 @@ Copy the file. This is actually the default. The
.Fl c
option is only included for backwards compatibility.
.It Fl d
-Create directories.
+Create directories.
Missing parent directories are created as required.
.It Fl f
Specify the target's file flags.
diff --git a/usr.bin/xstr/xstr.1 b/usr.bin/xstr/xstr.1
index af569bde3b1..cf8e2c889e9 100644
--- a/usr.bin/xstr/xstr.1
+++ b/usr.bin/xstr/xstr.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: xstr.1,v 1.4 1999/03/11 01:35:07 pjanzen Exp $
+.\" $OpenBSD: xstr.1,v 1.5 1999/06/05 01:21:52 aaron Exp $
.\" $NetBSD: xstr.1,v 1.4 1994/11/26 09:25:22 jtc Exp $
.\"
.\" Copyright (c) 1980, 1993
@@ -36,7 +36,7 @@
.\"
.Dd December 30, 1993
.Dt XSTR 1
-.Os BSD 3
+.Os
.Sh NAME
.Nm xstr
.Nd "extract strings from C programs to implement shared strings"
@@ -44,10 +44,10 @@
.Nm xstr
.Op Fl c
.Op Fl l Ar array
-.Op Fl
+.Op Fl
.Op Ar file
.Sh DESCRIPTION
-.Nm xstr
+.Nm
maintains a file
.Pa strings
into which strings in component parts of a large program are hashed.
@@ -58,10 +58,10 @@ are also read-only.
Available options:
.Bl -tag -width Ds
.It Fl
-.Nm xstr
+.Nm
reads from the standard input.
.It Fl c
-.Nm xstr
+.Nm
will extract the strings from the C source
.Ar file
or the standard input
@@ -70,7 +70,7 @@ replacing
string references by expressions of the form (&xstr[number])
for some number.
An appropriate declaration of
-.Nm xstr
+.Nm
is prepended to the file.
The resulting C text is placed in the file
.Pa x.c ,
@@ -88,7 +88,7 @@ strings. The default array name is xstr.
After all components of a large program have been compiled a file
.Pa xs.c
declaring the common
-.Nm xstr
+.Nm
space can be created by a command of the form
.Bd -literal -offset indent
xstr
@@ -101,7 +101,7 @@ of the program.
If possible, the array can be made read-only (shared) saving
space and swap overhead.
.Pp
-.Nm xstr
+.Nm
can also be used on a single file.
A command
.Bd -literal -offset indent
@@ -117,12 +117,12 @@ as before, without using or affecting any
file in the same directory.
.Pp
It may be useful to run
-.Nm xstr
+.Nm
after the C preprocessor if any macro definitions yield strings
or if there is conditional code which contains strings
which may not, in fact, be needed.
An appropriate command sequence for running
-.Nm xstr
+.Nm
after the C preprocessor is:
.Pp
.Bd -literal -offset indent -compact
@@ -131,7 +131,7 @@ cc \-c x.c
mv x.o name.o
.Ed
.Pp
-.Nm xstr
+.Nm
does not touch the file
.Pa strings
unless new items are added, so that
@@ -156,7 +156,7 @@ temporary file when `xstr name' doesn't touch
.Sh BUGS
If a string is a suffix of another string in the data base,
but the shorter string is seen first by
-.Nm xstr
+.Nm
both strings will be placed in the data base, when just
placing the longer one there will do.
.Sh HISTORY
diff --git a/usr.bin/yacc/yyfix.1 b/usr.bin/yacc/yyfix.1
index 62327af3f8a..ae248978aeb 100644
--- a/usr.bin/yacc/yyfix.1
+++ b/usr.bin/yacc/yyfix.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: yyfix.1,v 1.1 1999/04/18 20:41:46 millert Exp $
+.\" $OpenBSD: yyfix.1,v 1.2 1999/06/05 01:21:52 aaron Exp $
.\" Copyright (c) 1990, 1991 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -34,7 +34,7 @@
.\"
.Dd March 23, 1993
.Dt YYFIX 1
-.Os BSD 4.4
+.Os
.Sh NAME
.Nm yyfix
.Nd extract tables from y.tab.c
diff --git a/usr.bin/yes/yes.1 b/usr.bin/yes/yes.1
index 0c3d7880012..0b5dca1aa33 100644
--- a/usr.bin/yes/yes.1
+++ b/usr.bin/yes/yes.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: yes.1,v 1.3 1998/10/30 00:24:45 aaron Exp $
+.\" $OpenBSD: yes.1,v 1.4 1999/06/05 01:21:52 aaron Exp $
.\" $NetBSD: yes.1,v 1.3 1994/11/14 04:56:14 jtc Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -36,7 +36,7 @@
.\"
.Dd June 6, 1993
.Dt YES 1
-.Os BSD 4
+.Os
.Sh NAME
.Nm yes
.Nd be repetitively affirmative
diff --git a/usr.bin/ypcat/ypcat.1 b/usr.bin/ypcat/ypcat.1
index 00cdd2845f4..6cc130201ab 100644
--- a/usr.bin/ypcat/ypcat.1
+++ b/usr.bin/ypcat/ypcat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ypcat.1,v 1.3 1998/10/30 00:24:45 aaron Exp $
+.\" $OpenBSD: ypcat.1,v 1.4 1999/06/05 01:21:52 aaron Exp $
.\" $NetBSD: ypcat.1,v 1.4 1996/05/13 02:43:36 thorpej Exp $
.\"
.\" Copyright (c) 1993 Winning Strategies, Inc.
@@ -29,7 +29,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: ypcat.1,v 1.3 1998/10/30 00:24:45 aaron Exp $
+.\" $Id: ypcat.1,v 1.4 1999/06/05 01:21:52 aaron Exp $
.\"
.Dd December 3, 1993
.Dt YPCAT 1
@@ -42,11 +42,11 @@
.Op Fl kt
.Op Fl d Ar domainname
.Ar mapname
-.Nm ypcat
+.Nm ypcat
.Fl x
.Sh DESCRIPTION
-.Nm ypcat
-prints out the values of all keys from the
+.Nm
+prints out the values of all keys from the
.Tn YP
database specified by
.Ar mapname ,
diff --git a/usr.bin/ypmatch/ypmatch.1 b/usr.bin/ypmatch/ypmatch.1
index 19930b74bb9..2edf704c97e 100644
--- a/usr.bin/ypmatch/ypmatch.1
+++ b/usr.bin/ypmatch/ypmatch.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ypmatch.1,v 1.5 1999/05/16 19:58:07 alex Exp $
+.\" $OpenBSD: ypmatch.1,v 1.6 1999/06/05 01:21:52 aaron Exp $
.\" $NetBSD: ypmatch.1,v 1.5 1996/05/13 02:43:41 thorpej Exp $
.\"
.\" Copyright (c) 1993 Winning Strategies, Inc.
@@ -29,7 +29,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: ypmatch.1,v 1.5 1999/05/16 19:58:07 alex Exp $
+.\" $Id: ypmatch.1,v 1.6 1999/06/05 01:21:52 aaron Exp $
.\"
.Dd December 3, 1993
.Dt YPMATCH 1
@@ -43,11 +43,11 @@
.Op Fl d Ar domainname
.Ar key ...
.Ar mapname
-.Nm ypmatch
+.Nm ypmatch
.Fl x
.Sh DESCRIPTION
-.Nm ypmatch
-prints out the values of one or more keys from the
+.Nm
+prints out the values of one or more keys from the
.Tn YP
database specified by
.Ar mapname ,
diff --git a/usr.bin/ypwhich/ypwhich.1 b/usr.bin/ypwhich/ypwhich.1
index 6ad737b28f9..daa5521e419 100644
--- a/usr.bin/ypwhich/ypwhich.1
+++ b/usr.bin/ypwhich/ypwhich.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ypwhich.1,v 1.7 1999/03/20 15:36:12 maja Exp $
+.\" $OpenBSD: ypwhich.1,v 1.8 1999/06/05 01:21:52 aaron Exp $
.\" $NetBSD: ypwhich.1,v 1.3 1996/05/13 02:43:46 thorpej Exp $
.\"
.\" Copyright (c) 1994 Christopher G. Demetriou
@@ -29,7 +29,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: ypwhich.1,v 1.7 1999/03/20 15:36:12 maja Exp $
+.\" $Id: ypwhich.1,v 1.8 1999/06/05 01:21:52 aaron Exp $
.\"
.Dd February 23, 1994
.Dt YPWHICH 1
@@ -50,7 +50,7 @@
.Nm ypwhich
.Fl x
.Sh DESCRIPTION
-.Nm ypwhich
+.Nm
tells which
.Tn YP
server supplies
@@ -71,7 +71,7 @@ The options are as follows:
.It Fl d Ar domain
Specify a domain other than the default domain.
.It Fl h Ar host
-Specify which host to ask when
+Specify which host to ask when
.Fl m
is given.
.It Fl t
@@ -89,7 +89,7 @@ option.
can be a map name or nickname. If
.Ar mname
is omitted,
-.Nm ypwhich
+.Nm
will produce a list of available maps.
.It Fl x
Display the map nickname table.