From: Wayne Davison <wayned@samba.org>
Date: Sat, 11 Nov 2006 05:09:22 +0000 (+0000)
Subject: Docment that --max-delete=0 now works.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/2dc3db2a3e5d19f1d6197df054303aed6e2c3236

Docment that --max-delete=0 now works.
---

diff --git a/NEWS b/NEWS
index e3fb34b5..6d4cef28 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
 NEWS for rsync 3.0.0 (UNRELEASED)
-Protocol: 29 (unchanged)
+Protocol: 30 (changed)
 Changes since 2.6.9:
 
   BUG FIXES:
@@ -13,7 +13,11 @@ Changes since 2.6.9:
 
   ENHANCEMENTS:
 
-    - ...
+    - You may specify --max-delete=0 to a 3.0.0 client as long as the
+      receiving side is at least version 3.0.0.  This means that you
+      can pull from an older rsync with this option, but pushing to an
+      older rsync will generate an error.  *Be careful to never specify
+      a 0 value to older rsync client, or it will be silently ignored.*
 
   INTERNAL:
 
diff --git a/rsync.yo b/rsync.yo
index 05d18936..2a266d74 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -1004,7 +1004,12 @@ using bf(--delete-after), and it used to be non-functional unless the
 bf(--recursive) option was also enabled.
 
 dit(bf(--max-delete=NUM)) This tells rsync not to delete more than NUM
-files or directories (NUM must be non-zero).
+files or directories.
+Beginning with version 3.0.0, you may specify bf(--max-delete=0) to
+be warned about any extraneous files in the destination, but be very
+careful to never specify a 0 value to an older rsync client, or the
+option will be silently ignored.  (A 3.0.0 client will die with an
+error if the remote rsync is not new enough to handle the situation.)
 This is useful when mirroring very large trees to prevent disasters.
 
 dit(bf(--max-size=SIZE)) This tells rsync to avoid transferring any