move compat flags into a STANDARDS section;

update usage() whilst here...

2 files changed, 10 insertions, 8 deletions

diff --git a/usr.bin/rcs/rcsmerge.1 b/usr.bin/rcs/rcsmerge.1
index d89d5c7b398..cec085e5d3c 100644
--- a/usr.bin/rcs/rcsmerge.1
+++ b/usr.bin/rcs/rcsmerge.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rcsmerge.1,v 1.4 2006/03/06 09:41:53 deraadt Exp $
+.\"	$OpenBSD: rcsmerge.1,v 1.5 2006/03/06 14:44:51 jmc Exp $
 .\"
 .\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
 .\" All rights reserved.
@@ -23,7 +23,7 @@
 .Sh SYNOPSIS
 .Nm
 .Bk -words
-.Op Fl AEeTV
+.Op Fl AEeV
 .Op Fl k Ns Ar mode
 .Op Fl p Ns Op Ar rev
 .Op Fl q Ns Op Ar rev
@@ -62,9 +62,6 @@ Be quiet about reporting.
 .It Fl r Ns Ar rev
 Merge with respect to revision
 .Ar rev .
-.It Fl T
-No effect.
-For compatibility.
 .It Fl V
 Print RCS's version number.
 .It Fl x Ns Ar suffixes
@@ -101,3 +98,8 @@ overwriting the working copy:
 .Xr rcsclean 1 ,
 .Xr rcsdiff 1 ,
 .Xr rlog 1
+.Sh STANDARDS
+The flag
+.Op Fl T
+has no effect and is provided
+for compatibility only.
diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c
index e1275614814..331856a3d62 100644
--- a/usr.bin/rcs/rcsmerge.c
+++ b/usr.bin/rcs/rcsmerge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsmerge.c,v 1.15 2006/03/06 13:22:59 xsa Exp $	*/
+/*	$OpenBSD: rcsmerge.c,v 1.16 2006/03/06 14:44:51 jmc Exp $	*/
 /*
  * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
  * All rights reserved.
@@ -159,6 +159,6 @@ void
 rcsmerge_usage(void)
 {
 	fprintf(stderr,
-	    "usage: rcsmerge [-TV] [-kmode] [-p[rev]] [-q[rev]] "
-	    "[-rrev] [-xsuffixes] file ...\n");
+	    "usage: rcsmerge [-AEeV] [-kmode] [-p[rev]] [-q[rev]] "
+	    "[-rrev] [-xsuffixes] [-ztz] file ...\n");
 }