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.

25 files changed, 58 insertions, 43 deletions

diff --git a/share/man/man4/ipl.4 b/share/man/man4/ipl.4
index 7ef88730b11..f988e52b896 100644
--- a/share/man/man4/ipl.4
+++ b/share/man/man4/ipl.4
@@ -1,6 +1,6 @@
 .Dd June 13, 1999
-.Os
 .Dt IPL 4
+.Os
 .Sh NAME
 .Nm ipl
 .Nd IP packet log device
diff --git a/share/man/man4/lmc.4 b/share/man/man4/lmc.4
index e1ae964b82e..5e45cf69dfc 100644
--- a/share/man/man4/lmc.4
+++ b/share/man/man4/lmc.4
@@ -25,7 +25,7 @@
 .\"
 .Dd July 1, 1999
 .Dt LMC 4
-.Os OpenBSD
+.Os
 .Sh NAME
 .Nm lmc
 .Nd
diff --git a/share/man/man4/man4.alpha/cy.4 b/share/man/man4/man4.alpha/cy.4
index 5273df7de67..4e099423c86 100644
--- a/share/man/man4/man4.alpha/cy.4
+++ b/share/man/man4/man4.alpha/cy.4
@@ -24,10 +24,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.
 .\"
-.\"	$Id: cy.4,v 1.2 1999/07/02 20:11:49 aaron Exp $
+.\"	$Id: cy.4,v 1.3 1999/07/07 10:50:10 aaron Exp $
 .\"
 .Dd October 5, 1993
 .Dt CY 4
+.Os
 .Sh NAME
 .Nm cy
 .Nd
diff --git a/share/man/man4/man4.amiga/ae.4 b/share/man/man4/man4.amiga/ae.4
index 1fffdc63767..95362fb0b1a 100644
--- a/share/man/man4/man4.amiga/ae.4
+++ b/share/man/man4/man4.amiga/ae.4
@@ -1,4 +1,4 @@
-.\"   $OpenBSD: ae.4,v 1.5 1999/07/03 02:11:13 aaron Exp $
+.\"   $OpenBSD: ae.4,v 1.6 1999/07/07 10:50:10 aaron Exp $
 .\"	$NetBSD: ae.4,v 1.3 1995/10/07 18:09:11 chopps Exp $
 .\"
 .\" Copyright (c) 1995 Bernd Ernesti and Klaus Burkert. All rights reserved.
@@ -44,8 +44,8 @@
 .\"
 .\" The following requests are required for all man pages.
 .Dd August 1, 1995
-.Os
 .Dt AE 4 amiga
+.Os
 .Sh NAME
 .Nm ae
 .Nd Ethernet driver for AMD 79C960 LANCE based boards
diff --git a/share/man/man4/man4.amiga/afsc.4 b/share/man/man4/man4.amiga/afsc.4
index c4ece210f20..26be597b8be 100644
--- a/share/man/man4/man4.amiga/afsc.4
+++ b/share/man/man4/man4.amiga/afsc.4
@@ -27,11 +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.
 .\"
-.\"	$Id: afsc.4,v 1.2 1996/10/08 01:20:32 michaels Exp $
+.\"	$Id: afsc.4,v 1.3 1999/07/07 10:50:10 aaron Exp $
 .\"
 .Dd July 23, 1995
-.Os
 .Dt AFSC 4 amiga
+.Os
 .Sh NAME
 .Nm afsc
 .Nd A4091 low level SCSI interface
diff --git a/share/man/man4/man4.amiga/ahsc.4 b/share/man/man4/man4.amiga/ahsc.4
index b52bf0b3f31..c7d5308702c 100644
--- a/share/man/man4/man4.amiga/ahsc.4
+++ b/share/man/man4/man4.amiga/ahsc.4
@@ -27,11 +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.
 .\"
-.\"	$Id: ahsc.4,v 1.3 1998/09/01 16:38:20 deraadt Exp $
+.\"	$Id: ahsc.4,v 1.4 1999/07/07 10:50:10 aaron Exp $
 .\"
 .Dd August 31, 1994
-.Os
 .Dt AHSC 4 amiga
+.Os
 .Sh NAME
 .Nm ahsc
 .Nd A3000 low level SCSI interface
@@ -69,7 +69,11 @@ withing the SCSI chip.
 .It ahsc%d: abort %s: csr = 0x%02x, asr = 0x%02x
 A SCSI operation %s was aborted due to an error.
 .It ahsc%d: csr == 0x%02i
+<<<<<<< ahsc.4
+A error has occurred within the SCSI chip code.
+=======
 An error has occurred within the SCSI chip code.
+>>>>>>> 1.3
 .It ahsc%d: unexpected phase %d in icmd from %d
 The target described by
 .Sq from %d
diff --git a/share/man/man4/man4.amiga/atzsc.4 b/share/man/man4/man4.amiga/atzsc.4
index e03a05d88a3..db49b15a8c6 100644
--- a/share/man/man4/man4.amiga/atzsc.4
+++ b/share/man/man4/man4.amiga/atzsc.4
@@ -1,4 +1,4 @@
-.\"   $OpenBSD: atzsc.4,v 1.3 1998/09/01 16:38:21 deraadt Exp $
+.\"   $OpenBSD: atzsc.4,v 1.4 1999/07/07 10:50:10 aaron Exp $
 .\"
 .\" Copyright (c) 1994 Christian E. Hopps
 .\" All rights reserved.
@@ -28,11 +28,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.
 .\"
-.\"	$Id: atzsc.4,v 1.3 1998/09/01 16:38:21 deraadt Exp $
+.\"	$Id: atzsc.4,v 1.4 1999/07/07 10:50:10 aaron Exp $
 .\"
 .Dd August 31, 1994
-.Os
 .Dt ATZSC 4 amiga
+.Os
 .Sh NAME
 .Nm atzsc
 .Nd A2091 low level SCSI interface
@@ -78,7 +78,11 @@ withing the SCSI chip.
 .It atzsc%d: abort %s: csr = 0x%02x, asr = 0x%02x
 A SCSI operation %s was aborted due to an error.
 .It atzsc%d: csr == 0x%02i
+<<<<<<< atzsc.4
+A error has occurred within the SCSI chip code.
+=======
 An error has occurred within the SCSI chip code.
+>>>>>>> 1.3
 .It atzsc%d: unexpected phase %d in icmd from %d
 The target described by
 .Sq from %d
diff --git a/share/man/man4/man4.amiga/bah.4 b/share/man/man4/man4.amiga/bah.4
index a8d39056e78..99c79e37691 100644
--- a/share/man/man4/man4.amiga/bah.4
+++ b/share/man/man4/man4.amiga/bah.4
@@ -1,4 +1,4 @@
-.\"   $OpenBSD: bah.4,v 1.4 1999/07/03 02:11:13 aaron Exp $
+.\"   $OpenBSD: bah.4,v 1.5 1999/07/07 10:50:10 aaron Exp $
 .\"	$NetBSD: bah.4,v 1.2 1995/06/06 23:41:37 cgd Exp $
 .\"
 .\" Copyright (c) 1995 Ignatios Souvatzis
@@ -33,8 +33,8 @@
 
 .\" The following requests are required for all man pages.
 .Dd May 31, 1995
-.Os
 .Dt BAH 4 amiga
+.Os
 .Sh NAME
 .Nm bah
 .Nd ARCnet driver for SMC COM90C26 based boards
diff --git a/share/man/man4/man4.amiga/gtsc.4 b/share/man/man4/man4.amiga/gtsc.4
index a975f807eb1..d200b710af8 100644
--- a/share/man/man4/man4.amiga/gtsc.4
+++ b/share/man/man4/man4.amiga/gtsc.4
@@ -27,11 +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.
 .\"
-.\"	$Id: gtsc.4,v 1.3 1998/09/01 16:38:21 deraadt Exp $
+.\"	$Id: gtsc.4,v 1.4 1999/07/07 10:50:10 aaron Exp $
 .\"
 .Dd August 31, 1994
-.Os
 .Dt GTSC 4 amiga
+.Os
 .Sh NAME
 .Nm gtsc
 .Nd GVP low level SCSI interface
@@ -69,7 +69,11 @@ withing the SCSI chip.
 .It gtsc%d: abort %s: csr = 0x%02x, asr = 0x%02x
 A SCSI operation %s was aborted due to an error.
 .It gtsc%d: csr == 0x%02i
+<<<<<<< gtsc.4
+A error has occurred within the SCSI chip code.
+=======
 An error has occurred within the SCSI chip code.
+>>>>>>> 1.3
 .It gtsc%d: unexpected phase %d in icmd from %d
 The target described by
 .Sq from %d
diff --git a/share/man/man4/man4.amiga/mgnsc.4 b/share/man/man4/man4.amiga/mgnsc.4
index ab1e00695d7..714711837ce 100644
--- a/share/man/man4/man4.amiga/mgnsc.4
+++ b/share/man/man4/man4.amiga/mgnsc.4
@@ -27,11 +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.
 .\"
-.\"	$Id: mgnsc.4,v 1.2 1996/10/08 01:20:40 michaels Exp $
+.\"	$Id: mgnsc.4,v 1.3 1999/07/07 10:50:10 aaron Exp $
 .\"
 .Dd August 31, 1994
-.Os
 .Dt MGNSC 4 amiga
+.Os
 .Sh NAME
 .Nm mgnsc
 .Nd Magnum low level SCSI interface
diff --git a/share/man/man4/man4.amiga/qn.4 b/share/man/man4/man4.amiga/qn.4
index d468f2470b3..8698d42346b 100644
--- a/share/man/man4/man4.amiga/qn.4
+++ b/share/man/man4/man4.amiga/qn.4
@@ -42,8 +42,8 @@
 .\"
 .\" The following requests are required for all man pages.
 .Dd October 5, 1995
-.Os
 .Dt QN 4 amiga
+.Os
 .Sh NAME
 .Nm qn
 .Nd Ethernet driver for Fujitsu MB86950 based boards
diff --git a/share/man/man4/man4.amiga/wesc.4 b/share/man/man4/man4.amiga/wesc.4
index 69b1ef51090..e1006896e82 100644
--- a/share/man/man4/man4.amiga/wesc.4
+++ b/share/man/man4/man4.amiga/wesc.4
@@ -27,11 +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.
 .\"
-.\"	$Id: wesc.4,v 1.2 1996/10/08 01:20:41 michaels Exp $
+.\"	$Id: wesc.4,v 1.3 1999/07/07 10:50:10 aaron Exp $
 .\"
 .Dd August 31, 1994
-.Os
 .Dt WESC 4 amiga
+.Os
 .Sh NAME
 .Nm wesc
 .Nd Warp Engine low level SCSI interface
diff --git a/share/man/man4/man4.amiga/zssc.4 b/share/man/man4/man4.amiga/zssc.4
index 2bebf3beea5..c8f0c210661 100644
--- a/share/man/man4/man4.amiga/zssc.4
+++ b/share/man/man4/man4.amiga/zssc.4
@@ -27,11 +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.
 .\"
-.\"	$Id: zssc.4,v 1.2 1996/10/08 01:20:42 michaels Exp $
+.\"	$Id: zssc.4,v 1.3 1999/07/07 10:50:10 aaron Exp $
 .\"
 .Dd August 31, 1994
-.Os
 .Dt ZSSC 4 amiga
+.Os
 .Sh NAME
 .Nm zssc
 .Nd Zeus low level SCSI interface
diff --git a/share/man/man4/man4.i386/cy.4 b/share/man/man4/man4.i386/cy.4
index 8a86000c4d5..47ccc56653f 100644
--- a/share/man/man4/man4.i386/cy.4
+++ b/share/man/man4/man4.i386/cy.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: cy.4,v 1.4 1999/07/02 20:11:51 aaron Exp $
+.\"	$OpenBSD: cy.4,v 1.5 1999/07/07 10:50:10 aaron Exp $
 .\"
 .\" Copyright (c) 1993 Andrew Herbert.
 .\" All rights reserved.
@@ -27,6 +27,7 @@
 .\"
 .Dd October 5, 1993
 .Dt CY 4 i386
+.Os
 .Sh NAME
 .Nm cy
 .Nd
diff --git a/share/man/man4/man4.i386/xf86.4 b/share/man/man4/man4.i386/xf86.4
index 7a85fdffbfe..b3bbfbe2d25 100644
--- a/share/man/man4/man4.i386/xf86.4
+++ b/share/man/man4/man4.i386/xf86.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: xf86.4,v 1.7 1999/06/05 13:18:36 aaron Exp $
+.\"	$OpenBSD: xf86.4,v 1.8 1999/07/07 10:50:10 aaron Exp $
 .\"
 .\" Copyright (c) 1998 Matthieu Herrb
 .\" All rights reserved.
@@ -26,8 +26,8 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd February 20, 1998
-.Os
 .Dt XF86 4 i386
+.Os
 .Sh NAME
 .Nm xf86
 .Nd
diff --git a/share/man/man4/man4.mac68k/adb.4 b/share/man/man4/man4.mac68k/adb.4
index 30799c53be4..0ccd69e7cf4 100644
--- a/share/man/man4/man4.mac68k/adb.4
+++ b/share/man/man4/man4.mac68k/adb.4
@@ -28,12 +28,12 @@
 .\" (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: adb.4,v 1.2 1999/06/05 13:18:36 aaron Exp $
+.\"	$OpenBSD: adb.4,v 1.3 1999/07/07 10:50:09 aaron Exp $
 .\"	$NetBSD: adb.4,v 1.1 1997/07/18 02:13:42 ender Exp $
 .\"
 .Dd July 17, 1997
-.Os
 .Dt ADB 4 mac68k
+.Os
 .Sh NAME
 .Nm adb
 .Nd Apple Desktop Bus event interface
diff --git a/share/man/man4/man4.mac68k/ae.4 b/share/man/man4/man4.mac68k/ae.4
index a6a779c9270..19c60092bed 100644
--- a/share/man/man4/man4.mac68k/ae.4
+++ b/share/man/man4/man4.mac68k/ae.4
@@ -27,11 +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: ae.4,v 1.2 1999/05/16 19:57:08 alex Exp $
+.\"	$OpenBSD: ae.4,v 1.3 1999/07/07 10:50:09 aaron Exp $
 .\"
 .Dd June 7, 1997
-.Os
 .Dt AE 4 mac68k
+.Os
 .Sh NAME
 .Nm ae
 .Nd Ethernet driver for DP8390-based NuBus ethernet boards
diff --git a/share/man/man4/man4.mac68k/sn.4 b/share/man/man4/man4.mac68k/sn.4
index 768a7c958e3..465d3e506ef 100644
--- a/share/man/man4/man4.mac68k/sn.4
+++ b/share/man/man4/man4.mac68k/sn.4
@@ -27,11 +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: sn.4,v 1.2 1999/05/16 19:57:10 alex Exp $
+.\"	$OpenBSD: sn.4,v 1.3 1999/07/07 10:50:09 aaron Exp $
 .\"
 .Dd June 7, 1997
-.Os
 .Dt SN 4 mac68k
+.Os
 .Sh NAME
 .Nm sn
 .Nd Ethernet driver for SONIC-based ethernet adapters
diff --git a/share/man/man4/man4.sparc/magma.4 b/share/man/man4/man4.sparc/magma.4
index c756c127881..334b7bd7816 100644
--- a/share/man/man4/man4.sparc/magma.4
+++ b/share/man/man4/man4.sparc/magma.4
@@ -28,6 +28,7 @@
 .\"
 .Dd April 21, 1998
 .Dt MAGMA 4 sparc
+.Os
 .Sh NAME
 .Nm magma
 .Nd
diff --git a/share/man/man4/options.4 b/share/man/man4/options.4
index 4a4220a0c45..61fcfd83788 100644
--- a/share/man/man4/options.4
+++ b/share/man/man4/options.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: options.4,v 1.35 1999/07/06 22:19:39 aaron Exp $
+.\"	$OpenBSD: options.4,v 1.36 1999/07/07 10:50:10 aaron Exp $
 .\"	$NetBSD: options.4,v 1.21 1997/06/25 03:13:00 thorpej Exp $
 .\"
 .\" Copyright (c) 1998 Theo de Raadt 
@@ -35,8 +35,8 @@
 .\"
 .\"
 .Dd August 17, 1997
-.Os
 .Dt OPTIONS 4
+.Os
 .Sh NAME
 .Nm option
 .Nd miscellaneous kernel configuration options
diff --git a/share/man/man4/rln.4 b/share/man/man4/rln.4
index 5ee9c6ec832..3c835a0f2db 100644
--- a/share/man/man4/rln.4
+++ b/share/man/man4/rln.4
@@ -1,7 +1,7 @@
-.\"	$OpenBSD: rln.4,v 1.1 1999/06/21 23:40:43 d Exp $
+.\"	$OpenBSD: rln.4,v 1.2 1999/07/07 10:50:10 aaron Exp $
 .Dd 2 April, 1999
-.Os
 .Dt RLN 4
+.Os
 .Sh NAME
 .Nm rln
 .Nd device driver for RangeLAN2-based wireless network cards
diff --git a/share/man/man4/ss.4 b/share/man/man4/ss.4
index 445057180ec..27f340b3bf2 100644
--- a/share/man/man4/ss.4
+++ b/share/man/man4/ss.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ss.4,v 1.2 1999/07/02 20:11:50 aaron Exp $
+.\" $OpenBSD: ss.4,v 1.3 1999/07/07 10:50:10 aaron Exp $
 .\"
 .\" Copyright (c) 1998 Kenneth Stailey and Ian Darwin
 .\"
@@ -32,8 +32,8 @@
 .\"
 .\"
 .Dd September 28, 1998
-.Os
 .Dt SS 4
+.Os
 .Sh NAME
 .Nm ss
 .Nd SCSI Scanner device
diff --git a/share/man/man5/sysctl.conf.5 b/share/man/man5/sysctl.conf.5
index 10b2b226c1c..788980f3e00 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.4 1998/11/29 15:47:25 aaron Exp $
+.\" $OpenBSD: sysctl.conf.5,v 1.5 1999/07/07 10:50:09 aaron Exp $
 .\"
 .\" Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
 .\" All rights reserved.
@@ -26,8 +26,8 @@
 .\" ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd June 25, 1998
-.Os
 .Dt SYSCTL.CONF 5
+.Os
 .Sh NAME
 .Nm sysctl.conf
 .Nd sysctl variables to set at bootup
diff --git a/share/man/man7/mdoc.7 b/share/man/man7/mdoc.7
index 2927c9c70bd..d1459e28316 100644
--- a/share/man/man7/mdoc.7
+++ b/share/man/man7/mdoc.7
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: mdoc.7,v 1.10 1999/05/30 02:27:23 pjanzen Exp $
+.\"	$OpenBSD: mdoc.7,v 1.11 1999/07/07 10:50:09 aaron Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -34,8 +34,8 @@
 .\"	@(#)mdoc.7	8.2 (Berkeley) 12/30/93
 .\"
 .Dd December 30, 1993
-.Os
 .Dt MDOC 7
+.Os
 .Sh NAME
 .Nm mdoc
 .Nd quick reference guide for the
diff --git a/share/man/man8/rc.conf.8 b/share/man/man8/rc.conf.8
index 48a07d90ba0..70a0e3c565b 100644
--- a/share/man/man8/rc.conf.8
+++ b/share/man/man8/rc.conf.8
@@ -27,8 +27,8 @@
 .\" SUCH DAMAGE.
 .\"
 .Dd January 5, 1998
-.Os
 .Dt RC.CONF 8 SMM
+.Os
 .Sh NAME
 .Nm rc.conf
 .Nd system daemon configuration database