- fix rcs Xr; from Jared Yanovich

- correct order for sections
- remove unnecessary .Pp and -compact from display
- kill some double spacing
- sort SEE ALSO

1 files changed, 11 insertions, 12 deletions

diff --git a/usr.bin/diff3/diff3.1 b/usr.bin/diff3/diff3.1
index a97fd986a51..1afbea905ba 100644
--- a/usr.bin/diff3/diff3.1
+++ b/usr.bin/diff3/diff3.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: diff3.1,v 1.2 2003/07/14 17:43:52 deraadt Exp $
+.\" $OpenBSD: diff3.1,v 1.3 2003/10/24 08:01:52 jmc Exp $
 .\"
 .\" Copyright (c) 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -53,7 +53,7 @@ purging
 the separate versions into a new file.
 .Nm
 is used by
-.Xr RCS 1
+.Xr rcs 1
 to merge specific versions or create
 new versions.
 .Pp
@@ -98,7 +98,7 @@ specific only to
 Similar to
 .Fl e
 and
-.Fl x  ,
+.Fl x ,
 respectively, but treat overlapping changes (i.e., changes that would
 be noted with ==== in the normal listing) differently.
 The overlapping lines from both files will be inserted by the edit script,
@@ -109,7 +109,7 @@ The
 .Fl E
 option is used by
 .Tn RCS
-.Xr merge  1
+.Xr merge 1
 to ensure that overlapping changes in the merged files are preserved
 and brought to someone's attention.
 .Pp
@@ -124,8 +124,7 @@ Applying the edit script generated by the command
 to
 .Ar file1
 results in the file:
-.Pp
-.Bd -literal -offset indent -compact
+.Bd -literal -offset indent
 lines 1-6
 of file1
 <<<<<<< file1
@@ -180,8 +179,13 @@ the actual executable
 .Sh SEE ALSO
 .Xr diff 1 ,
 .Xr ed 1 ,
-.Xr merge 1
+.Xr merge 1 ,
 .Xr rcs 1
+.Sh HISTORY
+A
+.Nm
+command appeared in
+.At v7 .
 .Sh BUGS
 The
 .Fl e
@@ -194,8 +198,3 @@ as
 is an
 .Xr ed 1
 editing command.
-.Sh HISTORY
-A
-.Nm
-command appeared in
-.At v7 .