Various cleanups.

3 files changed, 79 insertions, 83 deletions

diff --git a/share/man/man5/passwd.5 b/share/man/man5/passwd.5
index a1c7e9821b4..c1f7b8c3b6b 100644
--- a/share/man/man5/passwd.5
+++ b/share/man/man5/passwd.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: passwd.5,v 1.12 2000/01/19 08:33:27 pjanzen Exp $
+.\"	$OpenBSD: passwd.5,v 1.13 2000/03/01 18:01:22 aaron Exp $
 .\"	$NetBSD: passwd.5,v 1.4 1995/07/28 06:46:05 phil Exp $
 .\"
 .\" Copyright (c) 1988, 1991, 1993
@@ -80,32 +80,31 @@ file is generated from the
 .Nm master.passwd
 file by
 .Xr pwd_mkdb 8
-and has the class, change, and expire fields removed.  Also, the encrypted
-password field is replaced by an asterisk
-.Pq Sq \&* .
+and has the class, change, and expire fields removed.
+Also, the encrypted password field is replaced by an asterisk
+.Pq Ql \&* .
 .Pp
 The
 .Ar name
 field is the login used to access the computer account, and the
 .Ar uid
-field is the number associated with it.  They should both be unique
-across the system (and often across a group of systems) since they
-control file access.
+field is the number associated with it.
+They should both be unique across the system (and often across a group of
+systems) since they control file access.
 .Pp
 While it is possible to have multiple entries with identical login names
-and/or identical user IDs, it is usually a mistake to do so.  Routines
-that manipulate these files will often return only one of the multiple
-entries, and that one by random selection.
+and/or identical user IDs, it is usually a mistake to do so.
+Routines that manipulate these files will often return only one of the
+multiple entries, and that one by random selection.
 .Pp
 The login name must never begin with a hyphen
-.Pq Sq \&- ;
+.Pq Ql \&- ;
 also, it is strongly
 suggested that neither uppercase characters nor dots
-.Pq Sq \&.
+.Pq Ql \&.
 be part
-of the name, as this tends to confuse mailers.  No field may contain a
-colon
-.Pq Sq \&:
+of the name, as this tends to confuse mailers.
+No field may contain a colon
 as this has been used historically to separate the fields
 in the user database.
 .Pp
@@ -115,7 +114,8 @@ form of the password.
 If the
 .Ar password
 field is empty, no password will be required to gain access to the
-machine.  This is almost invariably a mistake.
+machine.
+This is almost invariably a mistake.
 Because
 .Nm master.passwd
 contains the encrypted user passwords, it should
@@ -135,30 +135,28 @@ this field currently has little special meaning.
 .Pp
 The
 .Ar class
-field is currently unused.  In the near future it will be a key to
-a
+field is currently unused.
+In the near future it will be a key to a
 .Xr termcap 5
 style database of user attributes.
 .Pp
 The
 .Ar change
-field is the number in seconds,
-.Dv GMT ,
-from the epoch, until the
+field is the number in seconds, GMT, from the epoch, until the
 password for the account must be changed.
 This field may be left empty to turn off the password aging feature.
 .Pp
 The
 .Ar expire
-field is the number in seconds,
-.Dv GMT ,
-from the epoch, until the
+field is the number in seconds, GMT, from the epoch, until the
 account expires.
 This field may be left empty to turn off the account aging feature.
 .Pp
 The
 .Ar gecos
-field normally contains comma-separated subfields as follows:
+field normally contains comma
+.Pq Ql \&,
+separated subfields as follows:
 .Pp
 .Bl -tag -width office -offset indent -compact
 .It name
@@ -185,8 +183,7 @@ program and possibly by other applications.
 .Pp
 The user's home directory is the full
 .Tn UNIX
-path name where the user
-will be placed on login.
+path name where the user will be placed on login.
 .Pp
 The
 .Ar shell
@@ -203,17 +200,16 @@ file also supports standard YP exclusions and inclusions, based on user
 names and netgroups.
 .Pp
 Lines beginning with a
-.Dq \&-
+.Ql \&-
 (minus sign) are entries marked as being excluded
 from any following inclusions, which are marked with a
-.Dq +
+.Ql +
 (plus sign).
 .Pp
 If the second character of the line is a
-.Dq @
-(at sign), the operation
-involves the user fields of all entries in the netgroup specified by the
-remaining characters of the
+.Ql @
+(at sign), the operation involves the user fields of all entries in the
+netgroup specified by the remaining characters of the
 .Ar name
 field.
 Otherwise, the remainder of the
@@ -221,7 +217,7 @@ Otherwise, the remainder of the
 field is assumed to be a specific user name.
 .Pp
 The
-.Dq +
+.Ql +
 token may also be alone in the
 .Ar name
 field, which causes all users from the
@@ -235,16 +231,17 @@ If the entry contains non-empty
 or
 .Ar gid
 fields, the specified numbers will override the information retrieved
-from the YP maps. As well, if the
+from the YP maps.
+As well, if the
 .Ar gecos ,
-.Ar dir
+.Ar dir ,
 or
 .Ar shell
 entries contain text, it will override the information included via YP.
 On some systems, the
 .Ar passwd
-field may also be overridden.  It is recommended that the standard
-way to enable YP passwd support in
+field may also be overridden.
+It is recommended that the standard way to enable YP passwd support in
 .Pa /etc/master.passwd
 is:
 .Pp
@@ -257,7 +254,6 @@ will result in
 containing:
 .Pp
 +:*:0:0:::
-.Pp
 .Sh SEE ALSO
 .Xr chpass 1 ,
 .Xr login 1 ,
@@ -286,7 +282,7 @@ script can be used to convert your old-style password
 file into a new style password file.
 The additional fields
 .Dq class ,
-.Dq change
+.Dq change ,
 and
 .Dq expire
 are added, but are turned off by default.
diff --git a/share/man/man5/phones.5 b/share/man/man5/phones.5
index 8018de949ff..0279ca42368 100644
--- a/share/man/man5/phones.5
+++ b/share/man/man5/phones.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: phones.5,v 1.3 1999/05/23 14:11:05 aaron Exp $
+.\"	$OpenBSD: phones.5,v 1.4 2000/03/01 18:01:21 aaron Exp $
 .\"	$NetBSD: phones.5,v 1.3 1994/11/30 19:31:25 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -41,14 +41,13 @@
 .Nm phones
 .Nd remote host phone number data base
 .Sh DESCRIPTION
-The file
+The
 .Pa /etc/phones
-contains the system-wide
-private phone numbers for the
+file contains the system-wide private phone numbers for the
 .Xr tip 1
-program.  This file is normally unreadable, and so may contain
-privileged information.  The format of the file is a series of lines
-of the form:
+program.
+This file is normally unreadable, and so may contain privileged information.
+The format of the file is a series of lines of the form:
 .Pp
 .D1 Li <system-name>[\ \et]*<phone-number>
 .Pp
@@ -56,25 +55,26 @@ The system name is one of those defined in the
 .Xr remote 5
 file and the phone number is constructed from any sequence of
 characters terminated only by
-.Dq \&,
+.Ql \&,
 or the end of the line. The
-.Dq =
+.Ql =
 and
-.Dq \&*
+.Ql \&*
 characters are
 indicators to the auto call units to pause and wait for a second dial
-tone (when going through an exchange).  The
-.Dq =
+tone (when going through an exchange).
+The
+.Ql =
 is required by the
 .Tn DF02-AC
 and the
-.Dq \&*
+.Ql \&*
 is required by the
 .Tn BIZCOMP
 1030.
 .Pp
-Only one phone number per line is permitted.  However, if more than
-one line in the file contains the same system name
+Only one phone number per line is permitted.
+However, if more than one line in the file contains the same system name,
 .Xr tip 1
 will attempt to dial each one in turn, until it establishes a connection.
 .Sh FILES
diff --git a/share/man/man5/printcap.5 b/share/man/man5/printcap.5
index da3773fbf8f..712f58c9c92 100644
--- a/share/man/man5/printcap.5
+++ b/share/man/man5/printcap.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: printcap.5,v 1.9 1999/07/09 13:35:39 aaron Exp $
+.\"	$OpenBSD: printcap.5,v 1.10 2000/03/01 18:01:22 aaron Exp $
 .\"	$NetBSD: printcap.5,v 1.7 1998/02/20 12:24:50 hubertf Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -39,7 +39,7 @@
 .Os
 .Sh NAME
 .Nm printcap
-.Nd printer capability data base
+.Nd printer capability database
 .Sh SYNOPSIS
 .Nm printcap
 .Sh DESCRIPTION
@@ -47,13 +47,13 @@ The
 .Nm
 file is a simplified version of the
 .Xr termcap 5
-data base
-used to describe line printers.  The spooling system accesses the
+database used to describe line printers.
+The spooling system accesses the
 .Nm
 file every time it is used, allowing dynamic
-addition and deletion of printers.  Each entry in the data base
-is used to describe one printer.  This data base may not be
-substituted for, as is possible for
+addition and deletion of printers.
+Each entry in the database is used to describe one printer.
+This database may not be substituted for, as is possible for
 .Xr termcap ,
 because it may allow accounting to be bypassed.
 .Pp
@@ -61,7 +61,8 @@ The default printer is normally
 .Dq lp ,
 though the environment variable
 .Ev PRINTER
-may be used to override this.  Each spooling utility supports an option,
+may be used to override this.
+Each spooling utility supports an option,
 .Fl P Ns Ar printer ,
 to allow explicit naming of a destination printer.
 .Pp
@@ -83,7 +84,7 @@ call)
 .Pf ( Tn DVI
 format)
 .It "fc	num	0	if lp is a tty, clear flag bits"
-.Pq Pa sgtty.h
+.Pq Aq Pa sgtty.h
 .It "ff	str" Ta So Li \ef Sc Ta No "string to send for a form feed"
 .It "fo	bool	false	print a form feed when device is opened"
 .It "fs	num	0	like `fc' but set bits"
@@ -134,7 +135,7 @@ If the local line printer driver supports indentation, the daemon
 must understand how to invoke it.
 .Sh FILTERS
 If a printer is specified via
-.Cm lp
+.Sy lp
 (either local or remote),
 the
 .Xr lpd 8
@@ -142,7 +143,7 @@ daemon creates a pipeline of
 .Dq filters
 to process files for various printer types.
 The pipeline is not set up for remote printers specified via
-.Cm rm
+.Sy rm
 unless the local host is the same as the remote printer host
 given.
 The filters selected depend on the flags passed to
@@ -161,10 +162,10 @@ v	vf	raster image
 .Ed
 .Pp
 The
-.Cm if
+.Sy if
 filter is invoked with arguments:
 .Bd -filled -offset indent
-.Cm if
+.Sy if
 .Op Fl c
 .Fl w Ns Ar width
 .Fl l Ns Ar length
@@ -185,40 +186,40 @@ and
 .Ar length
 specify the page width and length
 (from
-.Cm pw
+.Sy pw
 and
-.Cm pl
+.Sy pl ,
 respectively) in characters.
 The
 .Fl n
 and
 .Fl h
 parameters specify the login name and host name of the owner
-of the job respectively.
+of the job, respectively.
 The
 .Ar acct-file
 function
 is passed from the
-.Cm af
+.Sy af
 .Nm
 entry.
 .Pp
 If no
-.Cm if
+.Sy if
 is specified,
-.Cm of
+.Sy of
 is used instead,
 with the distinction that
-.Cm of
+.Sy of
 is opened only once,
 while
-.Cm if
+.Sy if
 is opened for every individual job.
 Thus,
-.Cm if
+.Sy if
 is better suited to performing accounting.
 The
-.Cm of
+.Sy of
 is only given the
 .Ar width
 and
@@ -240,11 +241,10 @@ and
 .Ar length
 are represented in pixels,
 specified by the
-.Cm px
+.Sy px
 and
-.Cm py
-entries respectively.
-.Pp
+.Sy py
+entries, respectively.
 All filters take
 .Em stdin
 as the file,
@@ -270,7 +270,7 @@ Messages printed on
 .Em stderr
 of one of the filters
 are sent to the corresponding
-.Cm lf
+.Sy lf
 file.
 The filters may, of course, use
 .Xr syslog