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.

10 files changed, 32 insertions, 20 deletions

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