Import cvs-1.11.1p1 onto vendor branch

1 files changed, 8 insertions, 4 deletions

diff --git a/contrib/cvs/doc/cvsclient.texi b/contrib/cvs/doc/cvsclient.texi
index 5ba7ed6b4eb2..b81a7736c560 100644
--- a/contrib/cvs/doc/cvsclient.texi
+++ b/contrib/cvs/doc/cvsclient.texi
@@ -484,7 +484,8 @@ in use, or sticks to a common subset.
 The protocol contains times and dates in various places.
 
 For the @samp{-D} option to the @code{annotate}, @code{co}, @code{diff},
-@code{export}, @code{history}, @code{rdiff}, @code{rtag}, @code{tag},
+@code{export}, @code{history}, @code{rannotate}, @code{rdiff},
+@code{rtag}, @code{tag},
 and @code{update} requests, the server should support two formats:
 
 @example
@@ -495,7 +496,8 @@ and @code{update} requests, the server should support two formats:
 The former format is preferred; the latter however is sent by the CVS
 command line client (versions 1.5 through at least 1.9).
 
-For the @samp{-d} option to the @code{log} request, servers should at
+For the @samp{-d} option to the @code{log} and @code{rlog} requests,
+servers should at
 least support RFC 822/1123 format.  Clients are encouraged to use this
 format too (the command line CVS client, version 1.10 and older, just passed
 along the date format specified by the user, however).
@@ -1160,12 +1162,14 @@ and send it in a future @code{Entry} request.  Note that the entries
 line in the @code{Created} response must indicate whether the file is
 binary or text, so the client can create it correctly.
 
-@item rdiff \n
+@item rannotate \n
+@itemx rdiff \n
+@itemx rlog \n
 @itemx rtag \n
 Response expected: yes.  Actually do a cvs command.  This uses any
 previous @code{Argument} requests, if they have been sent.  The client
 should not send @code{Directory}, @code{Entry}, or @code{Modified}
-requests for this command; they are not used.  Arguments to these
+requests for these commands; they are not used.  Arguments to these
 commands are module names, as described for @code{co}.
 
 @item init @var{root-name} \n