diff --git a/sbin/natd/natd.8 b/sbin/natd/natd.8
index 4389afc90d6d..d526cb330c44 100644
--- a/sbin/natd/natd.8
+++ b/sbin/natd/natd.8
@@ -395,8 +395,13 @@ the script in the background should be enough to prevent this disaster.
 This program is the result of the efforts of many people at different
 times:
 
-  Divert sockets:               Archie Cobbs <archie@whistle.com>
-  Packet aliasing:              Charles Mott <cmott@srv.net>
-  IRC support & misc additions: Eivind Eklund <perhaps@yes.no>
-  Natd:                         Ari Suutari <suutari@iki.fi>
-  Glue:                         Brian Somers <brian@awfulhak.org>
+.An Archie Cobbs Aq archie@whistle.com
+(divert sockets)
+.An Charles Mott Aq cmott@srv.net
+(packet aliasing)
+.An Eivind Eklund Aq perhaps@yes.no
+(IRC support & misc additions)
+.An Ari Suutari Aq suutari@iki.fi
+(natd)
+.An Brian Somers Aq brian@awfulhak.org
+(glue)
diff --git a/usr.sbin/amd/amd/amd.8 b/usr.sbin/amd/amd/amd.8
index 71e0f78a1e73..61a6481b9eab 100644
--- a/usr.sbin/amd/amd/amd.8
+++ b/usr.sbin/amd/amd/amd.8
@@ -37,7 +37,7 @@
 .\"
 .\"     @(#)amd.8	5.10 (Berkeley) 4/19/94
 .\"
-.\" $Id: amd.8,v 1.5 1997/02/22 16:01:26 peter Exp $
+.\" $Id: amd.8,v 1.6 1997/06/23 04:03:24 steve Exp $
 .\"
 .Dd April 19, 1994
 .Dt AMD 8
@@ -223,9 +223,9 @@ the features.
 .Rs
 .%T Amd \- The 4.4 BSD Automounter
 .Re
-.Sh AUTHOR
-.An Jan-Simon Pendry
-<jsp@doc.ic.ac.uk>, Department of Computing, Imperial College, London, UK.
+.Sh AUTHORS
+.An Jan-Simon Pendry Aq jsp@doc.ic.ac.uk ,
+Department of Computing, Imperial College, London, UK.
 .Sh HISTORY
 The
 .Nm amd
diff --git a/usr.sbin/amd/amq/amq.8 b/usr.sbin/amd/amq/amq.8
index ba3b9bac4e31..708140be83c7 100644
--- a/usr.sbin/amd/amq/amq.8
+++ b/usr.sbin/amd/amq/amq.8
@@ -37,7 +37,7 @@
 .\"
 .\"     @(#)amq.8	8.3 (Berkeley) 4/18/94
 .\"
-.\" $Id$
+.\" $Id: amq.8,v 1.5 1997/02/22 16:02:06 peter Exp $
 .\"
 .Dd March 16, 1991
 .Dt AMQ 8
@@ -122,9 +122,9 @@ be in the
 database.
 .Sh SEE ALSO
 .Xr amd 8
-.Sh AUTHOR
-.An Jan-Simon Pendry
-<jsp@doc.ic.ac.uk>, Department of Computing, Imperial College, London, UK.
+.Sh AUTHORS
+.An Jan-Simon Pendry Aq jsp@doc.ic.ac.uk ,
+Department of Computing, Imperial College, London, UK.
 .Sh HISTORY
 .Nm Amq
 first appeared in 4.4BSD.
diff --git a/usr.sbin/apm/apm.8 b/usr.sbin/apm/apm.8
index d3a063af1baf..240671f5d3c2 100644
--- a/usr.sbin/apm/apm.8
+++ b/usr.sbin/apm/apm.8
@@ -99,5 +99,5 @@ or
 .Sh SEE ALSO
 .Xr apm 4 ,
 .Xr apmconf 8
-.Sh AUTHOR
-Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org>
+.Sh AUTHORS
+.An Tatsumi Hosokawa Aq hosokawa@jp.FreeBSD.org
diff --git a/usr.sbin/apmconf/apmconf.8 b/usr.sbin/apmconf/apmconf.8
index dfcabb568476..9a13fc82b585 100644
--- a/usr.sbin/apmconf/apmconf.8
+++ b/usr.sbin/apmconf/apmconf.8
@@ -54,5 +54,5 @@ for details.
 .Xr apm 4 ,
 .Xr apm 8 ,
 .Xr zzz 8
-.Sh AUTHOR
-Tatsumi Hosokawa <hosokawa@mjp.FreeBSD.org>
+.Sh AUTHORS
+.An Tatsumi Hosokawa Aq hosokawa@jp.FreeBSD.org
diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.8 b/usr.sbin/bootparamd/bootparamd/bootparamd.8
index 3573137f0a92..7e85edb247d9 100644
--- a/usr.sbin/bootparamd/bootparamd/bootparamd.8
+++ b/usr.sbin/bootparamd/bootparamd/bootparamd.8
@@ -43,6 +43,6 @@ The file to use as boot parameter file instead of
 .El
 .Sh BUGS
 You may find the syslog loggings to be verbose.
-.Sh AUTHOR
+.Sh AUTHORS
 Written by
 .An Klas Heggemann Aq klas@nada.kth.se
diff --git a/usr.sbin/cron/cron/cron.8 b/usr.sbin/cron/cron/cron.8
index dddea8f4cbc2..256de2b0fb1f 100644
--- a/usr.sbin/cron/cron/cron.8
+++ b/usr.sbin/cron/cron/cron.8
@@ -15,7 +15,7 @@
 .\" * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
 .\" */
 .\" 
-.\" $Id: cron.8,v 1.4 1997/02/22 16:04:39 peter Exp $
+.\" $Id: cron.8,v 1.5 1997/09/15 06:39:03 charnier Exp $
 .\" 
 .Dd December 20, 1993
 .Dt CRON 8
@@ -71,5 +71,5 @@ crontab.
 .Sh SEE ALSO
 .Xr crontab 1 ,
 .Xr crontab 5 
-.Sh AUTHOR
+.Sh AUTHORS
 .An Paul Vixie Aq paul@vix.com
diff --git a/usr.sbin/cron/crontab/crontab.1 b/usr.sbin/cron/crontab/crontab.1
index 9d13f4b904e2..0a12ace4d263 100644
--- a/usr.sbin/cron/crontab/crontab.1
+++ b/usr.sbin/cron/crontab/crontab.1
@@ -15,7 +15,7 @@
 .\" * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
 .\" */
 .\"
-.\" $Id: crontab.1,v 1.3 1997/02/22 16:04:51 peter Exp $
+.\" $Id: crontab.1,v 1.4 1997/09/15 06:39:13 charnier Exp $
 .\"
 .Dd December 29, 1993
 .Dt CRONTAB 1
@@ -111,5 +111,5 @@ SVR3 syntax.
 .Sh DIAGNOSTICS
 A fairly informative usage message appears if you run it with a bad command
 line.
-.Sh AUTHOR
+.Sh AUTHORS
 .An Paul Vixie Aq paul@vix.com
diff --git a/usr.sbin/cron/crontab/crontab.5 b/usr.sbin/cron/crontab/crontab.5
index c9d5bb5169fa..bd8625e9365e 100644
--- a/usr.sbin/cron/crontab/crontab.5
+++ b/usr.sbin/cron/crontab/crontab.5
@@ -15,7 +15,7 @@
 .\" * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
 .\" */
 .\"
-.\" $Id: crontab.5,v 1.6 1997/09/29 19:11:36 wosch Exp $
+.\" $Id: crontab.5,v 1.7 1997/11/02 17:22:10 ache Exp $
 .\" 
 .Dd January 24, 1994
 .Dt CRONTAB 5
@@ -221,5 +221,5 @@ Command output is mailed to the crontab owner (BSD can't do this), can be
 mailed to a person other than the crontab owner (SysV can't do this), or the
 feature can be turned off and no mail will be sent at all (SysV can't do this
 either).
-.Sh AUTHOR
+.Sh AUTHORS
 .An Paul Vixie Aq paul@vix.com
diff --git a/usr.sbin/crunch/crunchgen/crunchgen.1 b/usr.sbin/crunch/crunchgen/crunchgen.1
index 47243b7e04d7..367cd2c85142 100644
--- a/usr.sbin/crunch/crunchgen/crunchgen.1
+++ b/usr.sbin/crunch/crunchgen/crunchgen.1
@@ -271,8 +271,8 @@ Some versions of the BSD build environment do not by default build the
 intermediate object file for single-source file programs.  The ``make
 objs'' target must then be used to get those object files built, or
 some other arrangements made.
-.Sh AUTHOR
+.Sh AUTHORS
 .Nm Crunch
-was written by James da Silva <jds@cs.umd.edu>.
-.sp 0
+was written by
+.An James da Silva Aq jds@cs.umd.edu .
 Copyright (c) 1994 University of Maryland.  All Rights Reserved.
diff --git a/usr.sbin/crunch/crunchide/crunchide.1 b/usr.sbin/crunch/crunchide/crunchide.1
index 38a04cf6b93f..a12f692c0aa2 100644
--- a/usr.sbin/crunch/crunchide/crunchide.1
+++ b/usr.sbin/crunch/crunchide/crunchide.1
@@ -61,8 +61,8 @@ multiple component programs.
 .Sh SEE ALSO
 .Xr crunchgen 1 ,
 .Xr ld 1
-.Sh AUTHOR
+.Sh AUTHORS
 .Nm Crunch
-was written by James da Silva <jds@cs.umd.edu>.
-.sp 0
+was written by
+.An James da Silva Aq jds@cs.umd.edu .
 Copyright (c) 1994 University of Maryland.  All Rights Reserved.
diff --git a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1 b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
index 2338acfc5a8f..24789276cb2d 100644
--- a/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
+++ b/usr.sbin/ctm/ctm_rmail/ctm_rmail.1
@@ -470,10 +470,10 @@ turn up here too.  Error messages should be self explanatory.
 .Xr ctm 5
 .\" .Sh STANDARDS
 .\" .Sh HISTORY
-.Sh AUTHOR
+.Sh AUTHORS
 .An Stephen McKay Aq mckay@FreeBSD.org
 .\" .Sh BUGS
 .\" Gosh!  No bugs here!
 .\" This message brought to you by the Coalition for More Humour in Man Pages.
 .\"
-.\" $Id: ctm_rmail.1,v 1.11 1997/08/30 11:05:34 jmg Exp $
+.\" $Id: ctm_rmail.1,v 1.12 1997/09/17 06:24:50 charnier Exp $
diff --git a/usr.sbin/fdcontrol/fdcontrol.8 b/usr.sbin/fdcontrol/fdcontrol.8
index ace5cf2c6e47..edc02f3ca689 100644
--- a/usr.sbin/fdcontrol/fdcontrol.8
+++ b/usr.sbin/fdcontrol/fdcontrol.8
@@ -91,7 +91,7 @@ to overflow the syslog if not used with extreme care.
 .Nm Fdcontrol
 is currently under development. It's user interface and overall
 functionality are subjects to future improvements and changes.
-.Sh AUTHOR
+.Sh AUTHORS
 The program has been contributed by
 .if n Joerg Wunsch,
 .if t J\(:org Wunsch,
diff --git a/usr.sbin/fdformat/fdformat.1 b/usr.sbin/fdformat/fdformat.1
index e4bcff465f45..436d83430a80 100644
--- a/usr.sbin/fdformat/fdformat.1
+++ b/usr.sbin/fdformat/fdformat.1
@@ -150,8 +150,12 @@ and upgraded to the new
 floppy disk driver. It later became part of the
 .Fx 1.1
 system.
-.Sh AUTHOR
+.Sh AUTHORS
 The program has been contributed by
 .if n Joerg Wunsch,
 .if t J\(:org Wunsch,
-Dresden, with changes by Serge Vakulenko and Andrey A. Chernov, Moscow.
+Dresden, with changes by
+.An Serge Vakulenko
+and
+.An Andrey A. Chernov ,
+Moscow.
diff --git a/usr.sbin/fdwrite/fdwrite.1 b/usr.sbin/fdwrite/fdwrite.1
index 53cb70e8de4c..f0f5f885aa4e 100644
--- a/usr.sbin/fdwrite/fdwrite.1
+++ b/usr.sbin/fdwrite/fdwrite.1
@@ -6,7 +6,7 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" $Id: fdwrite.1,v 1.5 1997/05/19 16:33:27 eivind Exp $
+.\" $Id: fdwrite.1,v 1.6 1997/09/18 06:35:51 charnier Exp $
 .\"
 .\"
 .Dd September 16, 1993
@@ -88,13 +88,13 @@ here is done on the fly,
 thus reducing the amount of work for the floppy-jockey.
 
 .Sh SEE ALSO
-.Xr fdformat 1 .
+.Xr fdformat 1
 .Sh HISTORY
 .Nm Fdwrite
 was written while waiting for ``make world'' to complete.
 Some of the code was taken from
 .Xr fdformat 1 .
-.Sh AUTHOR
+.Sh AUTHORS
 The program has been contributed by
 .An Poul-Henning Kamp Aq phk@login.dknet.dk
 .Sh BUGS
diff --git a/usr.sbin/kbdmap/kbdmap.1 b/usr.sbin/kbdmap/kbdmap.1
index 7985037fb684..1b62c1fa469e 100644
--- a/usr.sbin/kbdmap/kbdmap.1
+++ b/usr.sbin/kbdmap/kbdmap.1
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: kbdmap.1,v 1.12 1997/08/30 12:22:44 jmg Exp $
+.\" $Id: kbdmap.1,v 1.13 1997/09/19 06:29:52 charnier Exp $
 
 .Dd Mar 25, 1995
 .Dt KBDMAP 1
@@ -125,7 +125,7 @@ and
 .Nm vidfont
 commands appeared in
 .Fx 2.1 .
-.Sh AUTHOR
+.Sh AUTHORS
 .An Wolfram Schneider
 .Aq wosch@FreeBSD.org ,
 Berlin.
diff --git a/usr.sbin/lpr/chkprintcap/chkprintcap.8 b/usr.sbin/lpr/chkprintcap/chkprintcap.8
index fce427ed26ed..6c689b9a98ca 100644
--- a/usr.sbin/lpr/chkprintcap/chkprintcap.8
+++ b/usr.sbin/lpr/chkprintcap/chkprintcap.8
@@ -25,7 +25,7 @@
 .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\"	$Id: chkprintcap.8,v 1.1 1997/12/02 20:45:09 wollman Exp $
 .Dd November 30, 1997
 .Dt CHKPRINTCAP 8
 .Os
@@ -83,7 +83,7 @@ capability in the database (default 1, which corresponds to user
 .Xr lpr 1 ,
 .Xr printcap 5 ,
 .Xr lpd 8
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm chkprintcap
 command was written by
diff --git a/usr.sbin/lpr/lp/lp.1 b/usr.sbin/lpr/lp/lp.1
index 1faeba931ccb..6bbd3429a4c7 100644
--- a/usr.sbin/lpr/lp/lp.1
+++ b/usr.sbin/lpr/lp/lp.1
@@ -31,7 +31,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: lp.1,v 1.5 1997/09/18 06:52:35 charnier Exp $
+.\" $Id: lp.1,v 1.6 1997/09/24 06:47:40 charnier Exp $
 .\"
 .Dd January 22, 1995
 .Dt LP 1
@@ -93,7 +93,7 @@ The
 command is expected to comply with the
 .St -p1003.2
 specification.
-.Sh AUTHOR
+.Sh AUTHORS
 This implementation of the
 .Nm
 command has been written by
diff --git a/usr.sbin/lptcontrol/lptcontrol.8 b/usr.sbin/lptcontrol/lptcontrol.8
index d174fe646d3b..dc6e6ffdaab7 100644
--- a/usr.sbin/lptcontrol/lptcontrol.8
+++ b/usr.sbin/lptcontrol/lptcontrol.8
@@ -11,7 +11,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\"
-.\" $Id: lptcontrol.8,v 1.5 1997/02/22 16:06:24 peter Exp $
+.\" $Id: lptcontrol.8,v 1.6 1997/09/25 06:36:28 charnier Exp $
 .Dd September 3, 1994
 .Dt LPTCONTROL 8
 .Os FreeBSD 2
@@ -71,7 +71,7 @@ Kernel configuration file.
 Sure to be some.
 .Sh "SEE ALSO"
 .Xr lpt 4 
-.Sh AUTHOR
+.Sh AUTHORS
 .An Geoffrey M. Rehmet
 .Sh HISTORY
 .Nm Lptcontrol
diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8
index ec031eee32f7..30ea68009f3c 100644
--- a/usr.sbin/mixer/mixer.8
+++ b/usr.sbin/mixer/mixer.8
@@ -127,11 +127,11 @@ command first appeared in
 .Fx 2.0.5 .
 .Sh AUTHORS
 Original source by
-.An  Craig Metz Aq cmetz@thor.tjhsst.edu
+.An Craig Metz Aq cmetz@thor.tjhsst.edu
 and
 .An Hannu Savolainen .
 Mostly rewriten by
-.An John-Mark Gurney Aq jmg@freebsd.org .
+.An John-Mark Gurney Aq jmg@FreeBSD.org .
 This
 manual page was written by
-.An Mike Pritchard Aq mpp@FreeBSD.ORG .
+.An Mike Pritchard Aq mpp@FreeBSD.org .
diff --git a/usr.sbin/mkdosfs/mkdosfs.1 b/usr.sbin/mkdosfs/mkdosfs.1
index 652f0e5eb050..2714e56e9844 100644
--- a/usr.sbin/mkdosfs/mkdosfs.1
+++ b/usr.sbin/mkdosfs/mkdosfs.1
@@ -25,7 +25,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $Id$
+.\" $Id: mkdosfs.1,v 1.5 1997/02/22 16:06:38 peter Exp $
 .\"
 .Dd November 5, 1995
 .Os
@@ -128,7 +128,7 @@ utility.
 .Nm Mkdosfs
 appeared in
 .Fx 2.2 .
-.Sh AUTHOR
+.Sh AUTHORS
 The program has been contributed by
 .if n Joerg Wunsch,
 .if t J\(:org Wunsch,
diff --git a/usr.sbin/moused/moused.8 b/usr.sbin/moused/moused.8
index c3b950a0462f..334ee3cf84f8 100644
--- a/usr.sbin/moused/moused.8
+++ b/usr.sbin/moused/moused.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: moused.8,v 1.11 1998/01/25 15:49:00 yokota Exp $
+.\"	$Id: moused.8,v 1.12 1998/03/12 15:00:04 yokota Exp $
 .\"
 .Dd December 3, 1997
 .Dt MOUSED 8
@@ -546,7 +546,7 @@ command was written by
 This manual page was written by
 .An Mike Pritchard Aq mpp@FreeBSD.org .
 The command and the manual page have been updated by
-.An Kazutaka YOKOTA Aq yokota@FreeBSD.org
+.An Kazutaka Yokota Aq yokota@FreeBSD.org
 since.
 .Sh HISTORY
 The
diff --git a/usr.sbin/mptable/mptable.1 b/usr.sbin/mptable/mptable.1
index 19c66042fce0..c36231f05736 100644
--- a/usr.sbin/mptable/mptable.1
+++ b/usr.sbin/mptable/mptable.1
@@ -62,4 +62,4 @@ The
 command first appeared in
 .Fx 3.0 .
 .Sh AUTHORS
-.An Steve Passe Aq fsmp@FreeBSD.ORG
+.An Steve Passe Aq fsmp@FreeBSD.org
diff --git a/usr.sbin/mrouted/map-mbone.8 b/usr.sbin/mrouted/map-mbone.8
index 8091467a80d1..170001bfb66f 100644
--- a/usr.sbin/mrouted/map-mbone.8
+++ b/usr.sbin/mrouted/map-mbone.8
@@ -76,5 +76,5 @@ must be run as root.
 .Xr mrouted 8 ,
 .Xr mrinfo 8 ,
 .Xr mtrace 8
-.Sh AUTHOR
+.Sh AUTHORS
 .An Pavel Curtis
diff --git a/usr.sbin/mrouted/mrinfo.8 b/usr.sbin/mrouted/mrinfo.8
index 7ad6466323ef..1f291f49cd3c 100644
--- a/usr.sbin/mrouted/mrinfo.8
+++ b/usr.sbin/mrouted/mrinfo.8
@@ -72,5 +72,5 @@ must be run as root.
 .Xr mrouted 8 ,
 .Xr map-mbone 8 ,
 .Xr mtrace 8
-.Sh AUTHOR
+.Sh AUTHORS
 .An Van Jacobson
diff --git a/usr.sbin/mrouted/mtrace.8 b/usr.sbin/mrouted/mtrace.8
index 3316ae5b1ec9..058d79fc3a8c 100644
--- a/usr.sbin/mrouted/mtrace.8
+++ b/usr.sbin/mrouted/mtrace.8
@@ -515,7 +515,7 @@ Querying full reverse path... * switching to hop-by-hop:
  -5  * * * noc.hpc.org (192.187.8.2) [mrouted 2.2] didn't respond
 Round trip time 95 ms
 .fi
-.Sh AUTHOR
+.Sh AUTHORS
 Implemented by
 .An Steve Casner
 based on an initial prototype written by
diff --git a/usr.sbin/natd/natd.8 b/usr.sbin/natd/natd.8
index 4389afc90d6d..d526cb330c44 100644
--- a/usr.sbin/natd/natd.8
+++ b/usr.sbin/natd/natd.8
@@ -395,8 +395,13 @@ the script in the background should be enough to prevent this disaster.
 This program is the result of the efforts of many people at different
 times:
 
-  Divert sockets:               Archie Cobbs <archie@whistle.com>
-  Packet aliasing:              Charles Mott <cmott@srv.net>
-  IRC support & misc additions: Eivind Eklund <perhaps@yes.no>
-  Natd:                         Ari Suutari <suutari@iki.fi>
-  Glue:                         Brian Somers <brian@awfulhak.org>
+.An Archie Cobbs Aq archie@whistle.com
+(divert sockets)
+.An Charles Mott Aq cmott@srv.net
+(packet aliasing)
+.An Eivind Eklund Aq perhaps@yes.no
+(IRC support & misc additions)
+.An Ari Suutari Aq suutari@iki.fi
+(natd)
+.An Brian Somers Aq brian@awfulhak.org
+(glue)
diff --git a/usr.sbin/newsyslog/newsyslog.8 b/usr.sbin/newsyslog/newsyslog.8
index 58415195a990..e7ee112c6169 100644
--- a/usr.sbin/newsyslog/newsyslog.8
+++ b/usr.sbin/newsyslog/newsyslog.8
@@ -1,7 +1,7 @@
 .\" This file contains changes from the Open Software Foundation.
 .\"
 .\"	from: @(#)newsyslog.8
-.\"	$Id: newsyslog.8,v 1.9 1997/10/06 07:46:06 charnier Exp $
+.\"	$Id: newsyslog.8,v 1.10 1998/03/14 22:28:24 pst Exp $
 .\"
 .\" Copyright 1988, 1989 by the Massachusetts Institute of Technology
 .\" 
@@ -167,7 +167,7 @@ configuration file.
 .El
 .Sh BUGS
 Doesn't yet automatically read the logs to find security breaches.
-.Sh AUTHOR
+.Sh AUTHORS
 .An Theodore Ts'o ,
 MIT Project Athena
 .Pp
diff --git a/usr.sbin/pccard/pccardd/pccardd.8 b/usr.sbin/pccard/pccardd/pccardd.8
index cf4d4c70f082..97feb0a42528 100644
--- a/usr.sbin/pccard/pccardd/pccardd.8
+++ b/usr.sbin/pccard/pccardd/pccardd.8
@@ -23,7 +23,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: pccardd.8,v 1.8 1997/10/06 11:36:07 charnier Exp $
+.\"	$Id: pccardd.8,v 1.9 1997/12/25 09:36:41 hoek Exp $
 .\"
 .Dd November 1, 1994
 .Dt PCCARD 8
@@ -137,7 +137,7 @@ interface to the card.
 .Sh SEE ALSO
 .Xr pccard.conf 5 ,
 .Xr ifconfig 8
-.Sh AUTHOR
+.Sh AUTHORS
 Developed by
 .An Andrew McRae Aq andrew@mega.com.au .
 .Sh BUGS
diff --git a/usr.sbin/pcvt/mcon/mcon.1 b/usr.sbin/pcvt/mcon/mcon.1
index 800d5eab1bea..61bd46753f9a 100644
--- a/usr.sbin/pcvt/mcon/mcon.1
+++ b/usr.sbin/pcvt/mcon/mcon.1
@@ -160,7 +160,7 @@ The
 utility appeared in
 .Xr pcvt 4 ,
 release 3.00.
-.Sh AUTHOR
+.Sh AUTHORS
 The mouse emulator has been contributed by
 .if n Joerg Wunsch.
 .if t J\(:org Wunsch.
diff --git a/usr.sbin/periodic/periodic.8 b/usr.sbin/periodic/periodic.8
index 3ac852cd803e..0ccb11bcf2f0 100644
--- a/usr.sbin/periodic/periodic.8
+++ b/usr.sbin/periodic/periodic.8
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: periodic.8,v 1.5 1997/08/19 16:49:35 pst Exp $
+.\"	$Id: periodic.8,v 1.6 1997/09/29 19:11:44 wosch Exp $
 .\"
 .Dd 13 August 1997
 .Os FreeBSD 3.0
@@ -133,5 +133,5 @@ The
 .Nm
 program first appeared in
 .Fx 3.0 .
-.Sh AUTHOR
-.An Paul Traina Aq pst@FreeBSD.ORG .
+.Sh AUTHORS
+.An Paul Traina Aq pst@FreeBSD.org
diff --git a/usr.sbin/pkg_install/add/pkg_add.1 b/usr.sbin/pkg_install/add/pkg_add.1
index 32431effa4bd..16b956f1df0d 100644
--- a/usr.sbin/pkg_install/add/pkg_add.1
+++ b/usr.sbin/pkg_install/add/pkg_add.1
@@ -342,12 +342,10 @@ period.
 .Xr sysconf 3 ,
 .Xr mtree 8
 .Sh AUTHORS
-.Bl -tag -width indent -compact
-.It "Jordan Hubbard"
-Initial work and ongoing development.
-.It "John Kohl"
-NetBSD refinements.
-.El
+.An Jordan Hubbard
+for initial work and ongoing development.
+.An John Kohl
+for NetBSD refinements.
 .Sh BUGS
 Hard links between files in a distribution are only preserved if either
 (1) the staging area is on the same file system as the target directory of
diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1
index 8d6a068ea8d9..797ad8616f61 100644
--- a/usr.sbin/pkg_install/create/pkg_create.1
+++ b/usr.sbin/pkg_install/create/pkg_create.1
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_create.1
-.\"	$Id: pkg_create.1,v 1.22 1997/09/27 13:41:33 hoek Exp $	
+.\"	$Id: pkg_create.1,v 1.23 1997/10/08 07:46:32 charnier Exp $	
 .\"
 .\" hacked up by John Kohl for NetBSD--fixed a few bugs, extended keywords,
 .\" added dependency tracking, etc.
@@ -357,18 +357,17 @@ directives may be used if the package depends on multiple other packages.
 .Xr pkg_add 1 ,
 .Xr pkg_delete 1 ,
 .Xr pkg_info 1 ,
-.Xr sysconf 3 .
+.Xr sysconf 3
 .Sh HISTORY
 The
 .Nm
-command first appeared in FreeBSD.
+command first appeared in
+.Bx Free .
 .Sh AUTHORS
-.Bl -tag -width indent -compact
-.It "Jordan Hubbard"
-most of the work
-.It "John Kohl"
-refined it for NetBSD
-.El
+.An Jordan Hubbard
+for most of the work.
+.An John Kohl
+for NetBSD refinements.
 .Sh BUGS
 Hard links between files in a distribution must be bracketed by
 .Cm @cwd
diff --git a/usr.sbin/pkg_install/delete/pkg_delete.1 b/usr.sbin/pkg_install/delete/pkg_delete.1
index 9a85d5cab2ff..31888e7338c9 100644
--- a/usr.sbin/pkg_install/delete/pkg_delete.1
+++ b/usr.sbin/pkg_install/delete/pkg_delete.1
@@ -166,13 +166,11 @@ or
 .Xr pkg_create 1 ,
 .Xr pkg_info 1 ,
 .Xr mktemp 3 ,
-.Xr mtree 8 .
+.Xr mtree 8
 .Sh AUTHORS
-.Bl -tag -width indent -compact
-.It "Jordan Hubbard"
-most of the work
-.It "John Kohl"
-refined it for NetBSD
-.El
+.An Jordan Hubbard
+for most of the work.
+.An John Kohl
+for NetBSD refinements.
 .Sh BUGS
 Sure to be some.
diff --git a/usr.sbin/pkg_install/info/pkg_info.1 b/usr.sbin/pkg_install/info/pkg_info.1
index ea8df62036b1..9c3df4bdfeb4 100644
--- a/usr.sbin/pkg_install/info/pkg_info.1
+++ b/usr.sbin/pkg_install/info/pkg_info.1
@@ -123,13 +123,11 @@ in
 .Xr pkg_create 1 ,
 .Xr pkg_delete 1 ,
 .Xr mktemp 3 ,
-.Xr mtree 8 .
+.Xr mtree 8
 .Sh AUTHORS
-.Bl -tag -width indent -compact
-.It "Jordan Hubbard"
-most of the work
-.It "John Kohl"
-refined it for NetBSD
-.El
+.An Jordan Hubbard
+for most of the work.
+.An John Kohl
+for NetBSD refinements.
 .Sh BUGS
 Sure to be some.
diff --git a/usr.sbin/rndcontrol/rndcontrol.8 b/usr.sbin/rndcontrol/rndcontrol.8
index d2dedbfd2b64..1dc7b4857948 100644
--- a/usr.sbin/rndcontrol/rndcontrol.8
+++ b/usr.sbin/rndcontrol/rndcontrol.8
@@ -30,7 +30,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $Id: rndcontrol.8,v 1.6 1997/02/22 16:12:47 peter Exp $
+.\" $Id: rndcontrol.8,v 1.7 1997/10/13 11:08:45 charnier Exp $
 .\"
 .Dd October 20, 1995
 .Dt RNDCONTROL 8
@@ -83,7 +83,7 @@ random device
 Sure to be some.
 .Sh "SEE ALSO"
 .Xr random 4 
-.Sh AUTHOR
+.Sh AUTHORS
 .An Theodore Ts'o
 wrote the core code.
 .An Mark Murray
diff --git a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8 b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
index 45067221e718..4047417b57c4 100644
--- a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
+++ b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: rpc.yppasswdd.8,v 1.7 1997/02/22 16:12:53 peter Exp $
+.\"	$Id: rpc.yppasswdd.8,v 1.8 1997/10/13 11:18:46 charnier Exp $
 .\"
 .Dd February 8, 1996
 .Dt RPC.YPPASSWDD 8
@@ -323,5 +323,5 @@ information or shell, then the cleartext password sent with the update
 will still be valid once the update is completed. If the network is
 insecure, this cleartext password could be intercepted and used to
 gain unauthorized access to the user's account.
-.Sh AUTHOR
+.Sh AUTHORS
 .An Bill Paul Aq wpaul@ctr.columbia.edu
diff --git a/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8 b/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
index 5a403cc3941f..37d15d6bbace 100644
--- a/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
+++ b/usr.sbin/rpc.ypxfrd/rpc.ypxfrd.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: rpc.ypxfrd.8,v 1.5 1997/02/22 16:13:01 peter Exp $
+.\"	$Id: rpc.ypxfrd.8,v 1.6 1997/10/13 11:22:35 charnier Exp $
 .\"
 .Dd June 2, 1996
 .Dt RPC.YPXFRD 8
@@ -136,5 +136,5 @@ implementation uses Berkeley DB. These two packages use vastly different
 file formats. Furthermore, ndbm is byte-order sensitive and not very
 smart about it, meaning that am ndbm database created on a big endian
 system can't be read on a little endian system.
-.Sh AUTHOR
+.Sh AUTHORS
 .An Bill Paul Aq wpaul@ctr.columbia.edu
diff --git a/usr.sbin/rtprio/rtprio.1 b/usr.sbin/rtprio/rtprio.1
index ccf55256f769..b89ab50b7edd 100644
--- a/usr.sbin/rtprio/rtprio.1
+++ b/usr.sbin/rtprio/rtprio.1
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: rtprio.1,v 1.13 1997/12/28 20:52:56 jraynard Exp $
+.\"	$Id: rtprio.1,v 1.14 1998/03/12 01:29:12 jkh Exp $
 .\"
 .Dd July 23, 1994
 .Dt RTPRIO 1
@@ -196,7 +196,7 @@ Under
 system calls are currently never preempted, therefore non-realtime
 processes can starve realtime processes, or idletime processes can
 starve normal priority processes.
-.Sh AUTHOR
+.Sh AUTHORS
 .An Henrik Vestergaard Draboel Aq hvd@terry.ping.dk
 is the original author. This
 implementation in
diff --git a/usr.sbin/sa/sa.8 b/usr.sbin/sa/sa.8
index fd6e8a4ecdce..e79217e4e7b7 100644
--- a/usr.sbin/sa/sa.8
+++ b/usr.sbin/sa/sa.8
@@ -27,7 +27,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: sa.8,v 1.7 1997/02/22 16:13:12 peter Exp $
+.\"	$Id: sa.8,v 1.8 1997/10/15 06:41:18 charnier Exp $
 .\"
 .Dd February 25, 1994
 .Dt SA 8
@@ -234,5 +234,5 @@ The formats of the summary files created by this version of
 are very different than the those used by the original version.
 This is not considered a problem, however, because the accounting record
 format has changed as well (since user ids are now 32 bits).
-.Sh AUTHOR
+.Sh AUTHORS
 .An Chris G. Demetriou Aq cgd@postgres.berkeley.edu
diff --git a/usr.sbin/sgsc/sgsc.1 b/usr.sbin/sgsc/sgsc.1
index 5078c0b01827..0cbf44c5831c 100644
--- a/usr.sbin/sgsc/sgsc.1
+++ b/usr.sbin/sgsc/sgsc.1
@@ -93,5 +93,5 @@ file format
 .El
 .Sh SEE ALSO
 .Xr gsc 4
-.Sh AUTHOR
+.Sh AUTHORS
 .An Gunther Schadow Aq gusw@fub46.zedat.fu-berlin.de
diff --git a/usr.sbin/sicontrol/sicontrol.8 b/usr.sbin/sicontrol/sicontrol.8
index 5443a1b34d3e..7360b3781e65 100644
--- a/usr.sbin/sicontrol/sicontrol.8
+++ b/usr.sbin/sicontrol/sicontrol.8
@@ -1,4 +1,4 @@
-.\" $Id: sicontrol.8,v 1.6 1997/02/22 16:13:30 peter Exp $
+.\" $Id: sicontrol.8,v 1.7 1997/10/15 06:43:52 charnier Exp $
 .\" The following requests are required for all man pages.
 .Dd September 26,1995
 .Dt SICONTROL 8
@@ -109,6 +109,6 @@ which was written by
 .Pp
 Specialix International do not support this device driver in any way.
 .Sh AUTHORS
-.An Peter Wemm Aq peter@freebsd.org
+.An Peter Wemm Aq peter@FreeBSD.org
 .Sh BUGS
 Bound to be many... :-)
diff --git a/usr.sbin/tcpdump/tcpslice/tcpslice.1 b/usr.sbin/tcpdump/tcpslice/tcpslice.1
index 4435a4a73655..2ac75e18915c 100644
--- a/usr.sbin/tcpdump/tcpslice/tcpslice.1
+++ b/usr.sbin/tcpdump/tcpslice/tcpslice.1
@@ -17,7 +17,7 @@
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
-.\" $Id$
+.\" $Id: tcpslice.1,v 1.5 1998/01/20 07:30:26 charnier Exp $
 .\"
 .Dd October 14, 1991
 .Dt TCPSLICE 1
@@ -223,10 +223,9 @@ rather than
 .El
 .Sh SEE ALSO
 .Xr tcpdump 1
-.Sh AUTHOR
-.An Vern Paxson Aq vern@ee.lbl.gov
-, of
-Lawrence Berkeley Laboratory, University of California, Berkeley, CA.
+.Sh AUTHORS
+.An Vern Paxson Aq vern@ee.lbl.gov ,
+of Lawrence Berkeley Laboratory, University of California, Berkeley, CA.
 .Sh BUGS
 An input filename that beings with a digit or a `+' can be confused
 with a start/end time.  Such filenames can be specified with a
diff --git a/usr.sbin/watch/watch.8 b/usr.sbin/watch/watch.8
index ae7ba5c685f1..8ae052762400 100644
--- a/usr.sbin/watch/watch.8
+++ b/usr.sbin/watch/watch.8
@@ -78,7 +78,7 @@ Only the superuser can run
 .Sh BUGS
 No terminal emulation is performed.
 All user output is reproduced as-is.
-.Sh AUTHOR
+.Sh AUTHORS
 .An Ugen J.S. Antsilevich Aq ugen@NetVision.net.il
 .Sh HISTORY
 .Nm Watch
diff --git a/usr.sbin/wormcontrol/wormcontrol.8 b/usr.sbin/wormcontrol/wormcontrol.8
index 5b007de41997..a3c3d57e7b5c 100644
--- a/usr.sbin/wormcontrol/wormcontrol.8
+++ b/usr.sbin/wormcontrol/wormcontrol.8
@@ -32,7 +32,7 @@
 .\" USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $Id: wormcontrol.8,v 1.9 1997/06/23 04:52:12 steve Exp $
+.\" $Id: wormcontrol.8,v 1.10 1997/10/27 12:25:37 charnier Exp $
 .\"
 .\" arrgh, hilit19 needs this" :-(
 .Dd January 27, 1996
@@ -168,7 +168,7 @@ pipe a constant data stream into the CD recorder.
 .Sh HISTORY
 .Nm Wormcontrol
 is currently under development.
-.Sh AUTHOR
+.Sh AUTHORS
 The program has been contributed by
 .ie t J\(:org Wunsch,
 .el Joerg Wunsch,
diff --git a/usr.sbin/xten/xten.1 b/usr.sbin/xten/xten.1
index 4a00f330894c..76f8668a59b4 100644
--- a/usr.sbin/xten/xten.1
+++ b/usr.sbin/xten/xten.1
@@ -27,7 +27,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: xten.1,v 1.6 1997/06/23 04:52:13 steve Exp $
+.\"	$Id: xten.1,v 1.7 1997/10/27 12:27:20 charnier Exp $
 .\"
 .Dd October 30, 1993
 .Dt XTEN 1
@@ -109,5 +109,5 @@ commands.
 .It Pa /dev/tw0
 the TW523 special file
 .El
-.Sh AUTHOR
+.Sh AUTHORS
 .An Eugene W. Stark Aq stark@cs.sunysb.edu
diff --git a/usr.sbin/yp_mkdb/yp_mkdb.8 b/usr.sbin/yp_mkdb/yp_mkdb.8
index c9e8dc8ad236..fef5eafda2f8 100644
--- a/usr.sbin/yp_mkdb/yp_mkdb.8
+++ b/usr.sbin/yp_mkdb/yp_mkdb.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: yp_mkdb.8,v 1.6 1997/04/15 07:06:15 jmg Exp $
+.\"	$Id: yp_mkdb.8,v 1.7 1997/10/27 12:29:24 charnier Exp $
 .\"
 .Dd March 12, 1996
 .Dt YP_MKDB 8
@@ -167,5 +167,5 @@ to build the NIS databases
 .Sh SEE ALSO
 .Xr db 3 ,
 .Xr ypserv 8
-.Sh AUTHOR
+.Sh AUTHORS
 .An Bill Paul Aq wpaul@ctr.columbia.edu
diff --git a/usr.sbin/ypbind/ypbind.8 b/usr.sbin/ypbind/ypbind.8
index 3498ae4b95c5..3005b534b7d4 100644
--- a/usr.sbin/ypbind/ypbind.8
+++ b/usr.sbin/ypbind/ypbind.8
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: ypbind.8,v 1.10 1997/05/25 19:49:32 wpaul Exp $
+.\"	$Id: ypbind.8,v 1.11 1997/10/27 07:45:46 charnier Exp $
 .\"
 .Dd April 9, 1995
 .Dt YPBIND 8
@@ -177,5 +177,5 @@ ypbind startup options are specified
 .Xr yp 4 ,
 .Xr ypserv 8 ,
 .Xr ypset 8
-.Sh AUTHOR
+.Sh AUTHORS
 .An Theo de Raadt Aq deraadt@fsa.ca
diff --git a/usr.sbin/yppoll/yppoll.8 b/usr.sbin/yppoll/yppoll.8
index 84219d340dca..f7ecd71bf9c1 100644
--- a/usr.sbin/yppoll/yppoll.8
+++ b/usr.sbin/yppoll/yppoll.8
@@ -34,7 +34,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: yppoll.8,v 1.1 1997/09/21 11:49:10 wosch Exp $
+.\"	$Id: yppoll.8,v 1.2 1997/10/27 12:30:30 charnier Exp $
 .\"
 .Dd October 25, 1994
 .Dt YPPOLL 8
@@ -79,4 +79,6 @@ instead of the default domain as returned by
 .Xr ypbind 8 ,
 .Xr ypset 8
 .Sh AUTHORS
-.An Theo De Raadt and An John Brezak
+.An Theo De Raadt
+and
+.An John Brezak
diff --git a/usr.sbin/yppush/yppush.8 b/usr.sbin/yppush/yppush.8
index 0f51ae94291b..add552991081 100644
--- a/usr.sbin/yppush/yppush.8
+++ b/usr.sbin/yppush/yppush.8
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: yppush.8,v 1.6 1997/02/22 16:15:00 peter Exp $
+.\"	$Id: yppush.8,v 1.7 1997/11/03 07:53:41 charnier Exp $
 .\"
 .Dd February 5, 1995
 .Dt YPPUSH 8
@@ -165,5 +165,5 @@ The mechanism for transferring NIS maps in NIS v1 is different
 than that in NIS version 2. This version of
 .Nm
 has support for transferring maps to NIS v2 systems only.
-.Sh AUTHOR
+.Sh AUTHORS
 .An Bill Paul Aq wpaul@ctr.columbia.edu
diff --git a/usr.sbin/ypserv/ypinit.8 b/usr.sbin/ypserv/ypinit.8
index f64bc070cd76..2b75e04ec30b 100644
--- a/usr.sbin/ypserv/ypinit.8
+++ b/usr.sbin/ypserv/ypinit.8
@@ -28,7 +28,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\"	$Id: ypinit.8,v 1.1 1997/11/10 22:17:11 wpaul Exp $
+.\"	$Id: ypinit.8,v 1.2 1997/11/16 03:49:12 wpaul Exp $
 .\"
 .Dd November 10, 1997
 .Dt YPINIT 8
@@ -168,7 +168,7 @@ It first appeared in
 .Bx Free
 in
 .Fx 3.0 .
-.Sh AUTHOR
+.Sh AUTHORS
 The original script was written by
 .An Mats O Jansson Aq moj@stacken.kth.se .
 It was modified for
diff --git a/usr.sbin/ypserv/ypserv.8 b/usr.sbin/ypserv/ypserv.8
index 740313c284a9..4dd2bf35d46e 100644
--- a/usr.sbin/ypserv/ypserv.8
+++ b/usr.sbin/ypserv/ypserv.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id: ypserv.8,v 1.13 1997/10/29 07:25:05 charnier Exp $
+.\"	$Id: ypserv.8,v 1.14 1997/11/01 15:55:09 jseger Exp $
 .\"
 .Dd February 4, 1995
 .Dt YPSERV 8
@@ -411,7 +411,7 @@ host access control file
 .Xr yppasswdd 8 ,
 .Xr yppush 8 ,
 .Xr ypxfr 8
-.Sh AUTHOR
+.Sh AUTHORS
 .An Bill Paul Aq wpaul@ctr.columbia.edu
 .Sh HISTORY
 This version of
diff --git a/usr.sbin/ypset/ypset.8 b/usr.sbin/ypset/ypset.8
index 60c6fac2c1fa..a5a7ecc92a4f 100644
--- a/usr.sbin/ypset/ypset.8
+++ b/usr.sbin/ypset/ypset.8
@@ -29,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     $Id: ypset.8,v 1.4 1997/02/22 16:15:19 peter Exp $
+.\"     $Id: ypset.8,v 1.5 1997/10/29 07:26:09 charnier Exp $
 .\"
 .Dd October 25, 1994
 .Dt YPSET 8
@@ -81,5 +81,5 @@ instead of the default domain as returned by
 .Xr ypmatch 1 ,
 .Xr yp 4 ,
 .Xr ypbind 8
-.Sh AUTHOR
+.Sh AUTHORS
 .An Theo De Raadt