summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usr.bin/units/units.190
-rw-r--r--usr.bin/uuencode/uuencode.120
-rw-r--r--usr.bin/uuencode/uuencode.54
-rw-r--r--usr.bin/vacation/vacation.142
-rw-r--r--usr.bin/vgrind/vgrind.122
-rw-r--r--usr.bin/vgrind/vgrindefs.543
-rw-r--r--usr.bin/vis/vis.131
-rw-r--r--usr.bin/vmstat/vmstat.827
-rw-r--r--usr.bin/w/w.138
-rw-r--r--usr.bin/wall/wall.111
-rw-r--r--usr.bin/wc/wc.142
-rw-r--r--usr.bin/what/what.111
-rw-r--r--usr.bin/whatis/whatis.116
-rw-r--r--usr.bin/which/whereis.118
-rw-r--r--usr.bin/which/which.140
-rw-r--r--usr.bin/who/who.115
-rw-r--r--usr.bin/whois/whois.138
-rw-r--r--usr.bin/window/window.1407
-rw-r--r--usr.bin/write/write.131
-rw-r--r--usr.bin/xargs/xargs.14
-rw-r--r--usr.bin/xinstall/install.149
-rw-r--r--usr.bin/xstr/xstr.114
-rw-r--r--usr.bin/yacc/yacc.142
-rw-r--r--usr.bin/ypwhich/ypwhich.112
24 files changed, 613 insertions, 454 deletions
diff --git a/usr.bin/units/units.1 b/usr.bin/units/units.1
index f4a35774ce1..3d831b2e243 100644
--- a/usr.bin/units/units.1
+++ b/usr.bin/units/units.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: units.1,v 1.9 1999/06/13 16:31:18 pjanzen Exp $
+.\" $OpenBSD: units.1,v 1.10 2000/03/14 14:58:24 aaron Exp $
.\" converted to new format by deraadt@openbsd.org
.Dd July 14, 1993
.Dt UNITS 1
@@ -13,26 +13,17 @@
.Op Fl v
.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
-Suppresses prompting of the user for units and the display of statistics
-about the number of units loaded.
-.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
-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
-their equivalents in other scales. The units program can only
-handle multiplicative scale changes. It cannot convert Celsius
-to Fahrenheit, for example. It works interactively by prompting
-the user for input:
+The
+.Nm
+program converts quantities expression in various scales to
+their equivalents in other scales.
+The
+.Nm
+program can only handle multiplicative scale changes.
+It cannot convert Celsius
+to Fahrenheit, for example.
+It works interactively by prompting the user for input:
.Pp
.nf
You have: meters
@@ -46,6 +37,22 @@ the user for input:
/ 3785.4118
.fi
.Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl f Ar filename
+Specifies the name of the units data file to load.
+.It Fl q
+Suppresses prompting of the user for units and the display of statistics
+about the number of units loaded.
+.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 line.
+No prompting will occur.
+The units program will print out
+only the result of this single conversion.
+.El
+.Pp
Powers of units can be specified using the
.Ql ^
character as shown in
@@ -54,7 +61,8 @@ the example, or by simple concatenation:
is equivalent to
.Sq cm^3 .
Multiplication of units can be specified by using spaces, a dash or
-an asterisk. Division of units is indicated by the slash
+an asterisk.
+Division of units is indicated by the slash
.Pq Ql / .
Note that multiplication has a higher precedence than division, so
.Sq m/s/s
@@ -74,9 +82,10 @@ it will display the reduced form for each unit:
2.1166667e-05 kg^2 m / sec
.fi
.Pp
-The conversion information is read from a units data file. The default
-file includes definitions for most familiar units, abbreviations and
-metric prefixes. Some constants of nature included are:
+The conversion information is read from a units data file.
+The default file includes definitions for most familiar units,
+abbreviations and metric prefixes.
+Some constants of nature included are:
.Bl -tag -width mercury
.It pi
ratio of circumference to diameter
@@ -101,11 +110,11 @@ astronomical unit
.El
.Pp
.Sq Pound
-is a unit of mass. Compound names are run together
-so
+is a unit of mass.
+Compound names are run together so
.Sq poundforce
-is a unit of force. British units that differ from their
-US counterparts are prefixed with
+is a unit of force.
+British units that differ from their US counterparts are prefixed with
.Sq br ,
and currency is prefixed with its country name:
.Sq belgiumfranc ,
@@ -119,8 +128,10 @@ or a trailing
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
+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
.Ql !
@@ -129,7 +140,8 @@ 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 applied
+a trailing dash at the end of the prefix name.
+Prefixes are applied
after the longest matching unit name is found; for example,
.Dq nmile
is taken to be a nautical mile rather than a nanomile.
@@ -141,18 +153,22 @@ in a prefix is surprising.
Exponents of units entered by the user can be only one digit.
You can work around this by multiplying several terms.
.Pp
-The user must use | to indicate division of numbers and / to
-indicate division of symbols. This distinction should not
-be necessary.
+The user must use
+.Ql |
+to indicate division of numbers and
+.Ql /
+to indicate division of symbols.
+This distinction should not be necessary.
.Pp
Prefixes specified without a unit are treated as dimensionless quantities.
This can lead to confusion when some prefixes are also defined as units
-(e.g., m). For example, Tera- / Giga- is 1000, but one Tesla (T) is 10,000
+(e.g., m).
+For example, Tera- / Giga- is 1000, but one Tesla (T) is 10,000
Gauss (G).
.Pp
Some non-SI units have multiple definitions (e.g, barrel, calorie) and
-others have changed over time (e.g., cubit). In particular, monetary
-values fluctuate.
+others have changed over time (e.g., cubit).
+In particular, monetary values fluctuate.
.Pp
The program contains various arbitrary limits on the length
of the units converted and on the length of the data file.
diff --git a/usr.bin/uuencode/uuencode.1 b/usr.bin/uuencode/uuencode.1
index 4c4098b72f5..29daa21300f 100644
--- a/usr.bin/uuencode/uuencode.1
+++ b/usr.bin/uuencode/uuencode.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uuencode.1,v 1.6 1999/06/05 01:21:46 aaron Exp $
+.\" $OpenBSD: uuencode.1,v 1.7 2000/03/14 14:58:24 aaron Exp $
.\" $NetBSD: uuencode.1,v 1.4 1994/11/17 07:39:42 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -77,7 +77,8 @@ files (or by default, the standard input) into the original form.
The resulting file is named
.Ar name
and will have the mode of the original file except that set-user-ID
-and execute bits are not retained. If the
+and execute bits are not retained.
+If the
.Fl p
option is specified, the output will instead be written to stdout.
.Nm uudecode
@@ -87,20 +88,17 @@ The following example packages up a source tree, compresses it,
uuencodes it and mails it to a user on another system.
When
.Nm uudecode
-is run on the target system, the file ``src_tree.tar.Z'' will be
-created which may then be uncompressed and extracted into the original
-tree.
+is run on the target system, the file
+.Pa src_tree.tar.Z
+will be created which may then be uncompressed and extracted
+into the original tree.
.Pp
.Bd -literal -offset indent -compact
tar cf \- src_tree \&| compress \&|
uuencode src_tree.tar.Z \&| mail sys1!sys2!user
.Ed
-.Sh DIAGNOSTICS
-The
-.Nm uudecode
-and
-.Nm uuencode
-utilities exit 0 on success or >0 if an error occurred.
+.Pp
+Both utilities exit 0 on success or >0 if an error occurred.
.Sh SEE ALSO
.Xr compress 1 ,
.Xr mail 1 ,
diff --git a/usr.bin/uuencode/uuencode.5 b/usr.bin/uuencode/uuencode.5
index 19cb5139ea3..42dd55d8e90 100644
--- a/usr.bin/uuencode/uuencode.5
+++ b/usr.bin/uuencode/uuencode.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: uuencode.5,v 1.6 1999/05/23 14:11:06 aaron Exp $
+.\" $OpenBSD: uuencode.5,v 1.7 2000/03/14 14:58:24 aaron Exp $
.\" $NetBSD: uuencode.format.5,v 1.3 1994/11/17 07:39:45 jtc Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
@@ -98,7 +98,7 @@ on a line by itself.
.Xr uuencode 1
.Sh HISTORY
The
-.Nm uuencode
+.Nm
file format appeared in
.Bx 4.0 .
.\" It was named uuencode.5 prior to 4.3
diff --git a/usr.bin/vacation/vacation.1 b/usr.bin/vacation/vacation.1
index 74f025955ea..68cc59a3329 100644
--- a/usr.bin/vacation/vacation.1
+++ b/usr.bin/vacation/vacation.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vacation.1,v 1.12 1999/10/17 20:24:33 aaron Exp $
+.\" $OpenBSD: vacation.1,v 1.13 2000/03/14 14:58:24 aaron Exp $
.\" $NetBSD: vacation.1,v 1.5 1995/08/31 21:57:08 jtc Exp $
.\"
.\" Copyright (c) 1985, 1987, 1990, 1991, 1993
@@ -48,11 +48,13 @@
.Op Fl a Ar alias
.Ar login
.Sh DESCRIPTION
-.Nm vacation
+.Nm
returns a message to the sender of a message telling them that you
-are currently not reading your mail. The intended use is in a
+are currently not reading your mail.
+The intended use is in a
.Pa .forward
-file. For example, your
+file.
+For example, your
.Pa .forward
file might have:
.Bd -literal -offset indent
@@ -73,20 +75,23 @@ Handle messages for
in the same manner as those received for the user's
login name.
.It Fl i
-Initialize the vacation database files. It should be used
-before you modify your
+Initialize the vacation database files.
+It should be used before you modify your
.Pa .forward
file.
.It Fl r
Set the reply interval to
.Ar interval
-days. The default is one week. An interval of
+days.
+The default is one week.
+An interval of
.Dq 0
means that
a reply is sent to each message, and an interval of
.Dq Li infinite
(actually, any non-numeric character) will never send more than
-one reply. It should be noted that intervals of
+one reply.
+It should be noted that intervals of
.Dq Li \&0
are quite
dangerous, as it allows mailers to get into
@@ -125,12 +130,13 @@ database in the file
.Pa .vacation.db
in your home directory.
.Pp
-.Nm vacation
+.Nm
expects a file
.Pa .vacation.msg ,
in your home directory, containing a message to be sent back to each
-sender. It should be an entire message (including headers). For
-example, it might contain:
+sender.
+It should be an entire message (including headers).
+For example, it might contain:
.Pp
.Bd -unfilled -offset indent -compact
From: eric@CS.Berkeley.EDU (Eric Allman)
@@ -138,7 +144,8 @@ Subject: I am on vacation
Delivered-By-The-Graces-Of: The Vacation program
Precedence: bulk
-I am on vacation until July 22. If you have something urgent,
+I am on vacation until July 22.
+If you have something urgent,
please contact Keith Bostic <bostic@CS.Berkeley.EDU>.
--eric
.Ed
@@ -148,22 +155,23 @@ Any occurrence of the string
in
.Pa .vacation.msg
will be replaced by the subject of the message that triggered the
-.Nm vacation
+.Nm
program.
.Pp
-.Nm vacation
+.Nm
reads the incoming message from standard input, checking the message
headers for either the
.Ux
.Dq From
line or a
.Dq Return-Path
-header to determine the sender. If both are present the sender from the
+header to determine the sender.
+If both are present the sender from the
.Dq Return-Path
header is used.
.Pp
Fatal errors, such as calling
-.Nm vacation
+.Nm
with incorrect arguments, or with non-existent
.Ar login Ns Ar s ,
are logged in the system log file, using
@@ -180,6 +188,6 @@ message to send
.Xr sendmail 8
.Sh HISTORY
The
-.Nm vacation
+.Nm
command appeared in
.Bx 4.3 .
diff --git a/usr.bin/vgrind/vgrind.1 b/usr.bin/vgrind/vgrind.1
index 9c78d7ce3a0..d2117e08e44 100644
--- a/usr.bin/vgrind/vgrind.1
+++ b/usr.bin/vgrind/vgrind.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vgrind.1,v 1.6 2000/03/06 03:17:40 aaron Exp $
+.\" $OpenBSD: vgrind.1,v 1.7 2000/03/14 14:58:25 aaron Exp $
.\" $NetBSD: vgrind.1,v 1.4 1994/11/17 08:28:04 jtc Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -65,7 +65,8 @@ page as it is encountered.
.Nm
runs in two basic modes, filter mode (see the
.Fl f
-option) or regular mode. In filter mode
+option) or regular mode.
+In filter mode
.Nm
acts as a filter in a manner similar to
.Xr tbl 1 .
@@ -80,10 +81,11 @@ starts processing
ends processing
.El
.Pp
-These lines are formatted as described above. The output from this
-filter can be passed to
+These lines are formatted as described above.
+The output from this 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 .
@@ -117,7 +119,8 @@ Forces filter mode.
Specifies a particular header to put on every output page (default is
the file name).
.It Fl l
-Specifies the language to use. Currently known are
+Specifies the language to use.
+Currently known are
.Tn PASCAL
.Pq Fl l Ns Ar p ,
.Tn MODEL
@@ -194,7 +197,8 @@ vfontedpr assumes that a certain programming style is followed:
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.
+asterisk.
+The parenthesized arguments must also be on the same line.
.Pp
For
.Tn PASCAL
@@ -214,8 +218,8 @@ name comment mechanisms will fail.
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
-your program you should use tabs. This is somewhat inevitable since the
-font used by
+your program you should use tabs.
+This is somewhat inevitable since the font used by
.Nm
is variable width.
.Pp
diff --git a/usr.bin/vgrind/vgrindefs.5 b/usr.bin/vgrind/vgrindefs.5
index 3219f7635b3..06422e9d17c 100644
--- a/usr.bin/vgrind/vgrindefs.5
+++ b/usr.bin/vgrind/vgrindefs.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vgrindefs.5,v 1.7 1999/07/09 13:35:30 aaron Exp $
+.\" $OpenBSD: vgrindefs.5,v 1.8 2000/03/14 14:58:25 aaron Exp $
.\" $NetBSD: vgrindefs.5,v 1.3 1994/11/17 08:28:07 jtc Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993
@@ -84,9 +84,13 @@ if ifdef ifndef include undef:
.Ed
.Pp
Note that the first field is just the language name (and any variants
-of it). Thus the C language could be specified to
+of it).
+Thus the C language could be specified to
.Xr vgrind 1
-as "c" or "C".
+as
+.Qq c
+or
+.Qq C .
.Pp
Entries may continue onto multiple lines by giving a \e as the last
character of a line.
@@ -98,15 +102,21 @@ some particular feature
and string
capabilities which give a regular expression or
keyword list.
-.Sh REGULAR EXPRESSIONS
+.Sh REGULAR EXPRESSIONS
.Nm vgrindefs
uses regular expression which are very similar to those of
.Xr ex 1
and
.Xr lex 1 .
-The characters `^', `$', `:' and `\e'
+The characters
+.Ql ^ ,
+.Ql $ ,
+.Ql \&: ,
+and
+.Ql \e
are reserved characters and must be
-"quoted" with a preceding
+.Dq quoted
+with a preceding
.Ql \e
if they
are to be included as normal characters.
@@ -121,7 +131,8 @@ A delimiter (space, tab, newline, start of line).
.It \ea
Matches any string of symbols (like .* in lex).
.It \ep
-Matches any alphanumeric name. In a procedure definition (pb) the string
+Matches any alphanumeric name.
+In a procedure definition (pb) the string
that matches this symbol is used as the procedure name.
.It ()
Grouping.
@@ -136,12 +147,22 @@ This is typically used for languages (like C) which can include the
string delimiter in a string by escaping it.
.El
.Pp
-Unlike other regular expressions in the system, these match words
-and not characters. Hence something like "(tramp|steamer)flies?"
-would match "tramp", "steamer", "trampflies", or "steamerflies".
+Unlike other regular expressions in the system, these match words
+and not characters.
+Hence something like
+.Dq (tramp|steamer)flies?
+would match
+.Dq tramp ,
+.Dq steamer ,
+.Dq trampflies ,
+or
+.Dq steamerflies .
.Sh KEYWORD LIST
The keyword list is just a list of keywords in the language separated
-by spaces. If the "oc" boolean is specified, indicating that upper
+by spaces.
+If the
+.Dq oc
+boolean is specified, indicating that upper
and lower case are equivalent, then all the keywords should be
specified in lower case.
.Sh FILES
diff --git a/usr.bin/vis/vis.1 b/usr.bin/vis/vis.1
index c565c80060a..aa0f112928d 100644
--- a/usr.bin/vis/vis.1
+++ b/usr.bin/vis/vis.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vis.1,v 1.5 1999/06/05 01:21:49 aaron Exp $
+.\" $OpenBSD: vis.1,v 1.6 2000/03/14 14:58:25 aaron Exp $
.\" $NetBSD: vis.1,v 1.5 1994/11/17 07:56:00 jtc Exp $
.\"
.\" Copyright (c) 1989, 1991, 1993, 1994
@@ -46,12 +46,14 @@
.Op Fl F Ar foldwidth
.Op Ar file ...
.Sh DESCRIPTION
-.Nm vis
+.Nm
is a filter for converting non-printable characters
-into a visual representation. It differs from
-.Ql cat -v
+into a visual representation.
+It differs from
+.Ic cat -v
in that
-the form is unique and invertible. By default, all non-graphic
+the form is unique and invertible.
+By default, all non-graphic
characters except space, tab, and newline are encoded.
A detailed description of the
various visual formats is given in
@@ -61,16 +63,17 @@ The options are as follows:
.Bl -tag -width Ds
.It Fl b
Turns off prepending of backslash before up-arrow control sequences
-and meta-characters, and disables the doubling of backslashes. This
-produces output which is neither invertible nor precise, but does
-represent a minimum of change to the input. It is similar to
-.Dq Li cat -v .
+and meta-characters, and disables the doubling of backslashes.
+This produces output which is neither invertible nor precise, but does
+represent a minimum of change to the input.
+It is similar to
+.Ic cat -v .
.It Fl c
Request a format which displays a small subset of the
non-printable characters using C-style backslash sequences.
.It Fl F
Causes
-.Nm vis
+.Nm
to fold output lines to foldwidth columns (default 80), like
.Xr fold 1 ,
except
@@ -95,14 +98,16 @@ still doubled and hidden newline sequences inserted if
.Fl f
or
.Fl F
-is selected. When combined with the
+is selected.
+When combined with the
.Fl f
flag,
-.Nm vis
+.Nm
becomes like
an invertible version of the
.Xr fold 1
-utility. That is, the output
+utility.
+That is, the output
can be unfolded by running the output through
.Xr unvis 1 .
.It Fl o
diff --git a/usr.bin/vmstat/vmstat.8 b/usr.bin/vmstat/vmstat.8
index 1e930e1ea65..646bd81318b 100644
--- a/usr.bin/vmstat/vmstat.8
+++ b/usr.bin/vmstat/vmstat.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vmstat.8,v 1.14 1999/07/03 02:11:09 aaron Exp $
+.\" $OpenBSD: vmstat.8,v 1.15 2000/03/14 14:58:25 aaron Exp $
.\" $NetBSD: vmstat.8,v 1.12 1996/05/10 23:19:30 thorpej Exp $
.\"
.\" Copyright (c) 1986, 1993
@@ -50,9 +50,9 @@
.Op Fl w Ar wait
.Op disks
.Sh DESCRIPTION
-.Nm vmstat
+.Nm
reports certain kernel statistics kept about process, virtual memory,
-disk, trap and cpu activity.
+disk, trap and CPU activity.
.Pp
The options are as follows:
.Bl -tag -width "blah"
@@ -104,7 +104,7 @@ is specified, the default is infinity.
.El
.Pp
By default,
-.Nm vmstat
+.Nm
displays the following information just once:
.Bl -tag -width "whatever"
.It procs
@@ -120,7 +120,8 @@ runnable or short sleeper (< 20 secs) but swapped
.El
.Pp
.It Ar memory
-Information about the usage of virtual and real memory. Virtual pages
+Information about the usage of virtual and real memory.
+Virtual pages
(reported in units of 1024 bytes) are considered active if they belong
to processes which are running or have run in the last 20 seconds.
.Pp
@@ -158,10 +159,10 @@ Typically paging will be split across the available drives.
The header of the field is the first character of the disk name and
the unit number.
If more than four disk drives are configured in the system,
-.Nm vmstat
+.Nm
displays only the first four drives.
To force
-.Nm vmstat
+.Nm
to display specific drives, their names may be supplied on the command line.
.Pp
.It Ar faults
@@ -173,7 +174,7 @@ device interrupts per interval (including clock interrupts)
.It Ar sy
system calls per interval
.It Ar cs
-cpu context switch rate (switches/interval)
+CPU context switch rate (switches/interval)
.El
.Pp
.It Ar cpu
@@ -185,11 +186,13 @@ user time for normal and low priority processes
.It Ar sy
system time
.It Ar id
-cpu idle
+CPU idle
.El
.El
.Sh EXAMPLES
-The command ``vmstat -w 5'' will print what the system is doing every five
+The command
+.Ic vmstat -w 5
+will print what the system is doing every five
seconds; this is a good choice of printing interval since this is how often
some of the statistics are sampled in the system.
Others vary every second and running the output for a while will make it
@@ -210,7 +213,9 @@ default memory file
.Xr iostat 8 ,
.Xr pstat 8
.Pp
-The sections starting with ``Interpreting system activity'' in
+The sections starting with
+.Dq Interpreting system activity
+in
.%T "Installing and Operating 4.3BSD" .
.Sh BUGS
The
diff --git a/usr.bin/w/w.1 b/usr.bin/w/w.1
index dce464ca180..be6ec0a8408 100644
--- a/usr.bin/w/w.1
+++ b/usr.bin/w/w.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: w.1,v 1.9 1999/08/12 19:26:39 millert Exp $
+.\" $OpenBSD: w.1,v 1.10 2000/03/14 14:58:25 aaron Exp $
.\"
.\" Copyright (c) 1980, 1990, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -94,13 +94,27 @@ list of users on the system
.Xr ps 1 ,
.Xr uptime 1 ,
.Xr who 1
+.Sh COMPATIBILITY
+The
+.Fl f ,
+.Fl l ,
+.Fl s ,
+and
+.Fl w
+flags are no longer supported.
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 3.0 .
.Sh BUGS
The notion of the
.Dq current process
is muddy.
-The current algorithm is ``the highest numbered process on the terminal
+The current algorithm is
+``the highest numbered process on the terminal
that is not ignoring interrupts, or, if there is none, the highest numbered
-process on the terminal''.
+process on the terminal.''
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.
@@ -109,9 +123,8 @@ to ignore interrupts.
prints
.Dq \- . )
.Pp
-The
-.Tn CPU
-time is only an estimate, in particular, if someone leaves a background
+The CPU time is only an estimate.
+In particular, if someone leaves a background
process running after logging out, the person currently on that terminal is
.Dq charged
with the time.
@@ -128,16 +141,3 @@ The
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.
-.Sh COMPATIBILITY
-The
-.Fl f ,
-.Fl l ,
-.Fl s ,
-and
-.Fl w
-flags are no longer supported.
-.Sh HISTORY
-The
-.Nm
-command appeared in
-.Bx 3.0 .
diff --git a/usr.bin/wall/wall.1 b/usr.bin/wall/wall.1
index 9ab409920de..602ac8b09db 100644
--- a/usr.bin/wall/wall.1
+++ b/usr.bin/wall/wall.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wall.1,v 1.5 1999/06/05 01:21:50 aaron Exp $
+.\" $OpenBSD: wall.1,v 1.6 2000/03/14 14:58:25 aaron Exp $
.\" $NetBSD: wall.1,v 1.3 1994/11/17 07:17:57 jtc Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
@@ -45,9 +45,9 @@
.Op Fl g Ar group
.Op Ar file
.Sh DESCRIPTION
-.Nm wall
+.Nm
displays the contents of
-.Ar file
+.Ar file ,
or, by default, its standard input, on the terminals of all
currently logged in users.
.Pp
@@ -55,9 +55,12 @@ Only the super-user can write on the
terminals of users who have chosen
to deny messages or are using a program which
automatically denies messages.
+.Pp
+The options are as follows:
.Bl -tag -width indent
.It Fl g
-Send messages to users in this group. This option may be specified
+Send messages to users in this group.
+This option may be specified
multiple times, and any user in any of the specified groups will
receive the message.
.El
diff --git a/usr.bin/wc/wc.1 b/usr.bin/wc/wc.1
index fb634256234..3c872537c71 100644
--- a/usr.bin/wc/wc.1
+++ b/usr.bin/wc/wc.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: wc.1,v 1.8 2000/03/06 03:17:40 aaron Exp $
+.\" $OpenBSD: wc.1,v 1.9 2000/03/14 14:58:25 aaron Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -49,16 +49,17 @@
.Op Ar file ...
.Sh DESCRIPTION
The
-.Nm wc
+.Nm
utility reads one or more input text files, and, by
default, writes the number of lines, words, and bytes
contained in each input file to the standard output.
If more than one input file is specified,
a line of cumulative count(s) for all named files is output on a
separate line following the last file count.
-.Nm wc
+.Nm
considers a word to be a maximal string of characters delimited by white
-space. White space characters are the set of characters for which the
+space.
+Whitespace characters are the set of characters for which the
.Xr isspace 3
function returns true.
.Pp
@@ -79,11 +80,12 @@ is written to the standard output.
.El
.Pp
When an option is specified,
-.Nm wc
+.Nm
only reports the information requested by that option.
The default action is equivalent to the flags
.Fl clw
-having been specified. The
+having been specified.
+The
.Fl c
and
.Fl m
@@ -110,23 +112,13 @@ The counts for lines, words and bytes are integers separated
by spaces.
.Pp
The
-.Nm wc
+.Nm
utility exits 0 on success or >0 if an error occurred.
.Sh SEE ALSO
.Xr isspace 3
-.Sh STANDARDS
-The
-.Nm wc
-utility conforms to
-.St -p1003.2-92 .
-.Sh HISTORY
-A
-.Nm
-utility appeared in
-.At v1 .
.Sh COMPATIBILITY
Historically, the
-.Nm wc
+.Nm
utility was documented to define a word as a ``maximal string of
characters delimited by <space>, <tab> or <newline> characters''.
The implementation, however, didn't handle non-printing characters
@@ -134,7 +126,19 @@ correctly so that `` ^D^E '' counted as 6 spaces, while ``foo^D^Ebar''
counted as 8 characters.
4BSD systems after 4.3BSD modified the implementation to be consistent
with the documentation.
-This implementation defines a ``word'' in terms of the
+This implementation defines a
+.Dq word
+in terms of the
.Xr isspace 3
function, as required by
.St -p1003.2-92 .
+.Sh STANDARDS
+The
+.Nm
+utility conforms to
+.St -p1003.2-92 .
+.Sh HISTORY
+A
+.Nm
+utility appeared in
+.At v1 .
diff --git a/usr.bin/what/what.1 b/usr.bin/what/what.1
index 8d43d6ddd53..bbca05751a1 100644
--- a/usr.bin/what/what.1
+++ b/usr.bin/what/what.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: what.1,v 1.5 2000/03/06 03:17:41 aaron Exp $
+.\" $OpenBSD: what.1,v 1.6 2000/03/14 14:58:26 aaron Exp $
.\" $NetBSD: what.1,v 1.3 1994/11/17 06:59:38 jtc Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -44,15 +44,16 @@
.Nm what
.Ar name Op Ar ...
.Sh DESCRIPTION
-.Nm what
+.Nm
reads each file
.Ar name
and searches for sequences of the form
.Dq \&@(#)
-as inserted by the source code control system. It prints the remainder
+as inserted by the source code control system.
+It prints the remainder
of the string following this marker, up to a null character, newline, double
quote, or
-.Dq \&>
+.Ql >
character.
.Sh HISTORY
The
@@ -65,7 +66,7 @@ As
is not licensed to distribute
.Tn SCCS
this is a rewrite of the
-.Nm what
+.Nm
command which is part of
.Tn SCCS ,
and may not behave exactly the same as that
diff --git a/usr.bin/whatis/whatis.1 b/usr.bin/whatis/whatis.1
index da541aed721..34cf9376b54 100644
--- a/usr.bin/whatis/whatis.1
+++ b/usr.bin/whatis/whatis.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: whatis.1,v 1.5 1999/10/07 19:15:25 aaron Exp $
+.\" $OpenBSD: whatis.1,v 1.6 2000/03/14 14:58:26 aaron Exp $
.\"
.\" Copyright (c) 1989, 1990, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -45,7 +45,7 @@
.Op Fl m Ar path
.Ar command Op Ar ...
.Sh DESCRIPTION
-.Nm whatis
+.Nm
looks up a given command and gives the header line from the manual page.
You can then use the
.Xr man 1
@@ -55,26 +55,24 @@ The options are as follows:
.Bl -tag -width Fl
.It Fl M Ar path
Override the list of standard directories
-.Nm whatis
+.Nm
searches for its database named
.Dq Pa whatis.db .
The supplied
.Ar path
must be a colon
-.Dq \&:
+.Pq Ql \&:
separated list of directories.
This search path may also be set using the environment variable
.Ev MANPATH .
.It Fl m Ar path
Augment the list of standard directories
-.Nm whatis
+.Nm
searches for its database named
.Dq Pa whatis.db .
The supplied
.Ar path
-must be a colon
-.Dq \&:
-separated list of directories.
+must be a colon-separated list of directories.
These directories will be searched before the standard directories
or the directories supplied with the
.Fl M
@@ -83,6 +81,8 @@ option or the
environment variable are searched.
.El
.Sh ENVIRONMENT
+The following environment variables affect the execution of
+.Nm whatis :
.Bl -tag -width MANPATH
.It Ev MANPATH
The standard search path used by
diff --git a/usr.bin/which/whereis.1 b/usr.bin/which/whereis.1
index caae8d73ff9..63941f714fc 100644
--- a/usr.bin/which/whereis.1
+++ b/usr.bin/which/whereis.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: whereis.1,v 1.6 2000/03/06 03:17:41 aaron Exp $
+.\" $OpenBSD: whereis.1,v 1.7 2000/03/14 14:58:26 aaron Exp $
.\" $NetBSD: whereis.1,v 1.4 1995/08/31 21:54:51 jtc Exp $
.\"
.\" Copyright (c) 1993
@@ -45,7 +45,7 @@
.Ar name Op Ar ...
.Sh DESCRIPTION
The
-.Nm whereis
+.Nm
utility checks the standard binary directories for the specified name,
printing out the paths of any it finds that are executable by the
user.
@@ -55,7 +55,7 @@ The path searched is the string returned by the
utility for the
.Dq user.cs_path
string.
-.Sh RETURN VALUES
+.Pp
The
.Nm
utility exits with one of the following values:
@@ -67,7 +67,7 @@ All names were successfully resolved.
Some names were resolved but not all.
.It 2
No names were resolved.
-.It -1
+.It \-1
A system error occurred.
.El
.Sh SEE ALSO
@@ -76,12 +76,12 @@ A system error occurred.
.Xr locate 1 ,
.Xr which 1 ,
.Xr sysctl 8
+.Sh COMPATIBILITY
+The historic flags and arguments for the
+.Nm
+utility are no longer available in this version.
.Sh HISTORY
The
-.Nm whereis
+.Nm
command appeared in
.Bx 3.0 .
-.Sh COMPATIBILITY
-The historic flags and arguments for the
-.Nm whereis
-utility are no longer available in this version.
diff --git a/usr.bin/which/which.1 b/usr.bin/which/which.1
index 6e77b4a1b46..ab72dd2d22d 100644
--- a/usr.bin/which/which.1
+++ b/usr.bin/which/which.1
@@ -1,4 +1,5 @@
-.\" $OpenBSD: which.1,v 1.11 1999/10/07 19:15:25 aaron Exp $
+.\" $OpenBSD: which.1,v 1.12 2000/03/14 14:58:26 aaron Exp $
+.\"
.\" Copyright (c) 1980, 1991 Regents of the University of California.
.\" All rights reserved.
.\"
@@ -43,7 +44,7 @@
.Op Fl a
.Ar name Op Ar ...
.Sh DESCRIPTION
-.Nm which
+.Nm
takes a list of names and looks for the files which would be
executed had these names been given as commands.
Each argument is searched for along the user's path.
@@ -53,7 +54,7 @@ If the
flag is given,
.Nm
will return a list of all matches instead of just the first match.
-.Sh RETURN VALUES
+.Pp
The
.Nm
utility exits with one of the following values:
@@ -65,19 +66,18 @@ All names were successfully resolved.
Some names were resolved but not all.
.It 2
No names were resolved.
-.It -1
+.It \-1
A system error occurred.
.El
.Sh DIAGNOSTICS
A diagnostic is given if an executable file with the argument
name was not found in the path.
.Sh ENVIRONMENT
+The following environment variables affect the execution of
+.Nm which :
.Bl -tag -width PATH
.It Ev PATH
-.Nm
-uses the environment variable
-.Ev PATH
-as a colon-separated list of directories in which to find executables.
+A colon-separated list of directories in which to find executables.
If
.Ev PATH
is not set, and the given name is not a fully qualified
@@ -85,18 +85,6 @@ or relative pathname,
.Nm
will fail.
.El
-.Sh CAVEATS
-The
-.Nm
-command formerly was a
-.Xr csh 1
-script and could expand aliases.
-.Xr csh 1
-now has a built-in
-.Nm
-command so this version is intended for use
-with other shells like
-.Xr sh 1 .
.Sh SEE ALSO
.Xr csh 1 ,
.Xr find 1 ,
@@ -109,3 +97,15 @@ A
.Nm
command appeared in
.Bx 3.0 .
+.Sh CAVEATS
+The
+.Nm
+command formerly was a
+.Xr csh 1
+script and could expand aliases.
+.Xr csh 1
+now has a built-in
+.Nm
+command so this version is intended for use
+with other shells like
+.Xr sh 1 .
diff --git a/usr.bin/who/who.1 b/usr.bin/who/who.1
index 2e7dd308cda..6d54e16d7cd 100644
--- a/usr.bin/who/who.1
+++ b/usr.bin/who/who.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: who.1,v 1.9 2000/03/06 03:17:41 aaron Exp $
+.\" $OpenBSD: who.1,v 1.10 2000/03/14 14:58:26 aaron Exp $
.\" $NetBSD: who.1,v 1.5 1994/12/07 04:28:47 jtc Exp $
.\"
.\" Copyright (c) 1986, 1991, 1993
@@ -56,7 +56,8 @@ hostname if not local.
The options are as follows:
.Bl -tag -width file
.It Fl m
-Only print information about the current terminal. This is the
+Only print information about the current terminal.
+This is the
.Tn POSIX
way of saying
.Nm
@@ -109,9 +110,13 @@ created.
If
.Pa /var/log/wtmp
is being used as the file, the user name may be empty
-or one of the special characters `|', `}' and `~'. Logouts produce
-an output line without any user name. For more information on the
-special characters, see
+or one of the special characters
+.Ql | ,
+.Ql } ,
+and
+.Ql \&~ .
+Logouts produce an output line without any user name.
+For more information on the special characters, see
.Xr utmp 5 .
.Sh FILES
.Bl -tag -width /var/log/wtmp.[0-6] -compact
diff --git a/usr.bin/whois/whois.1 b/usr.bin/whois/whois.1
index 561867b822f..187e3534caa 100644
--- a/usr.bin/whois/whois.1
+++ b/usr.bin/whois/whois.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: whois.1,v 1.12 2000/03/04 22:19:27 aaron Exp $
+.\" $OpenBSD: whois.1,v 1.13 2000/03/14 14:58:26 aaron Exp $
.\" $NetBSD: whois.1,v 1.5 1995/08/31 21:51:32 jtc Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
@@ -46,7 +46,7 @@
.Op Fl h Ar host
.Ar name Op Ar ...
.Sh DESCRIPTION
-.Nm whois
+.Nm
looks up records in the databases maintained by several
Network Information Centers
.Pq Tn NICs Ns .
@@ -56,14 +56,16 @@ The options are as follows:
.It Fl a
Use the American Registry for Internet Numbers
.Pq Tn ARIN
-database. It contains network numbers used in those parts of the world
+database.
+It contains network numbers used in those parts of the world
covered neither by
.Tn APNIC nor by
.Tn RIPE .
.It Fl d
Use the (US Military) Defense Data Network
.Pq Tn DDN
-database. It contains points of contact for subdomains of
+database.
+It contains points of contact for subdomains of
.Tn \&.MIL Ns .
.It Fl g
Use the US non-military federal government database, which contains points of
@@ -76,8 +78,8 @@ Either a host name or an IP address may be specified.
.It Fl i
Use the Network Solutions Registry for Internet Numbers
.Pq Tn InterNIC
-database. It contains network numbers and domain contact information
-for most of
+database.
+It contains network numbers and domain contact information for most of
.Tn \&.COM ,
.Tn \&.NET ,
.Tn \&.ORG
@@ -92,7 +94,8 @@ number of operators' networks.
.It Fl p
Use the Asia/Pacific Network Information Center
.Pq Tn APNIC
-database. It contains network numbers used in East Asia, Australia,
+database.
+It contains network numbers used in East Asia, Australia,
New Zealand, and the Pacific islands.
.It Fl q
Construct the name of a whois server to use from the top-level domain
@@ -113,29 +116,32 @@ automatically for a large number of TLDs, i.e., all of the following will
This option is now the default.
.Pp
.It Fl Q
-Do a quick lookup. This means that
+Do a quick lookup.
+This means that
.Nm
will not attempt to lookup the name in the authoratative whois
server (if one is listed) nor will it contact InterNic if a lookup
-fails. This flag has no effect when combined with any other flag.
+fails.
+This flag has no effect when combined with any other flag.
.It Fl r
Use the R\(aaeseaux IP Europ\(aaeens
.Pq Tn RIPE
-database. It contains network numbers and domain contact information
-for Europe.
+database.
+It contains network numbers and domain contact information for Europe.
.It Fl R
Use the Russia Network Information Center
.Pq Tn RIPN
-database. It contains network numbers and domain contact information
+database.
+It contains network numbers and domain contact information
for subdomains of
.Tn \&.RU Ns .
.El
.Pp
The operands specified to
-.Nm whois
+.Nm
are concatenated together (separated by whitespace) and presented to
the
-.Nm whois
+.Nm
server.
.Pp
The default action, unless directed otherwise with a special
@@ -148,11 +154,11 @@ For more information as to what
.Ar name
operands have special meaning, and how to guide the search, use
the special name
-.Dq Ar help .
+.Dq help .
.Sh SEE ALSO
RFC 812: Nicname/Whois
.Sh HISTORY
The
-.Nm whois
+.Nm
command appeared in
.Bx 4.3 .
diff --git a/usr.bin/window/window.1 b/usr.bin/window/window.1
index 63877e783ee..db24078772d 100644
--- a/usr.bin/window/window.1
+++ b/usr.bin/window/window.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: window.1,v 1.8 2000/03/06 03:17:41 aaron Exp $
+.\" $OpenBSD: window.1,v 1.9 2000/03/14 14:58:27 aaron Exp $
.\" $NetBSD: window.1,v 1.3 1995/09/28 10:35:05 tls Exp $
.\"
.\" Copyright (c) 1985, 1990, 1993
@@ -57,13 +57,17 @@ implements a window environment on
terminals.
.Pp
A window is a rectangular portion of the physical terminal
-screen associated with a set of processes. Its size and
-position can be changed by the user at any time. Processes
+screen associated with a set of processes.
+Its size and
+position can be changed by the user at any time.
+Processes
communicate with their window in the same way they normally
interact with a terminal - through their standard input, output,
-and diagnostic file descriptors. The window program handles the
+and diagnostic file descriptors.
+The window program handles the
details of redirecting input and output to and from the
-windows. At any one time, only one window can receive
+windows.
+At any one time, only one window can receive
input from the keyboard, but all windows can simultaneously send output
to the display.
.Pp
@@ -73,17 +77,19 @@ starts up, the commands (see long commands below)
contained in the file
.Pa .windowrc
in the user's home directory are
-executed. If it does not exist, two equal sized windows spanning
+executed.
+If it does not exist, two equal sized windows spanning
the terminal screen are created by default.
.Pp
-The command line options are:
+The options are as follows:
.Bl -tag -width Fl
.It Fl t
Turn on terse mode (see
.Ic terse
command below).
.It Fl f
-Fast. Don't perform any startup action.
+Fast.
+Don't perform any startup action.
.It Fl d
Ignore
.Pa .windowrc
@@ -98,7 +104,7 @@ can be a single character, or in the form
where
.Ar X
is any character, meaning
-.No control\- Ns Ar X .
+.No control\- Ns Ar X .
.It Fl c Ar command
Execute the string
.Ar command
@@ -106,30 +112,35 @@ as a long command (see below)
before doing anything else.
.El
.Pp
-Windows can overlap and are framed as necessary. Each window
-is named by one of the digits 1\-9. This one-character
+Windows can overlap and are framed as necessary.
+Each window 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
-.Ar foreground ,
+with the window on the top edge of its frame.
+A window can be designated to be in the
+.Ar foreground ,
in which case it will always be
on top of all normal, non-foreground windows, and can be covered
-only by other foreground windows. A window need not be completely
-within the edges of the terminal screen. Thus a large window
+only by other foreground windows.
+A window need not be completely
+within the edges of the terminal screen.
+Thus a large window
(possibly larger than the screen) may be positioned to show only
a portion of its full size.
.Pp
-Each window has a cursor and a set of control functions. Most intelligent
-terminal operations such as line and
-character deletion and insertion are supported. Display modes
+Each window has a cursor and a set of control functions.
+Most intelligent terminal operations such as line and
+character deletion and insertion are supported.
+Display modes
such as underlining and reverse video are available if they are
-supported by the terminal. In addition,
-similar to terminals with multiple pages of memory,
+supported by the terminal.
+In addition, similar to terminals with multiple pages of memory,
each window has a text buffer which can have more lines than the window
itself.
.Ss Process Environment
With each newly created window, a shell program is spawned with its
-process environment tailored to that window. Its standard input,
+process environment tailored to that window.
+Its standard input,
output, and diagnostic file descriptors are bound to one end of either
a pseudo-terminal
.Xr (pty 4 )
@@ -141,20 +152,23 @@ If a pseudo-terminal is used, then its special
characters and modes (see
.Xr stty 1 )
are copied from the physical
-terminal. A
+terminal.
+A
.Xr termcap 5
entry tailored to this window is created
and passed as environment
.Xr (environ 5 )
variable
-.Ev TERMCAP .
+.Ev TERMCAP .
The termcap entry contains the window's size and
characteristics as well as information from the physical terminal,
such as the existence of underline, reverse video, and other display
modes, and the codes produced by the terminal's function keys,
-if any. In addition, the window size attributes of the pseudo-terminal
+if any.
+In addition, the window size attributes of the pseudo-terminal
are set to reflect the size of this window, and updated whenever
-it is changed by the user. In particular, the editor
+it is changed by the user.
+In particular, the editor
.Xr vi 1
uses
this information to redraw its display.
@@ -162,11 +176,14 @@ this information to redraw its display.
During normal execution,
.Nm
can be in one of two states:
-conversation mode and command mode. In conversation mode, the
+conversation mode and command mode.
+In conversation mode, the
terminal's real cursor is placed at the cursor position of a particular
window--called the current window--and input from the keyboard is sent
-to the process in that window. The current window is always
-on top of all other windows, except those in foreground. In addition,
+to the process in that window.
+The current window is always
+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
@@ -174,7 +191,8 @@ Typing
escape character (normally
.Ic ^P )
in conversation
-mode switches it into command mode. In command mode, the top line of
+mode switches it into command mode.
+In command mode, the top line of
the terminal screen becomes the command prompt window, and
.Nm
interprets input from the keyboard as commands to manipulate windows.
@@ -196,7 +214,8 @@ means
.No control\- Ns Ar X ,
where
.Ar X
-is any character. In particular,
+is any character.
+In particular,
.Ic ^^
is
.Li control\-^ .
@@ -215,17 +234,20 @@ Select window
but stay in command mode.
.It Ic ^^
Select the previous window and return to conversation
-mode. This is useful for toggling between two windows.
+mode.
+This is useful for toggling between two windows.
.It Ic escape
Return to conversation mode.
.It Ic ^P
Return to conversation mode and write
.Ic ^P
to the
-current window. Thus, typing two
+current window.
+Thus, typing two
.Ic ^P Ns 's
in conversation
-mode sends one to the current window. If the
+mode sends one to the current window.
+If the
.Nm
escape is changed to some other character, that
character takes the place of
@@ -243,7 +265,8 @@ Confirmation is requested.
Suspend
.Nm window .
.It Ic w
-Create a new window. The user is prompted for the positions
+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
.Sq h ,
@@ -259,18 +282,21 @@ The keys
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
-is entered in the same manner. During this process,
+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
+is entered in the same manner.
+During this process,
the placement of the new window is indicated by a rectangular
box drawn on the screen, corresponding to where the new window
-will be framed. Typing escape at any point
-cancels this command.
+will be framed.
+Typing escape at any point cancels this command.
.Pp
This window becomes the current window,
-and is given the first available ID. The default buffer size
-is used (see
+and is given the first available ID.
+The default buffer size is used (see
.Ar default_nline
command below).
.Pp
@@ -287,13 +313,13 @@ handle this signal correctly and cause no problems.
.It Ic m Ns Ar #
Move window
.Ar #
-to another location. A box in the shape
-of the window is drawn on
+to another location.
+A box in the shape of the window is drawn on
the screen to indicate the new position of the window, and the same keys as
those for the
.Ic w
-command are used to position the box. The
-window can be moved partially off-screen.
+command are used to position the box.
+The window can be moved partially off-screen.
.It Ic M Ns Ar #
Move window
.Ar #
@@ -302,9 +328,9 @@ to its previous position.
Change the size of window
.Ar # .
The user is prompted
-to enter the new lower right corner of the window. A box
-is drawn to indicate the new window size. The same
-keys used in
+to enter the new lower right corner of the window.
+A box is drawn to indicate the new window size.
+The same keys used in
.Ic w
and
.Ic m
@@ -334,12 +360,13 @@ Move the cursor of the current window up by one line.
.It Ic l
Move the cursor of the current window right by one column.
.It Ic y
-Yank. The user is prompted to enter two points within the current
-window. Then the content of the current window between those two points
+Yank.
+The user is prompted to enter two points within the current window.
+Then the content of the current window between those two points
is saved in the yank buffer.
.It Ic p
-Put. The content of the yank buffer is written to the current
-window as input.
+Put.
+The content of the yank buffer is written to the current window as input.
.It Ic ^S
Stop output in the current window.
.It Ic ^Q
@@ -353,15 +380,17 @@ are supported.
.Ss Long Commands
Long commands are a sequence of statements
parsed much like a programming language, with a syntax
-similar to that of C. Numeric and string expressions and variables
+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.
+There are two data types: string and number.
+A string is a sequence of letters or digits beginning with a letter.
.Ql _
and
.Ql \&.
-are considered letters. Alternately, non-alphanumeric characters can
+are considered letters.
+Alternately, non-alphanumeric characters can
be included in strings by quoting them in
.Ql \&"
or escaping them with
@@ -373,7 +402,8 @@ both inside and outside quotes (e.g.,
.Ql \en
is a newline,
.Ql \er
-a carriage return). For example, these are legal strings:
+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:
@@ -385,15 +415,16 @@ 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
+of the C compiler).
+As in C, a non-zero number represents
a boolean true.
.Pp
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
+A statement is either a conditional or an expression.
+Expression statements are terminated with a new line or
.Ql \&; .
To continue
an expression on the next line, terminate the first line with
@@ -429,15 +460,18 @@ Expressions in
.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.
+operands.
+In addition, some are overloaded to operate on strings.
.Pp
When an expression is used as a statement, its value is discarded
-after evaluation. Therefore, only expressions with side
+after evaluation.
+Therefore, only expressions with side
effects (assignments and function calls) are useful as statements.
.Pp
Single valued (no arrays) variables are supported, of both
-numeric and string values. Some variables are predefined. They
-are listed below.
+numeric and string values.
+Some variables are predefined.
+They are listed below.
.Pp
The operators in order of increasing precedence:
.Bl -tag -width Fl
@@ -446,7 +480,8 @@ The operators in order of increasing precedence:
.Ic =
.Aq Va expr2
.Xc
-Assignment. The variable of name
+Assignment.
+The variable of name
.Aq Va expr1 ,
which must be string valued,
is assigned the result of
@@ -467,8 +502,8 @@ if
evaluates true
(non-zero numeric value); returns the value of
.Aq Va expr3
-otherwise. Only
-one of
+otherwise.
+Only one of
.Aq Va expr2
and
.Aq Va expr3
@@ -481,8 +516,9 @@ be numeric.
.Ic \&|\&|
.Aq Va expr2
.Xc
-Logical or. Numeric values only. Short circuit evaluation is supported
-(i.e., if
+Logical or.
+Numeric values only.
+Short circuit evaluation is supported (i.e., if
.Aq Va expr1
evaluates true, then
.Aq Va expr2
@@ -492,25 +528,29 @@ is not evaluated).
.Ic \&&\&&
.Aq Va expr2
.Xc
-Logical and with short circuit evaluation. Numeric values only.
+Logical and with short circuit evaluation.
+Numeric values only.
.It Xo
.Aq Va expr1
.Ic \&|
.Aq Va expr2
.Xc
-Bitwise or. Numeric values only.
+Bitwise or.
+Numeric values only.
.It Xo
.Aq Va expr1
.Ic ^
.Aq Va expr2
.Xc
-Bitwise exclusive or. Numeric values only.
+Bitwise exclusive or.
+Numeric values only.
.It Xo
.Aq Va expr1
.Ic \&&
.Aq Va expr2
.Xc
-Bitwise and. Numeric values only.
+Bitwise and.
+Numeric values only.
.It Xo
.Aq Va expr1
.Ic ==
@@ -519,9 +559,11 @@ Bitwise and. Numeric values only.
.Ic !=
.Aq expr2
.Xc
-Comparison (equal and not equal, respectively). The boolean
-result (either 1 or 0) of the comparison is returned. The
-operands can be numeric or string valued. One string operand
+Comparison (equal and not equal, respectively).
+The boolean
+result (either 1 or 0) of the comparison is returned.
+The operands can be numeric or string valued.
+One string operand
forces the other to be converted to a string in necessary.
.It Xo
.Aq Va expr1
@@ -535,8 +577,8 @@ forces the other to be converted to a string in necessary.
.Aq Va expr2 ,
.Xc
Less than, greater than, less than or equal to,
-greater than or equal to. Both numeric and string values, with
-automatic conversion as above.
+greater than or equal to.
+Both numeric and string values, with automatic conversion as above.
.It Xo
.Aq Va expr1
.Ic <<
@@ -550,7 +592,8 @@ If both operands are numbers,
is bit
shifted left (or right) by
.Aq Va expr2
-bits. If
+bits.
+If
.Aq Va expr1
is
a string, then its first (or last)
@@ -568,7 +611,8 @@ in place of its value).
.Ic -
.Aq Va expr2
.Xc
-Addition and subtraction on numbers. For
+Addition and subtraction on numbers.
+For
.Ql + ,
if one
argument is a string, then the other is converted to a string,
@@ -584,7 +628,8 @@ and the result is the concatenation of the two strings.
.Ic \&%
.Aq Va expr2
.Xc
-Multiplication, division, modulo. Numbers only.
+Multiplication, division, modulo.
+Numbers only.
.It Xo
.Ic \- Ns Aq Va expr ,
.Ic ~ Ns Aq Va expr ,
@@ -593,12 +638,14 @@ 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,
+on numbers only.
+The operator,
.Ql $ ,
takes
.Aq Va expr
and returns
-the value of the variable of that name. If
+the value of the variable of that name.
+If
.Aq Va expr
is numeric
with value
@@ -619,8 +666,8 @@ must be a string that is the unique
prefix of the name of a built-in
.Nm
function
-or the full name of a user defined alias macro. In the case of a built-in
-function,
+or the full name of a user defined alias macro.
+In the case of a built-in function,
.Aq Ar arglist
can be in one of two forms:
.Bd -literal -offset indent
@@ -629,29 +676,35 @@ argname1 = <expr1>, argname2 = <expr2>, ...
.Ed
.Pp
The two forms can in fact be intermixed, but the result is
-unpredictable. Most arguments can be omitted; default values will
-be supplied for them. The
+unpredictable.
+Most arguments can be omitted; default values will
+be supplied for them.
+The
.Ar argnames
can be unique prefixes
-of the argument names. The commas separating
+of the argument names.
+The commas separating
arguments are used only to disambiguate, and can usually be omitted.
.Pp
-Only the first argument form is valid for user defined aliases. Aliases
-are defined using the
+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 the
+built-in function (see below).
+Arguments 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
+only and so must be used as statements.
+When a function or an alias is used
as a statement, the parentheses surrounding
-the argument list may be omitted. Aliases return no value.
+the argument list may be omitted.
+Aliases return no value.
.El
-.Ss Built-in Functions
+.Ss Built-in functions
The arguments are listed by name in their natural
-order. Optional arguments are in square brackets
+order.
+Optional arguments are in square brackets
.Sq Op .
Arguments
that have no names are in angle brackets
@@ -675,14 +728,16 @@ in which case a non-zero value is true.
.Bq Aq Ar string\-list Pc
.Xc
If no argument is given, all currently defined alias macros are
-listed. Otherwise,
+listed.
+Otherwise,
.Aq Ar string
is defined as an alias,
with expansion
.Aq Ar string\-list > .
The previous definition of
.Aq Ar string ,
-if any, is returned. Default for
+if any, is returned.
+Default for
.Aq Ar string\-list
is no change.
.It Ic close Ns Pq Aq Ar window\-list
@@ -691,11 +746,12 @@ Close the windows specified in
If
.Aq Ar window\-list
is the word
-.Ar all ,
-than all windows are closed. No value is returned.
+.Ar all ,
+than all windows are closed.
+No value is returned.
.It Ic cursormodes Ns Pq Bq Ar modes
Set the window cursor to
-.Ar modes .
+.Ar modes .
.Ar Modes
is the bitwise
or of the mode bits defined as the variables
@@ -707,42 +763,44 @@ or of the mode bits defined as the variables
(blinking),
and
.Ar m_grp
-(graphics, terminal dependent). Return
-value is the previous modes. Default is no change.
+(graphics, terminal dependent).
+Return value is the previous modes.
+Default is no change.
For example,
.Li cursor($m_rev$m_blk)
sets the window cursors to blinking
reverse video.
.It Ic default_nline Ns Pq Bq Ar nline
Set the default buffer size to
-.Ar nline .
-Initially, it is
-48 lines. Returns the old default buffer size. Default is
-no change. Using a very large buffer can slow the program down
-considerably.
+.Ar nline .
+Initially, it is 48 lines.
+Returns the old default buffer size.
+Default is no change.
+Using a very large buffer can slow the program down considerably.
.It Ic default_shell Ns Pq Bq Aq Ar string\-list
Set the default window shell program to
.Aq Ar string\-list .
-Returns
-the first string in the old shell setting. Default is no change. Initially,
-the default shell is taken from the environment variable
-.Ev SHELL .
+Returns the first string in the old shell setting.
+Default is no change.
+Initially, the default shell is taken from the environment variable
+.Ev SHELL .
.It Ic default_smooth Ns Pq Bq Ar flag
Set the default value of the
.Ar smooth
argument
to the command
.Nm
-(see below). The argument
-is a boolean flag (one of
-.Ar on ,
-.Ar off ,
-.Ar yes ,
-.Ar no ,
-.Ar true ,
-.Ar false ,
+(see below).
+The argument is a boolean flag (one of
+.Ar on ,
+.Ar off ,
+.Ar yes ,
+.Ar no ,
+.Ar true ,
+.Ar false ,
or a number,
-as described above). Default is no change.
+as described above).
+Default is no change.
The old value (as a number) is returned.
The initial value is 1 (true).
.It Xo
@@ -754,18 +812,20 @@ Write the list of strings,
to
.Nm window ,
separated
-by spaces and terminated with a new line. The strings are only
+by spaces and terminated with a new line.
+The strings are only
displayed in the window, the processes in the window are not
involved (see
.Ic write
-below). No value is returned. Default
-is the current window.
+below).
+No value is returned.
+Default is the current window.
.It Ic escape Ns Pq Bq Ar escapec
Set the escape character to
-.Ar escape-char .
+.Ar escape-char .
Returns the old
-escape character as a one-character string. Default is no
-change.
+escape character as a one-character string.
+Default is no change.
.Ar Escapec
can be a string of a single character, or
in the form
@@ -780,8 +840,9 @@ Move
.Nm
in or out of foreground.
.Ar Flag
-is a boolean value. The old foreground flag
-is returned. Default for
+is a boolean value.
+The old foreground flag is returned.
+Default for
.Nm
is the current window,
default for
@@ -794,30 +855,32 @@ is no change.
Set the label of
.Nm
to
-.Ar label .
-Returns the old
-label as a string. Default for
+.Ar label .
+Returns the old label as a string.
+Default for
.Nm
is the current
window, default for
.Ar label
-is no change. To turn
-off a label, set it to an empty string ("").
+is no change.
+To turn off a label, set it to an empty string ("").
.It Ic list Ns Pq
-No arguments. List the identifiers and labels of all windows. No
-value is returned.
+No arguments.
+List the identifiers and labels of all windows.
+No value is returned.
.It Ic select Ns Pq Bq Ar window
Make
.Nm
-the current window. The previous current window
-is returned. Default is no change.
+the current window.
+The previous current window is returned.
+Default is no change.
.It Ic source Ns Pq Ar filename
Read and execute the long commands in
-.Ar filename .
+.Ar filename .
Returns \-1 if the file cannot be read, 0 otherwise.
.It Ic terse Ns Pq Bq flag
Set terse mode to
-.Ar flag .
+.Ar flag .
In terse mode, the command window
stays hidden even in command mode, and errors are reported by
sounding the terminal's bell.
@@ -825,24 +888,27 @@ sounding the terminal's bell.
can take on the same
values as in
.Ar foreground
-above. Returns the old terse flag.
+above.
+Returns the old terse flag.
Default is no change.
.It Ic unalias Ns Pq Ar alias
Undefine
-.Ar alias .
+.Ar alias .
Returns -1 if
.Ar alias
does not exist,
0 otherwise.
.It Ic unset Ns Pq Ar variable
Undefine
-.Ar variable .
+.Ar variable .
Returns -1 if
.Ar variable
does not exist,
0 otherwise.
.It Ic variables Ns Pq
-No arguments. List all variables. No value is returned.
+No arguments.
+List all variables.
+No value is returned.
.It Xo
.Ic window Ns ( Bq Ar row ,
.Bq Ar column ,
@@ -858,19 +924,20 @@ No arguments. List all variables. No value is returned.
.Bq Ar shell ) .
.Xc
Open a window with upper left corner at
-.Ar row ,
+.Ar row ,
.Ar column
and size
-.Ar nrow ,
-.Ar ncol .
+.Ar nrow ,
+.Ar ncol .
If
.Ar nline
is specified,
-then that many lines are allocated for the text buffer. Otherwise,
-the default buffer size is used. Default values for
-.Ar row ,
-.Ar column ,
-.Ar nrow ,
+then that many lines are allocated for the text buffer.
+Otherwise, the default buffer size is used.
+Default values for
+.Ar row ,
+.Ar column ,
+.Ar nrow ,
and
.Ar ncol
are, respectively,
@@ -878,8 +945,8 @@ the upper, left-most, lower, or right-most extremes of the
screen.
.Ar Label
is the label string.
-.Ar Frame ,
-.Ar pty ,
+.Ar Frame ,
+.Ar pty ,
and
.Ar mapnl
are flag values
@@ -891,10 +958,12 @@ allocate pseudo-terminal for this window rather than socketpair (default
true), and map new line characters in this window to carriage return
and line feed (default true if socketpair is used, false otherwise).
Normally, a window is automatically closed when its process
-exits. Setting
+exits.
+Setting
.Ar keepopen
to true (default false) prevents this
-action. When
+action.
+When
.Ar smooth
is true, the screen is updated more frequently
(for this window) to produce a more terminal-like behavior.
@@ -908,8 +977,8 @@ 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 ,
-see above). The created window's identifier
-is returned as a number.
+see above).
+The created window's identifier is returned as a number.
.It Xo
.Ic write Ns ( Bq Ar window ,
.Bq Aq Ar string\-list )
@@ -919,20 +988,22 @@ Send the list of strings,
to
.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
-is the current window.
+by spaces but not terminated with a new line.
+The strings are actually given to the window as input.
+No value is returned.
+Default is the current window.
.El
.Ss Predefined Variables
-These variables are for information only. Redefining them does
-not affect the internal operation of
+These variables are for information only.
+Redefining them does not affect the internal operation of
.Nm window .
.Bl -tag -width modes
.It Ar baud
The baud rate as a number between 50 and 38400.
.It Ar modes
The display modes (reverse video, underline, blinking, graphics)
-supported by the physical terminal. The value of
+supported by the physical terminal.
+The value of
.Ar modes
is the bitwise or of some of the one bit values,
.Ar m_blk ,
@@ -958,8 +1029,8 @@ The number of columns on the physical screen.
.It Ar nrow
The number of rows on the physical screen.
.It Ar term
-The terminal type. The standard name, found in the second name
-field of the terminal's
+The terminal type.
+The standard name, found in the second name field of the terminal's
.Ev TERMCAP
entry, is used.
.Sh ENVIRONMENT
diff --git a/usr.bin/write/write.1 b/usr.bin/write/write.1
index f04d03cb05c..869e6f11ccc 100644
--- a/usr.bin/write/write.1
+++ b/usr.bin/write/write.1
@@ -1,4 +1,5 @@
-.\" $OpenBSD: write.1,v 1.6 2000/03/06 03:17:41 aaron Exp $
+.\" $OpenBSD: write.1,v 1.7 2000/03/14 14:58:27 aaron Exp $
+.\"
.\" Copyright (c) 1989, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -46,12 +47,12 @@
.Ar user
.Op Ar ttyname
.Sh DESCRIPTION
-.Nm write
+.Nm
allows you to communicate with other users, by copying lines from
your terminal to theirs.
.Pp
When you run the
-.Nm write
+.Nm
command, the user you are writing to gets a message of the form:
.Pp
.Dl Message from yourname@yourhost on yourtty at hh:mm ...
@@ -59,16 +60,15 @@ command, the user you are writing to gets a message of the form:
Any further lines you enter will be copied to the specified user's
terminal.
If the other user wants to reply, they must run
-.Nm write
+.Nm
as well.
.Pp
When you are done, type an end-of-file or interrupt character.
The other user will see the message
-.Ql EOF
-indicating that the
-conversation is over.
+.Dq EOF
+indicating that the conversation is over.
.Pp
-You can prevent people (other than the super-user) from writing to you
+You can prevent people (other than the superuser) from writing to you
with the
.Xr mesg 1
command.
@@ -81,21 +81,21 @@ disallow writing automatically, so that your output isn't overwritten.
If the user you want to write to is logged in on more than one terminal,
you can specify which terminal to write to by specifying the terminal
name as the second operand to the
-.Nm write
+.Nm
command.
Alternatively, you can let
-.Nm write
+.Nm
select one of the terminals \- it will pick the one with the shortest
idle time.
This is so that if the user is logged in at work and also dialed up from
home, the message will go to the right place.
.Pp
The traditional protocol for writing to someone is that the string
-.Ql \-o ,
+.Dq \-o ,
either at the end of a line or on a line by itself, means that it's the
other person's turn to talk.
The string
-.Ql oo
+.Dq oo
means that the person believes the conversation to be
over.
.Sh SEE ALSO
@@ -109,11 +109,12 @@ command appeared in
.At v6 .
.Sh BUGS
The
-.Ql EOF
+.Dq EOF
message seen when the other
-.Nm write
+.Nm
terminates is indistinguishable from that party simply typing
-.Ql EOF
+.Dq EOF
to make you believe that any future messages did not come from them.
Especially messages such as:
+.Pp
.Dl "[1] Done rm -rf *"
diff --git a/usr.bin/xargs/xargs.1 b/usr.bin/xargs/xargs.1
index 18e60b8ad43..3c5bed61751 100644
--- a/usr.bin/xargs/xargs.1
+++ b/usr.bin/xargs/xargs.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: xargs.1,v 1.8 2000/01/20 07:18:25 deraadt Exp $
+.\" $OpenBSD: xargs.1,v 1.9 2000/03/14 14:58:27 aaron Exp $
.\" $NetBSD: xargs.1,v 1.6 1994/11/14 06:51:40 jtc Exp $
.\"
.\" Copyright (c) 1990, 1991, 1993
@@ -152,7 +152,7 @@ command line cannot be assembled,
.Ar utility
cannot be invoked, an invocation of the utility is terminated by a signal,
or an invocation of the utility exits with a value of 255.
-.Sh DIAGNOSTICS
+.Pp
.Nm
exits with one of the following values:
.Pp
diff --git a/usr.bin/xinstall/install.1 b/usr.bin/xinstall/install.1
index 75d701c81f5..109c06ed7f7 100644
--- a/usr.bin/xinstall/install.1
+++ b/usr.bin/xinstall/install.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: install.1,v 1.10 1999/10/17 20:35:48 aaron Exp $
+.\" $OpenBSD: install.1,v 1.11 2000/03/14 14:58:27 aaron Exp $
.\" $NetBSD: install.1,v 1.4 1994/11/14 04:57:17 jtc Exp $
.\"
.\" Copyright (c) 1987, 1990, 1993
@@ -105,7 +105,9 @@ Copy the file.
If the target file already exists and the files are the same,
then don't change the modification time of the target.
.It Fl c
-Copy the file. This is actually the default. The
+Copy the file.
+This is actually the default.
+The
.Fl c
option is only included for backwards compatibility.
.It Fl d
@@ -117,15 +119,17 @@ Specify the target's file flags.
.Xr chflags 1
for a list of possible flags and their meanings.)
.It Fl g
-Specify a group. A numeric GID is allowed.
+Specify a group.
+A numeric GID is allowed.
.It Fl m
Specify an alternate mode.
The default mode is set to rwxr-xr-x (0755).
The specified mode may be either an octal or symbolic value; see
-.Xr chmod 1
+.Xr chmod 1
for a description of possible mode values.
.It Fl o
-Specify an owner. A numeric UID is allowed.
+Specify an owner.
+A numeric UID is allowed.
.It Fl p
Preserve the modification time.
Copy the file, as if the
@@ -134,29 +138,35 @@ Copy the file, as if the
except if the target file doesn't already exist or is different,
then preserve the modification time of the file.
.It Fl S
-Safe copy. Normally,
-.Nm install
-unlinks an existing target before installing the new file. With the
+Safe copy.
+Normally,
+.Nm
+unlinks an existing target before installing the new file.
+With the
.Fl S
flag a temporary file is used and then renamed to be
-the target. The reason this is safer is that if the copy or
+the target.
+The reason this is safer is that if the copy or
rename fails, the existing target is left untouched.
.It Fl s
-.Nm install
+.Nm
exec's the command
.Pa /usr/bin/strip
to strip binaries so that install can be portable over a large
-number of systems and binary types. If the environment variable
+number of systems and binary types.
+If the environment variable
.Ev STRIP
is set, it is used instead.
.El
.Pp
By default,
-.Nm install
-preserves all file flags, with the exception of the ``nodump'' flag.
+.Nm
+preserves all file flags, with the exception of the
+.Dq nodump
+flag.
.Pp
The
-.Nm install
+.Nm
utility attempts to prevent moving a file onto itself.
.Pp
Installing
@@ -181,13 +191,14 @@ where XXXXXX is decided by
.Xr mkstemp 3 ,
are created in the target directory.
.Sh ENVIRONMENT
-.Nm
-utilizes the following environment variables.
+The following environment variables affect the execution of
+.Nm install :
.Bl -tag -width "STRIP"
.It Ev STRIP
For an alternate
.Xr strip 1
-program to run. Default is
+program to run.
+Default is
.Pa /usr/bin/strip .
.Sh SEE ALSO
.Xr chflags 1 ,
@@ -199,7 +210,7 @@ program to run. Default is
.Xr chown 8
.Sh HISTORY
The
-.Nm install
+.Nm
utility appeared in
.Bx 4.2 .
.Sh CAVEATS
@@ -211,5 +222,5 @@ and
flags are non-standard and should not relied upon for portability.
.Pp
Temporary files may be left in the target directory if
-.Nm install
+.Nm
exits abnormally.
diff --git a/usr.bin/xstr/xstr.1 b/usr.bin/xstr/xstr.1
index de3a948fe31..d840ebe2414 100644
--- a/usr.bin/xstr/xstr.1
+++ b/usr.bin/xstr/xstr.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: xstr.1,v 1.7 2000/03/06 03:17:41 aaron Exp $
+.\" $OpenBSD: xstr.1,v 1.8 2000/03/14 14:58:27 aaron Exp $
.\" $NetBSD: xstr.1,v 1.4 1994/11/26 09:25:22 jtc Exp $
.\"
.\" Copyright (c) 1980, 1993
@@ -82,8 +82,9 @@ data base if they are not there already.
Repeated strings and strings which are suffixes of existing strings
do not cause changes to the data base.
.It Fl l Ar array
-Specify the named array in program references to abstracted
-strings. The default array name is xstr.
+Specify the named array in program references to abstracted strings.
+The default array name is
+.Dq xstr .
.El
.Pp
After all components of a large program have been compiled a file
@@ -147,9 +148,12 @@ data base of strings
.It Pa x.c
massaged C source
.It Pa xs.c
-C source for definition of array `xstr'
+C source for definition of array
+.Dq xstr
.It Pa /tmp/xs*
-temporary file when `xstr name' doesn't touch
+temporary file when
+.Dq xstr name
+doesn't touch
.Pa strings
.El
.Sh SEE ALSO
diff --git a/usr.bin/yacc/yacc.1 b/usr.bin/yacc/yacc.1
index 31977fdfdb7..262ebb7114e 100644
--- a/usr.bin/yacc/yacc.1
+++ b/usr.bin/yacc/yacc.1
@@ -1,4 +1,5 @@
-.\" $OpenBSD: yacc.1,v 1.9 2000/03/05 00:28:56 aaron Exp $
+.\" $OpenBSD: yacc.1,v 1.10 2000/03/14 14:58:27 aaron Exp $
+.\"
.\" Copyright (c) 1989, 1990 The Regents of the University of California.
.\" All rights reserved.
.\"
@@ -51,7 +52,7 @@ parser generator
.Op Fl p Ar symbol_prefix
.Ar filename
.Sh DESCRIPTION
-.Nm yacc
+.Nm
reads the grammar specification in the file
.Ar filename
and generates an
@@ -61,7 +62,7 @@ The parsers consist of a set of
.Tn LALR(1)
parsing tables and a driver routine
written in the C programming language.
-.Nm yacc
+.Nm
normally writes the parse tables and the driver routine to the file
.Pa y.tab.c .
.Pp
@@ -85,14 +86,14 @@ to be written.
If the
.Fl l
option is not specified,
-.Nm yacc
+.Nm
will insert #line directives in the generated code.
The #line directives let the C compiler relate errors in the
generated code to the user's original code.
If the
.Fl l
option is specified,
-.Nm yacc
+.Nm
will not insert the #line directives.
#line directives specified by the user will be retained.
.It Fl o Ar output_file
@@ -118,7 +119,7 @@ The default prefix is the string
The
.Fl r
option causes
-.Nm yacc
+.Nm
to produce separate files for code and tables.
The code file is named
.Pa y.code.c ,
@@ -128,7 +129,7 @@ and the tables file is named
The
.Fl t
option changes the preprocessor directives generated by
-.Nm yacc
+.Nm
so that debugging statements will be incorporated in the compiled code.
.It Fl v
The
@@ -137,20 +138,15 @@ option causes a human-readable description of the generated parser to
be written to the file
.Pa y.output .
.Sh ENVIRONMENT
-The following environment variable is referenced by
+The following environment variables affect the execution of
.Nm yacc :
.Bl -tag -width TMPDIR
.It Ev TMPDIR
-If the environment variable
-.Ev TMPDIR
-is set, the string denoted by
-.Ev TMPDIR
-will be used as the name of the directory where the temporary
-files are created.
+Name of directory where temporary files are to be created.
.El
.Sh TABLES
The names of the tables generated by this version of
-.Nm yacc
+.Nm
are
.Dq yylhs ,
.Dq yylen ,
@@ -169,6 +165,13 @@ and
are created if
.Dv YYDEBUG
is defined and non-zero.
+.Sh DIAGNOSTICS
+If there are rules that are never reduced, the number of such rules is
+written to the standard error.
+If there are any
+.Tn LALR(1)
+conflicts, the number of conflicts is also written
+to the standard error.
.Sh FILES
.Bl -tag -width /tmp/yacc.uXXXXXXXXXX -compact
.It Pa y.code.c
@@ -179,17 +182,10 @@ is defined and non-zero.
.It Pa /tmp/yacc.tXXXXXXXXXX
.It Pa /tmp/yacc.uXXXXXXXXXX
.El
-.Sh DIAGNOSTICS
-If there are rules that are never reduced, the number of such rules is
-written to the standard error.
-If there are any
-.Tn LALR(1)
-conflicts, the number of conflicts is also written
-to the standard error.
.Sh SEE ALSO
.Xr yyfix 1
.Sh STANDARDS
The
-.Nm yacc
+.Nm
utility conforms to
.St -p1003.2 .
diff --git a/usr.bin/ypwhich/ypwhich.1 b/usr.bin/ypwhich/ypwhich.1
index daa5521e419..b6bb6ccafd3 100644
--- a/usr.bin/ypwhich/ypwhich.1
+++ b/usr.bin/ypwhich/ypwhich.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ypwhich.1,v 1.8 1999/06/05 01:21:52 aaron Exp $
+.\" $OpenBSD: ypwhich.1,v 1.9 2000/03/14 14:58:27 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.8 1999/06/05 01:21:52 aaron Exp $
+.\" $Id: ypwhich.1,v 1.9 2000/03/14 14:58:27 aaron Exp $
.\"
.Dd February 23, 1994
.Dt YPWHICH 1
@@ -80,13 +80,15 @@ to their corresponding map names.
.It Fl m Op Ar mname
Find the master
.Tn YP
-server for the named map. No
+server for the named map.
+No
.Ar host
may be specified with the
.Fl m
option.
.Ar Mname
-can be a map name or nickname. If
+can be a map name or nickname.
+If
.Ar mname
is omitted,
.Nm
@@ -104,5 +106,3 @@ Display the map nickname table.
.Xr ypset 8
.Sh AUTHOR
Theo De Raadt
-
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 09:58:24 +0000