The proper order of the ``introductory'' macros in a man page is .Dd/.Dt/.Os.

Out of the approximately 1450 man pages, only about 90 of them were wrong.
Thanks to kwesterback@home.com for coming up with a script and patch to repair
this. The patch also inserted a .Os macro in the few man pages that were
missing one.

23 files changed, 49 insertions, 41 deletions

diff --git a/usr.sbin/bootpd/bootpef.8 b/usr.sbin/bootpd/bootpef.8
index e8bba205648..2ffe73a062c 100644
--- a/usr.sbin/bootpd/bootpef.8
+++ b/usr.sbin/bootpd/bootpef.8
@@ -1,7 +1,7 @@
 .\" bootpef.8
 .Dd June 12, 1999
-.Os
 .Dt BOOTPEF 8
+.Os
 .Sh NAME
 .Nm bootpef
 .Nd BOOTP Extension File compiler
diff --git a/usr.sbin/bootpd/bootptest.8 b/usr.sbin/bootpd/bootptest.8
index e28d31237fa..1de7b6f588e 100644
--- a/usr.sbin/bootpd/bootptest.8
+++ b/usr.sbin/bootpd/bootptest.8
@@ -1,7 +1,7 @@
 .\" bootptest.8
 .Dd June 12, 1999
-.Os
 .Dt BOOTPTEST 8
+.Os
 .Sh NAME
 .Nm bootptest
 .Nd send BOOTP queries and print responses
diff --git a/usr.sbin/cron/cron.8 b/usr.sbin/cron/cron.8
index 9068b837c7f..f9dced87356 100644
--- a/usr.sbin/cron/cron.8
+++ b/usr.sbin/cron/cron.8
@@ -15,11 +15,11 @@
 .\" * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
 .\" */
 .\"
-.\" $Id: cron.8,v 1.6 1999/07/02 20:11:48 aaron Exp $
+.\" $Id: cron.8,v 1.7 1999/07/07 10:50:11 aaron Exp $
 .\"
 .Dd June 6, 1999
-.Os
 .Dt CRON 8
+.Os
 .Sh NAME
 .Nm cron
 .Nd daemon to execute scheduled commands (Vixie Cron)
diff --git a/usr.sbin/cron/crontab.1 b/usr.sbin/cron/crontab.1
index b99ac9ef299..899736d9ba2 100644
--- a/usr.sbin/cron/crontab.1
+++ b/usr.sbin/cron/crontab.1
@@ -15,11 +15,11 @@
 .\" * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
 .\" */
 .\"
-.\" $Id: crontab.1,v 1.3 1999/07/02 20:11:48 aaron Exp $
+.\" $Id: crontab.1,v 1.4 1999/07/07 10:50:11 aaron Exp $
 .\"
 .Dd June 8, 1999
-.Os
 .Dt CRONTAB 1
+.Os
 .Sh NAME
 .Nm crontab
 .Nd maintain crontab files for individual users (V3)
diff --git a/usr.sbin/cron/crontab.5 b/usr.sbin/cron/crontab.5
index 6ac2b832edc..7c00c99778f 100644
--- a/usr.sbin/cron/crontab.5
+++ b/usr.sbin/cron/crontab.5
@@ -15,11 +15,11 @@
 .\" * Paul Vixie          <paul@vix.com>          uunet!decwrl!vixie!paul
 .\" */
 .\"
-.\" $Id: crontab.5,v 1.6 1999/07/02 20:11:48 aaron Exp $
+.\" $Id: crontab.5,v 1.7 1999/07/07 10:50:11 aaron Exp $
 .\" 
 .Dd June 8, 1999
-.Os
 .Dt CRONTAB 5
+.Os
 .Sh NAME
 .Nm crontab
 .Nd tables for driving cron
diff --git a/usr.sbin/ctm/ctm/ctm.1 b/usr.sbin/ctm/ctm/ctm.1
index 0ed76235b22..9a59c3b3fc0 100644
--- a/usr.sbin/ctm/ctm/ctm.1
+++ b/usr.sbin/ctm/ctm/ctm.1
@@ -10,11 +10,11 @@
 .\"
 .\" CTM and ctm(1) by <phk@login.dknet.dk>
 .\"
-.\" $Id: ctm.1,v 1.7 1999/07/02 20:11:48 aaron Exp $
+.\" $Id: ctm.1,v 1.8 1999/07/07 10:50:11 aaron Exp $
 .\"
 .Dd March 25, 1995
-.Os
 .Dt CTM 1
+.Os
 .Sh NAME
 .Nm ctm
 .Nd source code mirror program
diff --git a/usr.sbin/ctm/ctm/ctm.5 b/usr.sbin/ctm/ctm/ctm.5
index 3d0c8284b06..cda3753f52e 100644
--- a/usr.sbin/ctm/ctm/ctm.5
+++ b/usr.sbin/ctm/ctm/ctm.5
@@ -10,11 +10,11 @@
 .\"
 .\" CTM and ctm(1) by <phk@login.dknet.dk>
 .\"
-.\" $Id: ctm.5,v 1.4 1999/06/05 22:16:39 aaron Exp $
+.\" $Id: ctm.5,v 1.5 1999/07/07 10:50:11 aaron Exp $
 .\"
 .Dd March 25, 1995
-.Os
 .Dt CTM 5
+.Os
 .Sh NAME
 .Nm ctm
 .Nd source code mirror system
diff --git a/usr.sbin/dev_mkdb/dev_mkdb.8 b/usr.sbin/dev_mkdb/dev_mkdb.8
index 93d51d5f3bd..dcb104a0242 100644
--- a/usr.sbin/dev_mkdb/dev_mkdb.8
+++ b/usr.sbin/dev_mkdb/dev_mkdb.8
@@ -30,11 +30,11 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	from: @(#)dev_mkdb.8	8.1 (Berkeley) 6/6/93
-.\"	$Id: dev_mkdb.8,v 1.3 1999/06/05 22:16:40 aaron Exp $
+.\"	$Id: dev_mkdb.8,v 1.4 1999/07/07 10:50:11 aaron Exp $
 .\"
 .Dd June 6, 1993
-.Os
 .Dt DEV_MKDB 8
+.Os
 .Sh NAME
 .Nm dev_mkdb
 .Nd create
diff --git a/usr.sbin/fdformat/fdformat.1 b/usr.sbin/fdformat/fdformat.1
index f82612e060c..1dc16aae82e 100644
--- a/usr.sbin/fdformat/fdformat.1
+++ b/usr.sbin/fdformat/fdformat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: fdformat.1,v 1.7 1999/07/04 19:25:20 aaron Exp $
+.\"	$OpenBSD: fdformat.1,v 1.8 1999/07/07 10:50:12 aaron Exp $
 .\"
 .\" Copyright (C) 1993, 1994 by Joerg Wunsch, Dresden
 .\" All rights reserved.
@@ -25,8 +25,8 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd September 16, 1993
-.Os
 .Dt FDFORMAT 1
+.Os
 .Sh NAME
 .Nm fdformat
 .Nd format floppy disks
diff --git a/usr.sbin/ipftest/ipftest.1 b/usr.sbin/ipftest/ipftest.1
index 730ef870c62..358ed771ebc 100644
--- a/usr.sbin/ipftest/ipftest.1
+++ b/usr.sbin/ipftest/ipftest.1
@@ -1,7 +1,7 @@
-.\"     $OpenBSD: ipftest.1,v 1.9 1999/06/05 22:17:04 aaron Exp $
+.\"     $OpenBSD: ipftest.1,v 1.10 1999/07/07 10:50:12 aaron Exp $
 .Dd May 23, 1999
-.Os
 .Dt IPFTEST 1
+.Os
 .Sh NAME
 .Nm ipftest
 .Nd test packet filter rules with arbitrary input
diff --git a/usr.sbin/map-mbone/map-mbone.8 b/usr.sbin/map-mbone/map-mbone.8
index d751b446423..d2a5a335190 100644
--- a/usr.sbin/map-mbone/map-mbone.8
+++ b/usr.sbin/map-mbone/map-mbone.8
@@ -1,9 +1,9 @@
-.\"	$OpenBSD: map-mbone.8,v 1.4 1999/07/04 15:44:26 aaron Exp $
+.\"	$OpenBSD: map-mbone.8,v 1.5 1999/07/07 10:50:12 aaron Exp $
 .\"	$NetBSD: map-mbone.8,v 1.2 1995/10/03 23:16:53 thorpej Exp $
 .\"
 .Dd June 13, 1999
-.Os
 .Dt MAP-MBONE 8
+.Os
 .Sh NAME
 .Nm map-mbone
 .Nd Multicast connection mapper
diff --git a/usr.sbin/mopd/mopa.out/mopa.out.1 b/usr.sbin/mopd/mopa.out/mopa.out.1
index 9dce4b7222b..e3e716d070d 100644
--- a/usr.sbin/mopd/mopa.out/mopa.out.1
+++ b/usr.sbin/mopd/mopa.out/mopa.out.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopa.out.1,v 1.5 1999/06/05 22:17:21 aaron Exp $
+.\"	$OpenBSD: mopa.out.1,v 1.6 1999/07/07 10:50:12 aaron Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -27,10 +27,11 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" @(#) $OpenBSD: mopa.out.1,v 1.5 1999/06/05 22:17:21 aaron Exp $
+.\" @(#) $OpenBSD: mopa.out.1,v 1.6 1999/07/07 10:50:12 aaron Exp $
 .\"
 .Dd August 11, 1996
 .Dt MOPA.OUT 1
+.Os
 .Sh NAME
 .Nm mopa.out
 .Nd create MOP image from an a.out file
diff --git a/usr.sbin/mopd/mopchk/mopchk.1 b/usr.sbin/mopd/mopchk/mopchk.1
index 150a29cef27..7f80b4012ac 100644
--- a/usr.sbin/mopd/mopchk/mopchk.1
+++ b/usr.sbin/mopd/mopchk/mopchk.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopchk.1,v 1.5 1999/06/05 22:17:22 aaron Exp $
+.\"	$OpenBSD: mopchk.1,v 1.6 1999/07/07 10:50:13 aaron Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -27,10 +27,11 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" @(#) $OpenBSD: mopchk.1,v 1.5 1999/06/05 22:17:22 aaron Exp $
+.\" @(#) $OpenBSD: mopchk.1,v 1.6 1999/07/07 10:50:13 aaron Exp $
 .\"
 .Dd October 2, 1995
 .Dt MOPCHK 1
+.Os
 .Sh NAME
 .Nm mopchk
 .Nd MOP check utility
diff --git a/usr.sbin/mopd/mopd/mopd.8 b/usr.sbin/mopd/mopd/mopd.8
index 38e4aa7b17a..b5c2c225570 100644
--- a/usr.sbin/mopd/mopd/mopd.8
+++ b/usr.sbin/mopd/mopd/mopd.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopd.8,v 1.5 1999/06/05 22:17:23 aaron Exp $
+.\"	$OpenBSD: mopd.8,v 1.6 1999/07/07 10:50:13 aaron Exp $
 .\"
 .\" Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
 .\"
@@ -27,10 +27,11 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" @(#) $OpenBSD: mopd.8,v 1.5 1999/06/05 22:17:23 aaron Exp $
+.\" @(#) $OpenBSD: mopd.8,v 1.6 1999/07/07 10:50:13 aaron Exp $
 .\"
 .Dd September 24, 1995
 .Dt MOPD 8
+.Os
 .Sh NAME
 .Nm mopd
 .Nd MOP loader daemon
diff --git a/usr.sbin/mopd/mopprobe/mopprobe.1 b/usr.sbin/mopd/mopprobe/mopprobe.1
index ed9ff29bf0b..6e576c90c46 100644
--- a/usr.sbin/mopd/mopprobe/mopprobe.1
+++ b/usr.sbin/mopd/mopprobe/mopprobe.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mopprobe.1,v 1.5 1999/06/05 22:17:24 aaron Exp $
+.\"	$OpenBSD: mopprobe.1,v 1.6 1999/07/07 10:50:12 aaron Exp $
 .\"
 .\" Copyright (c) 1996 Mats O Jansson.  All rights reserved.
 .\"
@@ -27,10 +27,11 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" @(#) $OpenBSD: mopprobe.1,v 1.5 1999/06/05 22:17:24 aaron Exp $
+.\" @(#) $OpenBSD: mopprobe.1,v 1.6 1999/07/07 10:50:12 aaron Exp $
 .\"
 .Dd October 2, 1995
 .Dt MOPPROBE 1
+.Os
 .Sh NAME
 .Nm mopprobe
 .Nd MOP Probe Utility
diff --git a/usr.sbin/mopd/moptrace/moptrace.1 b/usr.sbin/mopd/moptrace/moptrace.1
index d486a655e8c..0d8d6c03255 100644
--- a/usr.sbin/mopd/moptrace/moptrace.1
+++ b/usr.sbin/mopd/moptrace/moptrace.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: moptrace.1,v 1.4 1999/06/05 22:17:27 aaron Exp $
+.\"	$OpenBSD: moptrace.1,v 1.5 1999/07/07 10:50:12 aaron Exp $
 .\"
 .\" Copyright (c) 1993-95 Mats O Jansson.  All rights reserved.
 .\"
@@ -27,10 +27,11 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" @(#) $OpenBSD: moptrace.1,v 1.4 1999/06/05 22:17:27 aaron Exp $
+.\" @(#) $OpenBSD: moptrace.1,v 1.5 1999/07/07 10:50:12 aaron Exp $
 .\"
 .Dd October 2, 1995
 .Dt MOPTRACE 1
+.Os
 .Sh NAME
 .Nm moptrace
 .Nd MOP Trace Utility
diff --git a/usr.sbin/named/man/dig.1 b/usr.sbin/named/man/dig.1
index 8735ee4164a..1666e477a2a 100644
--- a/usr.sbin/named/man/dig.1
+++ b/usr.sbin/named/man/dig.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: dig.1,v 1.13 1999/06/05 22:17:34 aaron Exp $
+.\"	$OpenBSD: dig.1,v 1.14 1999/07/07 10:50:14 aaron Exp $
 .\" $From: dig.1,v 8.2 1997/06/01 20:34:33 vixie Exp $
 .\"
 .\" ++Copyright++ 1993
@@ -63,8 +63,8 @@
 .\" (arc@sgi.com)
 .\"
 .Dd August 30, 1990
-.Os
 .Dt dig 1
+.Os
 .Sh NAME
 .Nm dig
 .Nd send domain name query packets to name servers
diff --git a/usr.sbin/ppp/ppp/ppp.8 b/usr.sbin/ppp/ppp/ppp.8
index 61392c952ea..2edd49dc463 100644
--- a/usr.sbin/ppp/ppp/ppp.8
+++ b/usr.sbin/ppp/ppp/ppp.8
@@ -1,8 +1,8 @@
-.\" $Id: ppp.8,v 1.54 1999/07/03 02:11:10 aaron Exp $
+.\" $Id: ppp.8,v 1.55 1999/07/07 10:50:14 aaron Exp $
 .Dd 20 September 1995
 .nr XX \w'\fC00'
-.Os
 .Dt PPP 8
+.Os
 .Sh NAME
 .Nm ppp
 .Nd Point to Point Protocol (a.k.a. user-ppp)
diff --git a/usr.sbin/ppp/pppctl/pppctl.8 b/usr.sbin/ppp/pppctl/pppctl.8
index 2ee3f974ea2..33b8909d793 100644
--- a/usr.sbin/ppp/pppctl/pppctl.8
+++ b/usr.sbin/ppp/pppctl/pppctl.8
@@ -1,7 +1,7 @@
-.\" $Id: pppctl.8,v 1.5 1999/07/03 02:11:10 aaron Exp $
+.\" $Id: pppctl.8,v 1.6 1999/07/07 10:50:14 aaron Exp $
 .Dd 26 June 1997
-.Os
 .Dt PPPCTL 8
+.Os
 .Sh NAME
 .Nm pppctl
 .Nd
diff --git a/usr.sbin/pppd/pppstats/pppstats.8 b/usr.sbin/pppd/pppstats/pppstats.8
index bb06f36aa15..e1fbcaad894 100644
--- a/usr.sbin/pppd/pppstats/pppstats.8
+++ b/usr.sbin/pppd/pppstats/pppstats.8
@@ -1,6 +1,7 @@
-.\" $OpenBSD: pppstats.8,v 1.6 1999/06/05 22:17:58 aaron Exp $
+.\" $OpenBSD: pppstats.8,v 1.7 1999/07/07 10:50:14 aaron Exp $
 .Dd September 1, 1997
 .Dt PPPSTATS 8
+.Os
 .Sh NAME
 .Nm pppstats
 .Nd report statistics for the specified PPP interface
diff --git a/usr.sbin/rarpd/rarpd.8 b/usr.sbin/rarpd/rarpd.8
index 181954742de..14520c23ae9 100644
--- a/usr.sbin/rarpd/rarpd.8
+++ b/usr.sbin/rarpd/rarpd.8
@@ -17,10 +17,11 @@
 .\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
 .\" WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-.\" @(#) $Id: rarpd.8,v 1.6 1999/06/05 22:18:01 aaron Exp $
+.\" @(#) $Id: rarpd.8,v 1.7 1999/07/07 10:50:14 aaron Exp $
 .\"
 .Dd October 26, 1990
 .Dt RARPD 8
+.Os
 .Sh NAME
 .Nm rarpd
 .Nd reverse ARP daemon
diff --git a/usr.sbin/slstats/slstats.8 b/usr.sbin/slstats/slstats.8
index 4f60d3a6fb1..3772a93f267 100644
--- a/usr.sbin/slstats/slstats.8
+++ b/usr.sbin/slstats/slstats.8
@@ -1,7 +1,8 @@
-.\"	$OpenBSD: slstats.8,v 1.5 1999/07/03 02:11:10 aaron Exp $
+.\"	$OpenBSD: slstats.8,v 1.6 1999/07/07 10:50:14 aaron Exp $
 .\"	$NetBSD: slstats.8,v 1.2.6.1 1996/06/07 01:42:24 thorpej Exp $
 .Dd July 5, 1993
 .Dt SLSTATS 8
+.Os
 .Sh NAME
 .Nm slstats
 .Nd report slip statistics
diff --git a/usr.sbin/tcpdump/tcpdump.8 b/usr.sbin/tcpdump/tcpdump.8
index 41f9c80400a..d0034fd1700 100644
--- a/usr.sbin/tcpdump/tcpdump.8
+++ b/usr.sbin/tcpdump/tcpdump.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: tcpdump.8,v 1.16 1999/07/02 20:11:49 aaron Exp $
+.\"	$OpenBSD: tcpdump.8,v 1.17 1999/07/07 10:50:14 aaron Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996
 .\"	The Regents of the University of California.  All rights reserved.
@@ -20,8 +20,8 @@
 .\" MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 .\"
 .Dd May 25, 1999
-.Os
 .Dt TCPDUMP 8
+.Os
 .Sh NAME
 .Nm tcpdump
 .Nd dump traffic on a network