summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2006-04-19 12:49:56 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2006-04-19 12:49:56 +0000
commitaf8004a4295efb56481d95dbe8d4e96c78c0b3e8 (patch)
tree0882d60914efff8932e8fa932d612b2076031625 /usr.bin
parentb238cdd7ac6479e68803b5a3c1a1c1c20a90206c (diff)
make the keyword section make sense regarding cvs commands;
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/rcs/rcs.112
1 files changed, 10 insertions, 2 deletions
diff --git a/usr.bin/rcs/rcs.1 b/usr.bin/rcs/rcs.1
index b3ec54ca448..02513633f80 100644
--- a/usr.bin/rcs/rcs.1
+++ b/usr.bin/rcs/rcs.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: rcs.1,v 1.26 2006/04/19 12:44:00 jmc Exp $
+.\" $OpenBSD: rcs.1,v 1.27 2006/04/19 12:49:55 jmc Exp $
.\"
.\" Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
.\" Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
@@ -219,6 +219,7 @@ character.
.Sh KEYWORD SUBSTITUTION
As long as you edit source files inside a working directory you
can always find out the state of your files via the
+.Xr cvs 1
.Ic status
or
.Ic log
@@ -266,6 +267,8 @@ The state assigned to the revision.
Keyword substitution has its disadvantages: sometimes the
literal text string $\&Author$ is wanted inside a file without
.Nm
+or
+.Xr cvs 1
interpreting it as a keyword and expanding it into something like
$\&Author$.
The
@@ -289,6 +292,7 @@ This option is used to handle binary files.
.It Fl k Ns Ar k
Does not substitute the keywords.
Useful with the
+.Xr cvs 1
.Ic diff
command to avoid displaying the differences between keyword substitutions.
.It Fl k Ns Ar kv
@@ -302,10 +306,13 @@ except that the locker's name is displayed along with the version
if the given revision is currently locked.
This option is normally not useful as
.Nm
-does not use file locking by default.
+and
+.Xr cvs 1
+do not use file locking by default.
.It Fl k Ns Ar o
No substitutions are done.
This option is often used with the
+.Xr cvs 1
.Ic import
command to guarantee that files that already contain external keywords
do not get modified.
@@ -314,6 +321,7 @@ Substitute the value of keywords instead of keywords themselves
e.g. instead of $\&Revision$, only insert 1.1 and not $\&Revision: 1.1 $.
This option must be used with care, as it can only be used once.
It is often used with the
+.Xr cvs 1
.Ic export
command to freeze the values before releasing software.
.El