# 
# patch "ChangeLog"
#  from [13eeff23ef10288fec29c6d8ba50a2fc37594a4b]
#    to [c9fdccd9b5dae6701f72b07fd3f22fc542773f26]
# 
# patch "monotone.texi"
#  from [939f56de6aac68a630492031939ce4654f093203]
#    to [38e796ddafa66c78001fb53209d8c7e0dd8c0b75]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,9 @@
 2005-04-17  Nathaniel Smith  <address@hidden>
 
+	* monotone.texi (Branching and Merging): A few small edits.
+
+2005-04-17  Nathaniel Smith  <address@hidden>
+
 	* change_set.cc (path_item, sanity_check_path_item): Mark things
 	inline.
 
--- monotone.texi
+++ monotone.texi
@@ -2115,7 +2115,7 @@
 Continuing our example, suppose that Jim is so impressed by Beth's work
 on banana juice support that he assigns her to work on the JuiceBot 7's
 surprise new feature: muffins.  In the mean time, Abe will continue
-working on the JuiceBot's basic juice-related function.
+working on the JuiceBot's basic juice-related functions.
 
 The changes required to support muffins are somewhat complicated, and
 Beth is worried that her work might destabilize the program, and
@@ -2134,13 +2134,13 @@
 
 @smallexample
 @group
-$ monotone commit --branch=jp.co.juicebot.jb7.muffins --message='initial autobake framework'
+$ monotone commit --branch=jp.co.juicebot.jb7.muffins --message='autobake framework'
 monotone: beginning commit on branch 'jp.co.juicebot.jb7.muffins'
 monotone: committed revision d33caefd61823ecbb605c39ffb84705dec449857
 @end group
 @end smallexample
 
-That's all there is to it --- now there is a
+That's all there is to it --- there is now a
 @code{jp.co.juicebot.jb7.muffins} branch, with her initial checkin on
 it.  She can make further checkins from the same working copy, and they
 will automatically go to the muffins branch; if anyone else wants to