===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/cvs.1,v
retrieving revision 1.47
retrieving revision 1.48
diff -c -r1.47 -r1.48
*** src/usr.bin/cvs/cvs.1	2005/02/09 16:36:55	1.47
--- src/usr.bin/cvs/cvs.1	2005/02/09 16:56:39	1.48
***************
*** 1,4 ****
! .\"	$OpenBSD: cvs.1,v 1.47 2005/02/09 16:36:55 xsa Exp $
  .\"
  .\" Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  .\" Copyright (c) 2004, 2005 Xavier Santolaria <xsa@openbsd.org>
--- 1,4 ----
! .\"	$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,165 ****
  obtain a new revision of the file.
  The possible keywords are as follows:
  .Bl -tag -width "RevisionXXX"
! .It \&$Author\&$
  The name of the user who checked in the revision.
! .It \&$Date\&$
  The date and hour (UTC) the revision was checked in.
! .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
  of the RCS file.
! .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\&$
  The tag name used to check out the file.
! .It \&$RCSfile\&$
  The name of the RCS file, but without a path.
! .It \&$Revision\&$
  The revision number assigned to the revision.
! .It \&$Source\&$
  The full pathname of the RCS file.
! .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
  .Nm
  interpreting it as a keyword and expanding it into something like
! \&$Author\&$.
  The
  .Fl k Ar o
! 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
--- 126,165 ----
  obtain a new revision of the file.
  The possible keywords are as follows:
  .Bl -tag -width "RevisionXXX"
! .It $\&Author$
  The name of the user who checked in the revision.
! .It $\&Date$
  The date and hour (UTC) the revision was checked in.
! .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
  of the RCS file.
! .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$
  The tag name used to check out the file.
! .It $\&RCSfile$
  The name of the RCS file, but without a path.
! .It $\&Revision$
  The revision number assigned to the revision.
! .It $\&Source$
  The full pathname of the RCS file.
! .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
  .Nm
  interpreting it as a keyword and expanding it into something like
! $\&Author$.
  The
  .Fl k Ar o
! 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,201 ****
  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 $.
  .It Fl k Ar kvl
  Like
  .Fl k Ar kv ,
--- 194,201 ----
  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.1 $.
  .It Fl k Ar kvl
  Like
  .Fl k Ar kv ,
***************
*** 212,218 ****
  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 $.
  This option must be used with care, as it can only be used once.
  It is often used with the
  .Ic export
--- 212,218 ----
  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.1 $.
  This option must be used with care, as it can only be used once.
  It is often used with the
  .Ic export