--- cvs.texinfo.orig	Tue Apr 24 14:14:52 2001
+++ cvs.texinfo	Thu Sep  6 13:29:08 2001
@@ -6320,7 +6320,7 @@
 notifications about various actions taken on a file.
 You can do this without using @code{cvs watch on} for
 the file, but generally you will want to use @code{cvs
-watch on}, so that developers use the @code{cvs edit}
+watch on}, to remind developers to use the @code{cvs edit}
 command.
 
 @cindex watch add (subcommand)
@@ -6336,15 +6336,28 @@
 
 @item edit
 Another user has applied the @code{cvs edit} command (described
-below) to a file.
+below) to a watched file.
+
address@hidden commit
+Another user has committed changes to one of the named @var{files}.
 
 @item unedit
-Another user has applied the @code{cvs unedit} command (described
-below) or the @code{cvs release} command to a file, or has deleted
-the file and allowed @code{cvs update} to recreate it.
+Another user has abandoned editing a file (other than by committing changes).
+They can do this in several ways, by:
 
address@hidden commit
-Another user has committed changes to a file.
address@hidden @bullet
+
address@hidden
+applying the @code{cvs unedit} command (described below) to the file
+
address@hidden
+applying the @code{cvs release} command (@pxref{release}) to the file's parent directory
+(or recursively to a directory more than one level up)
+
address@hidden
+deleting the file and allowing @code{cvs update} to recreate it
+
address@hidden itemize
 
 @item all
 All of the above.
@@ -6358,8 +6371,8 @@
 The @code{-a} option may appear more than once, or not at all.  If
 omitted, the action defaults to @code{all}.
 
-The @var{files} and options are processed as for the
address@hidden watch} commands.
+The @var{files} and options are processed as for
address@hidden watch on}.
 
 @end deffn
 
@@ -6508,9 +6521,10 @@
 
 If watches are not in use, the @code{unedit} command
 probably does not work, and the way to revert to the
-repository version is to remove the file and then use
address@hidden update} to get a new copy.  The meaning is
-not precisely the same; removing and updating may also
+repository version is with the command @code{cvs update -C file}
+(@pxref{update}).
+The meaning is
+not precisely the same; the latter may also
 bring in some changes which have been made in the
 repository since the last time you updated.
 @c It would be a useful enhancement to CVS to make
@@ -10074,7 +10088,7 @@
 
 @itemize @bullet
 @item
-update [-AdflPpR] [-d] [-r tag|-D date] address@hidden
+update [-ACdflPpR] [-I name] [-j rev [-j rev]] [-k kflag] [-r tag|-D date] [-W spec] address@hidden
 @item
 Requires: repository, working directory.
 @item