diff options
| author | Jason McIntyre <jmc@cvs.openbsd.org> | 2006-04-27 07:54:16 +0000 |
|---|---|---|
| committer | Jason McIntyre <jmc@cvs.openbsd.org> | 2006-04-27 07:54:16 +0000 |
| commit | a68878a8f1fbd3499517fb209bc575f9dea579f1 (patch) | |
| tree | 7f78daf7d571740fd96b2823869e2444ae679704 | |
| parent | 22ed4557f3dbf6055e0456f866178225c772c699 (diff) | |
move -M into compat land; ok xsa
| -rw-r--r-- | usr.bin/rcs/rcs.1 | 19 | ||||
| -rw-r--r-- | usr.bin/rcs/rcsprog.c | 6 |
2 files changed, 8 insertions, 17 deletions
diff --git a/usr.bin/rcs/rcs.1 b/usr.bin/rcs/rcs.1 index 56d0d5bfa1b..5bd0d759592 100644 --- a/usr.bin/rcs/rcs.1 +++ b/usr.bin/rcs/rcs.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rcs.1,v 1.36 2006/04/26 08:42:00 jmc Exp $ +.\" $OpenBSD: rcs.1,v 1.37 2006/04/27 07:54:15 jmc Exp $ .\" .\" Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org> .\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> @@ -32,7 +32,7 @@ .Nd RCS file management program .Sh SYNOPSIS .Nm -.Op Fl ehIiLMqTUV +.Op Fl ehIiLqTUV .Op Fl A Ns Ar oldfile .Op Fl a Ns Ar users .Op Fl b Ns Op Ar rev @@ -131,15 +131,6 @@ Enable strict locking on the RCS files. Lock revision .Ar rev on the RCS files. -.It Fl M -Disable mail warnings when breaking a user's lock. -Normally, -.Nm -will send a mail to the lock owner when his lock is removed by a call -to -.Nm -.Fl u . -This option is currently ignored. .It Fl m Ns Ar rev : Ns Ar msg Replace revision .Ar rev Ns 's @@ -409,9 +400,9 @@ for more information. OpenRCS is compatible with Walter Tichy's original RCS implementation. .Pp -The flag -.Op Fl z -has no effect and is provided +The flags +.Op Fl Mz +have no effect and are provided for compatibility only. .Sh HISTORY The OpenRCS project is a BSD-licensed rewrite of the original diff --git a/usr.bin/rcs/rcsprog.c b/usr.bin/rcs/rcsprog.c index e846f98d8d6..4494356de51 100644 --- a/usr.bin/rcs/rcsprog.c +++ b/usr.bin/rcs/rcsprog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsprog.c,v 1.118 2006/04/26 21:55:22 joris Exp $ */ +/* $OpenBSD: rcsprog.c,v 1.119 2006/04/27 07:54:15 jmc Exp $ */ /* * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -159,9 +159,9 @@ void rcs_usage(void) { fprintf(stderr, - "usage: rcs [-ehIiLMqTUV] [-Aoldfile] [-ausers] [-b[rev]]\n" + "usage: rcs [-ehIiLqTUV] [-Aoldfile] [-ausers] [-b[rev]]\n" " [-cstring] [-e[users]] [-kmode] [-l[rev]] [-mrev:msg]\n" - " [-orange] [-sstate[:rev]] [-tfile|str] [-u[rev]]\n" + " [-orev] [-sstate[:rev]] [-tfile|str] [-u[rev]]\n" " [-xsuffixes] file ...\n"); } |