Document --no-detach.v2.5.1pre2

2 files changed, 14 insertions, 0 deletions

diff --git a/NEWS b/NEWS
index ea11c8aa..fc916f4c 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,10 @@ rsync 2.5.1 (sometime in 2001?)
     * --progress and -P now show estimated data transfer rate (in a
         multiple of bytes/s) and estimated time to completion.  Based
         on a patch by Rik Faith.
+   
+    * --no-detach option, required to run as a W32 service and also
+        useful when running on Unix under daemontools, AIX's SRC, or a
+        debugger.  Thanks to Max Bowsher and Jos Backus.
 
   BUG FIXES: 
    
diff --git a/rsync.yo b/rsync.yo
index cfda974f..0bb19448 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -267,6 +267,7 @@ verb(
      --include-from=FILE     don't exclude patterns listed in FILE
      --version               print version number
      --daemon                run as a rsync daemon
+     --no-detach             do not detach from the parent
      --address=ADDRESS       bind to the specified address
      --config=FILE           specify alternate rsyncd.conf file
      --port=PORT             specify alternate rsyncd port number
@@ -624,6 +625,15 @@ config file (/etc/rsyncd.conf) on each connect made by a client and
 respond to requests accordingly. See the rsyncd.conf(5) man page for more
 details. 
 
+dit(bf(--no-detach)) When running as a daemon, this option instructs
+rsync to not detach itself and become a background process.  This
+option is required when running as a service on Cygwin, and may also
+be useful when rsync is supervised by a program such as
+bf(daemontools) or AIX's bf(System Resource Controller).
+bf(--no-detach) is also recommended when rsync is run under a
+debugger.  This option has no effect if rsync is run from inetd or
+sshd.
+
 dit(bf(--address)) By default rsync will bind to the wildcard address
 when run as a daemon with the --daemon option or when connecting to a
 rsync server. The --address option allows you to specify a specific IP