diff options
| -rw-r--r-- | usr.bin/rcs/ci.1 | 28 | ||||
| -rw-r--r-- | usr.bin/rcs/ci.c | 4 | ||||
| -rw-r--r-- | usr.bin/rcs/rcs.1 | 21 | ||||
| -rw-r--r-- | usr.bin/rcs/rcsprog.c | 4 |
4 files changed, 25 insertions, 32 deletions
diff --git a/usr.bin/rcs/ci.1 b/usr.bin/rcs/ci.1 index f21d8f1d8e5..63822f32011 100644 --- a/usr.bin/rcs/ci.1 +++ b/usr.bin/rcs/ci.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ci.1,v 1.29 2006/04/27 09:58:12 jmc Exp $ +.\" $OpenBSD: ci.1,v 1.30 2006/04/29 05:10:16 ray Exp $ .\" .\" Copyright (c) 2005 Niall O'Higgins <niallo@openbsd.org> .\" All rights reserved. @@ -36,8 +36,7 @@ .Op Fl n Ns Ar symbol .Op Fl r Ns Op Ar rev .Op Fl s Ns Ar state -.Oo Fl t Ns Ar file Ns \*(Ba -.Ar str Oc +.Op Fl t Ns Ar str .Op Fl u Ns Op Ar rev .Op Fl w Ns Ar username .Op Fl x Ns Ar suffixes @@ -142,21 +141,18 @@ working file. Sets the state of the deposited revision to the identifier .Ar state . The specified value may not contain a space character. -.Sm off -.It Fl t Ar file \*(Ba Ar str -.Sm on +.It Fl t Ns Ar str Change the descriptive text. -The descriptive text is taken from the -.Ar file -specified as argument or from the string +The argument .Ar str -given as argument if it is preceded by the -.Sq - -character. -If no argument is used, the descriptive text is taken from standard input -terminated by end-of-file or by a line containing the -.Sq \&. -character by itself. +is interpreted as the name of a file containing +the descriptive text or, +if prefixed with a +.Sq - , +the actual descriptive text itself. +If no argument is given, +this option is ignored +(for compatibility reasons). .It Fl u The same as .Fl r , diff --git a/usr.bin/rcs/ci.c b/usr.bin/rcs/ci.c index a2ff9613060..e3840e7942f 100644 --- a/usr.bin/rcs/ci.c +++ b/usr.bin/rcs/ci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ci.c,v 1.164 2006/04/29 04:59:48 ray Exp $ */ +/* $OpenBSD: ci.c,v 1.165 2006/04/29 05:10:16 ray Exp $ */ /* * Copyright (c) 2005, 2006 Niall O'Higgins <niallo@openbsd.org> * All rights reserved. @@ -87,7 +87,7 @@ checkin_usage(void) fprintf(stderr, "usage: ci [-jMNqV] [-d[date]] [-f[rev]] [-I[rev]] [-i[rev]]\n" " [-j[rev]] [-k[rev]] [-l[rev]] [-M[rev]] [-mmsg]\n" - " [-Nsymbol] [-nsymbol] [-r[rev]] [-sstate] [-tfile|str]\n" + " [-Nsymbol] [-nsymbol] [-r[rev]] [-sstate] [-tstr]\n" " [-u[rev]] [-wusername] [-xsuffixes] [-ztz] file ...\n"); } diff --git a/usr.bin/rcs/rcs.1 b/usr.bin/rcs/rcs.1 index 54a0ff4107b..1190b52c5a3 100644 --- a/usr.bin/rcs/rcs.1 +++ b/usr.bin/rcs/rcs.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rcs.1,v 1.42 2006/04/28 22:26:07 jmc Exp $ +.\" $OpenBSD: rcs.1,v 1.43 2006/04/29 05:10:16 ray Exp $ .\" .\" Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org> .\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> @@ -45,8 +45,7 @@ .Op Fl o Ns Ar rev .Oo Fl s Ns Ar state Ns .Op : Ns Ar rev Oc -.Oo Fl t Ns Ar file Ns \*(Ba -.Ar str Oc +.Op Fl t Ns Ar str .Op Fl u Ns Op Ar rev .Op Fl x Ns Ar suffixes .Ar @@ -197,17 +196,15 @@ to the identifier The specified value may not contain a space character. .It Fl T Preserve the modification time of RCS files. -.Sm off -.It Fl t Ar file \*(Ba Ar str -.Sm on +.It Fl t Ns Ar str Change the descriptive text. -The descriptive text is taken from the -.Ar file -specified as argument or from the string +The argument .Ar str -given as argument if it is preceded by the -.Sq - -character. +is interpreted as the name of a file containing +the descriptive text or, +if prefixed with a +.Sq - , +the actual descriptive text itself. If no argument is used, the descriptive text is taken from standard input terminated by end-of-file or by a line containing the .Sq \&. diff --git a/usr.bin/rcs/rcsprog.c b/usr.bin/rcs/rcsprog.c index cd7e3efb47c..0fe107d0c34 100644 --- a/usr.bin/rcs/rcsprog.c +++ b/usr.bin/rcs/rcsprog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcsprog.c,v 1.120 2006/04/28 22:26:08 jmc Exp $ */ +/* $OpenBSD: rcsprog.c,v 1.121 2006/04/29 05:10:16 ray Exp $ */ /* * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -161,7 +161,7 @@ rcs_usage(void) fprintf(stderr, "usage: rcs [-eIiLqTUV] [-Aoldfile] [-ausers] [-b[rev]]\n" " [-cstring] [-e[users]] [-kmode] [-l[rev]] [-mrev:msg]\n" - " [-orev] [-sstate[:rev]] [-tfile|str] [-u[rev]]\n" + " [-orev] [-sstate[:rev]] [-tstr] [-u[rev]]\n" " [-xsuffixes] file ...\n"); } |