This commit was generated by cvs2svn to compensate for changes in r32896,

which included commits to RCS files with non-trunk default branches.

3 files changed, 50 insertions, 0 deletions

diff --git a/contrib/cvs/doc/ChangeLog b/contrib/cvs/doc/ChangeLog
index 0571444..3fd4433 100644
--- a/contrib/cvs/doc/ChangeLog
+++ b/contrib/cvs/doc/ChangeLog
@@ -1,3 +1,17 @@
+Wed Jan 28 23:09:39 1998  Jim Kingdon  <kingdon@harvey.cyclic.com>
+
+	* cvs.texinfo (Excluding directories): Add index entry for "!".
+
+28 Jan 1998  Karl Fogel and Jim Kingdon
+
+	* cvsclient.texi (Requests, Responses): document
+	"wrapper-sendme-rcsOptions" and "Wrapper-rcsOption".
+
+Tue Jan 27 18:37:37 1998  Ian Lance Taylor  <ian@cygnus.com>
+
+	* cvs.texinfo (Excluding directories): New node, documenting how
+	to exclude directories using ! in an alias module.
+
 Sun Jan 18 18:23:02 1998  Jim Kingdon  <kingdon@harvey.cyclic.com>
 
 	* cvsclient.texi (Requests): Add Kopt request.
diff --git a/contrib/cvs/doc/cvs.texinfo b/contrib/cvs/doc/cvs.texinfo
index 7c2a750..e50a793 100644
--- a/contrib/cvs/doc/cvs.texinfo
+++ b/contrib/cvs/doc/cvs.texinfo
@@ -10513,6 +10513,7 @@ a file @file{sfile}.
 * Alias modules::             The simplest kind of module
 * Regular modules::
 * Ampersand modules::
+* Excluding directories::     Excluding directories from a module
 * Module options::            Regular and ampersand modules can take options
 @end menu
 
@@ -10685,6 +10686,25 @@ a future release of @sc{cvs}.
 @c should put in a few words about why you would use one or
 @c the other in various situations.
 
+@node Excluding directories
+@appendixsubsec Excluding directories
+@cindex excluding directories, in modules file
+@cindex !, in modules file
+
+An alias module may exclude particular directories from
+other modules by using an exclamation mark (@samp{!})
+before the name of each directory to be excluded.
+
+For example, if the modules file contains:
+
+@example
+exmodule -a first-dir !first-dir/sdir
+@end example
+
+then checking out the module @samp{exmodule} will check
+out everything in @samp{first-dir} except any files in
+the subdirectory @samp{first-dir/sdir}.
+
 @node Module options
 @appendixsubsec Module options
 @cindex options, in modules file
diff --git a/contrib/cvs/doc/cvsclient.texi b/contrib/cvs/doc/cvsclient.texi
index f81ff92..35fe39b 100644
--- a/contrib/cvs/doc/cvsclient.texi
+++ b/contrib/cvs/doc/cvsclient.texi
@@ -1081,6 +1081,11 @@ Availability of this request in the server indicates to the client that
 it may compress files sent to the server, regardless of whether the
 client actually uses this request.
 
+@item wrapper-sendme-rcsOptions \n
+Response expected: yes.
+Request that the server transmit mappings from filenames to keyword
+expansion modes in @code{Wrapper-rcsOption} responses.
+
 @item @var{other-request} @var{text} \n
 Response expected: yes.
 Any unrecognized request expects a response, and does not
@@ -1372,6 +1377,17 @@ argument to a @code{co} request (for example, if the modules file
 contains the @samp{-d} option, it will be the directory specified with
 @samp{-d}, not the name of the module).
 
+@item Wrapper-rcsOption @var{pattern} -k '@var{option}' \n
+Transmit to the client a filename pattern which implies a certain
+keyword expansion mode.  The @var{pattern} is a wildcard pattern (for
+example, @samp{*.exe}.  The @var{option} is @samp{b} for binary, and so
+on.  Note that although the syntax happens to resemble the syntax in
+certain CVS configuration files, it is more constrained; there must be
+exactly one space between @var{pattern} and @samp{-k} and exactly one
+space between @samp{-k} and @samp{'}, and no string is permitted in
+place of @samp{-k} (extensions should be done with new responses, not by
+extending this one, for graceful handling of @code{Valid-responses}).
+
 @item M @var{text} \n
 A one-line message for the user.