# 
# patch "ChangeLog"
#  from [756728e6e8e1907f674cd0c90500b327606faed5]
#    to [e9dcb97d9497577f3dc765d311e07434e5fb5ab7]
# 
# patch "netsync.cc"
#  from [914f411e1e56fe34c67fee053d58e03fdc5551bc]
#    to [fb080ff453376ea47ead7af3c3168b6c83524461]
# 
========================================================================
--- ChangeLog	756728e6e8e1907f674cd0c90500b327606faed5
+++ ChangeLog	e9dcb97d9497577f3dc765d311e07434e5fb5ab7
@@ -1,5 +1,8 @@
 2005-10-10  Matthew Gregan  <address@hidden>
 
+	* netsync.cc: Remove comment stating that our official IANA port
+	should be renamed from 'netsync' to 'monotone'; Tomas sorted this
+	out a while ago.
 	* lua.cc (Lua::ok): Only log the 'Lua::ok() failed' message if
 	there has been a failure.
 	* monotone.texi: Fix a typo.
========================================================================
--- netsync.cc	914f411e1e56fe34c67fee053d58e03fdc5551bc
+++ netsync.cc	fb080ff453376ea47ead7af3c3168b6c83524461
@@ -77,8 +77,6 @@
 //         monotone-devel.
 //   -- apparently we have a IANA approved port: 4691.  I guess we should
 //      switch to using that.
-//      (It's registered under the name "netsync".  "monotone" would probably
-//      be better, but I don't know how possible it is to change this...)
 
 //
 // this is the "new" network synchronization (netsync) system in