#
#
# patch "cmd_netsync.cc"
#  from [81921e8b5294c2b6a568b782e6de2432609c9368]
#    to [f4a2db3f6b8328be21ec35f193179c22a7701890]
# 
# patch "monotone.texi"
#  from [c24cb62f61e05cf67714f4667960d21b3251ec67]
#    to [993c049a3eafadf83595962ac7987472ccae8188]
#
============================================================
--- cmd_netsync.cc	81921e8b5294c2b6a568b782e6de2432609c9368
+++ cmd_netsync.cc	f4a2db3f6b8328be21ec35f193179c22a7701890
@@ -488,8 +488,9 @@ CMD_NO_WORKSPACE(serve, "serve", "", CMD
   //on having a pid file when spawning mtn --daemon, since working with
   //the pid of the original process wouldn't do much good.
   //i think it makes some amount of sense even outside of this...
-  N(app.opts.daemon && !app.opts.pidfile.empty(),
-    F("When using --daemon, you must supply --pid-file also"));
+  if (app.opts.daemon)
+    N(!app.opts.pidfile.empty(),
+      F("When using --daemon, you must supply --pid-file also"));
   
   //this ensures that the specified pid file will work and opens it...doing
   //this before daemonizing ensures better user warnings in case of failure.
============================================================
--- monotone.texi	c24cb62f61e05cf67714f4667960d21b3251ec67
+++ monotone.texi	993c049a3eafadf83595962ac7987472ccae8188
@@ -4723,6 +4723,10 @@ @section Network
 the hooks @code{get_netsync_read_permitted} and
 @code{get_netsync_write_permitted} (see @ref{Hook Reference}).
 
+If a @option{--daemon} option is specified, the command @command{serve} will
+detach itself from the controlling terminal and run in the background.  This
+option requires the use of the @option{--pid-file} option.
+
 If a @option{--pid-file} option is specified, the command
 @command{serve} will create the specified file and record the process
 identifier of the server in the file.  This file can then be read to