consistency

18 files changed, 78 insertions, 54 deletions

diff --git a/bin/chio/chio.1 b/bin/chio/chio.1
index 79bae808c0a..adb7414fc5c 100644
--- a/bin/chio/chio.1
+++ b/bin/chio/chio.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: chio.1,v 1.12 1999/07/03 02:11:06 aaron Exp $
+.\"	$OpenBSD: chio.1,v 1.13 1999/08/17 14:03:59 aaron Exp $
 .\"	$NetBSD: chio.1,v 1.1.1.1 1996/04/03 00:34:38 thorpej Exp $
 .\"
 .\" Copyright (c) 1996 Jason R. Thorpe <thorpej@and.com>
@@ -48,9 +48,10 @@
 .Oc
 .Oc
 .Sh DESCRIPTION
+The
 .Nm
-is used to control the operation of medium changers, such as those found
-in tape and optical disk jukeboxes.
+utility is used to control the operation of medium changers, such as those
+found in tape and optical disk jukeboxes.
 .Pp
 The options are as follows:
 .Bl -tag -width indent
diff --git a/bin/date/date.1 b/bin/date/date.1
index 87c17b13f1c..a89051f3b6f 100644
--- a/bin/date/date.1
+++ b/bin/date/date.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: date.1,v 1.19 1999/06/04 02:45:12 aaron Exp $
+.\"	$OpenBSD: date.1,v 1.20 1999/08/17 14:03:59 aaron Exp $
 .\"	$NetBSD: date.1,v 1.12 1996/03/12 04:32:37 phil Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -52,8 +52,9 @@
 .Op Cm + Ns Ar format
 .Op [[[[[cc]yy]mm]dd]HH]MM[\&.SS]
 .Sh DESCRIPTION
+The
 .Nm
-displays the current date and time when invoked without arguments.
+utility displays the current date and time when invoked without arguments.
 Providing arguments will format the date and time in a user-defined
 way or set the date.
 Only the superuser may set the date.
diff --git a/bin/df/df.1 b/bin/df/df.1
index 923fa01c040..f43452520c7 100644
--- a/bin/df/df.1
+++ b/bin/df/df.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: df.1,v 1.17 1999/08/16 18:40:02 aaron Exp $
+.\"	$OpenBSD: df.1,v 1.18 1999/08/17 14:04:00 aaron Exp $
 .\"	$NetBSD: df.1,v 1.12 1995/12/05 02:42:45 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -49,8 +49,10 @@
 .Ar ...
 .Oc
 .Sh DESCRIPTION
+The
 .Nm
-displays statistics about the amount of free disk space on the specified
+utility displays statistics about the amount of free disk space on the
+specified
 .Ar file_system
 or on the file system of which
 .Ar file
diff --git a/bin/domainname/domainname.1 b/bin/domainname/domainname.1
index 629bda6d2b0..c20d413fba4 100644
--- a/bin/domainname/domainname.1
+++ b/bin/domainname/domainname.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: domainname.1,v 1.7 1999/05/23 14:10:47 aaron Exp $
+.\"	$OpenBSD: domainname.1,v 1.8 1999/08/17 14:04:00 aaron Exp $
 .\"	$NetBSD: domainname.1,v 1.7 1995/07/25 19:36:57 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1988, 1990, 1993
@@ -44,8 +44,9 @@
 .Nm domainname
 .Op Ar name-of-domain
 .Sh DESCRIPTION
+The
 .Nm
-prints the YP domain name of the current host.  The super-user can
+utility prints the YP domain name of the current host.  The super-user can
 set the domain name by supplying an argument; this is usually done in the
 network initialization script
 .Pa /etc/netstart ,
diff --git a/bin/echo/echo.1 b/bin/echo/echo.1
index 16da8fa025c..aff2d4fcff0 100644
--- a/bin/echo/echo.1
+++ b/bin/echo/echo.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: echo.1,v 1.6 1998/12/15 01:20:20 aaron Exp $
+.\"	$OpenBSD: echo.1,v 1.7 1999/08/17 14:04:00 aaron Exp $
 .\"	$NetBSD: echo.1,v 1.7 1995/03/21 09:04:26 cgd Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -57,7 +57,7 @@ characters and followed by a newline
 character, to the standard
 output.
 .Pp
-The following option is available:
+The options are as follows:
 .Bl -tag -width flag
 .It Fl n
 Do not print the trailing newline character.
diff --git a/bin/hostname/hostname.1 b/bin/hostname/hostname.1
index cde3595e35a..1584524a00d 100644
--- a/bin/hostname/hostname.1
+++ b/bin/hostname/hostname.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: hostname.1,v 1.7 1999/05/23 14:10:48 aaron Exp $
+.\"	$OpenBSD: hostname.1,v 1.8 1999/08/17 14:04:00 aaron Exp $
 .\"	$NetBSD: hostname.1,v 1.11 1995/09/07 06:28:39 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1988, 1990, 1993
@@ -45,15 +45,16 @@
 .Op Fl s
 .Op Ar name-of-host
 .Sh DESCRIPTION
+The
 .Nm
-prints the name of the current host.  The super-user can
+utility prints the name of the current host.  The super-user can
 set the host name by supplying an argument; this is usually done in the
 network initialization script
 .Pa /etc/netstart ,
 normally run at boot
 time.
 .Pp
-Options:
+The options are as follows:
 .Bl -tag -width flag
 .It Fl s
 Trims off any domain information from the printed
diff --git a/bin/kill/kill.1 b/bin/kill/kill.1
index 9d219b8d1d9..906ecad1f79 100644
--- a/bin/kill/kill.1
+++ b/bin/kill/kill.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: kill.1,v 1.9 1999/08/16 18:40:02 aaron Exp $
+.\"	$OpenBSD: kill.1,v 1.10 1999/08/17 14:04:00 aaron Exp $
 .\"	$NetBSD: kill.1,v 1.8 1995/09/07 06:30:26 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -63,7 +63,9 @@
 The
 .Nm
 utility sends a signal to the processes specified
-by the PID operand(s).
+by the
+.Ar pid
+operand(s).
 .Pp
 Only the super-user may send signals to other users' processes.
 .Pp
@@ -72,7 +74,7 @@ The options are as follows:
 .It Fl s Ar signal_name
 A symbolic signal name specifying the signal to be sent instead of the
 default
-.Dv TERM .
+.Dv SIGTERM .
 .It Fl l Op Ar exit_status
 If no operand is given, list the signal names; otherwise, write
 the signal name corresponding to
@@ -80,11 +82,11 @@ the signal name corresponding to
 .It Fl signal_name
 A symbolic signal name specifying the signal to be sent instead of the
 default
-.Dv TERM .
+.Dv SIGTERM .
 .It Fl signal_number
-A non-negative decimal integer, specifying the signal to be sent instead
+A non-negative decimal integer specifying the signal to be sent instead
 of the default
-.Dv TERM .
+.Dv SIGTERM .
 .El
 .Pp
 The following PIDs have special meanings:
diff --git a/bin/ls/ls.1 b/bin/ls/ls.1
index 0803fcccdb4..a50f884b998 100644
--- a/bin/ls/ls.1
+++ b/bin/ls/ls.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ls.1,v 1.19 1999/06/04 02:45:13 aaron Exp $
+.\"	$OpenBSD: ls.1,v 1.20 1999/08/17 14:04:00 aaron Exp $
 .\"	$NetBSD: ls.1,v 1.14 1995/12/05 02:44:01 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1991, 1993, 1994
@@ -70,7 +70,7 @@ non-directory operands are displayed first; directory
 and non-directory operands are sorted separately and in
 lexicographical order.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width indent
 .It Fl A
 List all entries except for
diff --git a/bin/mkdir/mkdir.1 b/bin/mkdir/mkdir.1
index f75c94eb9d4..99d9b0383c0 100644
--- a/bin/mkdir/mkdir.1
+++ b/bin/mkdir/mkdir.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mkdir.1,v 1.8 1999/08/16 18:40:03 aaron Exp $
+.\"	$OpenBSD: mkdir.1,v 1.9 1999/08/17 14:04:00 aaron Exp $
 .\"	$NetBSD: mkdir.1,v 1.9 1995/07/25 19:37:13 jtc Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -49,8 +49,9 @@
 .Op Fl m Ar mode
 .Ar directory_name Op Ar ...
 .Sh DESCRIPTION
+The
 .Nm
-creates the directories named as operands, in the order specified,
+utility creates the directories named as operands, in the order specified,
 using mode
 .Li rwxrwxrwx (\&0777)
 as modified by the current
diff --git a/bin/mt/mt.1 b/bin/mt/mt.1
index 90bcc5430d4..b5e27ef4a95 100644
--- a/bin/mt/mt.1
+++ b/bin/mt/mt.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mt.1,v 1.13 1999/05/28 22:59:55 aaron Exp $
+.\"	$OpenBSD: mt.1,v 1.14 1999/08/17 14:04:00 aaron Exp $
 .\"	$NetBSD: mt.1,v 1.8 1996/05/21 10:23:55 mrg Exp $
 .\"
 .\" Copyright (c) 1981, 1990, 1993
@@ -50,8 +50,9 @@
 .Op Fl f
 .Ar tapename
 .Sh DESCRIPTION
+The
 .Nm
-is used to give commands to a magnetic tape drive.
+utility sends commands to a magnetic tape drive.
 By default,
 .Nm
 performs the requested operation once.  Operations
diff --git a/bin/mv/mv.1 b/bin/mv/mv.1
index 3eb09b8709f..99df40ee642 100644
--- a/bin/mv/mv.1
+++ b/bin/mv/mv.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mv.1,v 1.7 1998/12/15 01:20:24 aaron Exp $
+.\"	$OpenBSD: mv.1,v 1.8 1999/08/17 14:04:01 aaron Exp $
 .\"	$NetBSD: mv.1,v 1.8 1995/03/21 09:06:51 cgd Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993
@@ -72,7 +72,7 @@ The destination path for each operand is the pathname produced by the
 concatenation of the last operand, a slash, and the final pathname
 component of the named file.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width flag
 .It Fl f
 Do not prompt for confirmation before overwriting the destination
diff --git a/bin/ps/ps.1 b/bin/ps/ps.1
index 3e6e045015f..77fa68f6a55 100644
--- a/bin/ps/ps.1
+++ b/bin/ps/ps.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: ps.1,v 1.21 1999/05/23 14:10:48 aaron Exp $
+.\"	$OpenBSD: ps.1,v 1.22 1999/08/17 14:04:01 aaron Exp $
 .\"	$NetBSD: ps.1,v 1.16 1996/03/21 01:36:28 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1991, 1993, 1994
@@ -54,11 +54,12 @@
 .Nm ps
 .Op Fl L
 .Sh DESCRIPTION
+The
 .Nm
-displays a header line followed by lines containing information about your
-processes that have controlling terminals.
-This information is sorted by process
-.Tn ID .
+utility displays information about active processes.
+When given no options,
+.Nm
+prints information about processes associated with the controlling terminal.
 .Pp
 The information displayed is selected based on a set of keywords (and for
 even more control, see the
@@ -67,8 +68,7 @@ even more control, see the
 and
 .Fl o
 options).
-The default output format includes, for each process, the process's
-.Tn ID ,
+The default output format includes, for each process, the process's ID,
 controlling terminal, CPU time (including both user and system time),
 state, and associated command.
 .Pp
diff --git a/bin/pwd/pwd.1 b/bin/pwd/pwd.1
index 446f6240ba6..3fc09d1fa95 100644
--- a/bin/pwd/pwd.1
+++ b/bin/pwd/pwd.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pwd.1,v 1.7 1999/05/23 14:10:49 aaron Exp $
+.\"	$OpenBSD: pwd.1,v 1.8 1999/08/17 14:04:01 aaron Exp $
 .\"	$NetBSD: pwd.1,v 1.10 1995/09/07 06:47:30 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -46,11 +46,20 @@
 .Sh SYNOPSIS
 .Nm pwd
 .Sh DESCRIPTION
+The
 .Nm
-writes the absolute pathname of the current working directory to
+utility prints the absolute pathname of the current working directory to
 the standard output.
+Both the Bourne shell
+.Pq Xr sh 1
+and Korn shell
+.Pq Xr ksh 1
+have their own built-in version of
+.Nm pwd .
 .Pp
-The pwd utility exits 0 on success or >0 if an error occurred.
+The
+.Nm
+utility exits 0 on success or >0 if an error occurred.
 .Sh STANDARDS
 The
 .Nm
@@ -60,6 +69,8 @@ compatible.
 .Sh SEE ALSO
 .Xr cd 1 ,
 .Xr csh 1 ,
+.Xr ksh 1 ,
+.Xr sh 1 ,
 .Xr getcwd 3
 .Sh BUGS
 In
diff --git a/bin/rcp/rcp.1 b/bin/rcp/rcp.1
index 205ae859040..eae74e56a11 100644
--- a/bin/rcp/rcp.1
+++ b/bin/rcp/rcp.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rcp.1,v 1.9 1999/07/21 01:27:27 deraadt Exp $
+.\"	$OpenBSD: rcp.1,v 1.10 1999/08/17 14:04:01 aaron Exp $
 .\"	$NetBSD: rcp.1,v 1.6 1995/07/25 19:37:25 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -51,8 +51,9 @@
 .Ar file ...
 .Ar directory
 .Sh DESCRIPTION
+The
 .Nm
-copies files between machines.  Each
+utility copies files between machines.  Each
 .Ar file
 or
 .Ar directory
@@ -60,16 +61,16 @@ argument is either a remote file name of the
 form
 .Dq rname@rhost:path ,
 or a local file name (containing no
-.Dq \&:
+.Ql \&:
 characters,
 or a
-.Dq /
+.Ql /
 before any
 .Br
-.Dq \&:
+.Ql \&:
 characters).
 .Pp
-Available options are as follows:
+The options are as follows:
 .Bl -tag -width flag
 .It Fl K
 Turns off all Kerberos authentication.
diff --git a/bin/rmail/rmail.8 b/bin/rmail/rmail.8
index 8c71e3ca60a..ae7de7c8acc 100644
--- a/bin/rmail/rmail.8
+++ b/bin/rmail/rmail.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rmail.8,v 1.9 1999/08/16 18:40:03 aaron Exp $
+.\"	$OpenBSD: rmail.8,v 1.10 1999/08/17 14:04:01 aaron Exp $
 .\"	$NetBSD: rmail.8,v 1.8 1995/03/21 07:08:21 cgd Exp $
 .\"
 .\" Copyright (c) 1983, 1990 The Regents of the University of California.
@@ -44,8 +44,9 @@
 .Nm rmail
 .Ar user Op Ar ...
 .Sh DESCRIPTION
+The
 .Nm
-interprets incoming mail received via
+utility interprets incoming mail received via
 .Xr uucp 1 ,
 collapsing
 .Dq From
@@ -68,7 +69,7 @@ and
 .Sh HISTORY
 The
 .Nm
-program appeared in
+utility appeared in
 .Bx 4.2 .
 .Sh BUGS
 .Nm
diff --git a/bin/rmdir/rmdir.1 b/bin/rmdir/rmdir.1
index 47c064de931..c4cc766936d 100644
--- a/bin/rmdir/rmdir.1
+++ b/bin/rmdir/rmdir.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rmdir.1,v 1.7 1999/08/16 18:40:04 aaron Exp $
+.\"	$OpenBSD: rmdir.1,v 1.8 1999/08/17 14:04:01 aaron Exp $
 .\"	$NetBSD: rmdir.1,v 1.10 1995/07/25 19:37:35 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -63,7 +63,7 @@ is empty when
 .Nm
 tries to remove it.
 .Pp
-The following option is available:
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl p
 Each
diff --git a/bin/stty/stty.1 b/bin/stty/stty.1
index 77deb086dda..6b503fb1dc6 100644
--- a/bin/stty/stty.1
+++ b/bin/stty/stty.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stty.1,v 1.16 1999/08/16 18:40:04 aaron Exp $
+.\"	$OpenBSD: stty.1,v 1.17 1999/08/17 14:04:01 aaron Exp $
 .\"	$NetBSD: stty.1,v 1.10 1995/09/07 06:57:14 jtc Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
@@ -61,7 +61,7 @@ the terminal state according to the specified arguments.
 Some combinations of arguments are mutually
 exclusive on some terminal types.
 .Pp
-The following options are available:
+The options are as follows:
 .Bl -tag -width Ds
 .It Fl a
 Display all the current settings for the terminal to standard output
diff --git a/bin/sync/sync.8 b/bin/sync/sync.8
index 9302d40fa41..6e04c324b01 100644
--- a/bin/sync/sync.8
+++ b/bin/sync/sync.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sync.8,v 1.8 1999/05/23 14:11:10 aaron Exp $
+.\"	$OpenBSD: sync.8,v 1.9 1999/08/17 14:04:02 aaron Exp $
 .\"	$NetBSD: sync.8,v 1.6 1995/03/21 09:11:35 cgd Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -43,9 +43,10 @@
 .Sh SYNOPSIS
 .Nm sync
 .Sh DESCRIPTION
+The
 .Nm
-can be called to ensure that all disk writes have been completed before the
-processor is halted in a way not suitably done by
+utility can be called to ensure that all disk writes have been completed before
+the processor is halted in a way not suitably done by
 .Xr reboot 8
 or
 .Xr halt 8 .