diff options
author | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-02-09 16:56:40 +0000 |
---|---|---|
committer | Xavier Santolaria <xsa@cvs.openbsd.org> | 2005-02-09 16:56:40 +0000 |
commit | bb9e83b635102fb3d018ce12711b79d2bdb1d5a9 (patch) | |
tree | 3e98dea1edd50129e67c6d493eab5f9c673c3af4 /usr.bin/cvs/cvs.1 | |
parent | 2a9d3c8040bea60f113b573b91ac44a9c794dfac (diff) |
hrmz, should be right now ...
Diffstat (limited to 'usr.bin/cvs/cvs.1')
-rw-r--r-- | usr.bin/cvs/cvs.1 | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/usr.bin/cvs/cvs.1 b/usr.bin/cvs/cvs.1 index 549b24b6e17..0499045a11b 100644 --- a/usr.bin/cvs/cvs.1 +++ b/usr.bin/cvs/cvs.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: cvs.1,v 1.47 2005/02/09 16:36:55 xsa Exp $ +.\" $OpenBSD: cvs.1,v 1.48 2005/02/09 16:56:39 xsa Exp $ .\" .\" Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> .\" Copyright (c) 2004, 2005 Xavier Santolaria <xsa@openbsd.org> @@ -126,40 +126,40 @@ are replaced with strings of the form $keyword: value$ whenever you obtain a new revision of the file. The possible keywords are as follows: .Bl -tag -width "RevisionXXX" -.It \&$Author\&$ +.It $\&Author$ The name of the user who checked in the revision. -.It \&$Date\&$ +.It $\&Date$ The date and hour (UTC) the revision was checked in. -.It \&$Header\&$ +.It $\&Header$ Standard header containing the full pathname of the RCS file, the revision number, the date (UTC), the author and the state. -.It \&$Id\&$ -The same content as \&$Header\&$ but without the path +.It $\&Id$ +The same content as $\&Header$ but without the path of the RCS file. -.It \&$Log\&$ +.It $\&Log$ The log message supplied during commit, preceded by a header containing the RCS filename, the revision number, the author, and the date (UTC). -.It \&$Name\&$ +.It $\&Name$ The tag name used to check out the file. -.It \&$RCSfile\&$ +.It $\&RCSfile$ The name of the RCS file, but without a path. -.It \&$Revision\&$ +.It $\&Revision$ The revision number assigned to the revision. -.It \&$Source\&$ +.It $\&Source$ The full pathname of the RCS file. -.It \&$State\&$ +.It $\&State$ The state assigned to the revision. .El .Pp Keyword substitution has its disadvantages: sometimes the -literal text string \&$Author\&$ is wanted inside a file without +literal text string $\&Author$ is wanted inside a file without .Nm interpreting it as a keyword and expanding it into something like -\&$Author\&$. +$\&Author$. The .Fl k Ar o -option can be used to turn off keyword substitution entirely though. +option can be used to turn off keyword substitution entirely though. There is unfortunately no way to selectively turn off keyword substitution. .Pp Each file and working directory copy of a file have a stored @@ -194,8 +194,8 @@ Useful with the command to avoid displaying the differences between keyword substitutions. .It Fl k Ar kv The default behaviour. -Keywords are normally substituted i.e. \&$Revision\&$ becomes -\&$Revision: 1.47 $. +Keywords are normally substituted i.e. $\&Revision$ becomes +$\&Revision: 1.1 $. .It Fl k Ar kvl Like .Fl k Ar kv , @@ -212,7 +212,7 @@ command to guarantee that files that already contain external keywords do not get modified. .It Fl k Ar v Substitue the value of keywords instead of keywords themselves -e.g. instead of \&$Revision\&$, only insert 1.1 and not \&$Revision: 1.47 $. +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 .Ic export |