# 
# 
# patch "Makefile.am"
#  from [43fc2e981abe555214637b7cb5fb46be6450d5ea]
#    to [99e71640c0d159c9e761cae856b6bb1a3a10ff0b]
# 
# patch "monotone.texi"
#  from [663f1413f7af7d9cc010c001c73cd2fd501e31dd]
#    to [22ed2ab06ba84e06c71aba93182937c131482ce2]
# 
============================================================
--- Makefile.am	43fc2e981abe555214637b7cb5fb46be6450d5ea
+++ Makefile.am	99e71640c0d159c9e761cae856b6bb1a3a10ff0b
@@ -56,12 +56,12 @@
          legacy.cc legacy.hh                                            \
                                                                         \
          lru_cache.h                                                    \
+                                                                        \
          piece_table.cc netxx_pipe.cc					\
 	 cleanup.hh unit_tests.hh interner.hh				\
          cycle_detector.hh randomfile.hh adler32.hh quick_alloc.hh	\
 	 netio.hh smap.hh gettext.h					\
          package_revision.c package_revision.h				\
-         cvs_client.cc cvs_sync.cc					\
          package_full_revision.c package_full_revision.h options.hh	\
          i18n.h hash_map.hh parallel_iter.hh safe_map.hh pch.hh
 
============================================================
--- monotone.texi	663f1413f7af7d9cc010c001c73cd2fd501e31dd
+++ monotone.texi	22ed2ab06ba84e06c71aba93182937c131482ce2
@@ -3374,6 +3374,7 @@
 @page
 @node    Using packets
 @section Using packets
+
 Suppose you made changes to your database, and want to send those
 changes to someone else but for some reason you cannot use netsync.  Or
 maybe you want to extract and inject individual revisions automatically
@@ -3399,8 +3400,6 @@
 @end smallexample
 
 Now set up a branch in A:
-Change your working directory to the topmost directory of a CVS project and
-enter
 
 @smallexample
 @group
@@ -3596,7 +3595,7 @@
 
 @smallexample
 @group
-$ monotone --branch=org.gnome.cvs.glade-- cvs_takeover glade--
+$ mtn --branch=org.gnome.cvs.glade-- cvs_takeover glade--
 @end group
 @end smallexample
 
@@ -3619,7 +3618,7 @@
 
 @smallexample
 @group
-$ monotone --branch=org.gnome.cvs.glade-- --since=2005-01-01T00:00:00 cvs_pull :pserver:anonymous@@anoncvs.gnome.org:/cvs/gnome glade--
+$ mtn --branch=org.gnome.cvs.glade-- --since=2005-01-01T00:00:00 cvs_pull :pserver:anonymous@@anoncvs.gnome.org:/cvs/gnome glade--
 @end group
 @end smallexample
 
@@ -3637,7 +3636,7 @@
 
 @smallexample
 @group
-$ monotone --branch=org.gnome.cvs.glade-- cvs_push
+$ mtn --branch=org.gnome.cvs.glade-- cvs_push
 @end group
 @end smallexample
 
@@ -4528,8 +4527,8 @@
 in case someone, for some odd reason, decides to put a ``*'' into their
 branch name.
 
address@hidden monotone cvs_pull [--since @var{time}] address@hidden @var{module} address@hidden
address@hidden monotone cvs_push address@hidden @var{module} address@hidden
address@hidden mtn cvs_pull [--since @var{time}] address@hidden @var{module} address@hidden
address@hidden mtn cvs_push address@hidden @var{module} address@hidden
 These commands communicate with a CVS server. @code{cvs_pull} works like
 @code{cvs update} and @code{cvs_push} is like @code{cvs commit}.
 See also @xref{cvssync,,cvssync introduction}.