# 
# 
# patch "COPYING"
#  from [3e9d284b3c48a939e82407d5c3fa6c9e0bf5efcb]
#    to [7d7e3bd4448ca5450c1a211675734ed6a5eae18a]
# 
# patch "ChangeLog"
#  from [ee3d9ba84c8aaab2cfbda505e0c05d8d9bc01019]
#    to [c5364829077f7d317ca3569892d4f943c7f9040d]
# 
# patch "ROADMAP"
#  from [745d2ad91a86dc235175a570896ae219fb9853ac]
#    to [273a37e332dd08dbf4c12bb6f527d4a80e4efc1f]
# 
============================================================
--- COPYING	3e9d284b3c48a939e82407d5c3fa6c9e0bf5efcb
+++ COPYING	7d7e3bd4448ca5450c1a211675734ed6a5eae18a
@@ -1,8 +1,8 @@
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -305,7 +305,7 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 Also add information on how to contact you by electronic and paper mail.
@@ -345,7 +345,7 @@
 
                         Version 1.1, March 2000
      Copyright (C) 2000 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307, USA
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
      
      Everyone is permitted to copy and distribute verbatim copies
      of this license document, but changing it is not allowed.
============================================================
--- ChangeLog	ee3d9ba84c8aaab2cfbda505e0c05d8d9bc01019
+++ ChangeLog	c5364829077f7d317ca3569892d4f943c7f9040d
@@ -1,5 +1,9 @@
 2006-03-10  Matthew Gregan  <address@hidden>
 
+	* ROADMAP: Remove items that have been done and correct a typo.
+
+	* COPYING: Update FSF address.
+
 	* po/fr.po: Fix up broken msgstrs that were causing msgmerge to
 	choke.
 
============================================================
--- ROADMAP	745d2ad91a86dc235175a570896ae219fb9853ac
+++ ROADMAP	273a37e332dd08dbf4c12bb6f527d4a80e4efc1f
@@ -21,16 +21,12 @@
 ROADMAP
 =======
 
-- tidy up major buid/use-breaking bugs in win32, BSD, OSX versions
+- tidy up major build/use-breaking bugs in win32, BSD, OSX versions
 - improve netsync error reporting code 
   - one part: many 'I's should be 'require's.
-- reimplement change_set.cc. major surgery :(
 - overhaul command-line option processing, perhaps use argp
 - move output formatting to lua hooks
 - integrate net.venge.monotone.ssh branch
-- integrate net.venge.monotone.botan branch
-- modify database code to use sqlite3 pre-parsed queries, blobs
-- change netsync to globbing branches, not using collections
 - implement improved ACL/permission system for default trust rules
 - implement "merge into workspace" approach to merging
 - emacs integration