# 
# patch "ChangeLog"
#  from [ea8eda75f028e560ff030dd0a4c449e05cb40707]
#    to [aa80779a8551e063b84d3a0436dff10f01047c13]
# 
# patch "monotone.1"
#  from [ba5f63a813f90f28050235e3d6131c42a31f48fe]
#    to [e1dc755c77a557270d1c1ca35432320b1992eb72]
# 
# patch "monotone.texi"
#  from [2e63f434deec3b8378969cc7d63cda1c225f9d42]
#    to [b6afbb8cf5d1e60fdc5794acf9052a66a613b094]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,9 @@
+2005-05-06  Nathaniel Smith  <address@hidden>
+
+	* monotone.1: 
+	* monotone.texi (Commands, Importing from CVS, RCS): Clarify
+	cvs_import documentation on cvsroot vs. module issues.
+
 2005-05-05  Richard Levitte  <address@hidden>
 
 	* AUTHORS: Add rghetta.
--- monotone.1
+++ monotone.1
@@ -107,10 +107,10 @@
 \fBread\fP
 Read packets from stdin. 
 .TP
-\fBcvs_import\fP \fI<cvsroot>\fP
-Import all versions in CVS repository. Reconstructs revisions and
-converts metadata to certificates. A private signing key must already
-exist in the database.
+\fBcvs_import\fP \fI<cvsroot>/<module>\fP
+Import all versions in CVS module. Reconstructs revisions and converts
+metadata to certificates. A private signing key must already exist in
+the database.
 .TP
 \fBrcs_import\fP \fI<rcsfile> ...\fP
 Import all file versions in RCS files. Does not reconstruct revisions
--- monotone.texi
+++ monotone.texi
@@ -2913,6 +2913,8 @@
 Your database name, @file{test.db} in this example.
 @item
 Your CVS repository path, @file{/usr/local/cvsroot} in this example.
address@hidden
+The CVS module name for your project, @code{wobbler} in this example.
 @end itemize
 
 Accounting for these differences at your site, the following is an
@@ -2924,7 +2926,7 @@
 @group
 $ monotone --db=test.db db init
 $ monotone --db=test.db genkey import@@example.net
-$ monotone --db=test.db --branch=net.example.wobbler cvs_import /usr/local/cvsroot
+$ monotone --db=test.db --branch=net.example.wobbler cvs_import /usr/local/cvsroot/wobbler
 $ monotone --db=test.db --branch=net.example.wobbler checkout wobber-checkout
 @end group
 @end smallexample
@@ -4851,16 +4853,21 @@
 database.  Note that this does not do any revision reconstruction, and
 is only useful for debugging.
 
address@hidden monotone cvs_import @var{pathname...}
address@hidden monotone cvs_import @var{pathname}
 
-This command imports all the file versions in each RCS file found in
-the tree of files starting at @var{pathname...}, then reconstructs the
+This command imports all the file versions in each RCS file found in the
+tree of files starting at @var{pathname}, then reconstructs the
 tree-wide history of logical changes by comparing RCS time stamps and
 change log entries. For each logical tree-wide change, monotone
 synthesizes a manifest and revision, and commits them (along with all
-associated file deltas) to your database. It also copies all change
-log entries, author identifiers, and date stamps to manifest
-certificates.
+associated file deltas) to your database. It also copies all change log
+entries, author identifiers, and date stamps to manifest certificates.
+
+In normal use, @var{pathname} will be a CVS module, though it is
+possible to point it at a directory within a module as well.  Whatever
+directory you point it at will become the root of monotone's version of
+the tree.
+
 @end ftable
 
 
@@ -6287,10 +6294,10 @@
 the trust assigned to keys.
 @comment TROFF INPUT: .TP
 
address@hidden @b{cvs_import} @i{<cvsroot>}
-Import all versions in CVS repository. Reconstructs revisions and
-converts metadata to certificates. A private signing key must already
-exist in the database.
address@hidden @b{cvs_import} @i{<cvsroot>/<module>}
+Import all versions in a CVS module. Reconstructs revisions and converts
+metadata to certificates. A private signing key must already exist in
+the database.
 @comment TROFF INPUT: .TP
 
 @item @b{rcs_import} @i{<rcsfile> ...}