summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin/date/date.15
-rw-r--r--bin/ed/ed.15
-rw-r--r--games/rogue/rogue.65
-rw-r--r--lib/libc/db/man/dbopen.35
-rw-r--r--lib/libc/net/getaddrinfo.35
-rw-r--r--lib/libc/net/getnameinfo.35
-rw-r--r--lib/libc/net/inet6_option_space.38
-rw-r--r--lib/libc/net/inet6_rthdr_space.38
-rw-r--r--lib/libc/sys/adjtime.25
-rw-r--r--sbin/newfs/newfs.84
-rw-r--r--sbin/newlfs/newlfs.84
-rw-r--r--sbin/ping6/ping6.85
-rw-r--r--share/man/man4/faith.45
-rw-r--r--share/man/man4/icmp6.48
-rw-r--r--share/man/man4/inet6.45
-rw-r--r--share/man/man4/ip6.48
-rw-r--r--usr.bin/chpass/chpass.15
-rw-r--r--usr.bin/passwd/passwd.15
-rw-r--r--usr.bin/ssh/sftp-server.85
-rw-r--r--usr.bin/ssh/sftp.15
-rw-r--r--usr.bin/ssh/ssh-keygen.15
-rw-r--r--usr.sbin/arp/arp.45
-rw-r--r--usr.sbin/faithd/faithd.85
-rw-r--r--usr.sbin/ifmcstat/ifmcstat.85
-rw-r--r--usr.sbin/route6d/route6d.85
-rw-r--r--usr.sbin/spppcontrol/spppcontrol.85
-rw-r--r--usr.sbin/timed/timed/timed.85
-rw-r--r--usr.sbin/timed/timedc/timedc.85
28 files changed, 60 insertions, 90 deletions
diff --git a/bin/date/date.1 b/bin/date/date.1
index ed89420d01b..efdd43dc713 100644
--- a/bin/date/date.1
+++ b/bin/date/date.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: date.1,v 1.29 2001/05/01 17:58:00 aaron Exp $
+.\" $OpenBSD: date.1,v 1.30 2001/06/23 02:33:22 deraadt Exp $
.\" $NetBSD: date.1,v 1.12 1996/03/12 04:32:37 phil Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -198,8 +198,7 @@ record of the user setting the time
.Xr timed 8
.Rs
.%T "TSP: The Time Synchronization Protocol for UNIX 4.3BSD"
-.%A R. Gusella
-.%A S. Zatti
+.%A R. Gusella and S. Zatti
.Re
.Sh DIAGNOSTICS
Exit status is 0 on success, 1 if unable to set the date, and 2
diff --git a/bin/ed/ed.1 b/bin/ed/ed.1
index 1c338f84934..4aa7f49f8d2 100644
--- a/bin/ed/ed.1
+++ b/bin/ed/ed.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ed.1,v 1.30 2001/05/28 15:36:08 aaron Exp $
+.\" $OpenBSD: ed.1,v 1.31 2001/06/23 02:33:21 deraadt Exp $
.\"
.Dd May 2, 1993
.Dt ED 1
@@ -892,8 +892,7 @@ attempts to write the buffer if the terminal hangs up
USD:12-13
.Pp
.Rs
-.%A B. W. Kernighan
-.%A P. J. Plauger
+.%A B. W. Kernighan and P. J. Plauger
.%B Software Tools in Pascal
.%O Addison-Wesley
.%D 1981
diff --git a/games/rogue/rogue.6 b/games/rogue/rogue.6
index 0aafe369f04..974fda5354a 100644
--- a/games/rogue/rogue.6
+++ b/games/rogue/rogue.6
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rogue.6,v 1.5 2001/06/06 20:52:22 pjanzen Exp $
+.\" $OpenBSD: rogue.6,v 1.6 2001/06/23 02:33:20 deraadt Exp $
.\"
.\" Copyright (c) 1988, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -93,8 +93,7 @@ Default save file
.El
.Sh SEE ALSO
.Rs
-.%A Michael C. Toy
-.%A Kenneth C. R. C. Arnold
+.%A Michael C. Toy and Kenneth C. R. C. Arnold
.%T A guide to the Dungeons of Doom
.Re
.Sh AUTHORS
diff --git a/lib/libc/db/man/dbopen.3 b/lib/libc/db/man/dbopen.3
index cd7568670ce..85c15743cca 100644
--- a/lib/libc/db/man/dbopen.3
+++ b/lib/libc/db/man/dbopen.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: dbopen.3,v 1.15 2000/04/18 02:31:35 aaron Exp $
+.\" $OpenBSD: dbopen.3,v 1.16 2001/06/23 02:33:20 deraadt Exp $
.\" $NetBSD: dbopen.3,v 1.6 1995/02/27 13:23:25 cgd Exp $
.\"
.\" Copyright (c) 1997, Phillip F Knaack. All rights reserved.
@@ -534,8 +534,7 @@ for any of the errors specified for the library routine
.Pp
.Rs
.%T "LIBTP: Portable, Modular Transactions for UNIX"
-.%A Margo Seltzer
-.%A Michael Olson
+.%A Margo Seltzer and Michael Olson
.%J USENIX proceedings
.%D Winter 1992
.Re
diff --git a/lib/libc/net/getaddrinfo.3 b/lib/libc/net/getaddrinfo.3
index 741b6d7197e..589f8980e03 100644
--- a/lib/libc/net/getaddrinfo.3
+++ b/lib/libc/net/getaddrinfo.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: getaddrinfo.3,v 1.15 2001/02/12 09:24:47 itojun Exp $
+.\" $OpenBSD: getaddrinfo.3,v 1.16 2001/06/23 02:33:17 deraadt Exp $
.\" $KAME: getaddrinfo.3,v 1.29 2001/02/12 09:24:45 itojun Exp $
.\"
.\" Copyright (c) 1983, 1987, 1991, 1993
@@ -557,8 +557,7 @@ indicate an unknown error.
.%D March 1999
.Re
.Rs
-.%A Tatsuya Jinmei
-.%A Atsushi Onoe
+.%A Tatsuya Jinmei and Atsushi Onoe
.%T "An Extension of Format for IPv6 Scoped Addresses"
.%R internet draft
.%N draft-ietf-ipngwg-scopedaddr-format-02.txt
diff --git a/lib/libc/net/getnameinfo.3 b/lib/libc/net/getnameinfo.3
index f5d40842470..cc69bd7c443 100644
--- a/lib/libc/net/getnameinfo.3
+++ b/lib/libc/net/getnameinfo.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: getnameinfo.3,v 1.12 2001/06/12 23:36:18 itojun Exp $
+.\" $OpenBSD: getnameinfo.3,v 1.13 2001/06/23 02:33:17 deraadt Exp $
.\" $KAME: getnameinfo.3,v 1.20 2001/01/05 13:37:37 itojun Exp $
.\"
.\" Copyright (c) 1983, 1987, 1991, 1993
@@ -273,8 +273,7 @@ The error code can be found in errno.
.%D March 1999
.Re
.Rs
-.%A Tatsuya Jinmei
-.%A Atsushi Onoe
+.%A Tatsuya Jinmei and Atsushi Onoe
.%T "An Extension of Format for IPv6 Scoped Addresses"
.%R internet draft
.%N draft-ietf-ipngwg-scopedaddr-format-02.txt
diff --git a/lib/libc/net/inet6_option_space.3 b/lib/libc/net/inet6_option_space.3
index 4323ead5a99..5fb797b7cca 100644
--- a/lib/libc/net/inet6_option_space.3
+++ b/lib/libc/net/inet6_option_space.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: inet6_option_space.3,v 1.6 2000/05/17 14:36:40 itojun Exp $
+.\" $OpenBSD: inet6_option_space.3,v 1.7 2001/06/23 02:33:18 deraadt Exp $
.\" $KAME: inet6_option_space.3,v 1.7 2000/05/17 14:32:13 itojun Exp $
.\"
.\" Copyright (c) 1983, 1987, 1991, 1993
@@ -425,15 +425,13 @@ RFC2292 gives comprehensive examples in chapter 6.
.\"
.Sh SEE ALSO
.Rs
-.%A W. Stevens
-.%A M. Thomas
+.%A W. Stevens and M. Thomas
.%T "Advanced Sockets API for IPv6"
.%N RFC2292
.%D February 1998
.Re
.Rs
-.%A S. Deering
-.%A R. Hinden
+.%A S. Deering and R. Hinden
.%T "Internet Protocol, Version 6 (IPv6) Specification"
.%N RFC2460
.%D December 1998
diff --git a/lib/libc/net/inet6_rthdr_space.3 b/lib/libc/net/inet6_rthdr_space.3
index 535b8c639fe..050c05d178d 100644
--- a/lib/libc/net/inet6_rthdr_space.3
+++ b/lib/libc/net/inet6_rthdr_space.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: inet6_rthdr_space.3,v 1.6 2000/05/17 14:36:40 itojun Exp $
+.\" $OpenBSD: inet6_rthdr_space.3,v 1.7 2001/06/23 02:33:18 deraadt Exp $
.\" $KAME: inet6_rthdr_space.3,v 1.8 2000/05/17 14:30:15 itojun Exp $
.\"
.\" Copyright (c) 1983, 1987, 1991, 1993
@@ -295,15 +295,13 @@ RFC2292 gives comprehensive examples in chapter 8.
.\"
.Sh SEE ALSO
.Rs
-.%A W. Stevens
-.%A M. Thomas
+.%A W. Stevens and M. Thomas
.%T "Advanced Sockets API for IPv6"
.%N RFC2292
.%D February 1998
.Re
.Rs
-.%A S. Deering
-.%A R. Hinden
+.%A S. Deering and R. Hinden
.%T "Internet Protocol, Version 6 (IPv6) Specification"
.%N RFC2460
.%D December 1998
diff --git a/lib/libc/sys/adjtime.2 b/lib/libc/sys/adjtime.2
index e6e4f3dc1c1..77e89831d1f 100644
--- a/lib/libc/sys/adjtime.2
+++ b/lib/libc/sys/adjtime.2
@@ -1,4 +1,4 @@
-.\" $OpenBSD: adjtime.2,v 1.10 2000/10/18 05:12:08 aaron Exp $
+.\" $OpenBSD: adjtime.2,v 1.11 2001/06/23 02:32:59 deraadt Exp $
.\" $NetBSD: adjtime.2,v 1.5 1995/10/12 15:40:44 jtc Exp $
.\"
.\" Copyright (c) 1980, 1991, 1993
@@ -97,9 +97,8 @@ The process's effective user ID is not that of the superuser.
.Xr timed 8 ,
.Xr timedc 8
.Rs
+.%A R. Gusella and S. Zatti
.%T "TSP: The Time Synchronization Protocol for UNIX 4.3BSD"
-.%A R. Gusella
-.%A S. Zatti
.Re
.Sh HISTORY
The
diff --git a/sbin/newfs/newfs.8 b/sbin/newfs/newfs.8
index f1087dcbd61..9dc79d6274a 100644
--- a/sbin/newfs/newfs.8
+++ b/sbin/newfs/newfs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: newfs.8,v 1.25 2001/04/04 22:06:39 gluk Exp $
+.\" $OpenBSD: newfs.8,v 1.26 2001/06/23 02:33:09 deraadt Exp $
.\" $NetBSD: newfs.8,v 1.12 1995/03/18 14:58:41 cgd Exp $
.\"
.\" Copyright (c) 1983, 1987, 1991, 1993, 1994
@@ -305,7 +305,7 @@ man page for possible options and their meanings.
.%A W. Joy
.%A S. Leffler
.%A R. Fabry
-.%T A Fast File System for UNIX ,
+.%T A Fast File System for UNIX
.%J ACM Transactions on Computer Systems 2
.%V 3
.%P pp 181-197
diff --git a/sbin/newlfs/newlfs.8 b/sbin/newlfs/newlfs.8
index dc10c1a8596..57216dc043c 100644
--- a/sbin/newlfs/newlfs.8
+++ b/sbin/newlfs/newlfs.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: newlfs.8,v 1.9 2000/03/18 22:56:02 aaron Exp $
+.\" $OpenBSD: newlfs.8,v 1.10 2001/06/23 02:33:09 deraadt Exp $
.\" $NetBSD: newlfs.8,v 1.2 1995/03/18 14:58:54 cgd Exp $
.\"
.\" Copyright (c) 1993
@@ -89,7 +89,7 @@ The size of the file system in sectors.
.%A W. Joy
.%A S. Leffler
.%A R. Fabry
-.%T A Fast File System for UNIX ,
+.%T A Fast File System for UNIX
.%J ACM Transactions on Computer Systems 2
.%V 3
.%P pp 181-197
diff --git a/sbin/ping6/ping6.8 b/sbin/ping6/ping6.8
index 0bcb59f4f47..98b63018089 100644
--- a/sbin/ping6/ping6.8
+++ b/sbin/ping6/ping6.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ping6.8,v 1.16 2001/06/22 13:20:21 itojun Exp $
+.\" $OpenBSD: ping6.8,v 1.17 2001/06/23 02:33:10 deraadt Exp $
.\" $KAME: ping6.8,v 1.40 2001/06/22 13:16:02 itojun Exp $
.\"
.\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -426,8 +426,7 @@ ping6 -a agl dst.foo.com
.Xr traceroute 8 ,
.Xr traceroute6 8
.Rs
-.%A A. Conta
-.%A S. Deering
+.%A A. Conta and S. Deering
.%T "Internet Control Message Protocol (ICMPv6) for the Internet Protocol Version 6 (IPv6) Specification"
.%N RFC2463
.%D December 1998
diff --git a/share/man/man4/faith.4 b/share/man/man4/faith.4
index a4cdc1ad503..52ae5713a28 100644
--- a/share/man/man4/faith.4
+++ b/share/man/man4/faith.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: faith.4,v 1.7 2000/11/24 10:25:12 itojun Exp $
+.\" $OpenBSD: faith.4,v 1.8 2001/06/23 02:33:11 deraadt Exp $
.\" $KAME: faith.4,v 1.7 2000/11/24 10:15:06 itojun Exp $
.\"
.\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -110,8 +110,7 @@ interface is intended to be used on routers, not on hosts.
.Xr inet6 4 ,
.Xr faithd 8
.Rs
-.%A Jun-ichiro itojun Hagino
-.%A Kazu Yamamoto
+.%A Jun-ichiro itojun Hagino and Kazu Yamamoto
.%T "An IPv6-to-IPv4 transport relay translator"
.%R internet draft
.%N draft-ietf-ngtrans-tcpudp-relay-01.txt
diff --git a/share/man/man4/icmp6.4 b/share/man/man4/icmp6.4
index 039336d33d2..736872c97f1 100644
--- a/share/man/man4/icmp6.4
+++ b/share/man/man4/icmp6.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: icmp6.4,v 1.5 2001/06/22 12:15:45 mpech Exp $
+.\" $OpenBSD: icmp6.4,v 1.6 2001/06/23 02:33:12 deraadt Exp $
.\" $KAME: icmp6.4,v 1.3 2000/11/24 08:44:40 itojun Exp $
.\"
.\" Copyright (C) 1999 WIDE Project.
@@ -231,16 +231,14 @@ socket with a network address for which no network interface exists.
.Xr inet6 4 ,
.Xr ip6 4
.Rs
-.%A W. Stevens
-.%A M. Thomas
+.%A W. Stevens and M. Thomas
.%R RFC
.%N 2292
.%D February 1998
.%T "Advanced Sockets API for IPv6"
.Re
.Rs
-.%A A. Conta
-.%A S. Deering
+.%A A. Conta and S. Deering
.%R RFC
.%N 2463
.%D December 1998
diff --git a/share/man/man4/inet6.4 b/share/man/man4/inet6.4
index e58f3e95558..fb18200cb82 100644
--- a/share/man/man4/inet6.4
+++ b/share/man/man4/inet6.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: inet6.4,v 1.19 2000/12/21 21:01:16 aaron Exp $
+.\" $OpenBSD: inet6.4,v 1.20 2001/06/23 02:33:12 deraadt Exp $
.\" $KAME: inet6.4,v 1.19 2000/11/24 10:13:18 itojun Exp $
.\"
.\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -359,8 +359,7 @@ If you need to accept both IPv4 and IPv6 traffic, listen to two sockets.
.Xr udp 4
.Sh STANDARDS
.Rs
-.%A Tatsuya Jinmei
-.%A Atsushi Onoe
+.%A Tatsuya Jinmei and Atsushi Onoe
.%T "An Extension of Format for IPv6 Scoped Addresses"
.%R internet draft
.%D June 2000
diff --git a/share/man/man4/ip6.4 b/share/man/man4/ip6.4
index 2cfd237719d..1607a5354a9 100644
--- a/share/man/man4/ip6.4
+++ b/share/man/man4/ip6.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ip6.4,v 1.7 2001/06/22 12:15:45 mpech Exp $
+.\" $OpenBSD: ip6.4,v 1.8 2001/06/23 02:33:12 deraadt Exp $
.\" $KAME: ip6.4,v 1.12 2000/06/08 21:19:39 itojun Exp $
.\"
.\" Copyright (C) 1999 WIDE Project.
@@ -615,16 +615,14 @@ The ancillary data items were improperly formed, or option name was unknown.
.Xr icmp6 4 ,
.Xr inet6 4
.Rs
-.%A W. Stevens
-.%A M. Thomas
+.%A W. Stevens and M. Thomas
.%R RFC
.%N 2292
.%D February 1998
.%T "Advanced Sockets API for IPv6"
.Re
.Rs
-.%A S. Deering
-.%A R. Hinden
+.%A S. Deering and R. Hinden
.%R RFC
.%N 2460
.%D December 1998
diff --git a/usr.bin/chpass/chpass.1 b/usr.bin/chpass/chpass.1
index 058aeeaa207..3cb4ffc0e67 100644
--- a/usr.bin/chpass/chpass.1
+++ b/usr.bin/chpass/chpass.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: chpass.1,v 1.20 2000/10/17 18:52:19 aaron Exp $
+.\" $OpenBSD: chpass.1,v 1.21 2001/06/23 02:33:15 deraadt Exp $
.\" $NetBSD: chpass.1,v 1.7 1996/05/15 21:50:40 jtc Exp $
.\"
.\" Copyright (c) 1988, 1990, 1993
@@ -255,8 +255,7 @@ temporary copy of the user passwd information
.Xr pwd_mkdb 8 ,
.Xr vipw 8
.Rs
-.%A Robert Morris
-.%A Ken Thompson
+.%A Robert Morris and Ken Thompson
.%T "UNIX Password Security"
.Re
.Sh HISTORY
diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index 0f6a22ed0d3..1d3b8b96e01 100644
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: passwd.1,v 1.14 2000/11/09 17:52:28 aaron Exp $
+.\" $OpenBSD: passwd.1,v 1.15 2001/06/23 02:33:16 deraadt Exp $
.\"
.\" Copyright (c) 1990 The Regents of the University of California.
.\" All rights reserved.
@@ -164,8 +164,7 @@ lock file for the passwd database
.Xr pwd_mkdb 8 ,
.Xr vipw 8
.Rs
-.%A Robert Morris
-.%A Ken Thompson
+.%A Robert Morris and Ken Thompson
.%T "UNIX password security"
.Re
.Sh HISTORY
diff --git a/usr.bin/ssh/sftp-server.8 b/usr.bin/ssh/sftp-server.8
index afb233e7825..2cd45048c5f 100644
--- a/usr.bin/ssh/sftp-server.8
+++ b/usr.bin/ssh/sftp-server.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp-server.8,v 1.6 2001/04/22 13:32:26 markus Exp $
+.\" $OpenBSD: sftp-server.8,v 1.7 2001/06/23 02:33:04 deraadt Exp $
.\"
.\" Copyright (c) 2000 Markus Friedl. All rights reserved.
.\"
@@ -48,8 +48,7 @@ for more information.
.Xr ssh 1 ,
.Xr sshd 8
.Rs
-.%A T. Ylonen
-.%A S. Lehtinen
+.%A T. Ylonen and S. Lehtinen
.%T "SSH File Transfer Protocol"
.%N draft-ietf-secsh-filexfer-00.txt
.%D January 2001
diff --git a/usr.bin/ssh/sftp.1 b/usr.bin/ssh/sftp.1
index 756123628aa..66293b32565 100644
--- a/usr.bin/ssh/sftp.1
+++ b/usr.bin/ssh/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.18 2001/05/05 13:42:51 stevesk Exp $
+.\" $OpenBSD: sftp.1,v 1.19 2001/06/23 02:33:04 deraadt Exp $
.\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\"
@@ -213,8 +213,7 @@ Damien Miller <djm@mindrot.org>
.Xr sftp-server 8 ,
.Xr sshd 8
.Rs
-.%A T. Ylonen
-.%A S. Lehtinen
+.%A T. Ylonen and S. Lehtinen
.%T "SSH File Transfer Protocol"
.%N draft-ietf-secsh-filexfer-00.txt
.%D January 2001
diff --git a/usr.bin/ssh/ssh-keygen.1 b/usr.bin/ssh/ssh-keygen.1
index 0f04af55b6a..daa9ea7b929 100644
--- a/usr.bin/ssh/ssh-keygen.1
+++ b/usr.bin/ssh/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-keygen.1,v 1.43 2001/06/22 21:55:49 markus Exp $
+.\" $OpenBSD: ssh-keygen.1,v 1.44 2001/06/23 02:33:05 deraadt Exp $
.\"
.\" -*- nroff -*-
.\"
@@ -271,8 +271,7 @@ protocol versions 1.5 and 2.0.
.Xr ssh-agent 1 ,
.Xr sshd 8
.Rs
-.%A J. Galbraith
-.%A R. Thayer
+.%A J. Galbraith and R. Thayer
.%T "SECSH Public Key File Format"
.%N draft-ietf-secsh-publickeyfile-01.txt
.%D March 2001
diff --git a/usr.sbin/arp/arp.4 b/usr.sbin/arp/arp.4
index 12bdc4cb8d5..54c933d4696 100644
--- a/usr.sbin/arp/arp.4
+++ b/usr.sbin/arp/arp.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: arp.4,v 1.10 2000/10/16 00:38:05 naddy Exp $
+.\" $OpenBSD: arp.4,v 1.11 2001/06/23 02:33:06 deraadt Exp $
.\" $NetBSD: arp.4,v 1.2 1995/03/01 11:50:56 chopps Exp $
.\"
.\" Copyright (c) 1985, 1986, 1988, 1994
@@ -137,8 +137,7 @@ The routing information is not modified.
.%T RFC826
.Re
.Rs
-.%A Leffler, S.J.
-.%A Karels, M.J.
+.%A Karels, M.J. and Leffler, S.J .
.%B "Trailer Encapsulations
.%T RFC893
.Re
diff --git a/usr.sbin/faithd/faithd.8 b/usr.sbin/faithd/faithd.8
index e4ff123f3e8..a3c19bf432b 100644
--- a/usr.sbin/faithd/faithd.8
+++ b/usr.sbin/faithd/faithd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: faithd.8,v 1.14 2001/05/01 07:40:04 itojun Exp $
+.\" $OpenBSD: faithd.8,v 1.15 2001/06/23 02:33:07 deraadt Exp $
.\" $KAME: faithd.8,v 1.28 2001/04/25 11:24:15 itojun Exp $
.\"
.\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -329,8 +329,7 @@ on error.
.Xr route 8 ,
.Xr sysctl 8
.Rs
-.%A Jun-ichiro itojun Hagino
-.%A Kazu Yamamoto
+.%A Jun-ichiro itojun Hagino and Kazu Yamamoto
.%T "An IPv6-to-IPv4 transport relay translator"
.%R internet draft
.%N draft-ietf-ngtrans-tcpudp-relay-04.txt
diff --git a/usr.sbin/ifmcstat/ifmcstat.8 b/usr.sbin/ifmcstat/ifmcstat.8
index d607fcb5b84..4fe587a3e08 100644
--- a/usr.sbin/ifmcstat/ifmcstat.8
+++ b/usr.sbin/ifmcstat/ifmcstat.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ifmcstat.8,v 1.4 2001/06/23 00:50:33 deraadt Exp $
+.\" $OpenBSD: ifmcstat.8,v 1.5 2001/06/23 02:33:22 deraadt Exp $
.\"
.\" Copyright (c) 1996 WIDE Project. All rights reserved.
.\"
@@ -36,7 +36,6 @@ Only root can use
.Sh SEE ALSO
.Xr netstat 8
.Pp
+.%A G. Malkin and R. Minnear
.%R IPng for IPv6
.%N RFC2080
-.%A G. Malkin
-.%A R. Minnear
diff --git a/usr.sbin/route6d/route6d.8 b/usr.sbin/route6d/route6d.8
index 27a3057a719..7ca1f4257a3 100644
--- a/usr.sbin/route6d/route6d.8
+++ b/usr.sbin/route6d/route6d.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: route6d.8,v 1.10 2000/10/06 02:46:58 itojun Exp $
+.\" $OpenBSD: route6d.8,v 1.11 2001/06/23 02:33:08 deraadt Exp $
.\" $KAME: route6d.8,v 1.9 2000/07/24 12:39:46 itojun Exp $
.\"
.\" Copyright (c) 1996 WIDE Project. All rights reserved.
@@ -213,8 +213,7 @@ or
.\"
.Sh SEE ALSO
.Rs
-.%A G. Malkin
-.%A R. Minnear
+.%A G. Malkin and R. Minnear
.%T RIPng for IPv6
.%R RFC2080
.%D January 1997
diff --git a/usr.sbin/spppcontrol/spppcontrol.8 b/usr.sbin/spppcontrol/spppcontrol.8
index 75bb8adeb69..a2ea67f0180 100644
--- a/usr.sbin/spppcontrol/spppcontrol.8
+++ b/usr.sbin/spppcontrol/spppcontrol.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: spppcontrol.8,v 1.2 2000/10/17 19:06:31 aaron Exp $
+.\" $OpenBSD: spppcontrol.8,v 1.3 2001/06/23 02:33:23 deraadt Exp $
.\"
.\" Copyright (C) 1997 by Joerg Wunsch, Dresden
.\" All rights reserved.
@@ -213,8 +213,7 @@ by the previous example.
.Xr sppp 4 ,
.Xr ifconfig 8
.Rs
-.%A B. Lloyd
-.%A W. Simpson
+.%A B. Lloyd and W. Simpson
.%T "PPP Authentication Protocols"
.%O RFC 1334
.Re
diff --git a/usr.sbin/timed/timed/timed.8 b/usr.sbin/timed/timed/timed.8
index c857a0414a4..c69234eb23d 100644
--- a/usr.sbin/timed/timed/timed.8
+++ b/usr.sbin/timed/timed/timed.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: timed.8,v 1.6 2000/03/19 17:57:16 aaron Exp $
+.\" $OpenBSD: timed.8,v 1.7 2001/06/23 02:33:00 deraadt Exp $
.\"
.\" Copyright (c) 1980, 1991 Regents of the University of California.
.\" All rights reserved.
@@ -217,8 +217,7 @@ log file for master
.Xr timedc 8
.Rs
.%T "TSP: The Time Synchronization Protocol for UNIX 4.3BSD"
-.%A R. Gusella
-.%A S. Zatti
+.%A R. Gusella and S. Zatti
.Re
.Sh HISTORY
The
diff --git a/usr.sbin/timed/timedc/timedc.8 b/usr.sbin/timed/timedc/timedc.8
index 7fe047525fb..bc04525434a 100644
--- a/usr.sbin/timed/timedc/timedc.8
+++ b/usr.sbin/timed/timedc/timedc.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: timedc.8,v 1.8 2000/04/15 02:15:21 aaron Exp $
+.\" $OpenBSD: timedc.8,v 1.9 2001/06/23 02:33:01 deraadt Exp $
.\"
.\" Copyright (c) 1980, 1991 Regents of the University of California.
.\" All rights reserved.
@@ -128,9 +128,8 @@ log file for master timed
.Xr icmp 4 ,
.Xr timed 8
.Rs
+.%A R. Gusella and S. Zatti
.%T "TSP: The Time Synchronization Protocol for UNIX 4.3BSD"
-.%A R. Gusella
-.%A S. Zatti
.Re
.Sh DIAGNOSTICS
.Bl -tag -width Ds -compact