diff options
author | Jason McIntyre <jmc@cvs.openbsd.org> | 2006-04-24 22:06:50 +0000 |
---|---|---|
committer | Jason McIntyre <jmc@cvs.openbsd.org> | 2006-04-24 22:06:50 +0000 |
commit | 365220074efda889b1f01f9618018925d573e6ff (patch) | |
tree | c4a534d45f495060260bcbf93f6890d53836ec66 /usr.bin/rcs | |
parent | d9a9e74cc87010bb2bacdc0d71378876c302ee8b (diff) |
be consistent when describing revision selection;
input/ok: xsa joris niallo ray
Diffstat (limited to 'usr.bin/rcs')
-rw-r--r-- | usr.bin/rcs/ci.1 | 15 | ||||
-rw-r--r-- | usr.bin/rcs/co.1 | 16 | ||||
-rw-r--r-- | usr.bin/rcs/rcs.1 | 20 | ||||
-rw-r--r-- | usr.bin/rcs/rcsclean.1 | 6 | ||||
-rw-r--r-- | usr.bin/rcs/rcsmerge.1 | 10 |
5 files changed, 41 insertions, 26 deletions
diff --git a/usr.bin/rcs/ci.1 b/usr.bin/rcs/ci.1 index 67aeeda4ac7..b7deaad7d12 100644 --- a/usr.bin/rcs/ci.1 +++ b/usr.bin/rcs/ci.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ci.1,v 1.27 2006/04/19 11:08:23 jmc Exp $ +.\" $OpenBSD: ci.1,v 1.28 2006/04/24 22:06:49 jmc Exp $ .\" .\" Copyright (c) 2005 Niall O'Higgins <niallo@openbsd.org> .\" All rights reserved. @@ -72,6 +72,14 @@ using the .Fl x option. .Pp +Files may be selected by revision or, +where no revision is specified, +the latest revision of the default branch is used. +Revisions are specified either by using the +.Fl r +option or +by appending the revision number to any option that supports it. +.Pp .Nm also supports keyword substitution \(en @@ -89,9 +97,8 @@ If .Ar date is not specified, use the working file's last modification time. .It Fl f Ns Op Ar rev -Force check-in - optionally to -.Ar rev -- even if no changes have been made to the working file. +Force check-in +\(en even if no changes have been made to the working file. .It Fl I Interactive mode. .It Fl i Ns Op Ar rev diff --git a/usr.bin/rcs/co.1 b/usr.bin/rcs/co.1 index fc30bafd7b7..b39e012c4ef 100644 --- a/usr.bin/rcs/co.1 +++ b/usr.bin/rcs/co.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: co.1,v 1.24 2006/04/19 11:08:23 jmc Exp $ +.\" $OpenBSD: co.1,v 1.25 2006/04/24 22:06:49 jmc Exp $ .\" .\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> .\" All rights reserved. @@ -67,6 +67,14 @@ option. During this time, no other users may check out the file whilst it is locked. .Pp +Files may be selected by revision or, +where no revision is specified, +the latest revision of the default branch is used. +Revisions are specified either by using the +.Fl r +option or +by appending the revision number to any option that supports it. +.Pp .Nm also supports keyword substitution \(en @@ -96,17 +104,11 @@ retrieved revision. Print the latest revision no later than .Ar rev to standard output. -If -.Ar rev -is not specified, print HEAD. .It Fl q Ns Op Ar rev Be quiet about reporting. .It Fl r Ns Op Ar rev Retrieve the latest revision no later than .Ar rev . -If -.Ar rev -is not specified, retrieve HEAD. .It Fl s Ns Ar state Retrieve revision of the specified .Ar state diff --git a/usr.bin/rcs/rcs.1 b/usr.bin/rcs/rcs.1 index 05213ddb580..8a93f93b310 100644 --- a/usr.bin/rcs/rcs.1 +++ b/usr.bin/rcs/rcs.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rcs.1,v 1.33 2006/04/20 09:16:28 jmc Exp $ +.\" $OpenBSD: rcs.1,v 1.34 2006/04/24 22:06:49 jmc Exp $ .\" .\" Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org> .\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> @@ -75,6 +75,14 @@ and See the respective manual pages for more information about these utilities. .Pp +Files may be selected by revision or, +where no revision is specified, +the latest revision of the default branch is used. +Revisions are specified either by using the +.Fl r +option or +by appending the revision number to any option that supports it. +.Pp .Nm also supports keyword substitution \(en @@ -123,9 +131,6 @@ Enable strict locking on the RCS files. Lock revision .Ar rev on the RCS files. -If -.Ar rev -is not given, the head revision is locked. .It Fl M Disable mail warnings when breaking a user's lock. Normally, @@ -178,10 +183,6 @@ Sets the state of revision to the identifier .Ar state . The specified value may not contain a space character. -If -.Ar rev -is not specified, the latest revision of the default branch -is assumed. .It Fl T Preserve the modification time of RCS files. .Sm off @@ -205,9 +206,6 @@ Disable strict locking on the RCS files. Unlock revision .Ar rev on the RCS files. -If -.Ar rev -is not given, the head revision is unlocked. .It Fl V Print the program's version string and exit. .It Fl x Ns Ar suffixes diff --git a/usr.bin/rcs/rcsclean.1 b/usr.bin/rcs/rcsclean.1 index 7f1139b4ea3..392b0c7967a 100644 --- a/usr.bin/rcs/rcsclean.1 +++ b/usr.bin/rcs/rcsclean.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rcsclean.1,v 1.16 2006/04/24 18:06:59 jmc Exp $ +.\" $OpenBSD: rcsclean.1,v 1.17 2006/04/24 22:06:49 jmc Exp $ .\" .\" Copyright (c) 2005 Joris Vink <joris@openbsd.org> .\" All rights reserved. @@ -42,9 +42,9 @@ does not remove files from the RCS repository. Files may be selected by revision or, where no revision is specified, the latest revision of the default branch is used. -Revisions are specified either explicitly using the +Revisions are specified either by using the .Fl r -option or implicitly +option or by appending the revision number to any option that supports it. .Pp .Nm diff --git a/usr.bin/rcs/rcsmerge.1 b/usr.bin/rcs/rcsmerge.1 index 2c2e51dc67b..741f361b809 100644 --- a/usr.bin/rcs/rcsmerge.1 +++ b/usr.bin/rcs/rcsmerge.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: rcsmerge.1,v 1.8 2006/04/24 13:32:10 jmc Exp $ +.\" $OpenBSD: rcsmerge.1,v 1.9 2006/04/24 22:06:49 jmc Exp $ .\" .\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org> .\" All rights reserved. @@ -36,6 +36,14 @@ The program merges changes between two revisions of an RCS file into the corresponding working file. .Pp +Files may be selected by revision or, +where no revision is specified, +the latest revision of the default branch is used. +Revisions are specified either by using the +.Fl r +option or +by appending the revision number to any option that supports it. +.Pp .Nm also supports keyword substitution \(en |