[Cvs-cvs] Changes to ccvs/doc/cvs.texinfo [cvs1-11-x-branch]

[Derek Robert Price]

Index: ccvs/doc/cvs.texinfo
diff -u ccvs/doc/cvs.texinfo:1.545.2.47 ccvs/doc/cvs.texinfo:1.545.2.48
--- ccvs/doc/cvs.texinfo:1.545.2.47     Fri Aug 12 20:42:43 2005
+++ ccvs/doc/cvs.texinfo        Mon Aug 22 20:28:32 2005
@@ -5945,10 +5945,12 @@
 @cindex Merging a file
 @cindex Update, introduction
 
-When you want to update or merge a file, use the @code{update}
+When you want to update or merge a file, use the @code{cvs update -d}
 command.  For files that are not up to date this is roughly equivalent
 to a @code{checkout} command: the newest revision of the file is
-extracted from the repository and put in your working directory.
+extracted from the repository and put in your working directory.  The
address@hidden option, not necessary with @code{checkout}, tells @sc{cvs}
+that you wish it to create directories added by other developers.
 
 Your modifications to a file are never lost when you
 use @code{update}.  If no newer revision exists,