#
# patch "ChangeLog"
#  from [ccdae702f8a09d0b7aba6acbd8de47e338deed4a]
#    to [be6ee766fee05dc86d5a4aa6ba040dabaf3485a9]
#
# patch "NEWS"
#  from [7dccd806b4f5fea115110ed91d0eef708a423899]
#    to [ddc65d2453cf32d6df8dd430fa7a70f32ea13910]
#
========================================================================
--- ChangeLog	ccdae702f8a09d0b7aba6acbd8de47e338deed4a
+++ ChangeLog	be6ee766fee05dc86d5a4aa6ba040dabaf3485a9
@@ -1,7 +1,12 @@
 2005-09-29  Nathaniel Smith  <address@hidden>

+	* NEWS: Fix typos pointed out by Matthew Gregan.
+
+2005-09-29  Nathaniel Smith  <address@hidden>
+
 	* UPGRADE, configure.ac, monotone.spec, win32/monotone.iss:
 	* debian/changelog: Bump version number.
+	
 2005-09-30  Grahame Bowland  <address@hidden>

 	* paths.hh: update file_path documentation,
========================================================================
--- NEWS	7dccd806b4f5fea115110ed91d0eef708a423899
+++ NEWS	ddc65d2453cf32d6df8dd430fa7a70f32ea13910
@@ -1,9 +1,9 @@
 ????????????????????????????

         0.23 release.

         Possibly incompatible changes:
-        - hook_note_commit and hook_note_netsync_revision_recieved
+        - hook_note_commit and hook_note_netsync_revision_received
           take a new argument containing the text of the revision that
           was received.  (Timothy Brownawell <address@hidden>)
         - 'cat FILENAME' now acts like the old 'cat file REV
@@ -17,7 +17,7 @@
         - much work on making monotone more i18n friendly (Benoît
           Dejean <address@hidden>, Matt Johnston
           <address@hidden>)
-        - support for new more interactive merge tools:
+        - support for more interactive merge tools:
           - FileMerge.app (comes with OS X) (Marcel van der Boom
             <address@hidden>)
           - TortoiseMerge (Win32; comes with TortoiseSVN) (Matthew