From 92107daf44524d76e29e39fb793d562dfd31325e Mon Sep 17 00:00:00 2001
From: Jason McIntyre <jmc@cvs.openbsd.org>
Date: Mon, 6 Mar 2006 14:44:52 +0000
Subject: move compat flags into a STANDARDS section; update usage() whilst
 here...

---
 usr.bin/rcs/rcsmerge.1 | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'usr.bin/rcs/rcsmerge.1')

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.
-- 
cgit v1.2.3