#
# patch "AUTHORS"
#  from [82c58d1acbc33679c1333196dd0b555c2550cfdc]
#    to [439b592907209a2735f17fbb8e700f8a712dcad2]
#
# patch "ChangeLog"
#  from [6aae9a37db052ff5ffdb7b1b52548b28a08a5269]
#    to [01c30f2cdb173dcc3460ca2fbdd522dae4732ebd]
#
# patch "NEWS"
#  from [494d8b2496f3b78e6225d572f92e2643ea7ef223]
#    to [7dccd806b4f5fea115110ed91d0eef708a423899]
#
# patch "monotone.texi"
#  from [6d5a231b85631453f85095ac4ce027c3fdc15e38]
#    to [5cc1a931d274bc7d3f0cc95fc932162506011cb6]
#
========================================================================
--- AUTHORS	82c58d1acbc33679c1333196dd0b555c2550cfdc
+++ AUTHORS	439b592907209a2735f17fbb8e700f8a712dcad2
@@ -67,6 +67,8 @@
   Vladimir Vukicevic <address@hidden>
   Benoît Dejean <address@hidden>
   Patrick Mauritz <address@hidden>
+  Grahame Bowland <address@hidden>
+  Marcel van der Boom <address@hidden>

 Several people have also contributed to the translation of monotone
 into non-English languages; their work is available in the po/
========================================================================
--- ChangeLog	6aae9a37db052ff5ffdb7b1b52548b28a08a5269
+++ ChangeLog	01c30f2cdb173dcc3460ca2fbdd522dae4732ebd
@@ -1,3 +1,10 @@
+2005-09-29  Nathaniel Smith  <address@hidden>
+
+	* AUTHORS: Add Grahame and Marcel.
+	* NEWS: Write 0.23 entry.
+	* monotone.texi (Reserved Files): Mention in .mt-ignore docs that
+	the patterns are regexes.
+	
 2005-09-30  Grahame Bowland  <address@hidden>

 	* paths.cc (file_path::file_path): Allow external paths outside of
========================================================================
--- NEWS	494d8b2496f3b78e6225d572f92e2643ea7ef223
+++ NEWS	7dccd806b4f5fea115110ed91d0eef708a423899
@@ -1,3 +1,75 @@
+????????????????????????????
+
+        0.23 release.
+
+        Possibly incompatible changes:
+        - hook_note_commit and hook_note_netsync_revision_recieved
+          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
+          FILENAME'; use new commands 'automate get_revision',
+          'automate get_manifest', 'automate get_file' to fetch
+          objects by hash.  (Grahame Bowland <address@hidden>)
+
+        General improvements:
+        - .mt-ignore support (Martin Dvorak
+          <address@hidden>, Timothy Brownawell <address@hidden>)
+        - much work on making monotone more i18n friendly (Benoît
+          Dejean <address@hidden>, Matt Johnston
+          <address@hidden>)
+        - support for new more interactive merge tools:
+          - FileMerge.app (comes with OS X) (Marcel van der Boom
+            <address@hidden>)
+          - TortoiseMerge (Win32; comes with TortoiseSVN) (Matthew
+            Gregan <address@hidden>)
+        - rename and drop now actually perform the specified rename or
+          deletion when the argument --execute is passed.  (Richard
+          Levitte <address@hidden>)
+        - 'help' command, same as --help (Matt Johnston
+          <address@hidden>).
+        - 'usher' support: experimental method for proxying multiple
+          netsync servers through a single port (similar concept to
+          vhosts) (Timothy Brownawell <address@hidden>)
+        - support long passphrases (Matt Johnston <address@hidden>)
+        - Faster binary file detection (Eric Anderson
+          <address@hidden>)
+        - netsync speedups:
+          - when handling large files (Eric Anderson
+            <address@hidden>)
+          - when handling many branches (Marcel van der Boom
+            <address@hidden>)
+        - complete rework of path handling code, for clarity,
+          robustness, and speed.  No user visible changes, except for
+          the many bugs fixed.  (Special thanks to Matthew Gregan
+          <address@hidden> and Grahame Bowland
+          <address@hidden>.)
+        - as always, many small bug fixes, speedups, and improved
+          messages.
+
+        New translations:
+        - fr (Benoît Dejean <address@hidden>)
+        - ja (Satoru SATOH <address@hidden>)
+
+        Other new monotone-related projects since 0.22:
+        - mtsh by Timothy Brownawell:
+            https://netfiles.uiuc.edu/brownawe/www/mtsh/
+          GTK+ wrapper for monotone focusing on working copy
+          operations -- add/drop/revert/rename/commit/update/diff and
+          browsing.  Has a mechanism for per-file commit comments.
+
+        - "dumb server" support by Nathaniel Smith (share your
+          monotone repositories via HTTP/FTP, no netsync daemon
+          needed):
+            http://viewmtn.angrygoats.net//branch.psp?branch=net.venge.monotone.dumb
+          Still needs a command-line frontend to be usable, among
+          other things.  Help wanted.  In python.
+
+        - m7 by Larry Hastings <address@hidden>
+            http://www.midwinter.com/~lch/programming/m7/
+          Experimental drop-in command-line wrapper for monotone.
+          Uses certs to add local incrementing version numbers, and an
+          enhanced annotate front-end.
+
 Mon Aug  8 23:23:53 PDT 2005

         0.22 release.  new crypto library, bug fixes, ui improvements
========================================================================
--- monotone.texi	6d5a231b85631453f85095ac4ce027c3fdc15e38
+++ monotone.texi	5cc1a931d274bc7d3f0cc95fc932162506011cb6
@@ -2714,8 +2714,8 @@
 Contains versioned attributes of files, associated with the files'
 pathnames.
 @item .mt-ignore
-Contains a list of patterns, one per line. If it exists, any file with a name
-matching one of these patterns is ignored.
+Contains a list of regular expression patterns, one per line. If it exists,
+any file with a name matching one of these patterns is ignored.
 @item MT/wanted-testresults
 Contains a list of testresult key names, one per line. If it exists, update
 will only select revisions that do not have regressions according to the given