#
# patch "ChangeLog"
#  from [78807b197c9e56f8292988eb938fd0d3f203c511]
#    to [38099db924c0943fae7d5896fc743c8eed8e15e9]
#
# patch "NEWS"
#  from [99678784bf033790e0cf616f35a4c016946b6f49]
#    to [4e6e48c7d84b9e778412486592d47032638dff3f]
#
# patch "monotone.texi"
#  from [2b5791aab65173933526a8a26a2167e5e493e154]
#    to [182448f115ae70d11d3e594e4c88aae731577213]
#
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,8 @@
+2005-04-14  Jeremy Cowgar  <address@hidden>
+
+	* monotone.texi (Making Changes): Fixed duplicate paragraph
+	* NEWS: Corrected spelling error in my name.
+
 2005-04-13  Nathaniel Smith  <address@hidden>

 	* monotone.texi (Informative): 'diff' with two revision arguments
@@ -2707,7 +2712,7 @@
 	* AUTHORS: Mention Wojciech and Neil.
 	* revision.cc (calculate_ancestors_from_graph): Make non-recursive.

-2005-01-17  Wojciech Miłkowski  <address@hidden>
+2005-01-17  Wojciech Miłkowski  <address@hidden>

 	* std_hooks.lua: Teach about meld.

--- NEWS
+++ NEWS
@@ -41,7 +41,7 @@
                 - New "--depth" argument to 'log'.  Thanks to Richard
                   Levitte <address@hidden>.
                 - 'db info' gives statistics on space usage.
-                - new command 'dropkey'.  Thanks to Jeremey Cowgar
+                - new command 'dropkey'.  Thanks to Jeremy Cowgar
                   <address@hidden>.
         - robustness improvement: if monotone crashes in a working
           directory and --dump and --debug were not specified, saves
--- monotone.texi
+++ monotone.texi
@@ -1886,16 +1886,6 @@
 @end group
 @end smallexample

-and logs her changes in @file{MT/log} right away so she does not
-forget what she has done:
-
address@hidden
address@hidden
-$ vi MT/log
-* src/banana.c: Added polling implementation
address@hidden group
address@hidden smallexample
-
 Later, she commits her work.  Monotone again invokes an external editor
 for her to edit her log message, but this time it fills in the messages
 she's written so far, and she simply checks them over one last time