# 
# patch "ChangeLog"
#  from [ca06092389315b504e13f1f14bd1a9b260e5a55f]
#    to [6d6babd353a051b7b5d6028319c3c98c8d81f7b2]
# 
# patch "UPGRADE"
#  from [1a40f29c9b2db0ca595d0e5ee06eb0e14b6fefd5]
#    to [66a47dba0a68403448e658fd2febb5dbe6ae9407]
# 
========================================================================
--- ChangeLog	ca06092389315b504e13f1f14bd1a9b260e5a55f
+++ ChangeLog	6d6babd353a051b7b5d6028319c3c98c8d81f7b2
@@ -1,5 +1,9 @@
 2005-11-26  Nathaniel Smith  <address@hidden>
 
+	* UPGRADE: Add note about serve changing syntax.
+
+2005-11-26  Nathaniel Smith  <address@hidden>
+
 	* UPGRADE: Update for 0.24.
 	* configure.ac, win32/monotone.iss, monotone.spec:
 	* debian/changelog: Bump version number.
========================================================================
--- UPGRADE	1a40f29c9b2db0ca595d0e5ee06eb0e14b6fefd5
+++ UPGRADE	66a47dba0a68403448e658fd2febb5dbe6ae9407
@@ -6,8 +6,10 @@
     OS X), or %APPDATA%\Monotone\keys (Windows).  You must run 'db
     migrate' against each of your databases; this will automatically
     migrate the keys.  See NEWS for details.
+    Command line syntax for 'serve' has changed; please adjust startup
+    scripts accordingly.
     On Windows only, monotone now looks in a different place for the
-    monotonerc file; see NEWS for details.
+    monotonerc file; see NEWS for 0.24 for details.
   - 0.21 or earlier: hooks governing netsync read permission have
     changed again; see NEWS for 0.22.
   - 0.19 or earlier: there are incompatible command line and server