Various cleanup.

10 files changed, 101 insertions, 87 deletions

diff --git a/share/man/man5/motd.5 b/share/man/man5/motd.5
index 69a1c8da591..ce690a668d1 100644
--- a/share/man/man5/motd.5
+++ b/share/man/man5/motd.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: motd.5,v 1.3 1998/11/26 04:25:58 aaron Exp $
+.\"	$OpenBSD: motd.5,v 1.4 2000/02/29 04:48:39 aaron Exp $
 .\"	$NetBSD: motd.5,v 1.2 1994/12/28 18:58:53 glass Exp $
 .\"
 .\" This file is in the public domain.
@@ -8,11 +8,11 @@
 .Os
 .Sh NAME
 .Nm motd
-.Nd file containing message(s) of the day
+.Nd message of the day
 .Sh DESCRIPTION
-The file
+The
 .Pa /etc/motd
-is normally displayed by
+file is normally displayed by
 .Xr login 1
 after a user has logged in but before the shell is run.
 It is generally used for important system-wide announcements.
@@ -23,10 +23,6 @@ Individual users may suppress the display of this file by
 creating a file named
 .Pa .hushlogin
 in their home directories.
-.Sh FILES
-.Bl -tag -width /etc/motd -compact
-.It Pa /etc/motd
-.El
 .Sh EXAMPLES
 .Bd -literal
 OpenBSD 1.2 (GENERIC) #3: Fri Jun 28 22:47:57 MDT 1996
@@ -35,5 +31,9 @@ Make sure you have a .forward file...
 
 4/17	Machine will be down for backups all day Saturday.
 .Ed
+.Sh FILES
+.Bl -tag -width /etc/motd -compact
+.It Pa /etc/motd
+.El
 .Sh SEE ALSO
 .Xr login 1
diff --git a/share/man/man5/protocols.5 b/share/man/man5/protocols.5
index 1ef1f837971..242652afacf 100644
--- a/share/man/man5/protocols.5
+++ b/share/man/man5/protocols.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: protocols.5,v 1.5 1999/05/23 14:11:05 aaron Exp $
+.\"	$OpenBSD: protocols.5,v 1.6 2000/02/29 04:48:39 aaron Exp $
 .\"	$NetBSD: protocols.5,v 1.3 1994/11/30 19:31:27 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -54,11 +54,13 @@ aliases
 .Ed
 .Pp
 Items are separated by any number of blanks and/or
-tab characters.  A
-.Dq #
+tab characters.
+.Pp
+A hash mark
+.Pq Ql #
 indicates the beginning of
-a comment; characters up to the end of the line are
-not interpreted by routines which search the file.
+a comment; subsequent characters up to the end of the line are
+not interpreted by the routines which search the file.
 .Pp
 Protocol names may contain any printable
 character other than a field delimiter, newline,
@@ -74,7 +76,7 @@ A name server should be used instead of a static file.
 Lines in
 .Pa /etc/protocols
 are limited to
-.Dv BUFSIZE
+.Dv BUFSIZ
 characters (currently 1024).  Longer lines will be ignored.
 .Sh HISTORY
 The
diff --git a/share/man/man5/remote.5 b/share/man/man5/remote.5
index fb566372469..e4012183fae 100644
--- a/share/man/man5/remote.5
+++ b/share/man/man5/remote.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: remote.5,v 1.5 1999/07/09 13:35:39 aaron Exp $
+.\"	$OpenBSD: remote.5,v 1.6 2000/02/29 04:48:39 aaron Exp $
 .\"	$NetBSD: remote.5,v 1.4 1997/04/20 00:05:27 mellon Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -102,40 +102,40 @@ for example,
 A boolean capability is specified by simply listing
 the capability.
 .Bl -tag -width indent
-.It Cm \&at
+.It Sy \&at
 (str)
 Auto call unit type.
-.It Cm \&br
+.It Sy \&br
 (num)
 The baud rate used in establishing
 a connection to the remote host.
 This is a decimal number.
 The default baud rate is 300 baud.
-.It Cm \&cm
+.It Sy \&cm
 (str)
 An initial connection message to be sent
 to the remote host.  For example, if a
 host is reached through port selector, this
 might be set to the appropriate sequence
 required to switch to the host.
-.It Cm \&cu
+.It Sy \&cu
 (str)
 Call unit if making a phone call.
 Default is the same as the
-.Cm dv
+.Sy dv
 field.
-.It Cm \&dc
+.It Sy \&dc
 (bool)
 This host is directly connected, and tip should not expect carrier detect
 to be high, nor should it exit if carrier detect drops.
-.It Cm \&di
+.It Sy \&di
 (str)
 Disconnect message sent to the host when a
 disconnect is requested by the user.
-.It Cm \&du
+.It Sy \&du
 (bool)
 This host is on a dial-up line.
-.It Cm \&dv
+.It Sy \&dv
 (str)
 .Tn UNIX
 device(s) to open to establish a connection.
@@ -143,7 +143,7 @@ If this file refers to a terminal line,
 .Xr tip 1
 attempts to perform an exclusive open on the device to insure only
 one user at a time has access to the port.
-.It Cm \&el
+.It Sy \&el
 (str)
 Characters marking an end-of-line.
 The default is
@@ -153,23 +153,23 @@ escapes are only
 recognized by
 .Xr tip
 after one of the characters in
-.Cm el ,
+.Sy el ,
 or after a carriage-return.
-.It Cm \&fs
+.It Sy \&fs
 (str)
 Frame size for transfers.
 The default frame size is equal to
 .Dv BUFSIZ .
-.It Cm \&hd
+.It Sy \&hd
 (bool)
 The host uses half-duplex communication, local
 echo should be performed.
-.It Cm \&ie
+.It Sy \&ie
 (str)
 Input end-of-file marks.
 The default is
 .Dv NULL .
-.It Cm \&oe
+.It Sy \&oe
 (str)
 Output end-of-file string.
 The default is
@@ -178,7 +178,7 @@ When
 .Xr tip
 is transferring a file, this
 string is sent at end-of-file.
-.It Cm \&pa
+.It Sy \&pa
 (str)
 The type of parity to use when sending data
 to the host.  This may be one of
@@ -191,7 +191,7 @@ or
 .Dq one
 (always set bit 8 to 1).
 The default is even parity.
-.It Cm \&pn
+.It Sy \&pn
 (str)
 Telephone number(s) for this host.
 If the telephone number field contains
@@ -201,7 +201,7 @@ searches the file
 .Pa /etc/phones
 file for a list of telephone numbers (see
 .Xr phones 5 ) .
-.It Cm \&tc
+.It Sy \&tc
 (str)
 Indicates that the list of capabilities is continued
 in the named description.  This is used
diff --git a/share/man/man5/rpc.5 b/share/man/man5/rpc.5
index 9e231e12725..575d73159fc 100644
--- a/share/man/man5/rpc.5
+++ b/share/man/man5/rpc.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rpc.5,v 1.4 1999/07/09 13:35:39 aaron Exp $
+.\"	$OpenBSD: rpc.5,v 1.5 2000/02/29 04:48:39 aaron Exp $
 .\"	$NetBSD: rpc.5,v 1.2 1994/11/30 19:31:30 jtc Exp $
 .\"	@(#)rpc.5	2.2 88/08/03 4.0 RPCSRC; from 1.4 87/11/27 SMI;
 .\"
@@ -29,10 +29,11 @@ aliases
 .Pp
 Items are separated by any number of blanks and/or
 tab characters.
-A
-.Dq #
-indicates the beginning of a comment; characters up to the end of
-the line are not interpreted by routines which search the file.
+.Pp
+A hash mark
+.Pq Ql #
+indicates the beginning of a comment; subsequent characters up to the end of
+the line are not interpreted by the routines which search the file.
 .Sh EXAMPLES
 Here is an example of the
 .Pa /etc/rpc
@@ -75,5 +76,6 @@ nsemntd		100039
 .Sh FILES
 .Bl -tag -width /etc/rpc -compact
 .It Pa /etc/rpc
+.El
 .Sh SEE ALSO
 .Xr getrpcent 3
diff --git a/share/man/man5/services.5 b/share/man/man5/services.5
index 022fa635f25..ff81e755ba8 100644
--- a/share/man/man5/services.5
+++ b/share/man/man5/services.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: services.5,v 1.6 1999/07/09 13:35:39 aaron Exp $
+.\"	$OpenBSD: services.5,v 1.7 2000/02/29 04:48:39 aaron Exp $
 .\"	$NetBSD: services.5,v 1.3 1994/11/30 19:31:31 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -58,15 +58,15 @@ aliases
 .Pp
 Items are separated by any number of blanks and/or
 tab characters.  The port number and protocol name
-are considered a single
-.Em item ;
-a
-.Dq /
+are considered a single item;
+a slash
+.Pq Ql /
 is used to
 separate the port and protocol (e.g.,
 .Dq 512/tcp ) .
-A
-.Dq #
+.Pp
+A hash mark
+.Pq Ql #
 indicates the beginning of
 a comment; subsequent characters up to the end of the line are
 not interpreted by the routines which search the file.
@@ -85,7 +85,7 @@ A name server should be used instead of a static file.
 Lines in
 .Pa /etc/services
 are limited to
-.Dv BUFSIZE
+.Dv BUFSIZ
 characters (currently 1024).  Longer lines will be ignored.
 .Sh HISTORY
 The
diff --git a/share/man/man5/shells.5 b/share/man/man5/shells.5
index fdb73eb057b..45181180876 100644
--- a/share/man/man5/shells.5
+++ b/share/man/man5/shells.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: shells.5,v 1.4 1999/05/23 14:11:05 aaron Exp $
+.\"	$OpenBSD: shells.5,v 1.5 2000/02/29 04:48:39 aaron Exp $
 .\"	$NetBSD: shells.5,v 1.3 1994/11/30 19:31:32 jtc Exp $
 .\"
 .\" Copyright (c) 1986, 1991, 1993
@@ -43,7 +43,9 @@
 .Sh DESCRIPTION
 The
 .Nm
-file contains a list of the shells on the system.
+file contains a list of valid shells available on the system.
+A shell is a command line interpreter that reads user input and executes
+commands.
 For each shell a single line should be present, consisting of the
 shell's path, relative to root.
 .Pp
@@ -53,11 +55,22 @@ indicates the beginning of a comment; subsequent
 characters up to the end of the line are not interpreted by the
 routines which search the file.
 Blank lines are also ignored.
+.Pp
+The
+.Xr chpass 1
+program will not let regular users change their default shell to one not
+listed in the
+.Nm
+file.
+The
+.Xr ftpd 8
+daemon denies access to users who are not using one of the listed shells.
 .Sh FILES
 .Bl -tag -width /etc/shells -compact
 .It Pa /etc/shells
 .El
 .Sh SEE ALSO
+.Xr chpass 1 ,
 .Xr getusershell 3
 .Sh HISTORY
 The
diff --git a/share/man/man5/stab.5 b/share/man/man5/stab.5
index 33bb6f32d95..db5cca3410f 100644
--- a/share/man/man5/stab.5
+++ b/share/man/man5/stab.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: stab.5,v 1.7 1999/07/09 13:35:39 aaron Exp $
+.\"	$OpenBSD: stab.5,v 1.8 2000/02/29 04:48:39 aaron Exp $
 .\"	$NetBSD: stab.5,v 1.3 1994/11/30 19:31:33 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -43,9 +43,9 @@
 .Sh SYNOPSIS
 .Fd #include <stab.h>
 .Sh DESCRIPTION
-The file
+The
 .Aq Pa stab.h
-defines some of the symbol table
+file defines some of the symbol table
 .Fa n_type
 field values for
 .Xr a.out 5
@@ -55,12 +55,19 @@ used by the old debugger
 .Em sdb
 and the Berkeley Pascal compiler
 .Xr pc 1 .
+.Pp
 Symbol table entries can be produced by the
 .Dq .stabs
 assembler directive.
 This allows one to specify a double-quote delimited name, a symbol type,
-one char and one short of information about the symbol, and an unsigned
-long (usually an address).
+one
+.Li char
+and one
+.Li short
+of information about the symbol, as well as an
+.Li unsigned long
+(usually an address).
+.Pp
 To avoid having to produce an explicit label for the address field,
 the
 .Dq .stabd
@@ -74,8 +81,7 @@ by
 directives.
 As described in
 .Xr a.out 5 ,
-an element of the symbol table
-consists of the following structure:
+an element of the symbol table consists of the following structure:
 .Bd -literal
 /*
 * Format of a symbol table entry.
@@ -118,7 +124,7 @@ bits set.
 The
 .Fa n_value
 field of a symbol is relocated by the linker,
-.Xr ld 1
+.Xr ld 1 ,
 as an address within the appropriate segment.
 .Fa n_value
 fields of symbols not in any segment are unchanged by the linker.
diff --git a/share/man/man5/sysctl.conf.5 b/share/man/man5/sysctl.conf.5
index 788980f3e00..145062085e5 100644
--- a/share/man/man5/sysctl.conf.5
+++ b/share/man/man5/sysctl.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sysctl.conf.5,v 1.5 1999/07/07 10:50:09 aaron Exp $
+.\" $OpenBSD: sysctl.conf.5,v 1.6 2000/02/29 04:48:39 aaron Exp $
 .\"
 .\" Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
 .\" All rights reserved.
@@ -30,12 +30,12 @@
 .Os
 .Sh NAME
 .Nm sysctl.conf
-.Nd sysctl variables to set at bootup
+.Nd sysctl variables to set at system startup
 .Sh DESCRIPTION
 .Nm
 contains a list of
 .Xr sysctl 8
-variable assignments that is read on bootup by
+variable assignments that is read at system startup by
 .Xr rc 8
 early on in the boot sequence.
 .Pp
diff --git a/share/man/man5/types.5 b/share/man/man5/types.5
index ff8759a2d4b..f85e8c33611 100644
--- a/share/man/man5/types.5
+++ b/share/man/man5/types.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: types.5,v 1.6 1999/05/23 14:11:05 aaron Exp $
+.\"	$OpenBSD: types.5,v 1.7 2000/02/29 04:48:39 aaron Exp $
 .\"	$NetBSD: types.5,v 1.4 1997/07/10 06:56:38 mikel Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -43,9 +43,9 @@
 .Sh SYNOPSIS
 .Fd #include <sys/types.h>
 .Sh DESCRIPTION
-The file
-.Pa Aq sys/types.h
-contains the defined data types used in the kernel (most are
+The
+.Aq Pa sys/types.h
+file contains the defined data types used in the kernel (most are
 used throughout the system).
 .Bd -literal
 #ifndef _SYS_TYPES_H_
diff --git a/share/man/man5/utmp.5 b/share/man/man5/utmp.5
index 76151c89184..14fafb7d8cb 100644
--- a/share/man/man5/utmp.5
+++ b/share/man/man5/utmp.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: utmp.5,v 1.12 2000/01/18 21:49:00 aaron Exp $
+.\"	$OpenBSD: utmp.5,v 1.13 2000/02/29 04:48:39 aaron Exp $
 .\"	$NetBSD: utmp.5,v 1.5 1994/11/30 19:31:35 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1991, 1993
@@ -43,17 +43,17 @@
 .Sh SYNOPSIS
 .Fd #include <utmp.h>
 .Sh DESCRIPTION
-The file
+The
 .Aq Pa utmp.h
-declares the structures used to record information about current
+file declares the structures used to record information about current
 users in the
-.Nm
+.Nm utmp
 file, logins and logouts in the
 .Nm wtmp
 file, and last logins in the
 .Nm lastlog
 file.
-The time stamps of date changes, shutdowns and reboots are also logged in
+The time stamps of date changes, shutdowns, and reboots are also logged in
 the
 .Nm wtmp
 file.
@@ -91,12 +91,13 @@ Each time a user logs in, the
 .Xr login
 program looks up the user's
 .Tn UID
-in the file
-.Nm lastlog .
+in the
+.Nm lastlog
+file.
 If it is found, the timestamp of the last time the user logged
-in, the terminal line and the hostname
+in, the terminal line, and the hostname
 are written to the standard output (provided the login is not
-.Dq quiet ,
+.Dq quiet ;
 see
 .Xr login 1 ) .
 The
@@ -112,14 +113,13 @@ record is written,
 .\" .Xr libutil 3
 .\" routine
 the
-.Nm
+.Nm utmp
 file is opened and the
 .Fa utmp
-record for the user inserted.
-This record remains there until
-the user logs out at which time it is deleted.
+record for the user is inserted.
+This record remains until the user logs out at which time it is deleted.
 The
-.Nm
+.Nm utmp
 file is used by the programs
 .Xr rwho 1 ,
 .Xr users 1 ,
@@ -198,17 +198,8 @@ strings are thus not guaranteed to be null terminated.
 .Sh FILES
 .Bl -tag -width /var/log/lastlog -compact
 .It Pa /var/run/utmp
-the
-.Nm
-file
 .It Pa /var/log/wtmp
-the
-.Nm wtmp
-file
 .It Pa /var/log/lastlog
-the
-.Nm lastlog
-file
 .El
 .Sh SEE ALSO
 .Xr last 1 ,
@@ -218,7 +209,7 @@ file
 .Xr init 8
 .Sh HISTORY
 A
-.Nm
+.Nm utmp
 and
 .Nm wtmp
 file format appeared in